acts-as-taggable-on 1.0.15 → 1.0.16

data/VERSION

@@ -1 +1 @@
-1.0.15
+1.0.16

data/lib/acts_as_taggable_on/tag_list.rb

@@ -79,8 +79,8 @@ class TagList < Array
         string = string.to_s.dup
         
         # Parse the quoted tags
-        string.gsub!(/"(.*?)"\s*#{delimiter}?\s*/) { tag_list << $1; "" }
-        string.gsub!(/'(.*?)'\s*#{delimiter}?\s*/) { tag_list << $1; "" }
+        string.gsub!(/(\A|#{delimiter})\s*"(.*?)"\s*(#{delimiter}\s*|\z)/) { tag_list << $2; $3 }
+        string.gsub!(/(\A|#{delimiter})\s*'(.*?)'\s*(#{delimiter}\s*|\z)/) { tag_list << $2; $3 }
         
         tag_list.add(string.split(delimiter))
       end

data/lib/acts_as_taggable_on/tagging.rb

@@ -5,4 +5,6 @@ class Tagging < ActiveRecord::Base #:nodoc:
   
   validates_presence_of :context
   validates_presence_of :tag_id
+  
+  validates_uniqueness_of :tag_id, :scope => [:taggable_type, :taggable_id, :context]
 end

data/rails/init.rb

@@ -2,6 +2,4 @@ require 'acts-as-taggable-on'
 
 ActiveRecord::Base.send :include, ActiveRecord::Acts::TaggableOn
 ActiveRecord::Base.send :include, ActiveRecord::Acts::Tagger
-ActionView::Base.send :include, TagsHelper if defined?(ActionView::Base)
-
-RAILS_DEFAULT_LOGGER.info "** acts_as_taggable_on: initialized properly."
+ActionView::Base.send :include, TagsHelper if defined?(ActionView::Base)

data/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb

@@ -176,16 +176,6 @@ describe "Acts As Taggable On" do
   end
 
   describe 'Tagging Contexts' do
-    before(:all) do
-      class Array
-        def freq
-          k=Hash.new(0)
-          self.each {|e| k[e]+=1}
-          k
-        end
-      end
-    end
-
     it 'should eliminate duplicate tagging contexts ' do
       TaggableModel.acts_as_taggable_on(:skills, :skills)
       TaggableModel.tag_types.freq[:skills].should_not == 3
@@ -212,10 +202,6 @@ describe "Acts As Taggable On" do
         TaggableModel.acts_as_taggable_on([nil])
       }.should_not raise_error
     end
-
-    after(:all) do
-      class Array; remove_method :freq; end
-    end
   end
 
 end

data/spec/acts_as_taggable_on/tag_list_spec.rb

@@ -20,6 +20,18 @@ describe TagList do
     @tag_list.include?("wicked").should be_true
   end
   
+  it "should be able to add delimited list of words with quoted delimiters" do
+    @tag_list.add("'cool, wicked', \"really cool, really wicked\"", :parse => true)
+    @tag_list.include?("cool, wicked").should be_true
+    @tag_list.include?("really cool, really wicked").should be_true
+  end
+  
+  it "should be able to handle other uses of quotation marks correctly" do
+    @tag_list.add("john's cool car, mary's wicked toy", :parse => true)
+    @tag_list.include?("john's cool car").should be_true
+    @tag_list.include?("mary's wicked toy").should be_true
+  end
+  
   it "should be able to add an array of words" do
     @tag_list.add(["cool", "wicked"], :parse => true)
     @tag_list.include?("cool").should be_true

data/spec/acts_as_taggable_on/tagging_spec.rb

@@ -13,4 +13,13 @@ describe Tagging do
     @tagging.should_not be_valid
     @tagging.errors.on(:tag_id).should == "can't be blank"
   end
+  
+  it "should not create duplicate taggings" do
+    @taggable = TaggableModel.create(:name => "Bob Jones")
+    @tag = Tag.create(:name => "awesome")
+    
+    lambda {
+      2.times { Tagging.create(:taggable => @taggable, :tag => @tag, :context => 'tags') }
+    }.should change(Tagging, :count).by(1)
+  end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,14 @@ module Spec::Example::ExampleGroupMethods
   alias :context :describe
 end
 
+class Array
+  def freq
+    k=Hash.new(0)
+    each {|e| k[e]+=1}
+    k
+  end
+end
+
 TEST_DATABASE_FILE = File.join(File.dirname(__FILE__), '..', 'test.sqlite3')
 
 File.unlink(TEST_DATABASE_FILE) if File.exist?(TEST_DATABASE_FILE)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version 
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-18 00:00:00 +01:00
+date: 2009-12-25 00:00:00 +01:00
 default_executable: 
 dependencies: []