cauchy 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a066911b251f0e0cbe301bd90dcaf7e3ec3d2cf9
-  data.tar.gz: 8637a44b98222b417751327618fda0d55b5a1e57
+  metadata.gz: d08afcae445ff25b3d59b8f8d1362e0ee6af672b
+  data.tar.gz: 4f34c2abe722c7fb89a13d0c84aa63a654d7ae4d
 SHA512:
-  metadata.gz: 64c6a2980ed4869e14a8b0b827afd7a3eb6f7eeb2ed1c47d95e755500cdf34ddb5f1f0497671daaec0ea1b11f1516d050d9f077ca7c429e3e9c5e2cf6f5cfeaf
-  data.tar.gz: 1a842585547d2b43b1c75482065cd03aaf302c19c2b63f14bb13f1a49d196a3215f551f805e4f72dbaf6604997fa69a14f344e82ef0e9e5f89f1103255ba179a
+  metadata.gz: 879d10050c250276d941c9a43caa1bec30e7eb0d541b1206672705f888aaf7913c45bbaf23c06722b21597bd22913120d7a7a7007a00a763d8e5d95b1b0a8410
+  data.tar.gz: 994491e4b86f87854906e52ec3933825c5611c2190cd089b508ce90ad2b3bc2deb357b2e7d1be8848486e961643e0c4b00445d5e9066333442f328a725caed67

data/lib/cauchy/index_schema/normalization.rb

@@ -12,28 +12,36 @@ module Cauchy
 
       def normalize_mapping(hash)
         hash.deep_stringify_keys.sort.map do |key, field|
-          if field.key?('properties')
-            field['properties'] = normalize_mapping(field['properties'])
-            field['type'] = 'object'
+          if field.is_a?(Hash)
+            normalize_field(key, field)
+          else
+            [key, field]
           end
+        end.to_h
+      end
 
-          if field['type'] == 'date'
-            field['format'] ||= 'dateOptionalTime'
-          end
+      def normalize_field(key, field)
+        if field.key?('properties')
+          field['properties'] = normalize_mapping(field['properties'])
+          field['type'] ||= 'object'
+        end
 
-          if ['boolean', 'long', 'double', 'date'].include?(field['type'])
-            field.delete('analyzer')
-            field['index'] ||= 'not_analyzed'
-          end
+        if field['type'] == 'date'
+          field['format'] ||= 'dateOptionalTime'
+        end
 
-          if key == 'properties'
-            field = normalize_mapping(field)
-          else
-            field = normalize_value(field)
-          end
+        if ['boolean', 'long', 'double', 'date'].include?(field['type'])
+          field.delete('analyzer')
+          field['index'] ||= 'not_analyzed'
+        end
 
-          [key, field]
-        end.to_h
+        if key == 'properties'
+          field = normalize_mapping(field)
+        else
+          field = normalize_value(field)
+        end
+
+        return [key, field]
       end
 
       def normalize_settings(hash)

data/lib/cauchy/version.rb

@@ -1,3 +1,3 @@
 module Cauchy
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cauchy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Paul Hamera
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: An elasticsearch schema management tool