SHIMODA Hiroshi
null+****@clear*****
Mon Aug 13 14:39:10 JST 2012
SHIMODA Hiroshi 2012-08-13 14:39:10 +0900 (Mon, 13 Aug 2012) New Revision: 3f4cabec42c62005b5d80b1c85c4d231c92abf25 https://github.com/groonga/gcs/commit/3f4cabec42c62005b5d80b1c85c4d231c92abf25 Log: Remove Translator module Removed files: lib/batch/translator.js test/batch-translator.test.js Modified files: lib/api/2011-02-01/configuration.js lib/batch/index.js Modified: lib/api/2011-02-01/configuration.js (+0 -1) =================================================================== --- lib/api/2011-02-01/configuration.js 2012-08-13 14:35:05 +0900 (7e68ec7) +++ lib/api/2011-02-01/configuration.js 2012-08-13 14:39:10 +0900 (13f9e1d) @@ -1,7 +1,6 @@ var path = require('path'); var nroonga = require('../../wrapped-nroonga'); var Domain = require('../../database').Domain; -var Translator = require('../../batch/translator').Translator; var dateFormat = require('dateformat'); var xmlbuilder = require('../../xmlbuilder'); var ipv4 = require('../../ipv4'); Modified: lib/batch/index.js (+0 -1) =================================================================== --- lib/batch/index.js 2012-08-13 14:35:05 +0900 (3f7c713) +++ lib/batch/index.js 2012-08-13 14:39:10 +0900 (01d068e) @@ -1,2 +1 @@ exports.Processor = require('./processor').Processor; -exports.Translator = require('./translator').Translator; Deleted: lib/batch/translator.js (+0 -82) 100644 =================================================================== --- lib/batch/translator.js 2012-08-13 14:35:05 +0900 (dc4caaa) +++ /dev/null @@ -1,82 +0,0 @@ -var Domain = require('../database').Domain; - -function Translator(domain, context) { - this.domain = new Domain(domain, context); - this.initialize(); -} - -Translator.prototype = { - TYPE_ADD: 'add', - TYPE_DELETE: 'delete', - MAPPED_FIELDS: { - 'id': '_key' - }, - - initialize: function() { - this.tableName = this.domain.tableName; - }, - - translate: function(batches) { - var commands = batches.map(function(batch) { - return this.translateOne(batch); - }, this); - return commands; - }, - translateOne: function(batch) { - switch (batch.type) { - case this.TYPE_ADD: - return this.addToLoad(batch); - case this.TYPE_DELETE: - return this.deleteToDelete(batch); - default: - throw new Error('batch type "' + batch.type + '" is not acceptable'); - } - }, - addToLoad: function(batch) { - var line = { - _key: batch.id - }; - for (var field in batch.fields) { - if (!batch.fields.hasOwnProperty(field)) - continue; - line[this.domain.getIndexField(field).columnName] = batch.fields[field]; - } - var values = JSON.stringify([line]); - return { - command: 'load', - options: { - table: this.tableName, - values: values - } - }; - }, - deleteToDelete: function(batch) { - return { - command: 'delete', - options: { - table: this.tableName, - key: batch.id - } - }; - } -}; -exports.Translator = Translator; - -function commandToString(commandSet) { - var options = commandSet.options || {}; - var string = commandSet.command; - for (var option in options) { - if (!options.hasOwnProperty(option)) - continue; - string += ' --' + option + ' ' + options[option]; - } - return string; -} -exports.commandToString = Translator.commandToString = commandToString; - -function commandsToString(commandSets) { - return commandSets.map(function(commandSet) { - return commandToString(commandSet); - }).join('\n'); -} -exports.commandsToString = Translator.commandsToString = commandsToString; Deleted: test/batch-translator.test.js (+0 -216) 100644 =================================================================== --- test/batch-translator.test.js 2012-08-13 14:35:05 +0900 (81dfda0) +++ /dev/null @@ -1,216 +0,0 @@ -var utils = require('./test-utils'); -var assert = require('chai').assert; -var fs = require('fs'); - -var Translator = require('../lib/batch/translator').Translator; - -var addBatches = fs.readFileSync(__dirname + '/fixture/companies/add.sdf.json', 'UTF-8'); -addBatches = JSON.parse(addBatches); -var deleteBatches = fs.readFileSync(__dirname + '/fixture/companies/delete.sdf.json', 'UTF-8'); -deleteBatches = JSON.parse(deleteBatches); - -suite('batch/translator/Translator (instance methods)', function() { - var translator; - - setup(function() { - translator = new Translator('test'); - }); - - teardown(function() { - translator = undefined; - }); - - test('addToLoad', function() { - var batch = addBatches[0]; - var expected = { - command: 'load', - options: { - table: translator.domain.tableName, - values: JSON.stringify([{ - '_key': batch['id'], - 'name': batch['fields']['name'], - 'address': batch['fields']['address'], - 'email_address': batch['fields']['email_address'], - 'age': batch['fields']['age'], - 'product': batch['fields']['product'] - }]) - } - }; - var translated = translator.addToLoad(batch); - assert.deepEqual(translated, expected); - }); - - test('deleteToDelete', function() { - var batch = deleteBatches[0]; - var expected = { - command: 'delete', - options: { - table: translator.domain.tableName, - key: batch['id'] - } - }; - var translated = translator.deleteToDelete(batch); - assert.deepEqual(translated, expected); - }); - - test('translateOne for add', function() { - var batch = addBatches[0]; - var expected = { - command: 'load', - options: { - table: translator.domain.tableName, - values: JSON.stringify([{ - '_key': batch['id'], - 'name': batch['fields']['name'], - 'address': batch['fields']['address'], - 'email_address': batch['fields']['email_address'], - 'age': batch['fields']['age'], - 'product': batch['fields']['product'] - }]) - } - }; - var translated = translator.translateOne(batch); - assert.deepEqual(translated, expected); - }); - - test('translateOne for delete', function() { - var batch = deleteBatches[0]; - var expected = { - command: 'delete', - options: { - table: translator.domain.tableName, - key: batch['id'] - } - }; - var translated = translator.translateOne(batch); - assert.deepEqual(translated, expected); - }); - - test('translate', function() { - var batches = addBatches.slice(0, 2).concat(deleteBatches.slice(0, 1)); - var expected = [ - { - command: 'load', - options: { - table: translator.domain.tableName, - values: JSON.stringify([{ - '_key': batches[0]['id'], - 'name': batches[0]['fields']['name'], - 'address': batches[0]['fields']['address'], - 'email_address': batches[0]['fields']['email_address'], - 'age': batches[0]['fields']['age'], - 'product': batches[0]['fields']['product'] - }]) - } - }, - { - command: 'load', - options: { - table: translator.domain.tableName, - values: JSON.stringify([{ - '_key': batches[1]['id'], - 'name': batches[1]['fields']['name'], - 'address': batches[1]['fields']['address'], - 'email_address': batches[1]['fields']['email_address'], - 'age': batches[1]['fields']['age'], - 'product': batches[1]['fields']['product'] - }]) - } - }, - { - command: 'delete', - options: { - table: translator.domain.tableName, - key: batches[2]['id'] - } - } - ]; - var translated = translator.translate(batches); - assert.deepEqual(translated, expected); - }); -}); - -suite('batch/translator/Translator (class methods)', function() { - suite('commandToString', function() { - test('load', function() { - var batches = addBatches; - var batch = batches[0]; - var command = { - command: 'load', - options: { - table: 'domain_test_00000000000000000000000000', - values: JSON.stringify([{ - '_key': batch['id'], - 'name': batch['fields']['name'], - 'address': batch['fields']['address'], - 'email_address': batch['fields']['email_address'] - }]) - } - }; - var expected = 'load --table domain_test_00000000000000000000000000 --values ' + command.options.values; - var stringified = Translator.commandToString(command); - assert.equal(stringified, expected); - }); - - test('delete', function() { - var batches = deleteBatches; - var batch = batches[0]; - var command = { - command: 'delete', - options: { - table: 'domain_test_00000000000000000000000000', - key: batch['id'] - } - }; - var expected = 'delete --table domain_test_00000000000000000000000000 --key ' + command.options.key; - var stringified = Translator.commandToString(command); - assert.equal(stringified, expected); - }); - }); - - suite('commandsToString', function() { - test('load and delete', function() { - var batches = addBatches.slice(0, 2).concat(deleteBatches.slice(0, 1)); - var commands = [ - { - command: 'load', - options: { - table: 'domain_test_00000000000000000000000000', - values: JSON.stringify([{ - '_key': batches[0]['id'], - 'name': batches[0]['fields']['name'], - 'address': batches[0]['fields']['address'], - 'email_address': batches[0]['fields']['email_address'] - }]) - } - }, - { - command: 'load', - options: { - table: 'domain_test_00000000000000000000000000', - values: JSON.stringify([{ - '_key': batches[1]['id'], - 'name': batches[1]['fields']['name'], - 'address': batches[1]['fields']['address'], - 'email_address': batches[1]['fields']['email_address'] - }]) - } - }, - { - command: 'delete', - options: { - table: 'domain_test_00000000000000000000000000', - key: batches[2]['id'] - } - } - ]; - var expected = [ - 'load --table domain_test_00000000000000000000000000 --values ' + commands[0].options.values, - 'load --table domain_test_00000000000000000000000000 --values ' + commands[1].options.values, - 'delete --table domain_test_00000000000000000000000000 --key ' + commands[2].options.key - ].join('\n'); - var stringified = Translator.commandsToString(commands); - assert.equal(stringified, expected); - }); - }); -}); -------------- next part -------------- HTML����������������������������...Download