elasticsearch-model-extensions 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 187c414c19b2a65be386cf8c75eb4ee039440b2f
-  data.tar.gz: 18ef824732bed168ee717707eba28d5717418cde
+  metadata.gz: 9a5e049bad3147441c538c4b369b93d438dc431c
+  data.tar.gz: 93cee441524ba5c0dcfc77e1c4024fe53be31371
 SHA512:
-  metadata.gz: 6c8f14d33a0eb2e91ac6c8aaaa3de81a598e3593fc016690c99ec74e21acde23bdf82d14626ce8829f3aa05361f2398a04e0fee068001a4a5b22537524c8c6bf
-  data.tar.gz: 69cc264beccef5a22492fe67597a843af325db385e56303739e4a09a51fc896f6a22b73a7799115b692370914a8d2bd1d660986ada30a8f3de7c1d2a8fdbce43
+  metadata.gz: a34d4689f80a8676ca79f4bd522c45b8d9f044ecf13fe541632e5bcfb120d220bbca7a75c63648c46e2791d8843316a22799957360d512cd9172776bb386977c
+  data.tar.gz: 34b1d5ce206560036aad88adcc71833292f4bf7ae0d53a56a941939f09cb70323852ed7d58829b3a89ce884f900d10ff2d46e2f23f14e70d61a23b4bf6ea84dd

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

@@ -39,7 +39,7 @@ module Elasticsearch
         def build_hash
           child_class = @active_record_class
 
-          field_to_update = -> {
+          field_to_update = @field_to_update || begin
             path = child_class.path_from(@parent_class)
             parent_to_child_path = path.map(&:name)
 
@@ -47,7 +47,9 @@ module Elasticsearch
             # そのとき、
             # 親aから子cへのパスが[:b, :c]だったら、bだけをupdateすればよいので
             parent_to_child_path.first
-          }.call || @field_to_update
+          end
+
+          parent_to_child_path ||= [field_to_update]
 
           puts "#{child_class.name} updates #{@parent_class.name}'s #{field_to_update}"
 

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

@@ -117,12 +117,14 @@ module Elasticsearch
             delayed = options[:delayed] || nil
             only_if = options[:if] || (-> r { true })
             records_to_update_documents = options[:records_to_update_documents] || nil
+            field_to_update = options[:field_to_update] || nil
 
             initialize_active_record!(
               self,
               :parent_class => parent_class,
               :delayed => delayed,
               :only_if => only_if,
+              :field_to_update => field_to_update,
               :records_to_update_documents => records_to_update_documents
             )
           end

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

@@ -2,6 +2,8 @@ module Elasticsearch
   module Model
     module Extensions
       class ShortestPath
+        MAX_DEPTH = 5
+
         class Node
           include Enumerable
 
@@ -59,7 +61,10 @@ module Elasticsearch
 
         module ClassMethods
           def breadth_first_search(node, &block)
-            paths = node.each.map { |e| [e] }
+            original_paths = node.each.map { |e| [e] }
+            paths = original_paths
+
+            depth = 0
 
             loop {
               a = paths.select { |p|
@@ -69,12 +74,15 @@ module Elasticsearch
               }
 
               return a if a.size != 0
+              raise RuntimeError, 'Maximum depth exceeded while calculating the shortest path' if depth >= Elasticsearch::Model::Extensions::ShortestPath::MAX_DEPTH
 
               paths = paths.flat_map { |p|
                 p.last.destination.each.map { |e|
                   p + [e]
                 }
               }
+
+              depth += 1
             }
           end
 

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

@@ -1,7 +1,7 @@
 module Elasticsearch
   module Model
     module Extensions
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-model-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yusuke KUOKA