mongoid-collection-separated 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2db1c0e56ef0f51a62a9cae1301527cc601207cdc3d29c88d0b0b62ee4434056
-  data.tar.gz: d483cfedb5024cfd7b1773309878fffb11273e17951f7a7a70f15eb3aed58e3e
+  metadata.gz: bfba70a37de67de41dc7d5d0adf80a2a2b3d5bc8e2c33ad8aa69b135e9b6f5f3
+  data.tar.gz: a44ba06116ad965932694728814144307946de2e3defe2718d4266cce185e3b4
 SHA512:
-  metadata.gz: c2f90b4d09bf56814bf34c8918f943a219b84995daf2a4b21fab506d34850ee050c44f25caae72dd444d2d42290840e08bd11dfde16ec011021ebfa9de87dff7
-  data.tar.gz: e848e4bfc8cf1858e17b1bf3b4d157a92fd090a8c7e0f4cf8a88ee57c58295769855b32d630b88d4e4b1e2c253b3d189d0abcc9e0cbdcffc183fa971c4974460
+  metadata.gz: cba3d857433998e06971c0493c0708986509ad5afd63ecb78c6c68347eef00537052f44fbbea291fe8b3b8aa9c7b9469f9cc1d9fd370b45e0b36e4508b9bba6c
+  data.tar.gz: '048c3cf68d0e75226afc477b70fbb9acf42ce2cd419e263c97201ac7fec5b498ab4a27b27e39907c7263a1a25dc536d2f1dfab53347ed667dcd9b1523f04cedd'

data/README.md

@@ -20,13 +20,53 @@ Or install it yourself as:
 
 ## Usage
 Add the following line into the model class that you want to split:
+### 1. spepated by simple field
 ```ruby
-  separated_by :form_id, :calc_collection_name
+    class Entry
+      include Mongoid::Document
+      include Mongoid::Timestamps
+      include Mongoid::CollectionSeparated
+      include Mongoid::Attributes::Dynamic
+
+      separated_by :collection_suffix, :calc_collection_name
+      class << self
+        def calc_collection_name collection_suffix
+          return if collection_suffix.nil?
+          "entries_#{collection_suffix}"
+        end
+      end
+    end
+```
+
+### 2. spepated by belongs to model id
+```ruby
+    class Entry
+      include Mongoid::Document
+      include Mongoid::Timestamps
+      include Mongoid::CollectionSeparated
+      include Mongoid::Attributes::Dynamic
+      belongs_to :form
+
+      separated_by :form_id, :calc_collection_name, parent_class: 'Form'
+      class << self
+        def calc_collection_name form_id
+          return if form_id.nil?
+          "entries_#{form_id}"
+        end
+      end
+    end
+
+
+    class Form
+      include Mongoid::Document
+      has_many :entries
+    end
+
 ```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/mongoid_collection_separatable.
+Bug reports and pull requests are welcome on GitHub at https://github.com/WeiGangqiang/mongoid_collection_separated
 
 ## License
 

data/lib/mongoid/collection_separated/monkey_patches.rb

@@ -20,8 +20,8 @@ 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(query_class.calc_collection_name_fun, (separated_value(query_class)))
+      return unless query_class.respond_to?(:calc_collection_name_fun) && query_class.respond_to?(query_class.calc_collection_name_fun)
+      query_class.send(query_class.calc_collection_name_fun, separated_value(query_class))
     end
 
     def separated_value query_class
@@ -68,11 +68,18 @@ module Mongoid
         end
 
         def should_query_from_separated_collection?(query_class)
-          query_class.respond_to?(:separated_field) && query_class.send(:separated_field) && base.is_a?(query_class.separated_parent_class) && base.respond_to?(query_class.separated_parent_field)
+          is_separated_query_class?(query_class) && is_separated_parent_class?(query_class)
+        end
+
+        def is_separated_query_class? query_class
+          query_class.respond_to?(:separated_field) && query_class.send(:separated_field) && query_class.respond_to?(:calc_collection_name_fun) && query_class.respond_to?(query_class.calc_collection_name_fun)
+        end
+
+        def is_separated_parent_class? query_class
+          base.is_a?(query_class.separated_parent_class) && base.respond_to?(query_class.separated_parent_field)
         end
 
         def calc_new_collection_name query_class
-          return unless query_class.respond_to?(:calc_collection_name_fun) or query_class.respond_to?(query_class.calc_collection_name_fun)
           query_class.send(query_class.calc_collection_name_fun, base.send(query_class.separated_parent_field))
         end
 

data/lib/mongoid/collection_separated/version.rb

@@ -1,6 +1,6 @@
 module Mongoid 
   module CollectionSeparated
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-collection-separated
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - aibotyu