lean_tag 0.1.5 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c4c9dab55f5a421f093dab3d2aa54b068e2d979
-  data.tar.gz: d561913360f1b7225d23cf44f24f584b788947f7
+  metadata.gz: 2dd657758a95c3cf60c8a8c4b114a611cca14c63
+  data.tar.gz: d71ef2552be6a0b7b529ab8d26935b718dc82b91
 SHA512:
-  metadata.gz: a1f765cc88d1bcf0c317dfb21ca12e150b51c34e97101ccc0a93cd3a50a0b9d228631a4d2420e4e09994c5f9c9f8c2b8a378e4614223af042698e53b4f9c0d9d
-  data.tar.gz: 9f987131d6426194ba05e5d4fb5c3fe681a6da5ea6b69226a0795ed25c9e74e44f4f697482c601be3bb9e1eb9a763969921a1029e698c41adf1b0c09ffc6a5a3
+  metadata.gz: ae98ad3da770f5c2453c3ec6beaba0da04687022cb00316dabfa69d0df8c72599ae148e15a102a09fdb0691e979b98f2a980bc5bc85bd139a7c3e1044ec579eb
+  data.tar.gz: f833b97b9ca7e45d8dd4c42dbec0ece5cfc7a9e73a4d355c302bd902a6c90275b0e1064f6ffc0045170f58c8438e6dbfaacb05bfc54da29c697b6eb1fb0608ba

data/lib/lean_tag/tag.rb

@@ -6,6 +6,7 @@ module LeanTag
     has_many :records, through: :taggings
     has_many :taggings, class_name: "LeanTag::Tagging", inverse_of: :tag
 
+    scope :matches, -> (list) { where("tags.name IN (?)", list) }
     scope :ranked, -> { order("taggings_count DESC") }
 
     validates :name, presence: true, uniqueness: true

data/lib/lean_tag/taggable.rb

@@ -2,6 +2,9 @@ module LeanTag
   module Taggable
 
     def self.included(base)
+      base.extend ClassMethods
+      base.send :include, InstanceMethods
+
       base.class_eval do
         has_many :taggings, class_name: "LeanTag::Tagging", as: :record, inverse_of: :record, dependent: :destroy
         has_many :tags, through: :taggings
@@ -12,90 +15,100 @@ module LeanTag
       end
     end
 
-    ##
-    # Adds a single tag on parent save
-    def add_tag(tag)
-      if tag.is_a?(String)
-        tag_name = tag
-        tag = Tag.find_by_name(tag_name)
-
-        if tag.nil?
-          self.tags.build(name: tag_name)
-        elsif !self.taggings.exists?(tag_id: tag.id)
-          self.taggings.build(tag_id: tag.id)
-        end
-      else
-        self.taggings.build(tag_id: tag.id)
+
+    module ClassMethods
+
+      def tagged_in(list)
+        list = list.split(LeanTag.config.delimiter) if list.is_a?(String)
+        tag_ids = Tag.matches(list).pluck(:id)
+        record_ids = Tagging.where(record_type: self.name, tag_id: tag_ids).pluck(:record_id).uniq
+        return self.where(id: record_ids)
       end
-    end
 
-    ##
-    # Adds a single tag immediately
-    def add_tag!(tag)
-       if tag.is_a?(String)
-        tag_name = tag
-        tag = Tag.find_by_name(tag_name)
-
-        if tag.nil?
-          self.tags.create(name: tag_name)
-        elsif !self.taggings.exists?(tag_id: tag.id)
-          self.taggings.create(tag_id: tag.id)
-        end
-      else
-        self.taggings.create(tag_id: tag.id)
+      def tags
+        tag_ids = Tagging.where(record_type: self.name).pluck(:tag_id).uniq
+        return Tag.where(id: tag_ids)
       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 current tags on this record which are in the passed list
-    def included_tags(tag_names)
-      self.tags.select { |t| t.name.in?(tag_names) }
-    end
 
-    ##
-    # Removes a single tag on parent save
-    def remove_tag(tag)
-      tag = self.tags.where(name: tag).first if tag.is_a?(String)
+    module InstanceMethods
 
-      self.taggings.each { |t| t.mark_for_destruction if t.tag.eql?(tag) }
-    end
+      ##
+      # Adds a single tag on parent save
+      def add_tag(tag)
+        if tag.is_a?(String)
+          record = Tag.find_by_name(tag)
+        end
 
-    ##
-    # Removes a single tag immediately
-    def remove_tag!(tag)
-      tag = self.tags.where(name: tag).first if tag.is_a?(String)
+        if record.nil?
+          self.tags.build(name: tag)
+        elsif !self.taggings.exists?(tag_id: record.id)@
+          self.taggings.build(tag_id: record.id)
+        end
+      end
 
-      self.taggings.each { |t| t.mark_for_destruction if t.tag.eql?(tag) }
-    end
+      ##
+      # Adds a single tag immediately
+      def add_tag!(tag)
+        self.add_tag(tag)
+        self.save!
+      end
 
-    ##
-    # Set a list of tags
-    def tag_list=(value)
-      if value.is_a?(String)
-        tag_names = value.split(LeanTag.config.delimiter)
-      elsif value.is_a?(Array)
-        tag_names = value
-      else
-        tag_names = []
+      ##
+      # 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
 
-      # Get rid of existing tags that aren't in the list
-      self.excluded_tags(tag_names).each { |t| self.remove_tag(t) }
+      ##
+      # Finds current tags on this record which are in the passed list
+      def included_tags(tag_names)
+        self.tags.select { |t| t.name.in?(tag_names) }
+      end
 
-      # Add any new tags
-      tag_names.each { |t| self.add_tag(t) }
-    end
+      ##
+      # Removes a single tag on parent save
+      def remove_tag(tag)
+        if tag.is_a?(String)
+          tag = self.tags.where(name: tag).first
+        end
+
+        self.taggings.each { |t| t.mark_for_destruction if t.tag.eql?(tag) }
+      end
+
+      ##
+      # Removes a single tag immediately
+      def remove_tag!(tag)
+        self.remove_tag(tag)
+        self.save!
+      end
+
+      ##
+      # Set a list of tags
+      def tag_list=(value)
+        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) }
+
+        # Add any new tags
+        tag_names.each { |t| self.add_tag(t) }
+      end
+
+      ##
+      # Returns a delimited list of tag names
+      def tag_list
+        self.tags.map(&:name).join(',')
+      end
 
-    ##
-    # Returns a delimited list of tag names
-    def tag_list
-      self.tags.map(&:name).join(',')
     end
 
   end

data/lib/lean_tag/version.rb

@@ -1,5 +1,5 @@
 module LeanTag
 
-  VERSION = '0.1.5'
+  VERSION = '0.1.13'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lean_tag
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.13
 platform: ruby
 authors:
 - Matt Ellis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-19 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec