active_content 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cb9c9ba1c2461a6a6756106db94041a75a53a6e
-  data.tar.gz: 65c8989b5e2732c26590c8d900caa081690f4935
+  metadata.gz: b4d733346b4391d869a6dc9e82b49a0efd9a4bd0
+  data.tar.gz: 74bd6d1516920cfd6b0da9a0edaedc5b31b44ed0
 SHA512:
-  metadata.gz: 4b738f0b07040e6df0b15967d51e61047e9b752958ceb1a0f1328f14261c65b61bff0851f41637d9c5eacc8f14e76fa7838446a1b06cc008a0c8694857e4cf41
-  data.tar.gz: 21ea39f9a3bb162eabc391bbe5125e2992034f9d94fe56f9b1fde0b2ba92975e7b0ab66ecc8a014fb71cbf429730a1271bd3f72a96b63d73efaf71f8fed69a1d
+  metadata.gz: cde1fc9c0d26f7d55ada8f940b3ead5ebe65a1677c3d1fe22a3b691fdd59ab4a515219a70e9152994d63b64d0e3604065896ae089062fb6a9e36992750dab4b8
+  data.tar.gz: 56f4444c548d83bd095e00f560ede5b4530a7988d7a8e44cc8045c79be3d56ba891e21f3ab9b55686afd778e35870cfc08baef83046519fbca342eba90aae011

data/lib/active_content/taxonomizable.rb

@@ -8,7 +8,7 @@ module ActiveContent
         options = options.merge(through: :"#{name}_taxonomizations")
         setting = { as: :taxonomizable, class_name: 'ActiveContent::Taxonomization', autosave: true, dependent: :destroy }
 
-        has_many options[:through], setting
+        has_many options[:through], -> { where field: "#{name}".downcase }, setting
         has_many name, options
 
         define_method :"#{name}_list" do
@@ -24,25 +24,22 @@ module ActiveContent
           self.send :"#{name}=", names
         end
 
-        query = self.includes(name)
-        blank = { taxonomies: { id: nil } }
-
         scope :"with_#{name}", -> (*ids) do
-          id = { taxonomies: { id: ids } }
-          ids.empty? ? query.where.not(blank) : query.where(id)
+          joins(name).where(taxonomies: { id: ids })
         end
 
         scope :"without_#{name}", -> (*ids) do
-          id = { taxonomies: { id: ids } }
-          ids.empty? ? query.where(blank) : query.where(blank).or(query.where.not(id))
+          joins(name).where.not(taxonomies: { id: ids })
         end
       end
 
       def has_taxonomized(name, options={})
-        assoc_name = "#{name}".pluralize
-        assoc_type = (options[:class_name] || "#{name}".classify).constantize.base_class.name
+        assoc_name  = "#{name}".pluralize
+        assoc_field = options[:through] || self.name.parameterize.underscore.pluralize
+        assoc_type  = (options[:class_name] || "#{name}".classify).constantize.base_class.name
+        assoc_proc  = -> { where taxonomizations: { field: assoc_field } }
 
-        has_many :"#{assoc_name}", through: :taxonomizations, source: :taxonomizable, source_type: "#{assoc_type}"
+        has_many :"#{assoc_name}", assoc_proc, through: :taxonomizations, source: :taxonomizable, source_type: "#{assoc_type}"
       end
     end
   end

data/lib/active_content/version.rb

@@ -1,3 +1,3 @@
 module ActiveContent
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/generators/active_content/templates/taxonomy.rb

@@ -12,12 +12,13 @@ class CreateTaxonomies < ActiveRecord::Migration[5.0]
     add_index :taxonomies, :ancestry
 
     create_table :taxonomizations do |t|
+      t.string     :field, null: false
       t.references :taxonomy
       t.references :taxonomizable, null: false, polymorphic: true, index: false
 
       t.timestamps
     end
 
-    add_index :taxonomizations, [:taxonomizable_id, :taxonomizable_type, :taxonomy_id], unique: true, name: :index_taxonomizations_on_taxonomizable_attribute
+    add_index :taxonomizations, [:taxonomizable_id, :taxonomizable_type, :taxonomy_id, :field], unique: true, name: :index_taxonomizations_on_taxonomizable_attribute
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_content
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Olibia Tsati
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-19 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord