dm-tags 0.0.2 → 0.0.3

data/History.txt

@@ -6,4 +6,9 @@
 == 0.0.2 2008-07-30
 
 * 1 major enhancement:
-  * Added contextual finding to Model.tagged_with
+  * Added contextual finding to Model.tagged_with
+  
+== 0.0.3 2008-09-14
+
+* 1 major enhancement:
+  * Fixed requirement of dm-core dependency on load

data/README.txt

@@ -3,6 +3,8 @@
 http://dm-tags.rubyforge.org/
 http://github.com/bobby/dm-tags/
 
+dm-tags is now part of dm-more [http://github.com/sam/dm-more].
+
 == 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.
@@ -20,62 +22,65 @@ This package brings tagging to DataMapper.  It is inspired by Acts As Taggable O
 
 == Synopsis
 
-require 'rubygems'
-require 'dm-core'
-require 'dm-tags'
-
-DataMapper.setup(:default, "sqlite3::memory:")
-
-class MyModel
-  include DataMapper::Resource
-  property :id, Integer, :serial => true
-  has_tags_on :tags, :skills
-end
-
-DataMapper.auto_migrate!
-
-# Contextual tagging
-MyModel.taggable? #=> true
-MyModel.new.taggable? #=> true
-
-model = MyModel.new
-model.tag_list = 'test, me out,   please   '
-model.tag_list #=> ['me out', 'please', 'test'] # Sanitized and alphabetized
-model.save #=> true
-model.tags #=> [#<Tag id=1 name="me out">, #<Tag id=2 name="please">, #<Tag id=3 name="test">]
-model.tag_list = 'test, again'
-model.save #=> true
-model.tags #=> [#<Tag id=3 name="test">, #<Tag id=4 name="again">] # Checks for existing tags
-Tag.all #=> [#<Tag id=1 name="me out">, #<Tag id=2 name="please">, #<Tag id=3 name="test">, #<Tag id=4 name="again">]
-another = MyModel.new
-another.skill_list = 'test, all, you, like'
-another.save #=> true
-another.tag_list #=> []
-another.skills
-#=> [#<Tag id=5 name="all">, #<Tag id=6 name="like">, #<Tag id=3 name="test">, #<Tag id=7 name="you">]
-
-MyModel.tagged_with('test') #=> [#<MyModel id=1>, #<MyModel id=2>]
-MyModel.tagged_with('test', :on => 'tags') #=> [#<MyModel id=1>]
-MyModel.tagged_with('test', :on => 'skills') #=> [#<MyModel id=2>]
-
-# Traditional 'tags only' tagging
-
-class TagsOnly
-  include DataMapper::Resource
-  property :id, Integer, :serial => true
-  has_tags
-end
-
-TagsOnly.auto_migrate!
-
-TagsOnly.taggable? #=> true
-TagsOnly.new.taggable? #=> true
-
-tags_only = TagsOnly.new
-tags_only.tag_list = 'tags, only'
-tags_only.tag_list #=> ['only', 'tags']
-tags_only.save #=> true
-tags_only.tags #=> [#<Tag id=8 name="only">, #<Tag id=9 name="tags">]
+  require 'rubygems'
+  require 'dm-core'
+  require 'dm-tags'
+
+  DataMapper.setup(:default, "sqlite3::memory:")
+
+  class MyModel
+    include DataMapper::Resource
+    property :id, Integer, :serial => true
+    has_tags_on :tags, :skills
+  end
+
+  DataMapper.auto_migrate!
+
+  # Contextual tagging
+  MyModel.taggable? #=> true
+  MyModel.new.taggable? #=> true
+
+  model = MyModel.new
+  model.tag_list = 'test, me out,   please   '
+  model.tag_list #=> ['me out', 'please', 'test'] # Sanitized and alphabetized
+  model.save #=> true
+  model.tags
+  #=> [#<Tag id=1 name="me out">, #<Tag id=2 name="please">, #<Tag id=3 name="test">]
+  model.tag_list = 'test, again'
+  model.save #=> true
+  model.tags
+  #=> [#<Tag id=3 name="test">, #<Tag id=4 name="again">] # Checks for existing tags
+  Tag.all
+  #=> [#<Tag id=1 name="me out">, #<Tag id=2 name="please">, #<Tag id=3 name="test">, #<Tag id=4 name="again">]
+  another = MyModel.new
+  another.skill_list = 'test, all, you, like'
+  another.save #=> true
+  another.tag_list #=> []
+  another.skills
+  #=> [#<Tag id=5 name="all">, #<Tag id=6 name="like">,  #<Tag id=3 name="test">, #<Tag id=7 name="you">]
+
+  MyModel.tagged_with('test') #=> [#<MyModel id=1>, #<MyModel id=2>]
+  MyModel.tagged_with('test', :on => 'tags') #=> [#<MyModel id=1>]
+  MyModel.tagged_with('test', :on => 'skills') #=> [#<MyModel id=2>]
+
+  # Traditional 'tags only' tagging
+
+  class TagsOnly
+    include DataMapper::Resource
+    property :id, Integer, :serial => true
+    has_tags
+  end
+
+  TagsOnly.auto_migrate!
+
+  TagsOnly.taggable? #=> true
+  TagsOnly.new.taggable? #=> true
+
+  tags_only = TagsOnly.new
+  tags_only.tag_list = 'tags, only'
+  tags_only.tag_list #=> ['only', 'tags']
+  tags_only.save #=> true
+  tags_only.tags #=> [#<Tag id=8 name="only">, #<Tag id=9 name="tags">]
 
 == Requirements
 

data/lib/dm-tags/dm_tags.rb

@@ -1,4 +1,3 @@
-require 'dm-core'
 module DataMapper
   module Resource
     class << self
@@ -16,9 +15,9 @@ module DataMapper
       def has_tags_on(*args)
         args.flatten!
         args.uniq!
-        
+
         self.extend(DataMapper::Tags::SingletonMethods)
-        
+
         args.map{|arg| arg.to_sym}.each do |arg|
           class_eval <<-RUBY
           property :frozen_#{arg.to_s.singular}_list, String
@@ -42,22 +41,22 @@ module DataMapper
             return if #{arg.to_s.singular}_list.empty?
             deleted_#{arg} = frozen_#{arg.to_s.singular}_list.to_s.split(',') - #{arg.to_s.singular}_list
             deleted_#{arg}.each do |name|
-              tag = Tag.first(:name => name)
-              tagging = #{arg.to_s.singular}_taggings.first(:tag_id => tag.id)
-              tagging.destroy
-              #{arg.to_s.singular}_taggings.reload
-            end
-            #{arg.to_s.singular}_list.each do |name|
-              tag = Tag.first(:name => name)
-              next if #{arg}.to_a.include?(tag)
-              tag = Tag.create!(:name => name) unless tag
-              #{arg.to_s.singular}_taggings << Tagging.new(:tag => tag, :taggable_type => self.class.to_s, :tag_context => "#{arg}")
-            end
-            self.frozen_#{arg.to_s.singular}_list = #{arg}.map{|#{arg.to_s.singular}| #{arg.to_s.singular}.name}.sort.join(',')
+            tag = Tag.first(:name => name)
+            tagging = #{arg.to_s.singular}_taggings.first(:tag_id => tag.id)
+            tagging.destroy
+            #{arg.to_s.singular}_taggings.reload
           end
-        RUBY
+          #{arg.to_s.singular}_list.each do |name|
+          tag = Tag.first(:name => name)
+          next if #{arg}.to_a.include?(tag)
+          tag = Tag.create!(:name => name) unless tag
+          #{arg.to_s.singular}_taggings << Tagging.new(:tag => tag, :taggable_type => self.class.to_s, :tag_context => "#{arg}")
+        end
+        self.frozen_#{arg.to_s.singular}_list = #{arg}.map{|#{arg.to_s.singular}| #{arg.to_s.singular}.name}.sort.join(',')
       end
+      RUBY
     end
+  end
 
   def has_tags(*args)
     has_tags_on :tags
@@ -77,7 +76,7 @@ module SingletonMethods
     conditions[:tag_context] = options[:on] if options[:on]
     Tagging.all(conditions).map{|tagging| tagging.taggable}
   end
-  
+
   def taggable?
     true
   end

data/lib/dm-tags/version.rb

@@ -3,7 +3,7 @@ module DataMapper::Tags
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/dm-tags.rb

@@ -1,6 +1,7 @@
 $:.unshift(File.dirname(__FILE__)) unless
 $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+require 'dm-core'
 require 'dm-tags/tagging'
 require 'dm-tags/tag'
 require 'dm-tags/dm_tags'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-tags
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Bobby Calderwood
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-31 00:00:00 -06:00
+date: 2008-09-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.7.0
     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.
+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: 
 - bobby_calderwood@me.com
 executables: []
@@ -81,7 +81,7 @@ rubyforge_project: dm-tags
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: 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.
+summary: 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.
 test_files: 
 - spec/dm-tags/dm_tags_spec.rb
 - spec/dm-tags/tag_spec.rb