active_content 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81339ecd1014291cbeec5f9e4aa44f09fe5b62fa
-  data.tar.gz: 26bc41b698ba4fa90dd625e29c9b19baa3567586
+  metadata.gz: 306cd17dcc26dec11f03cbb2962af633f19495a3
+  data.tar.gz: c3611f17322d2f19b4770f67452829af64ce03e9
 SHA512:
-  metadata.gz: a1ab2114fea295f0896334dae25f483df959c52e8d2bde5162e21227fd62b5f12620762c133168860e7bf2c2c1657278f930d4378cc877e8a073453090ac6eb0
-  data.tar.gz: dc6d428ce4719d6515e419166ba2bda756bae210e8d122cb5f0255f17efaa7541f13bebd808c4c4c7f5e85de441bffa651b78f70ce255576cd165fb9e501eb60
+  metadata.gz: dfce19e1777822256f60937738961432a9f6a142bfeaf1eb1d36bd98124359c660d2e66a4f834d8412f0fa8c60378d4e46c1f613b3006a8c28d689386fa913ae
+  data.tar.gz: ed7ec9961658fc85c4dea16d28061785e37ce91d0bfe2fb3f78fe1794e8d5e06860f93dd0896255953cc793a2c0887ddfeb9afac6715e724c23d67292a4d497f

data/lib/active_content/taxonomizable.rb

@@ -12,34 +12,52 @@ module ActiveContent
         has_many name, options
 
         define_method :"#{name}_list" do
-          self.send name
+          self.send(name).pluck(:name)
         end
 
-        define_method :"#{name}_list=" do |names|
+        define_method :"#{name}_list=" do |*names|
           model = options[:class_name].classify.constantize
-          names = Array(names).map do |n|
+          items = names.flatten.reject(&:blank?).map do |n|
             model.find_by_name(n) || model.new(name: n)
           end
 
-          self.send :"#{name}=", names
+          self.send :"#{name}=", items
         end
 
         scope :"with_#{name}", -> (*ids) do
-          joins(name).where(taxonomies: { id: ids })
+          params = ids.flatten
+          query  = joins(:"#{name}")
+          query  = query.where(taxonomies: { id: params }) if params.any?
+
+          query.distinct(true)
         end
 
         scope :"without_#{name}", -> (*ids) do
-          joins(name).where.not(taxonomies: { id: ids })
+          joins(:"#{name}").where.not(taxonomies: { id: ids }).distinct(true)
         end
       end
 
       def has_taxonomized(name, options={})
         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_class = (options[:class_name] || "#{name}".classify).constantize.base_class
+        assoc_table = assoc_class.table_name
+        assoc_type  = assoc_class.name
         assoc_proc  = -> { where taxonomizations: { field: assoc_field } }
 
         has_many :"#{assoc_name}", assoc_proc, through: :taxonomizations, source: :taxonomizable, source_type: "#{assoc_type}"
+
+        scope :"with_#{assoc_name}", -> (*ids) do
+          params = ids.flatten
+          query  = joins(:"#{assoc_name}")
+          query  = query.where(assoc_table => { id: params }) if params.any?
+
+          query.distinct(true)
+        end
+
+        scope :"without_#{assoc_name}", -> (*ids) do
+          joins(:"#{assoc_name}").where.not(assoc_table => { id: ids }).distinct(true)
+        end
       end
     end
   end

data/lib/active_content/version.rb

@@ -1,3 +1,3 @@
 module ActiveContent
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

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