tagalong 0.0.2 → 0.0.3

data/lib/tagalong/taggable.rb

@@ -16,11 +16,11 @@ module Tagalong
 
     module InstanceMethods
       def has_tag?(name)
-        return self.tagalong_tags(true).map { |r| r.name }.include?(name)
+        return self.tagalong_tags.map { |r| r.name }.include?(name)
       end
 
       def tags
-        return self.tagalong_tags(true).order("number_of_references DESC").map { |r| r.name }
+        return self.tagalong_tags.order("number_of_references DESC").map { |r| r.name }
       end
     end
   end

data/lib/tagalong/tagger.rb

@@ -28,9 +28,12 @@ module Tagalong
 
       def tags(taggable = nil)
         if taggable == nil
-          return self.tagalong_tags(true).order("number_of_references DESC").map { |r| r.name }
+          return self.tagalong_tags.order("number_of_references DESC").map { |r| r.name }
         else
-          return self.tagalong_tags(true).joins("LEFT OUTER JOIN tagalong_taggings ON tagalong_taggings.tagalong_tag_id = tagalong_tags.id").select("tagalong_tags.id, tagalong_tags.name, tagalong_tags.number_of_references, tagalong_taggings.id as used").order("number_of_references DESC").map { |r| { :tag => r.name, :used => !r.used.nil?, :number_of_references => r.number_of_references } }
+          return self.tagalong_tags.
+                  joins("LEFT OUTER JOIN tagalong_taggings ON tagalong_taggings.tagalong_tag_id = tagalong_tags.id AND tagalong_taggings.taggable_id = '#{taggable.id.to_s}'").
+                  select("tagalong_tags.id, tagalong_tags.name, tagalong_tags.number_of_references, tagalong_taggings.id as used").
+                  order("number_of_references DESC").map { |r| { :tag => r.name, :used => !r.used.nil?, :number_of_references => r.number_of_references } }
         end
       end
 

data/lib/tagalong/version.rb

@@ -1,3 +1,3 @@
 module Tagalong
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/tagalong/tagger_spec.rb

@@ -55,6 +55,31 @@ describe "Tagger" do
             { :tag => "bar", :used => false, :number_of_references => 0 }
           ]
         end
+
+        it "returns a hash of tags with usage information about the passed taggable on secondary calls when the taggable changes" do
+          tag = @user.tagalong_tags.create!(:name => "foo", :number_of_references => 1)
+          @contact.tagalong_taggings.create!(:tagalong_tag_id => tag.id)
+          @user.tagalong_tags.create!(:name => "bar", :number_of_references => 0)
+          tag = @user.tagalong_tags.create!(:name => "car", :number_of_references => 1)
+          @contact.tagalong_taggings.create!(:tagalong_tag_id => tag.id)
+          @user.tags(@contact).should == [
+            { :tag => "foo", :used => true, :number_of_references => 1  },
+            { :tag => "car", :used => true, :number_of_references => 1 },
+            { :tag => "bar", :used => false, :number_of_references => 0 }
+          ]
+          @other_contact = Contact.create!(:name => "My Other Taggable")
+          tag = @user.tagalong_tags.create!(:name => "jones", :number_of_references => 1)
+          @other_contact.tagalong_taggings.create!(:tagalong_tag_id => tag.id)
+          tag = @user.tagalong_tags.create!(:name => "jimmy", :number_of_references => 2)
+          @other_contact.tagalong_taggings.create!(:tagalong_tag_id => tag.id)
+          @user.tags(@other_contact).should == [
+            { :tag => "jimmy", :used => true, :number_of_references => 2  },
+            { :tag => "foo", :used => false, :number_of_references => 1  },
+            { :tag => "car", :used => false, :number_of_references => 1 },
+            { :tag => "jones", :used => true, :number_of_references => 1 },
+            { :tag => "bar", :used => false, :number_of_references => 0 }
+          ]
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagalong
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-12 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70212871717240 !ruby/object:Gem::Requirement
+  requirement: &70224007918900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212871717240
+  version_requirements: *70224007918900
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70212871716800 !ruby/object:Gem::Requirement
+  requirement: &70224007918420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212871716800
+  version_requirements: *70224007918420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70212871716300 !ruby/object:Gem::Requirement
+  requirement: &70224007917920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212871716300
+  version_requirements: *70224007917920
 description: A Rails tagging plugin that makes sense.
 email:
 - cyphactor@gmail.com