Groonga - fulltext search engine.

[Groonga-commit] groonga/gcs [master] Remove use of begin method of xmlbuilder

Yoji SHIDARA null+****@clear*****
Thu Dec 13 16:57:01 JST 2012

• Previous message: [Groonga-commit] groonga/groonga-query-log [master] test: use important information to name
• Next message: [Groonga-commit] [Fixed] groonga/gcs#737 (master - 990e9db)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Yoji SHIDARA	2012-12-13 16:57:01 +0900 (Thu, 13 Dec 2012)

  New Revision: 990e9dbcc19807ce65fa593b6e5d60a51b29ed5a
  https://github.com/groonga/gcs/commit/990e9dbcc19807ce65fa593b6e5d60a51b29ed5a

  Log:
    Remove use of begin method of xmlbuilder

  Modified files:
    lib/api/2011-02-01/configuration.js
    lib/api/2011-02-01/search.js
    npm-shrinkwrap.json

  Modified: lib/api/2011-02-01/configuration.js (+32 -44)
===================================================================
--- lib/api/2011-02-01/configuration.js    2012-12-13 14:18:44 +0900 (2a71dd2)
+++ lib/api/2011-02-01/configuration.js    2012-12-13 16:57:01 +0900 (ff4147d)
@@ -62,14 +62,13 @@ function createCommonErrorResponse(errorCode, error, requestId) {
   } else {
     error = error.toString();
   }
-  var doc = xmlbuilder.create();
-  doc.begin('ErrorResponse', { version: '1.0' })
+  var doc = xmlbuilder.create('ErrorResponse', { version: '1.0' })
     .attribute('xmlns', XMLNS)
     .element('Error')
       .element('Code').text(errorCode).up()
       .element('Message').text(error).up()
     .up()
-    .element('RequestId').text(requestId).up();
+    .element('RequestId').text(requestId).up().doc();
   return doc.toString(PRETTY_PRINT_OPTIONS);
 }
 
@@ -79,23 +78,21 @@ function createSenderErrorResponse(errorCode, error, requestId) {
   } else {
     error = error.toString();
   }
-  var doc = xmlbuilder.create();
-  doc.begin('ErrorResponse', { version: '1.0' })
+  var doc = xmlbuilder.create('ErrorResponse', { version: '1.0' })
     .attribute('xmlns', XMLNS)
     .element('Error')
       .element('Type').text('Sender').up()
       .element('Code').text(errorCode).up()
       .element('Message').text(error).up()
     .up()
-    .element('RequestId').text(requestId).up();
+    .element('RequestId').text(requestId).up().doc();
   return doc.toString(PRETTY_PRINT_OPTIONS);
 }
 
 var handlers = Object.create(null);
 
 function createGenericResponse(action, result, requestId) {
-  var doc = xmlbuilder.create();
-  var root = doc.begin(action + 'Response', { version: '1.0' })
+  var root = xmlbuilder.create(action + 'Response', { version: '1.0' })
                 .attribute('xmlns', XMLNS);
 
   var resultContainer = root.element(action + 'Result');
@@ -104,12 +101,11 @@ function createGenericResponse(action, result, requestId) {
   root.element('ResponseMetadata')
       .element('RequestId').text(requestId);
 
-  return doc.toString(PRETTY_PRINT_OPTIONS);
+  return root.doc().toString(PRETTY_PRINT_OPTIONS);
 }
 
 function createDomainStatus(options) {
-  var domainStatus = xmlbuilder.create();
-  domainStatus.begin(options.element || 'DomainStatus', { version: '1.0' })
+  var domainStatus = xmlbuilder.create(options.element || 'DomainStatus', { version: '1.0' })
     .element('Created').text('true').up() // always true, for compatibility with ACS
     .element('Deleted').text(options.deleted || 'false').up()
     .element('DocService')
@@ -173,15 +169,14 @@ handlers.DeleteDomain = function(context, request, response, config) {
 };
 
 function createDomainStatusList(options) {
-  var doc = xmlbuilder.create();
-  var domainStatusList = doc.begin('DomainStatusList', {version: '1.0'});
+  var domainStatusList = xmlbuilder.create('DomainStatusList', {version: '1.0'});
   options.domains.forEach(function(domain) {
     domainStatusList.importXMLBuilder(createDomainStatus({
                        domain:  domain,
                        element: 'member'
                      }));
   });
-  return doc;
+  return domainStatusList.doc();
 }
 
 handlers.DescribeDomains = function(context, request, response, config) {
@@ -222,26 +217,23 @@ function createIndexFieldOptionStatus(field, givenOptions) {
   var hasOption = Object.keys(field.getAllOptions()).length;
   switch (field.type) {
     case 'text':
-      var textOptions = xmlbuilder.create();
-      var textOptionsFragment = textOptions.begin('TextOptions', { version: '1.0' });
+      var textOptionsFragment = xmlbuilder.create('TextOptions', { version: '1.0' });
       if (field.hasDefaultValue)
         textOptionsFragment.element('DefaultValue').text(field.defaultValue);
       if (field.hasFacetEnabled)
         textOptionsFragment.element('FacetEnabled').text(field.facetEnabled);
       if (field.hasResultEnabled)
         textOptionsFragment.element('ResultEnabled').text(field.resultEnabled);
-      return hasOption ? textOptions : null;
+      return hasOption ? textOptionsFragment.doc() : null;
 
     case 'uint':
-      var uintOptions = xmlbuilder.create();
-      var uintOptionsFragment = uintOptions.begin('UIntOptions', { version: '1.0' });
+      var uintOptionsFragment = xmlbuilder.create('UIntOptions', { version: '1.0' });
       if (field.hasDefaultValue)
         uintOptionsFragment.element('DefaultValue').text(field.defaultValue);
-      return hasOption ? uintOptions : null;
+      return hasOption ? uintOptionsFragment.doc() : null;
 
     case 'literal':
-      var literalOptions = xmlbuilder.create();
-      var literalOptionsFragment = literalOptions.begin('LiteralOptions', { version: '1.0' });
+      var literalOptionsFragment = xmlbuilder.create('LiteralOptions', { version: '1.0' });
       if (field.hasDefaultValue)
         literalOptionsFragment.element('DefaultValue').text(field.defaultValue);
       if (field.hasFacetEnabled)
@@ -250,12 +242,11 @@ function createIndexFieldOptionStatus(field, givenOptions) {
         literalOptionsFragment.element('ResultEnabled').text(field.resultEnabled);
       if (field.hasSearchEnabled)
         literalOptionsFragment.element('SearchEnabled').text(field.searchEnabled);
-      return hasOption ? literalOptions : null;
+      return hasOption ? literalOptionsFragment.doc() : null;
   }
 }
 
 function createOptionStatus(options) {
-  var optionStatus = xmlbuilder.create();
   var createdAt = options.createdAt;
   var pendingDeletion = options.pendingDeletion;
   var state = options.state;
@@ -268,18 +259,17 @@ function createOptionStatus(options) {
     if (!updatedAt) updatedAt = options.field.updatedAt;
     if (!updateVersion) updateVersion = options.field.updateVersion;
   }
-  optionStatus.begin(options.element || 'Status', { version: '1.0' })
+  var status = xmlbuilder.create(options.element || 'Status', { version: '1.0' })
     .element('CreationDate').text(dateFormat(createdAt, 'isoUtcDateTime')).up()
     .element('PendingDeletion').text(pendingDeletion || 'false').up()
     .element('State').text(state || 'RequiresIndexDocuments').up()
     .element('UpdateDate').text(dateFormat(updatedAt, 'isoUtcDateTime')).up()
     .element('UpdateVersion').text(updateVersion || '0');
-  return optionStatus;
+  return status.doc();
 }
 
 function createIndexFieldStatus(options) {
-  var indexFieldStatus = xmlbuilder.create();
-  var statusFragment = indexFieldStatus.begin(options.element || 'IndexField', { version: '1.0' });
+  var statusFragment = xmlbuilder.create(options.element || 'IndexField', { version: '1.0' });
 
   var optionsFragment = statusFragment
         .element('Options')
@@ -296,7 +286,7 @@ function createIndexFieldStatus(options) {
                                            updatedAt:       options.updatedAt,
                                            updateVersion:   options.updateVersion,
                                            element:         'Status' }));
-  return indexFieldStatus;
+  return statusFragment.doc();
 }
 
 handlers.DefineIndexField = function(context, request, response, config) {
@@ -441,15 +431,14 @@ handlers.DeleteIndexField = function(context, request, response, config) {
 };
 
 function createIndexFields(fields) {
-  var doc = xmlbuilder.create();
-  var indexFields = doc.begin('IndexFields', {version: '1.0'});
+  var indexFields = xmlbuilder.create('IndexFields', {version: '1.0'});
   fields.forEach(function(field) {
     indexFields.importXMLBuilder(createIndexFieldStatus({
                   field:   field,
                   element: 'member'
                 }));
   });
-  return doc;
+  return indexFields.doc();
 }
 
 handlers.DescribeIndexFields = function(context, request, response, config) {
@@ -494,20 +483,19 @@ handlers.DescribeIndexFields = function(context, request, response, config) {
 };
 
 function createFieldNames(domain) {
-  var doc = xmlbuilder.create();
-  var fieldNames = doc.begin('FieldNames', {version: '1.0'});
+  var fieldNames = xmlbuilder.create('FieldNames', {version: '1.0'});
   domain.indexFields
     .map(function(field) {
       return field.name;
     })
     .sort()
     .forEach(function(fieldName) {
-      var member = xmlbuilder.create();
-      member.begin('member', { version: '1.0' })
-        .text(fieldName);
+      var member = xmlbuilder.create('member', { version: '1.0' })
+        .text(fieldName)
+        .doc();
      fieldNames.importXMLBuilder(member);
     });
-  return doc;
+  return fieldNames.doc();
 }
 
 handlers.IndexDocuments = function(context, request, response, config) {
@@ -523,8 +511,7 @@ function createSynonymOptionsStatus(options) {
   var synonyms = options.domain.getSynonymsSync();
   var synonymOptions = { synonyms: synonyms };
 
-  var synonymOptionsStatus = xmlbuilder.create();
-  synonymOptionsStatus.begin('Synonyms', { version: '1.0' })
+  var synonymOptionsStatus = xmlbuilder.create('Synonyms', { version: '1.0' })
     .element('Options')
       .text(JSON.stringify(synonymOptions))
     .up()
@@ -532,7 +519,8 @@ function createSynonymOptionsStatus(options) {
                                            createdAt:     options.createdAt,
                                            updatedAt:     options.updatedAt,
                                            updateVersion: options.updateVersion,
-                                           element:       'Status' }));
+                                           element:       'Status' }))
+    .doc();
   return synonymOptionsStatus;
 }
 
@@ -565,8 +553,7 @@ handlers.DescribeSynonymOptions = function(context, request, response, config) {
 };
 
 function createDefaultSearchFieldStatus(options) {
-  var defaultSearchFieldStatus = xmlbuilder.create();
-  defaultSearchFieldStatus.begin('DefaultSearchField', { version: '1.0' })
+  var defaultSearchFieldStatus = xmlbuilder.create('DefaultSearchField', { version: '1.0' })
     .element('Options').text(options.fieldName).up()
     .importXMLBuilder(createOptionStatus({
        state:         options.state,
@@ -574,7 +561,8 @@ function createDefaultSearchFieldStatus(options) {
        updatedAt:     options.updatedAt,
        updateVersion: options.updateVersion,
        element:       'Status'
-    }));
+    }))
+    .doc();
   return defaultSearchFieldStatus;
 }
 

  Modified: lib/api/2011-02-01/search.js (+2 -3)
===================================================================
--- lib/api/2011-02-01/search.js    2012-12-13 14:18:44 +0900 (b7ad798)
+++ lib/api/2011-02-01/search.js    2012-12-13 16:57:01 +0900 (d20ad62)
@@ -149,8 +149,7 @@ function createErrorBody(options) {
 }
 
 function toXMLResponse(body) {
-  var doc = xmlbuilder.create();
-  var results = doc.begin('results', { version: '1.0' })
+  var results = xmlbuilder.create('results', { version: '1.0' })
                   .attribute('xmlns', XMLNS);
 
   if (body.error) {
@@ -185,7 +184,7 @@ function toXMLResponse(body) {
     results.element('info', body.info);
   }
 
-  return doc.toString(PRETTY_PRINT_OPTIONS);
+  return results.doc().toString(PRETTY_PRINT_OPTIONS);
 }
 
 exports.createHandler = function(context, config) {

  Modified: npm-shrinkwrap.json (+3 -3)
===================================================================
--- npm-shrinkwrap.json    2012-12-13 14:18:44 +0900 (c2f603f)
+++ npm-shrinkwrap.json    2012-12-13 16:57:01 +0900 (95cb013)
@@ -211,16 +211,16 @@
       "version": "0.4.2"
     },
     "chai": {
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "mocha": {
-      "version": "1.6.0",
+      "version": "1.7.4",
       "dependencies": {
         "commander": {
           "version": "0.6.1"
         },
         "growl": {
-          "version": "1.5.1"
+          "version": "1.6.1"
         },
         "jade": {
           "version": "0.26.3",
-------------- next part --------------
HTML����������������������������...
Download 

• Previous message: [Groonga-commit] groonga/groonga-query-log [master] test: use important information to name
• Next message: [Groonga-commit] [Fixed] groonga/gcs#737 (master - 990e9db)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]