dm-tags 0.9.10 → 0.9.11

data/History.txt

@@ -1,6 +1,20 @@
+=== 0.9.11 / 2009-03-29
+
+Change frozen_tag_list property to Text
+
+* 3 minor enhancements:
+
+  * Added add_tag(string) for convenient adding of tags
+  * Added tag_collection method to allow easy adding/editing of tags
+  * Added callback to destroy orphaned taggings
+
+* 1 bug fix:
+
+  * Fix bug in add_tag where exisiting tags would be overwritten
+
 === 0.9.10 / 2009-01-19
 
-  * No changes this version
+* No changes this version
 
 === 0.9.9 / 2009-01-04
 

data/README.txt

@@ -1,7 +1,6 @@
 = dm-tags
 
-http://dm-tags.rubyforge.org/
-http://github.com/bobby/dm-tags/
+http://github.com/datamapper/dm-more/tree/master
 
 == Description
 
@@ -61,6 +60,14 @@ This package brings tagging to DataMapper.  It is inspired by Acts As Taggable O
   MyModel.tagged_with('test', :on => 'tags') #=> [#<MyModel id=1>]
   MyModel.tagged_with('test', :on => 'skills') #=> [#<MyModel id=2>]
 
+
+  #Helper methods for text fields
+  model.tag_collection = "tag1, tag2, tag3"
+  model.save
+  model.tag_collection => "tag1, tag2, tag3"
+  model.tags
+  #=> [#<Tag id=1 name="tag1">, #<Tag id=2 name="tag2">, #<Tag id=3 name="tag3">]
+
   # Traditional 'tags only' tagging
 
   class TagsOnly
@@ -86,7 +93,7 @@ This package brings tagging to DataMapper.  It is inspired by Acts As Taggable O
 
 == Installation
 
-  git clone http://github.com/bobby/dm-tags
+  git clone http://github.com/datamapper/dm-more/tree/master
   cd dm-tags
   rake install
 

data/Rakefile

@@ -12,7 +12,7 @@ AUTHOR = 'Bobby Calderwood'
 EMAIL  = 'bobby_calderwood [a] me [d] com'
 GEM_NAME = 'dm-tags'
 GEM_VERSION = DataMapper::Tags::VERSION
-GEM_DEPENDENCIES = [['dm-core', "~>#{GEM_VERSION}"], ['dm-validations', "~>#{GEM_VERSION}"]]
+GEM_DEPENDENCIES = [['dm-core', GEM_VERSION], ['dm-validations', GEM_VERSION]]
 GEM_CLEAN = %w[ log pkg coverage ]
 GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
 

data/lib/dm-tags/dm_tags.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 
-gem 'dm-core', '~>0.9.10'
+gem 'dm-core', '0.9.11'
 require 'dm-core'
 
 module DataMapper
@@ -22,10 +22,10 @@ module DataMapper
       def tagged_with(string, options = {})
         tag = Tag.first(:name => string)
         conditions = {}
-        conditions[:tag_id] = tag.id
-        conditions[:tag_context] = options[:on] if options.has_key?(:on)
-        conditions[:taggable_type] = self.to_s
-        Tagging.all(conditions).map { |tagging| tagging.taggable }
+        conditions['taggings.tag_id'] = tag.id
+        conditions['taggings.tag_context'] = options.delete(:on) if options[:on]
+        conditions.merge!(options)
+        all(conditions)
       end
 
       def taggable?
@@ -38,6 +38,19 @@ module DataMapper
         associations.flatten!
         associations.uniq!
 
+        class_eval do
+          has n, :taggings, :class_name => "Tagging", :child_key => [:taggable_id],
+          :taggable_type => self.to_s
+
+          before :destroy, :destroy_taggings unless respond_to?(:destroy_taggings)
+
+          def destroy_taggings
+            taggings.destroy!
+          end unless respond_to?(:destroy_taggings)
+
+          private :taggings, :taggings=, :destroy_taggings
+        end
+
         self.extend(DataMapper::Tags::SingletonMethods)
 
         associations.each do |association|
@@ -45,7 +58,7 @@ module DataMapper
           singular    = association.singular
 
           class_eval <<-RUBY
-            property :frozen_#{singular}_list, String
+            property :frozen_#{singular}_list, Text
 
             has n, :#{singular}_taggings, :class_name => "Tagging", :child_key => [:taggable_id], :taggable_type => self.to_s, :tag_context => "#{association}"
 
@@ -84,6 +97,29 @@ module DataMapper
 
               self.frozen_#{singular}_list = #{association}.map { |tag| tag.name }.join(',')
             end
+
+            ##
+            # Helper methods to make setting tags easier
+            # FIXME: figure out why calling #{singular}_list=(string) won't work
+            def #{singular}_collection=(string)
+              @#{singular}_list = string.to_s.split(',').map { |name| name.gsub(/[^\\w\\s_-]/i, '').strip }.uniq.sort
+            end
+
+            ##
+            # Helper methods to make setting tags easier
+            #
+            def #{singular}_collection
+              #{association}.map { |tag| tag.name }.join(', ')
+            end
+
+            ##
+            # Like tag_collection= except it only add's tags
+            #
+            def add_#{singular}(string)
+              tag_array = string.to_s.split(',').map { |name| name.gsub(/[^\\w\\s_-]/i, '').strip }.uniq.sort
+              @#{singular}_list = (tag_array + #{singular}_list)
+            end
+
           RUBY
         end
       end

data/lib/dm-tags/tagging.rb

@@ -9,7 +9,11 @@ class Tagging
 
   belongs_to :tag
 
+  if respond_to?(:validates_present)
+    validates_present :taggable_type, :taggable_id
+  end
+
   def taggable
-    eval("#{taggable_type}.get!(#{taggable_id})") if taggable_type and taggable_id
+    Object.const_get(taggable_type).send(:get!, taggable_id)
   end
 end

data/lib/dm-tags/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   class Tags
-    VERSION = '0.9.10'
+    VERSION = '0.9.11'
   end
 end

data/spec/dm-tags/tag_spec.rb

@@ -20,4 +20,17 @@ describe Tag do
     @tag.name = "Meme"
     @tag.should be_valid
   end
+
+  it "should list taggables for a tag" do
+    tag = Tag.create!(:name => 'tag1')
+    taggable1 = TaggedModel.new
+    taggable2 = TaggedModel.new
+    taggable3 = TaggedModel.new
+    taggable1.tag_list = "tag1"
+    taggable1.save
+    taggable2.tag_list = "tag1"
+    taggable2.save
+    tag.taggables.should == [taggable1, taggable2]
+    tag.taggables.include?(taggable3).should be_false
+  end
 end

data/spec/dm-tags/taggable_spec.rb

@@ -51,6 +51,30 @@ describe "Taggable" do
     @taggable.skills.sort_by{|skill| skill.id}.should_not == [tag3, Tag.first(:name => 'tag4')]
   end
 
+  it "should set tags with a string, and return a string (form helpers)" do
+    @taggable = TaggedModel.new
+    tags_string = "tag-a, tag-b, tag-c"
+    @taggable.tag_collection = tags_string
+    @taggable.save
+    @taggable.tag_collection.should == tags_string
+    @taggable.tags.size.should == 3
+  end
+
+  it "should be able to add tags and not overwrite old tags" do
+    @taggable = TaggedModel.new
+    @taggable.add_tag("tag-1")
+    @taggable.save
+    @taggable.tags.size.should == 1
+    @taggable.add_tag("tag-2, tag-3")
+    @taggable.save
+    @taggable.tags.size.should == 3
+    @taggable.add_tag("tag-4")
+    @taggable.tag_list.include?("tag-4").should be_true
+    @taggable.tag_list.include?("tag-1").should be_true
+    @taggable.save
+    @taggable.tags.size.should == 4
+  end
+
   describe ".tagged_with" do
     it "should have a class method .tagged_with" do
       DefaultTaggedModel.should respond_to(:tagged_with)
@@ -79,6 +103,18 @@ describe "Taggable" do
     end
   end
 
+  it "should allow extra conditions for the query" do
+    taggable1 = TaggedModel.new
+    taggable2 = TaggedModel.new
+    taggable1.tag_list = 'tag1, tag2, tag3'
+    taggable2.skill_list = 'tag1, skill4'
+    taggable1.save
+    taggable2.save
+    TaggedModel.tagged_with('tag1').should == [taggable1, taggable2]
+    TaggedModel.tagged_with('tag1', :id => taggable1.id).should == [taggable1]
+  end
+
+
   it "should have a class method .taggable? which returns true if tagging is defined, and false otherwise" do
     UntaggedModel.taggable?.should be_false
     TaggedModel.taggable?.should be_true
@@ -90,4 +126,14 @@ describe "Taggable" do
     TaggedModel.new.taggable?.should == TaggedModel.taggable?
     TaggedModel.new.taggable?.should be_true
   end
+
+  it 'should destroy associated taggings when destroyed' do
+    taggable = TaggedModel.new
+    taggable.tag_list = 'tag1, tag2, tag3'
+    taggable.save
+    TaggedModel.tagged_with('tag1').should == [taggable]
+    taggable.destroy
+    TaggedModel.tagged_with('tag1').should == []
+  end
+
 end

data/spec/dm-tags/tagging_spec.rb

@@ -6,6 +6,7 @@ include DataMapper::Tags
 describe Tagging do
   before do
     @tagging = Tagging.new
+    @tagged_model =TaggedModel.create
   end
 
   it "should be a model which includes DataMapper::Resource" do
@@ -18,8 +19,6 @@ describe Tagging do
     @tagging.attributes.should have_key(:tag_id)
     @tagging.attributes.should have_key(:taggable_id)
     @tagging.attributes.should have_key(:taggable_type)
-    # @tagging.attributes.should have_key(:tagger_id)
-    # @tagging.attributes.should have_key(:tagger_type)
     @tagging.attributes.should have_key(:tag_context)
   end
 
@@ -42,10 +41,8 @@ describe Tagging do
 
   it "should have a method Tagging#taggable which returns the associated taggable instance" do
     @tagging.should respond_to(:taggable)
-    @tagging.taggable.should_not be
-    @tagging.taggable_id = 11111
-    @tagging.taggable_type = "TaggedModel"
-    TaggedModel.should_receive(:get!).with(11111)
-    @tagging.taggable
+    @tagging.taggable_id =  @tagged_model.id
+    @tagging.taggable_type = @tagged_model.class.to_s
+    @tagging.taggable.should == @tagged_model
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 require 'rubygems'
 
-gem 'dm-core', '~>0.9.8'
+gem 'dm-core', '0.9.11'
 require 'dm-core'
 
 ROOT = Pathname(__FILE__).dirname.parent.expand_path

data/tasks/spec.rb

@@ -1,5 +1,5 @@
 begin
-  gem 'rspec', '~>1.1.11'
+  gem 'rspec', '~>1.2'
   require 'spec'
   require 'spec/rake/spectask'
 
@@ -14,6 +14,7 @@ begin
       gem 'rcov', '~>0.8'
       t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
       t.rcov_opts << '--exclude' << 'spec'
+      t.rcov_opts << '--exclude' << 'dm-validations'
       t.rcov_opts << '--text-summary'
       t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
     rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-tags
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors: 
 - Bobby Calderwood
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-19 00:00:00 -08:00
+date: 2009-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.10
+        version: 0.9.11
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-validations
@@ -28,9 +28,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.10
+        version: 0.9.11
     version: 
 description: This package brings tagging to DataMapper.  It is inspired by Acts As Taggable On by Michael Bleigh, github's mbleigh.  Props to him for the contextual tagging based on Acts As Taggable on Steroids.
 email: