lean_tag 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 826bf0e70d6602d1652e50075eebb8cdc7a6954a
-  data.tar.gz: 1582db1e1b197c7aba0f15f3a87d67fdd4e240d0
+  metadata.gz: 2ffdb5ec65f889d90046f2628c41fe0dd9ca59f4
+  data.tar.gz: 31319030ef5e90fc62f6e298617c8fb2e29b4953
 SHA512:
-  metadata.gz: ff3b6bd7dbc748e48cebdbd4cbbecff204581cbe0f3fa9be61d6e2e25a2f220c8e220e7f77c63dfedab1615541940c3fa44874fca04365a9c2aca2f19a56f908
-  data.tar.gz: 2ca680df07bc3377d291be9c0903b60b83ae2bef91bbda84257478c86c992c4e3f23194fe46ba9f7dc047625f502712b5e14018761b81a30ec9a0da7d43e9eee
+  metadata.gz: d1c26a81cd07972b6814d7b6a7c630c816743eb30af43e7df9942058deb6c05a8364170fe8cea17c3c3079a398234ab7c285b9e62287d9b4b83a3eab298c4d8c
+  data.tar.gz: 4f461ede0df0fcba085aaa3bee431b7a5c289beae1b53b1f6e25123c10cd0bd0b569943721814e8d8e172bd467b1f615d0b740288b9466d83593abbcf4bc075f

data/lib/lean_tag/taggable.rb

@@ -6,6 +6,8 @@ module LeanTag
         has_many :taggings, class_name: "LeanTag::Tagging", as: :record, inverse_of: :record, dependent: :destroy
         has_many :tags, through: :taggings
 
+        accepts_nested_attributes_for :taggings, allow_destroy: true
+
         scope :with_tags, -> { includes(:tags) }
       end
     end
@@ -44,26 +46,12 @@ module LeanTag
       end
     end
 
-    ##
-    # Destroy a tag if it's no longer in use
-    def destroy_if_unused(tag)
-      if tag.taggings_count && LeanTag.config.remove_unused
-        tag.destroy
-      end
-    end
-
     ##
     # Finds current tags on this record which aren't in the passed list
     def excluded_tags(tag_names)
       self.tags.reject { |t| t.name.in?(tag_names) }
     end
 
-    ##
-    # Finds a tag on this record by name
-    def find_tag(tag_name)
-      self.tags.find_by_name(tag_name)
-    end
-
     ##
     # Finds current tags on this record which are in the passed list
     def included_tags(tag_names)
@@ -72,30 +60,32 @@ module LeanTag
 
     ##
     # Removes a single tag on parent save
-    def remove_tag(tag, method='mark_for_destruction')
-      tag = self.find_tag(tag) if tag.is_a?(String)
-
-      tagging = tagging.find_by_tag_id(tag.id)
-      tagging.send(method) unless tagging.nil?
+    def remove_tag(tag)
+      tag = self.tags.where(name: tag).first if tag.is_a?(String)
 
-      destroy_if_unused(tag)
+      tagging = self.taggings.where(tag_id: tag.id).first
+      tagging.mark_for_destruction unless tagging.nil?
     end
 
     ##
     # Removes a single tag immediately
     def remove_tag!(tag)
-      tag = self.find_tag(tag) if tag.is_a?(String)
+      tag = self.tags.where(name: tag).first if tag.is_a?(String)
 
-      tagging = tagging.find_by_tag_id(tag.id)
+      tagging = self.taggings.where(tag_id: tag.id).first
       tagging.destroy unless tagging.nil?
-
-      destroy_if_unused(tag)
     end
 
     ##
     # Set a list of tags
     def tag_list=(value)
-      tag_names = value.blank? ? [] : value.split(LeanTag.config.delimiter)
+      if value.is_a?(String)
+        tag_names = value.split(LeanTag.config.delimiter)
+      elsif value.is_a?(Array)
+        tag_names = value
+      else
+        tag_names = []
+      end
 
       # Get rid of existing tags that aren't in the list
       self.excluded_tags(tag_names).each { |t| self.remove_tag(t) }
@@ -107,7 +97,7 @@ module LeanTag
     ##
     # Returns a delimited list of tag names
     def tag_list
-      self.tags.map(&:name).join(LeanTag.config.delimiter)
+      self.tags.map(&:name).join(',')
     end
 
   end

data/lib/lean_tag/version.rb

@@ -1,5 +1,5 @@
 module LeanTag
 
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lean_tag
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Matt Ellis