freeze_tag 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47b2394d2f080146b1820559c8ae66fa499e34a1
-  data.tar.gz: 502553609b09b02c70f14ee5a5d40c7dc69f3a8b
+  metadata.gz: 4efe3728e7ca3f3481063a4031f602f2c2f95667
+  data.tar.gz: 0d346dfeea75f18484606ca6cf022fb58a8734ed
 SHA512:
-  metadata.gz: 4f1b3e6b7e499a196c520c28b2925661d7fbaeca1c342a1069489159f20137c7dc411b0bac90c6f70172ac80cd09b8fab59d5c67b8d17b663423493f3ee0fa49
-  data.tar.gz: 24591727e01b8b3ac2a0078f2b522cbe1cf49de18dbbcfd6a37e757e3a84d9bb6988599d94ce928716adf6611dc66311202c894ee3e6001fb001aead61bd03d0
+  metadata.gz: 17397bdfd51dad209132c32c368a1c89b1ae86db33f202c243a2ac738dc184202f5789f5dd563f500755bf4d9bc59929f593b75dab377400c4bec1541575d022
+  data.tar.gz: 59b40f8ba43789c5123224442724ac645e88586a9c440612c33b95b5e0df0b9efe97979f003f1c06721bef69959ba04d3c3cc1891cced787f1ef587bfbbce1c9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    freeze_tag (0.1.2)
+    freeze_tag (0.1.3)
       rails (>= 4.2)
 
 GEM

data/lib/freeze_tag/taggable.rb

@@ -70,27 +70,27 @@ module FreezeTag
       def freeze_tagged(as: nil, list: nil)
         as = as.downcase if self.try(:freeze_tag_case_sensitive)
         if list.present?
-          self.joins("INNER JOIN freeze_tags ON freeze_tags.taggable_id = #{self.table_name}.id AND (freeze_tags.expired_at IS NULL OR freeze_tags.expired_at > '#{DateTime.now}') AND freeze_tags.tag = '#{as}' AND freeze_tags.list = '#{list}'")
+          self.joins("INNER JOIN freeze_tags ON freeze_tags.taggable_id = #{self.table_name}.id AND (freeze_tags.expired_at IS NULL OR freeze_tags.expired_at > '#{DateTime.now}') AND freeze_tags.tag = '#{as}' AND freeze_tags.list = '#{list}'").distinct
         else
-          self.joins("INNER JOIN freeze_tags ON freeze_tags.taggable_id = #{self.table_name}.id AND (freeze_tags.expired_at IS NULL OR freeze_tags.expired_at > '#{DateTime.now}') AND freeze_tags.tag = '#{as}'")
+          self.joins("INNER JOIN freeze_tags ON freeze_tags.taggable_id = #{self.table_name}.id AND (freeze_tags.expired_at IS NULL OR freeze_tags.expired_at > '#{DateTime.now}') AND freeze_tags.tag = '#{as}'").distinct
         end
       end
 
       def previously_freeze_tagged(as: nil, list: nil)
         as = as.downcase if self.try(:freeze_tag_case_sensitive)
         if list.present?
-          self.joins("INNER JOIN freeze_tags ON freeze_tags.taggable_id = #{self.table_name}.id AND freeze_tags.expired_at < '#{DateTime.now}' AND freeze_tags.tag = '#{as}' AND freeze_tags.list = '#{list}'")
+          self.joins("INNER JOIN freeze_tags ON freeze_tags.taggable_id = #{self.table_name}.id AND freeze_tags.expired_at < '#{DateTime.now}' AND freeze_tags.tag = '#{as}' AND freeze_tags.list = '#{list}'").distinct
         else
-          self.joins("INNER JOIN freeze_tags ON freeze_tags.taggable_id = #{self.table_name}.id AND freeze_tags.expired_at < '#{DateTime.now}' AND freeze_tags.tag = '#{as}'")
+          self.joins("INNER JOIN freeze_tags ON freeze_tags.taggable_id = #{self.table_name}.id AND freeze_tags.expired_at < '#{DateTime.now}' AND freeze_tags.tag = '#{as}'").distinct
         end
       end
 
       def ever_freeze_tagged(as: nil, list: nil)
         as = as.downcase if self.try(:freeze_tag_case_sensitive)
         if list.present?
-          self.joins("INNER JOIN freeze_tags ON freeze_tags.taggable_id = #{self.table_name}.id AND freeze_tags.tag = '#{as}' AND freeze_tags.list = '#{list}'")
+          self.joins("INNER JOIN freeze_tags ON freeze_tags.taggable_id = #{self.table_name}.id AND freeze_tags.tag = '#{as}' AND freeze_tags.list = '#{list}'").distinct
         else
-          self.joins("INNER JOIN freeze_tags ON freeze_tags.taggable_id = #{self.table_name}.id AND freeze_tags.tag = '#{as}'")
+          self.joins("INNER JOIN freeze_tags ON freeze_tags.taggable_id = #{self.table_name}.id AND freeze_tags.tag = '#{as}'").distinct
         end
       end
     end

data/lib/freeze_tag/version.rb

@@ -1,3 +1,3 @@
 module FreezeTag
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freeze_tag
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Paul Franzen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails