freeze_tag 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3ffb789a97a168f562d82cbbcbafe9cea792d9c
-  data.tar.gz: 74e21ca1f03b52ea295964ccdcba756250423e61
+  metadata.gz: d7026c601f2468b7dbc1c55128bcb05f2e0e5b69
+  data.tar.gz: 95aa739db8ed9f23ff7b9f669aa25d31b1403305
 SHA512:
-  metadata.gz: 9ae4657972deba0f249602afd6f1003167e95896b80e76b66933f56f100f71355bd7ff41a141ec72e5aed8d8bd2868be8d1cceee870286015ca43ce31f360b23
-  data.tar.gz: 2e20761a2789411d0113e4ca7813b8fd32ced24b15e8c5d741895284a7980aeb74f1a9dc9d977e255a6b2af809bc2d108822b7595ec34573d51682c3b5c27bdf
+  metadata.gz: 3f0bc37e41913104bad687f23aa95a9b0f1209304b9126ac302ba2e5b369965afaedabca3fde1306eb8d6ff0dd8b0d0829e5e3ef317d617654b661e751adcc10
+  data.tar.gz: 630ffb47d31a07a01f9e039e8b92cc01c41fb3b8cf9f5cc39135bb656b182111d1a9caf8bc74c2d27ae049f7cca7886c610b06b82fd097e79a1e309c9eef0f33

data/.gitignore

@@ -10,3 +10,4 @@
 # rspec failure tracking
 .rspec_status
 .byebug_history
+*.gem

data/Gemfile.lock

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

data/README.md

@@ -8,7 +8,7 @@ As excellent and useful as ActsAsTaggable is, this library is attempt to reconci
 
 1. Freeze tag allows for a more "stateless" approach to tagging. 
 
-Tags are never deleted, instead they have an "ended_at" column, which can be updated to make them active or inactive.
+Tags are never deleted, instead they have an "expired_at" column, which can be updated to make them inactive.
 
 2. The associations are more simple.
 

data/lib/freeze_tag/taggable.rb

@@ -7,7 +7,7 @@ module FreezeTag
  
     included do
       has_many :freeze_tags, as: :taggable, class_name: "FreezeTag::Tag"
-      has_many :active_freeze_tags, -> { where("ended_at IS NULL OR ended_at > ?", DateTime.now) }, as: :taggable, class_name: "FreezeTag::Tag"
+      has_many :active_freeze_tags, -> { where("expired_at IS NULL OR expired_at > ?", DateTime.now) }, as: :taggable, class_name: "FreezeTag::Tag"
 
       def freeze_tag(as: [], expire_others: false, list: nil)
         ActiveRecord::Base.transaction do
@@ -15,13 +15,11 @@ module FreezeTag
           as = as.map(&:downcase) if self.class.try(:freeze_tag_case_sensitive)
           
           if expire_others == true
-            active_freeze_tags.where(list: list).where.not(tag: as).update_all(ended_at: DateTime.now)
+            active_freeze_tags.where(list: list).where.not(tag: as).update_all(expired_at: DateTime.now)
           end
 
           as.each do |t|
-            ft = FreezeTag::Tag.find_or_create_by(taggable_type: self.class.name, taggable_id: self.id, tag: t, list: list)
-            ft.ended_at = nil
-            ft.save! if ft.changed?
+            ft = FreezeTag::Tag.find_or_create_by(taggable_type: self.class.name, taggable_id: self.id, tag: t, list: list, expired_at: nil)
           end
         end
       end
@@ -39,7 +37,7 @@ module FreezeTag
         to_exp = freeze_tags.find_by(tag: tag, list: list)
         return nil unless to_exp.present?
         exp_at = date.present? ? date : DateTime.now
-        to_exp.ended_at = exp_at
+        to_exp.expired_at = exp_at
         to_exp.save
       end
 
@@ -49,18 +47,18 @@ 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.ended_at IS NULL OR freeze_tags.ended_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}'")
         else
-          self.joins("INNER JOIN freeze_tags ON freeze_tags.taggable_id = #{self.table_name}.id AND (freeze_tags.ended_at IS NULL OR freeze_tags.ended_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}'")
         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.ended_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}'")
         else
-          self.joins("INNER JOIN freeze_tags ON freeze_tags.taggable_id = #{self.table_name}.id AND freeze_tags.ended_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}'")
         end
       end
 

data/lib/freeze_tag/version.rb

@@ -1,3 +1,3 @@
 module FreezeTag
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/generators/freeze_tag/install/templates/create_freeze_tag_tables.rb

@@ -9,13 +9,13 @@ class CreateFreezeTagTables < ActiveRecord::Migration
       t.string  :list,           index: true
       # t.uuid    :taggable_id,   index: true, null: false # Use this if you're mapping using UUIDs as a primary key
       # t.integer :taggable_id,   index: true, null: false # Use this if you're mapping using Integer Primary Keys
-      t.datetime  :ended_at,     index: true
+      t.datetime  :expired_at,   index: true
       t.timestamps
     end
 
-    add_index :freeze_tags, [:taggable_type, :taggable_id, :tag, :ended_at]
-    add_index :freeze_tags, [:taggable_type, :taggable_id, :ended_at]
-    add_index :freeze_tags, [:tag, :ended_at]    
-    add_index :freeze_tags, [:taggable_type, :taggable_id, :tag, :list], unique: true, name: "unique"
+    add_index :freeze_tags, [:taggable_type, :taggable_id, :tag, :expired_at, :list]
+    add_index :freeze_tags, [:taggable_type, :taggable_id, :expired_at, :list]
+    add_index :freeze_tags, [:tag, :expired_at, :list]
+    add_index :freeze_tags, [:taggable_type, :taggable_id, :tag, :list, :expired_at], unique: true, name: "fz_unique_tt_tid_t_li_ex_at"
   end
 end 

metadata

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