lean_tag 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f369a5cfbafb5c23c6842f54d5d4559fa7f66569
-  data.tar.gz: 8f603c5cd549aaae3d8fe1b6cd955eb1c48341ec
+  metadata.gz: 8ca52f15d56e66b8a54ceb0c32b770fe71236dd6
+  data.tar.gz: 836cfdec108219024dd45764f3988579a39f1b37
 SHA512:
-  metadata.gz: f765bdb09d95df190fddc8c54c12bf074368f24ad7ac10ced9338a6e6896c25eea9a04629d01fed5d0606c41248511afd0cd72e2bf2673f726c278926cfe9749
-  data.tar.gz: 4129c3c05ba79ee0d85faad922d520cffcbe7a51d31d1f924c16212bb04c4c15f8fdaa4ed1eb00d6906b0b88dda9ab2090fc152cd269f8b3c9fd4ab6c3599620
+  metadata.gz: acc268c6caf08fbc494c232c268f4634c436dca828b9f393e28168e18ad31c826057a31af00fd8ca3c0b328a5f9084887857258e0fa1f0df3e72339338a0bfb3
+  data.tar.gz: 6a95536c112c1cc66aa9143a09c3f2a1d3ca356d4e5026b988a4ff037a1b3cfcb18eb95baf457786993018a3f9e1b05a668688e03ab1562c6336da1b51f1c5a1

data/lib/lean_tag.rb

@@ -5,7 +5,6 @@ require 'active_support/core_ext/module'
 require_relative 'lean_tag/engine' if defined?(Rails)
 
 module LeanTag
-
   def self.config
     @configuration ||= Configuration.new
   end
@@ -15,18 +14,13 @@ module LeanTag
     yield self.config if block_given?
   end
 
-
   class Configuration
-
-    attr_accessor :delimiter, :force_lowercase, :legal_characters, :remove_unused
+    attr_accessor :delimiter, :force_lowercase, :remove_unused
 
     def initialize
       self.delimiter = ','
       self.force_lowercase = true
-      self.legal_characters = /[^0-9a-zA-Z]+/
       self.remove_unused = true
     end
-
   end
-
 end

data/lib/lean_tag/engine.rb

@@ -6,8 +6,6 @@ require 'lean_tag/tagging'
 
 module LeanTag
   class Engine < ::Rails::Engine
-
     isolate_namespace LeanTag
-
   end
 end

data/lib/lean_tag/tag.rb

@@ -1,6 +1,5 @@
 module LeanTag
   class Tag < ActiveRecord::Base
-
     self.table_name = :tags
 
     has_many :records, through: :taggings
@@ -13,10 +12,9 @@ module LeanTag
 
     def name=(value)
       if value.present?
-        self[:name] = value.gsub(LeanTag.config.legal_characters, "")
+        self[:name] = value.gsub(/[^0-9a-zA-Z]+/, "")
         self[:name] = self[:name].downcase if LeanTag.config.force_lowercase
       end
     end
-
   end
 end

data/lib/lean_tag/taggable.rb

@@ -1,8 +1,6 @@
 module LeanTag
   module Taggable
-
     def self.extended(base)
-
       def taggable_on(relation="tags")
         extend ClassMethods
 
@@ -20,16 +18,13 @@ module LeanTag
           define_method "add_#{tag_relation.to_s.singularize}!", ->(tag) { _add_tag!(tag, tag_relation) }
           define_method "#{tag_relation.to_s.singularize}_list", ->() { _get_tag_list(tag_relation) }
           define_method "remove_#{tag_relation.to_s.singularize}", ->(tag) { _remove_tag(tag, tag_relation) }
-          define_method "remove_#{tag_relation.to_s.singularize}!", ->(tag) { _remove_tag(tag, tag_relation) }
+          define_method "remove_#{tag_relation.to_s.singularize}!", ->(tag) { _remove_tag!(tag, tag_relation) }
           define_method "#{tag_relation.to_s.singularize}_list=", ->(list) { _set_tag_list(list, tag_relation) }
         end
       end
-
     end
 
-
     module ClassMethods
-
       ##
       # Returns all records which include at least one of the passed tags
       def tagged_with(list, filter="tags")
@@ -39,27 +34,25 @@ module LeanTag
         return self.where(id: taggings.select(:record_id).distinct)
       end
 
-
       ##
       # Get all tags used by this class
       def tags(filter="tags")
         taggings = Tagging.where(record_type: self.name, filter: filter).where(filter: filter)
         return Tag.where(id: taggings.select(:tag_id).distinct)
       end
-
     end
 
-
     module InstanceMethods
-
       ##
       # Adds a single tag on parent save
       def _add_tag(tag, filter="tags")
         if tag.is_a?(String)
-          record = Tag.find_or_create_by(name: tag)
+          record = Tag.find_by_name(tag)
         end
 
-        unless self._taggings(filter).exists?(tag_id: record.id)
+        if record.nil?
+          self._tags(filter).build(name: tag)
+        elsif !self._taggings(filter).exists?(tag_id: record.id)
           self._taggings(filter).build(tag_id: record.id)
         end
       end
@@ -104,9 +97,8 @@ module LeanTag
           tag_names = []
         end
 
-        tags = self._taggings(filter).map(&:tag)
-        tags.reject! { |t| t.name.in?(tag_names) }
-        tags.each { |t| self._remove_tag(t, filter) }
+        tags = Tag.where(id: self._taggings(filter).select(:tag_id).distinct)
+        tags.reject { |t| t.name.in?(tag_names) }.each { |t| self._remove_tag(t, filter) }
 
         # Add any new tags
         tag_names.each { |t| self._add_tag(t, filter) }
@@ -123,8 +115,6 @@ module LeanTag
       def _taggings(filter)
         self.send("#{filter}_taggings")
       end
-
     end
-
   end
 end

data/lib/lean_tag/tagging.rb

@@ -1,6 +1,5 @@
 module LeanTag
   class Tagging < ActiveRecord::Base
-
     self.table_name = :taggings
 
     belongs_to :record, polymorphic: true, inverse_of: :taggings
@@ -8,8 +7,8 @@ module LeanTag
 
     scope :for, -> (filter) { where(filter: filter) }
 
+    validates :record_id, presence: true
     validates :record_type, presence: true
     validates :tag, presence: true, uniqueness: { scope: [:record_type, :record_id] }
-
   end
 end

data/lib/lean_tag/version.rb

@@ -1,5 +1,3 @@
 module LeanTag
-
-  VERSION = '1.0.5'
-
+  VERSION = '1.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lean_tag
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Matt Ellis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2017-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A lightweight method for tagging content