Merge pull request #602 from toptal/specification-storage

Specification stored as json
toptal · Nov 6, 2017 · 1a13f75 · 1a13f75
2 parents 1509dde + 8c2e70c
commit 1a13f75
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/lib/chewy/index/specification.rb b/lib/chewy/index/specification.rb
@@ -24,7 +24,7 @@ def initialize(index)
       def lock!
         Chewy::Stash::Specification.import!([
           id: @index.derivable_name,
-          value: current.to_json
+          specification: current
         ], journal: false)
       end
 
@@ -34,7 +34,9 @@ def lock!
       # @return [Hash] hash produced with JSON parser
       def locked
         filter = {ids: {values: [@index.derivable_name]}}
-        JSON.parse(Chewy::Stash::Specification.filter(filter).first.try!(:value) || '{}')
+        document = Chewy::Stash::Specification.filter(filter).first
+        return {} unless document
+        document.specification || JSON.parse(document.value || '{}')
       end
 
       # Simply returns `Chewy::Index.specification_hash`, but

diff --git a/lib/chewy/stash.rb b/lib/chewy/stash.rb
@@ -11,6 +11,7 @@ class Stash < Chewy::Index
       default_import_options journal: false
 
       field :value, index: 'no'
+      field :specification, type: 'object', enabled: false
     end
 
     define_type :journal do # rubocop:disable Metrics/BlockLength

diff --git a/spec/chewy/index/specification_spec.rb b/spec/chewy/index/specification_spec.rb
@@ -59,7 +59,10 @@
         '_type' => 'specification',
         '_id' => 'places',
         '_score' => 1.0,
-        '_source' => {'value' => '{"settings":{"index":{"number_of_shards":1,"number_of_replicas":0}},"mappings":{"city":{"properties":{"name":{"type":"string"}}}}}'}
+        '_source' => {'specification' => {
+          'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
+          'mappings' => {'city' => {'properties' => {'name' => {'type' => 'string'}}}}
+        }, 'value' => nil}
       }])
     end
 
@@ -72,13 +75,19 @@
           '_type' => 'specification',
           '_id' => 'places',
           '_score' => 1.0,
-          '_source' => {'value' => '{"settings":{"index":{"number_of_shards":1,"number_of_replicas":0}},"mappings":{"city":{"properties":{"name":{"type":"string"}}}}}'}
+          '_source' => {'specification' => {
+            'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
+            'mappings' => {'city' => {'properties' => {'name' => {'type' => 'string'}}}}
+          }, 'value' => nil}
         }, {
           '_index' => 'chewy_stash',
           '_type' => 'specification',
           '_id' => 'namespace/cities',
           '_score' => 1.0,
-          '_source' => {'value' => '{"settings":{"index":{"number_of_shards":1,"number_of_replicas":0}},"mappings":{"city":{"properties":{"population":{"type":"integer"}}}}}'}
+          '_source' => {'specification' => {
+            'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
+            'mappings' => {'city' => {'properties' => {'population' => {'type' => 'integer'}}}}
+          }, 'value' => nil}
         }])
       end
     end