elasticsearch-model-extensions 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 391098b48433332f19ef9836bd8e49dd95dbbcf1
-  data.tar.gz: f2c5d5ff94939acf9455c13816cee7136ff8355e
+  metadata.gz: 076cb7342044b51ad4a7920aae0dfc09070c015e
+  data.tar.gz: bfc79e42c19c27aad6852d0df43513c4517678a5
 SHA512:
-  metadata.gz: aba8b1b0a198b56f8922561bfc9f0b2fae188385e12d4d78636ce842e2129aecf314667081ec27d4f3ccb99e01f5feb57b8a2df0bd8b0e6b4334708d2c303deb
-  data.tar.gz: a60735a7d26bf1e287e393bb0b1177d7f886df09b366d854b3954729db793240b3820558c66634798539803116c20dfd95a77c7133ee9f8a011c0c7c4b96ed42
+  metadata.gz: 553c045a7765157dadc41acf13e3cd14194efe87369088cbda79390dab9e48aa4f8655105af1dd0ccd06875fa5691d2def56c68438cffbefd7aaad5cac0bea81
+  data.tar.gz: 7879a6be1cf2bf6f9292df21f8aa267d052d70354b8c1b19098ac32e9482c25742b0d3d47a7d63c06f405a295f8258d4051dce46e19b811fdbd11515ed13d217

data/gemfiles/rails41.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mumoshu/Repositories/elasticsearch-model-extensions
   specs:
-    elasticsearch-model-extensions (0.2.2)
+    elasticsearch-model-extensions (0.3.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/elasticsearch/model/extensions/configuration.rb

@@ -70,26 +70,44 @@ module Elasticsearch
           @association_path_finder ||= Elasticsearch::Model::Extensions::AssociationPathFinding::AssociationPathFinder.new
         end
 
-        def build_hash
-          child_class = @active_record_class
+        def provided_parent_to_child_path
+          field_to_update = @field_to_update
+
+          @parent_to_child_path ||=
+              if field_to_update.is_a? Hash
+                extract_path_from_hash(field_to_update)
+              elsif field_to_update.is_a? Symbol
+                [field_to_update]
+              elsif field_to_update.nil?
+                @calculated_path = association_path_finder.find_path(from: @parent_class, to: @active_record_class)
+                @calculated_path.map(&:name)
+              else
+                raise "Unexpected type for field_to_update: #{field_to_update}(#{field_to_update.class})"
+              end
+        end
+
+        def extract_path_from_hash(hash)
+          hash.is_a?(Symbol) ? [hash] : (hash.keys.empty? ? [] : [hash.keys.first] + extract_path_from_hash(hash[hash.keys.first]))
+        end
 
-          field_to_update = @field_to_update || begin
-            path = association_path_finder.find_path(from: @parent_class, to: child_class)
-            parent_to_child_path = path.map(&:name)
+        def provided_field_to_update
+          # a has_a b has_a cという関係のとき、cが更新されたらaのフィールドbをupdateする必要がある。
+          # そのとき、
+          # 親aから子cへのパスが[:b, :c]だったら、bだけをupdateすればよいので
+          provided_parent_to_child_path.first
+        end
 
-            # a has_a b has_a cという関係のとき、cが更新されたらaのフィールドbをupdateする必要がある。
-            # そのとき、
-            # 親aから子cへのパスが[:b, :c]だったら、bだけをupdateすればよいので
-            parent_to_child_path.first
-          end
+        def build_hash
+          child_class = @active_record_class
 
-          parent_to_child_path ||= [field_to_update]
+          field_to_update = provided_field_to_update
+          parent_to_child_path = provided_parent_to_child_path
 
           puts "#{child_class.name} updates #{@parent_class.name}'s #{field_to_update}"
 
           @nested_object_fields = @parent_class.__mapping_reflector__.nested_object_fields_for(parent_to_child_path).map(&:to_s)
           @has_dependent_fields = @parent_class.__dependency_tracker__.has_dependent_fields?(field_to_update) ||
-            (path && path.first.destination.through_class == child_class && @parent_class.__dependency_tracker__.has_association_named?(field_to_update) && @parent_class.__mapping_reflector__.has_document_field_named?(field_to_update))
+            (@calculated_path && @calculated_path.first.destination.through_class == child_class && @parent_class.__dependency_tracker__.has_association_named?(field_to_update) && @parent_class.__mapping_reflector__.has_document_field_named?(field_to_update))
 
           custom_if = @if
 

data/lib/elasticsearch/model/extensions/version.rb

@@ -1,7 +1,7 @@
 module Elasticsearch
   module Model
     module Extensions
-      VERSION = "0.3.1"
+      VERSION = "0.3.2"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-model-extensions
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Yusuke KUOKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-25 00:00:00.000000000 Z
+date: 2014-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler