inquisitio 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a82ff5d2d9e82c66a70e7f562fe341dbcf801132
-  data.tar.gz: 001c23a1eb0cc0bda0312c5b0e750823c9de5ef1
+  metadata.gz: 89aae9dc681251070a23032fd2dab54af311e0cc
+  data.tar.gz: 3bdf5147f6bd81d43164e38c700255263c58f981
 SHA512:
-  metadata.gz: 86d076089e49f4312e987ed5fb3aaa89a90eb998b5bcf6c95057ca240577de82b86b9092bb51a80ad56f7c2954e826d73ae364d7ae784424064434fe97e0388c
-  data.tar.gz: d3d5df92f1a49fa3fbe43c43a104966d16cd88eacf856f910c2352cf3665f428c566fa0ceb50c0ad9c9f90911a9f18dba0b7e0144c2abae949f99598e203b8ff
+  metadata.gz: 0f6218f321736cfa15f6bebd2dc5456817ae118f3e8335929f1c73ab0bf9f0498d5b75db95f5ffe52cbb31a2fd4fd9fed24294995b062798bad30f49fe3aee9b
+  data.tar.gz: 508afe8065da867c2d0eee4fadbdba18f66aabfc584f9998487f0b516ede922b4a21770eac2eefc7e63fc0d5725133d2b01ebcb3e65bcbd478e2cfc472030419

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+1.2.0 / 2014-06-03
+[FEATURE] Support for 2013-01-01 version of cloudsearch API
+
 1.1.2 / 2014-03-20
 [BUGFIX] Encode ampersands
 

data/lib/inquisitio/configuration.rb

@@ -6,6 +6,7 @@ module Inquisitio
   class Configuration
 
     SETTINGS = [
+      :api_version,
       :search_endpoint,
       :document_endpoint,
       :default_search_size,
@@ -32,6 +33,9 @@ module Inquisitio
 
     def get_or_raise(setting)
       val = instance_variable_get("@#{setting.to_s}")
+      if setting == :api_version && val.nil?
+        val = '2011-02-01'
+      end
       val.nil?? raise(InquisitioConfigurationError.new("Configuration for #{setting} is not set")) : val
     end
   end

data/lib/inquisitio/document.rb

@@ -3,22 +3,20 @@ module Inquisitio
   class Document
 
     attr_reader :type, :id, :version, :fields
+
     def initialize(type, id, version, fields)
       @type = type
       @id = id
       @version = version
-      @fields = fields.reject {|k,v| v.nil?}
+      @fields = fields.reject { |k, v| v.nil? }
     end
 
     def to_SDF
-      <<-EOS
-{ "type": "#{type}",
-  "id":   "#{id}",
-  "version": #{version},
-  "lang": "en",
-  "fields": #{fields.to_json}
-}
-      EOS
+      if Inquisitio.config.api_version == '2011-02-01'
+        "{ \"type\": \"#{type}\", \"id\": \"#{id}\", \"version\": #{version}, \"lang\": \"en\", \"fields\": #{fields.to_json} }"
+      elsif Inquisitio.config.api_version == '2013-01-01'
+        "{ \"type\": \"#{type}\", \"id\": \"#{id}\", \"fields\": #{fields.to_json} }"
+      end
     end
   end
 end

data/lib/inquisitio/indexer.rb

@@ -31,7 +31,7 @@ module Inquisitio
     end
 
     def batch_index_url
-      "#{Inquisitio.config.document_endpoint}/2011-02-01/documents/batch"
+      "#{Inquisitio.config.document_endpoint}/#{Inquisitio.config.api_version}/documents/batch"
     end
       
     def post_to_endpoint

data/lib/inquisitio/search_url_builder.rb

@@ -49,7 +49,11 @@ module Inquisitio
         end
       end
 
-      "bq=#{URI.encode("(and #{query_blocks.join(' ')})").gsub('&', '%26')}"
+      if Inquisitio.config.api_version == '2011-02-01'
+        "bq=#{URI.encode("(and #{query_blocks.join(' ')})").gsub('&', '%26')}"
+      elsif Inquisitio.config.api_version == '2013-01-01'
+        "q=#{URI.encode("(and #{query_blocks.join(' ')})").gsub('&', '%26')}&q.parser=structured"
+      end
     end
 
     def sanitise(value)
@@ -58,7 +62,11 @@ module Inquisitio
 
     def return_fields_query_string
       return "" if @return_fields.nil?
-      "&return-fields=#{URI::encode(@return_fields.join(',').gsub('\'',''))}"
+      if Inquisitio.config.api_version == '2011-02-01'
+        "&return-fields=#{URI::encode(@return_fields.join(',').gsub('\'',''))}"
+      elsif Inquisitio.config.api_version == '2013-01-01'
+        "&return=#{URI::encode(@return_fields.join(',').gsub('\'',''))}"
+      end
     end
 
     def arguments
@@ -67,7 +75,7 @@ module Inquisitio
     end
 
     def url_root
-      "#{Inquisitio.config.search_endpoint}/2011-02-01/search?"
+      "#{Inquisitio.config.search_endpoint}/#{Inquisitio.config.api_version}/search?"
     end
 
     def add_default_size

data/lib/inquisitio/searcher.rb

@@ -143,7 +143,11 @@ module Inquisitio
 
     def search_url
       @search_url ||= begin
-        return_fields = params[:returns].empty? ? [:type, :id] : params[:returns]
+        if Inquisitio.config.api_version == '2011-02-01'
+          return_fields = params[:returns].empty? ? [:type, :id] : params[:returns]
+        elsif Inquisitio.config.api_version == '2013-01-01'
+          return_fields = params[:returns].empty? ? nil : params[:returns]
+        end
 
         SearchUrlBuilder.build(
           query: params[:criteria],

data/lib/inquisitio/version.rb

@@ -1,3 +1,3 @@
 module Inquisitio
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

data/test/configuration_test.rb

@@ -19,6 +19,15 @@ module Inquisitio
       assert_equal test_search_endpoint, Inquisitio.config.search_endpoint
     end
 
+    def test_api_version
+      assert_equal '2011-02-01', Inquisitio.config.api_version
+      Inquisitio.config.api_version = '2013-01-01'
+      assert_equal '2013-01-01', Inquisitio.config.api_version
+      Inquisitio.config.api_version = nil
+      assert_equal '2011-02-01', Inquisitio.config.api_version
+      Inquisitio.config.api_version = '2011-02-01'
+    end
+
     def test_search_endpoint
       assert_equal 3, Inquisitio.config.max_attempts
     end

data/test/test_document.rb

@@ -0,0 +1,49 @@
+require File.expand_path('../test_helper', __FILE__)
+require 'json'
+
+module Inquisitio
+  class TestDocument < Minitest::Test
+
+    def test_initialization_sets_type
+      document = Document.new('add', '12345', 1, {:title => 'The Title', :author => 'The Author'})
+      assert_equal 'add', document.type
+    end
+
+    def test_initialization_sets_id
+      document = Document.new('add', '12345', 1, {:title => 'The Title', :author => 'The Author'})
+      assert_equal '12345', document.id
+    end
+
+    def test_initialization_sets_version
+      document = Document.new('add', '12345', 1, {:title => 'The Title', :author => 'The Author'})
+      assert_equal 1, document.version
+    end
+
+    def test_initialization_sets_fields
+      fields = {:title => 'The Title', :author => 'The Author'}
+      document = Document.new('add', '12345', 1, fields)
+      assert_equal fields, document.fields
+    end
+
+    def test_create_valid_SDF_json_for_2011
+      expected_SDF = '{ "type": "add", "id": "12345", "version": 1, "lang": "en", "fields": { "title": "The Title", "author": "The Author" } }'
+      document = Document.new('add', '12345', 1, {:title => 'The Title', :author => 'The Author'})
+      assert_equal JSON.parse(expected_SDF).to_json, JSON.parse(document.to_SDF).to_json
+    end
+
+    def test_create_valid_SDF_json_for_2013
+      Inquisitio.config.api_version = '2013-01-01'
+      expected_SDF = '{ "type": "add", "id": "12345", "fields": { "title": "The Title", "author": "The Author" } }'
+      document = Document.new('add', '12345', 1, {:title => 'The Title', :author => 'The Author'})
+      assert_equal JSON.parse(expected_SDF).to_json, JSON.parse(document.to_SDF).to_json
+      Inquisitio.config.api_version = nil
+    end
+
+    def test_should_ignore_null_field_values_when_creating_SDF_json
+      expected_SDF = '{ "type": "add", "id": "12345", "version": 1, "lang": "en", "fields": { "title": "The Title" } }'
+      fields = {:title => 'The Title', :author => nil}
+      document = Document.new('add', '12345', 1, fields)
+      assert_equal JSON.parse(expected_SDF).to_json, JSON.parse(document.to_SDF).to_json
+    end
+  end
+end

data/test/{indexer_test.rb → test_indexer_for_2011.rb}

@@ -1,7 +1,7 @@
 require File.expand_path('../test_helper', __FILE__)
 
 module Inquisitio
-  class IndexerTest < Minitest::Test
+  class TestIndexerFor2011 < Minitest::Test
     def setup
       @document_endpoint = 'http://my.document-endpoint.com'
       Inquisitio.config.document_endpoint = @document_endpoint
@@ -34,8 +34,14 @@ module Inquisitio
 
     def test_create_correct_index_url
       indexer = Indexer.new(@documents)
-      expected_url = 'http://my.document-endpoint.com/2011-02-01/documents/batch'
-      assert_equal expected_url, indexer.send(:batch_index_url)
+      assert_equal 'http://my.document-endpoint.com/2011-02-01/documents/batch', indexer.send(:batch_index_url)
+    end
+
+    def test_create_correct_index_url_2013
+      Inquisitio.config.api_version = '2013-01-01'
+      indexer = Indexer.new(@documents)
+      assert_equal 'http://my.document-endpoint.com/2013-01-01/documents/batch', indexer.send(:batch_index_url)
+      Inquisitio.config.api_version = nil
     end
 
     def test_create_correct_body

data/test/{search_url_builder_test.rb → test_search_url_builder_for_2011.rb}

@@ -1,7 +1,7 @@
 require File.expand_path('../test_helper', __FILE__)
 
 module Inquisitio
-  class SearchUrlBuilderTest < Minitest::Test
+  class TestSearchUrlBuilderFor2011 < Minitest::Test
     def setup
       super
       @search_endpoint = 'http://my.search-endpoint.com'

data/test/test_search_url_builder_for_2013.rb

@@ -0,0 +1,110 @@
+require File.expand_path('../test_helper', __FILE__)
+
+module Inquisitio
+  class TestSearchUrlBuilderFor2013 < Minitest::Test
+    def setup
+      super
+      @search_endpoint = 'http://my.search-endpoint.com'
+      Inquisitio.config.api_version = '2013-01-01'
+      Inquisitio.config.search_endpoint = @search_endpoint
+      Inquisitio.config.default_search_size = '10'
+    end
+
+    def test_create_correct_search_url_with_single_criteria_query
+      url = SearchUrlBuilder.build(query: ['Star Wars'])
+      expected_url = 'http://my.search-endpoint.com/2013-01-01/search?q=Star%20Wars&size=10'
+      assert_equal expected_url, url
+    end
+
+    def test_create_correct_search_url_with_ampersand
+      url = SearchUrlBuilder.build(query: ['Star&Wars'])
+      expected_url = 'http://my.search-endpoint.com/2013-01-01/search?q=Star%26Wars&size=10'
+      assert_equal expected_url, url
+    end
+
+    def test_create_correct_search_url_with_multiple_criteria_should_create_boolean_query
+      url = SearchUrlBuilder.build(query: ['Star Wars', 'Episode One'])
+      expected_url = 'http://my.search-endpoint.com/2013-01-01/search?q=(and%20(or%20\'Star%20Wars\'%20\'Episode%20One\'))&q.parser=structured&size=10'
+      assert_equal expected_url, url
+    end
+
+    def test_create_correct_search_url_with_multiple_criteria_with_ampersand
+      url = SearchUrlBuilder.build(query: ['Star&Wars', 'Episode One'])
+      expected_url = 'http://my.search-endpoint.com/2013-01-01/search?q=(and%20(or%20\'Star%26Wars\'%20\'Episode%20One\'))&q.parser=structured&size=10'
+      assert_equal expected_url, url
+    end
+
+
+    def test_create_correct_search_url_including_return_fields
+      url = SearchUrlBuilder.build(query: ['Star Wars'], return_fields: [ 'title', 'year', '%' ] )
+      expected_url = 'http://my.search-endpoint.com/2013-01-01/search?q=Star%20Wars&return=title,year,%25&size=10'
+      assert_equal expected_url, url
+    end
+
+    def test_create_boolean_query_search_url_with_only_filters
+      url = SearchUrlBuilder.build(filters: {title: 'Star Wars'})
+      expected_url = 'http://my.search-endpoint.com/2013-01-01/search?q=(and%20title:\'Star%20Wars\')&q.parser=structured&size=10'
+      assert_equal expected_url, url
+    end
+
+    def test_create_boolean_query_search_url_with_query_and_filters
+      url = SearchUrlBuilder.build(query: ['Star Wars'], filters: {genre: 'Animation'})
+      expected_url = 'http://my.search-endpoint.com/2013-01-01/search?q=(and%20\'Star%20Wars\'%20genre:\'Animation\')&q.parser=structured&size=10'
+      assert_equal expected_url, url
+    end
+
+    def test_create_boolean_query_search_url_with_query_and_filters_and_return_fields
+      url = SearchUrlBuilder.build(query: ['Star Wars'], filters: {genre: 'Animation'}, return_fields: [ 'title', 'year', '%' ])
+      expected_url = 'http://my.search-endpoint.com/2013-01-01/search?q=(and%20\'Star%20Wars\'%20genre:\'Animation\')&q.parser=structured&return=title,year,%25&size=10'
+      assert_equal expected_url, url
+    end
+
+    def test_create_search_url_with_added_arguments
+      url = SearchUrlBuilder.build(query: ['Star Wars'], filters: {genre: 'Animation'}, :arguments => { facet: 'genre', 'facet-genre-constraints' => 'Animation', 'facet-genre-top-n' => '5'})
+      expected_url = 'http://my.search-endpoint.com/2013-01-01/search?q=(and%20\'Star%20Wars\'%20genre:\'Animation\')&q.parser=structured&facet=genre&facet-genre-constraints=Animation&facet-genre-top-n=5&size=10'
+      assert_equal expected_url, url
+    end
+
+    def test_create_search_url_with_default_size
+      url = SearchUrlBuilder.build(query: ['Star Wars'])
+      expected_url = 'http://my.search-endpoint.com/2013-01-01/search?q=Star%20Wars&size=10'
+      assert_equal expected_url, url
+    end
+
+    def test_create_search_url_overriding_default_size
+      url = SearchUrlBuilder.build(query: ['Star Wars'], :arguments => { size: '200' })
+      expected_url = 'http://my.search-endpoint.com/2013-01-01/search?q=Star%20Wars&size=200'
+      assert_equal expected_url, url
+    end
+
+    def test_create_search_url_with_start_and_default_size
+      url = SearchUrlBuilder.build(query: ['Star Wars'], :arguments => { start: '20' })
+      expected_url = 'http://my.search-endpoint.com/2013-01-01/search?q=Star%20Wars&start=20&size=10'
+      assert_equal expected_url, url
+    end
+
+    def test_create_search_url_with_start_and_size
+      url = SearchUrlBuilder.build(query: ['Star Wars'], :arguments => { start: '2', size: '200' })
+      expected_url = 'http://my.search-endpoint.com/2013-01-01/search?q=Star%20Wars&start=2&size=200'
+      assert_equal expected_url, url
+    end
+
+    def test_create_correct_search_url_with_sanatised_query_string
+      url = SearchUrlBuilder.build(query: ['Star\' Wars'], filters: {genre: 'Anim\'ation'}, :arguments => { facet: 'ge\'nre', 'facet-genr\'e-constraints' => 'Anim\'ation', 'facet-gen\'re-top-n' => '\'5'}, return_fields: [ 't\'itle', 'y\'ear' ])
+      expected_url = 'http://my.search-endpoint.com/2013-01-01/search?q=(and%20\'Star%20Wars\'%20genre:\'Animation\')&q.parser=structured&return=title,year&facet=genre&facet-genre-constraints=Animation&facet-genre-top-n=5&size=10'
+      assert_equal expected_url, url
+    end
+
+    def test_create_search_url_with_filter_array
+      url = SearchUrlBuilder.build(query: ['Star Wars'], filters: {genre: ['Animation', 'Action']})
+      expected_url = 'http://my.search-endpoint.com/2013-01-01/search?q=(and%20\'Star%20Wars\'%20(or%20genre:\'Animation\'%20genre:\'Action\'))&q.parser=structured&size=10'
+      assert_equal expected_url, url
+    end
+
+    def test_throws_exception_when_using_unsupported_filter_value_type
+      assert_raises(InquisitioError) do
+        SearchUrlBuilder.build(query: ['Star Wars'], filters: {genre: {}})
+      end
+    end
+  end
+end

data/test/{searcher_test.rb → test_searcher.rb}

@@ -16,11 +16,12 @@ module Inquisitio
     end
   end
 
-  class SearcherTest < Minitest::Test
+  class TestSearcher < Minitest::Test
     def setup
       super
       @search_endpoint = 'http://my.search-endpoint.com'
       Inquisitio.config.search_endpoint = @search_endpoint
+      Inquisitio.config.api_version = nil
       @result_1 = {'data' => {'id' => ['1'], 'title' => ["Foobar"], 'type' => ["Cat"]}}
       @result_2 = {'data' => {'id' => ['2'], 'title' => ["Foobar"], 'type' => ["Cat"]}}
       @result_3 = {'data' => {'id' => ['20'], 'title' => ["Foobar2"], 'type' => ["Module_Dog"]}}
@@ -91,11 +92,17 @@ module Inquisitio
       assert searcher.send(:search_url).include? "q=Star%20Wars"
     end
 
-    def test_where_gets_correct_url_with_filters
+    def test_where_gets_correct_url_with_filters_for_2011
       searcher = Searcher.where(title: 'Star Wars')
       assert searcher.send(:search_url).include? "bq=(and%20(or%20title:'Star%20Wars'))"
     end
 
+    def test_where_gets_correct_url_with_filters_for_2013
+      Inquisitio.config.api_version = '2013-01-01'
+      searcher = Searcher.where(title: 'Star Wars')
+      assert searcher.send(:search_url).include? "q=(and%20(or%20title:'Star%20Wars'))&q.parser=structured"
+    end
+
     def test_where_works_with_array_in_a_hash
       criteria = {thing: ['foo', 'bar']}
       searcher = Searcher.where(criteria)
@@ -181,21 +188,33 @@ module Inquisitio
       assert searcher.params[:returns].include?('foobar')
     end
 
-    def test_returns_gets_correct_urlns_appends_variable
+    def test_returns_gets_correct_urlns_appends_variable_for_2011
       searcher = Searcher.returns('foobar')
       assert searcher.send(:search_url).include? "&return-fields=foobar"
     end
 
+    def test_returns_gets_correct_urlns_appends_variable_for_2013
+      Inquisitio.config.api_version = '2013-01-01'
+      searcher = Searcher.returns('foobar')
+      assert searcher.send(:search_url).include? "&return=foobar"
+    end
+
     def test_returns_with_array_sets_variable
       searcher = Searcher.returns('dog', 'cat')
       assert_equal ['dog', 'cat'], searcher.params[:returns]
     end
 
-    def test_returns_with_array_gets_correct_url
+    def test_returns_with_array_gets_correct_url_for_2011
       searcher = Searcher.returns('id', 'foobar')
       assert searcher.send(:search_url).include? "&return-fields=id,foobar"
     end
 
+    def test_returns_with_array_gets_correct_url_for_2013
+      Inquisitio.config.api_version = '2013-01-01'
+      searcher = Searcher.returns('id', 'foobar')
+      assert searcher.send(:search_url).include? "&return=id,foobar"
+    end
+
     def test_returns_appends_variable
       searcher = Searcher.returns('id').returns('foobar')
       assert_equal ['id', 'foobar'], searcher.params[:returns]
@@ -291,11 +310,18 @@ module Inquisitio
       2.times { searcher.search }
     end
 
-    def test_should_return_type_and_id_by_default
+    def test_should_return_type_and_id_by_default_for_2011
       searcher = Searcher.where('Star Wars')
       assert_equal [], searcher.params[:returns]
       assert searcher.send(:search_url).include? "&return-fields=type,id"
-      searcher.send(:search_url)
+    end
+
+    def test_should_not_specify_return_by_default_for_2013
+      Inquisitio.config.api_version = '2013-01-01'
+      searcher = Searcher.where('Star Wars')
+      assert_equal [], searcher.params[:returns]
+      refute searcher.send(:search_url).include? "&return="
+      refute searcher.send(:search_url).include? "&return-fields="
     end
 
     def test_should_return_ids

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inquisitio
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Jeremy Walker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -148,13 +148,14 @@ files:
 - lib/inquisitio/searcher.rb
 - lib/inquisitio/version.rb
 - test/configuration_test.rb
-- test/document_test.rb
-- test/indexer_test.rb
 - test/logger_test.rb
 - test/results_test.rb
-- test/search_url_builder_test.rb
-- test/searcher_test.rb
+- test/test_document.rb
 - test/test_helper.rb
+- test/test_indexer_for_2011.rb
+- test/test_search_url_builder_for_2011.rb
+- test/test_search_url_builder_for_2013.rb
+- test/test_searcher.rb
 homepage: https://github.com/meducation/inquisition
 licenses:
 - AGPL3
@@ -175,17 +176,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: This wraps AWS CloudSearch in a Ruby Gem
 test_files:
 - test/configuration_test.rb
-- test/document_test.rb
-- test/indexer_test.rb
 - test/logger_test.rb
 - test/results_test.rb
-- test/search_url_builder_test.rb
-- test/searcher_test.rb
+- test/test_document.rb
 - test/test_helper.rb
+- test/test_indexer_for_2011.rb
+- test/test_search_url_builder_for_2011.rb
+- test/test_search_url_builder_for_2013.rb
+- test/test_searcher.rb
 has_rdoc: 

data/test/document_test.rb

@@ -1,68 +0,0 @@
-require File.expand_path('../test_helper', __FILE__)
-require 'json'
-
-module Inquisitio
-  class DocumentTest < Minitest::Test
-    def setup
-      @type = 'add'
-      @id = '12345'
-      @version = 1
-      @fields = { :title => 'The Title', :author => 'The Author' }
-      @document = Document.new(@type, @id, @version, @fields)
-
-      @expected_SDF = 
-        <<-EOS
-{ "type": "add",
-  "id":   "12345",
-  "version": 1,
-  "lang": "en",
-  "fields": {
-    "title": "The Title",
-    "author": "The Author"
-  }
-}
-        EOS
-    end
-
-    def test_initialization_sets_type
-      assert_equal @type, @document.type
-    end
-
-    def test_initialization_sets_id
-      assert_equal @id, @document.id
-    end
-
-    def test_initialization_sets_version
-      assert_equal @version, @document.version
-    end
-
-    def test_initialization_sets_fields
-      assert_equal @fields, @document.fields
-    end
-
-    def test_create_valid_SDF_json
-      assert_equal JSON.parse(@expected_SDF).to_json,
-                   JSON.parse(@document.to_SDF).to_json
-    end
-
-    def test_should_ignore_null_field_values_when_creating_SDF_json
-      expected_SDF = 
-        <<-EOS
-{ "type": "add",
-  "id":   "12345",
-  "version": 1,
-  "lang": "en",
-  "fields": {
-    "title": "The Title"
-  }
-}
-        EOS
-        
-      fields = { :title => 'The Title', :author => nil }
-      document = Document.new(@type, @id, @version, fields)
-        
-      assert_equal JSON.parse(expected_SDF).to_json,
-                   JSON.parse(document.to_SDF).to_json
-    end
-  end
-end