mongoid-collection-separated 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c93b8ba4b2578a02d4c742f7f32da37e987a193b432c46a0940d58e25436852a
-  data.tar.gz: b8e532c66fde7ad1a94e4a24039d666bd130727ceb48c01f1e831219c5e537e1
+  metadata.gz: eaeca25cec0e6b9f7eb25b233a73b0d795bb6ce6ba40e6108f87a7f9dfa80c8a
+  data.tar.gz: 82f28eaba1b9f99b3d40821cc2a5c05df050e457c235894b9bf53fed63cf573f
 SHA512:
-  metadata.gz: f7f7b633a8c184b940f97fd87a70e9c03cf309a3d302360c42822fd148f37f5b97eb84d1d93675eef5ce3b975f97b172929912f83c12ef655c3cd306dad1de32
-  data.tar.gz: cdfef2d83d9f94c0bd1930ffdcc49f0fe0e8cf685738aeb40e87cf00854e014ea174be327d2a0f24bbc1f2d38ebe2dafa6177d3c5a41d14b6bd5ecfffcdef28c
+  metadata.gz: 0df796bad56cb2c450ce688091b5145e188c6f32e34592a9f4988c0d466e4d74d6c9fceca50f9abb5483f1ac58ddf6a10f602c34131ac9483a9bdce27533879c
+  data.tar.gz: 802d77484471bcccff19959901d876caa610fd726c93823a01e0773ad4c3a68030602bdf9d9efddbd4d8832615f7425d1e9cad43d3ef255fd193d495e463f209

data/.gitignore

@@ -13,3 +13,4 @@
 tags
 .byebug_history
 .DS_Store
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongoid-collection-separated (0.3.0)
+    mongoid-collection-separated (0.3.1)
       mongoid (~> 6.2)
 
 GEM

data/lib/mongoid/collection_separated.rb

@@ -18,12 +18,6 @@ module Mongoid
         @calc_collection_name_fun = calc_collection_name_fun
       end
 
-      def ensure_collection_name separate_key
-        cache_key = "#{__method__}_#{separate_key}"
-        return instance_variable_get "@#{cache_key}" if instance_variable_defined? "@#{cache_key}"
-        collection_name = self.send(self.send(:calc_collection_name_fun), separate_key)
-        instance_variable_set "@#{cache_key}", collection_name
-      end
     end
 
   end

data/lib/mongoid/collection_separated/monkey_patches.rb

@@ -21,7 +21,12 @@ module Mongoid
     def calc_new_collection_name query_class
       return unless query_class.respond_to?(:separated_field) && query_class.send(:separated_field).present?
       return unless query_class.respond_to?(:calc_collection_name_fun) && query_class.respond_to?(query_class.calc_collection_name_fun)
-      query_class.send(:ensure_collection_name, separated_value(query_class))
+      separated_key = separated_value(query_class)
+      cache_key = "#{__method__}_#{separated_key}"
+      return instance_variable_get "@#{cache_key}" if instance_variable_defined? "@#{cache_key}"
+      collection_name = query_class.send(query_class.calc_collection_name_fun, separated_key)
+      instance_variable_set "@#{cache_key}", collection_name
+      collection_name
     end
 
     def separated_value query_class
@@ -80,7 +85,12 @@ module Mongoid
         end
 
         def calc_new_collection_name query_class
-          query_class.send(:ensure_collection_name, base.send(query_class.separated_parent_field))
+          separated_key = base.send(query_class.separated_parent_field)
+          cache_key = "#{__method__}_#{separated_key}"
+          return instance_variable_get "@#{cache_key}" if instance_variable_defined? "@#{cache_key}"
+          collection_name = query_class.send(query_class.calc_collection_name_fun, separated_key)
+          instance_variable_set "@#{cache_key}", collection_name
+          collection_name
         end
 
         alias_method :criteria_without_separated, :criteria

data/lib/mongoid/collection_separated/version.rb

@@ -1,6 +1,6 @@
 module Mongoid 
   module CollectionSeparated
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-collection-separated
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - aibotyu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-11 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid