tagalong 0.0.3 → 0.0.4

data/lib/tagalong/tagalong_tagging.rb

@@ -4,6 +4,6 @@ module Tagalong
     belongs_to :taggable, :polymorphic => true
 
     validates_presence_of :tagalong_tag_id
-    validates_presence_of :tagalong_tag_id, :scope => [ :taggable_type, :taggable_id ]
+    validates_uniqueness_of :tagalong_tag_id, :scope => [ :taggable_type, :taggable_id ]
   end
 end

data/lib/tagalong/taggable.rb

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

data/lib/tagalong/tagger.rb

@@ -28,12 +28,12 @@ module Tagalong
 
       def tags(taggable = nil)
         if taggable == nil
-          return self.tagalong_tags.order("number_of_references DESC").map { |r| r.name }
+          return self.tagalong_tags.order("name ASC").map { |r| r.name }
         else
           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 } }
+                  order("name ASC").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.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/tagalong/taggable_spec.rb

@@ -10,15 +10,15 @@ describe "Taggable" do
   end
 
   describe "Integration" do
-    describe "#has_tag?" do
+    describe "#tagged_with?" do
       it "returns true if the taggable has the given tag" do
         tag = @user.tagalong_tags.create!(:name => "foo")
         @contact.tagalong_taggings.create!(:tagalong_tag_id => tag.id)
-        @contact.has_tag?("foo").should be_true
+        @contact.tagged_with?("foo").should be_true
       end
       
       it "returns false if the taggable does NOT have the given tag" do
-        @contact.has_tag?("bar").should be_false
+        @contact.tagged_with?("bar").should be_false
       end
     end
 
@@ -27,7 +27,7 @@ describe "Taggable" do
         @contact.tagalong_tags.create!(:name => "foo")
         @contact.tagalong_tags.create!(:name => "bar")
         @contact.tagalong_tags.create!(:name => "car")
-        @contact.tags.should == ["foo", "bar", "car"]
+        @contact.tags.should == ["bar", "car", "foo"]
       end
 
       it "returns list of tags currently applied in descending order of references" do

data/spec/lib/tagalong/tagger_spec.rb

@@ -31,14 +31,14 @@ describe "Tagger" do
           @user.tagalong_tags.create!(:name => "foo")
           @user.tagalong_tags.create!(:name => "bar")
           @user.tagalong_tags.create!(:name => "car")
-          @user.tags.should == ["foo", "bar", "car"]
+          @user.tags.should == ["bar", "car", "foo"]
         end
 
-        it "returns the list of tags in descending order of number of references" do
+        it "returns the list of tags in ascending alphabetical order" do
           @user.tagalong_tags.create!(:name => "foo", :number_of_references => 20)
           @user.tagalong_tags.create!(:name => "bar", :number_of_references => 100)
           @user.tagalong_tags.create!(:name => "car", :number_of_references => 8)
-          @user.tags.should == ["bar", "foo", "car"]
+          @user.tags.should == ["bar", "car", "foo"]
         end
       end
 
@@ -50,9 +50,9 @@ describe "Tagger" do
           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 => "bar", :used => false, :number_of_references => 0 },
             { :tag => "car", :used => true, :number_of_references => 1 },
-            { :tag => "bar", :used => false, :number_of_references => 0 }
+            { :tag => "foo", :used => true, :number_of_references => 1  }
           ]
         end
 
@@ -63,9 +63,9 @@ describe "Tagger" do
           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 => "bar", :used => false, :number_of_references => 0 },
             { :tag => "car", :used => true, :number_of_references => 1 },
-            { :tag => "bar", :used => false, :number_of_references => 0 }
+            { :tag => "foo", :used => true, :number_of_references => 1  }
           ]
           @other_contact = Contact.create!(:name => "My Other Taggable")
           tag = @user.tagalong_tags.create!(:name => "jones", :number_of_references => 1)
@@ -73,11 +73,11 @@ describe "Tagger" do
           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 => "bar", :used => false, :number_of_references => 0 },
             { :tag => "car", :used => false, :number_of_references => 1 },
-            { :tag => "jones", :used => true, :number_of_references => 1 },
-            { :tag => "bar", :used => false, :number_of_references => 0 }
+            { :tag => "foo", :used => false, :number_of_references => 1  },
+            { :tag => "jimmy", :used => true, :number_of_references => 2  },
+            { :tag => "jones", :used => true, :number_of_references => 1 }
           ]
         end
       end

metadata

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