dm-tags 0.0.3 → 0.9.7

data/History.txt

@@ -7,8 +7,3 @@
 
 * 1 major enhancement:
   * 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/License.txt

@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Manifest.txt

@@ -17,4 +17,4 @@ spec/dm-tags/taggable_spec.rb
 spec/dm-tags/tagging_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
-tasks/rspec.rake
+tasks/rspec.rake

data/README.txt

@@ -3,8 +3,6 @@
 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.
@@ -115,4 +113,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,4 +1,4 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+require 'config/requirements'
+require 'config/hoe' # setup Hoe + all gem configuration
+
+Dir['tasks/**/*.rake'].each { |rake| load rake }

data/lib/dm-tags/dm_tags.rb

@@ -1,3 +1,4 @@
+require 'dm-core'
 module DataMapper
   module Resource
     class << self
@@ -30,7 +31,7 @@ module DataMapper
           end
 
           def #{arg.to_s.singular}_list
-            @#{arg.to_s.singular}_list || #{arg}.map{|#{arg.to_s.singular}| #{arg.to_s.singular}.name}.sort
+            @#{arg.to_s.singular}_list ||= #{arg}.map{|#{arg.to_s.singular}| #{arg.to_s.singular}.name}.sort
           end
 
           def #{arg.to_s.singular}_list=(string)
@@ -41,22 +42,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
+              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(',')
           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(',')
+        RUBY
       end
-      RUBY
     end
-  end
 
   def has_tags(*args)
     has_tags_on :tags
@@ -93,4 +94,4 @@ def self.included(receiver)
   receiver.extend(ClassMethods)
 end
 end
-end
+end

data/lib/dm-tags/tag.rb

@@ -4,8 +4,8 @@ class Tag
   property :name, String, :nullable => false, :unique => true
 
   has n, :taggings
-  
+
   def taggables
     taggings.map{|tagging| tagging.taggable}
   end
-end
+end

data/lib/dm-tags/tagging.rb

@@ -5,10 +5,10 @@ class Tagging
   property :taggable_id, Integer, :nullable => false
   property :taggable_type, String, :nullable => false
   property :tag_context, String, :nullable => false
-  
+
   belongs_to :tag
-  
+
   def taggable
     eval("#{taggable_type}.get!(#{taggable_id})") if taggable_type and taggable_id
   end
-end
+end

data/lib/dm-tags/version.rb

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

data/lib/dm-tags.rb

@@ -1,7 +1,6 @@
 $:.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'
+require 'dm-tags/dm_tags'

data/setup.rb

@@ -659,7 +659,7 @@ module FileOperations
   def ruby(*args)
     command config('rubyprog'), *args
   end
-  
+
   def make(task = nil)
     command(*[config('makeprog'), task].compact)
   end
@@ -722,7 +722,7 @@ module HookScriptAPI
   def srcdirectory?(path)
     File.dir?(srcfile(path))
   end
-  
+
   def srcfile?(path)
     File.file?(srcfile(path))
   end
@@ -826,7 +826,7 @@ class ToplevelInstaller
       __send__ "exec_#{task}"
     end
   end
-  
+
   def run_metaconfigs
     @config.load_script "#{@ardir}/metaconfig"
   end
@@ -1404,7 +1404,7 @@ class Installer
   end
 
   # picked up many entries from cvs-1.11.1/src/ignore.c
-  JUNK_FILES = %w( 
+  JUNK_FILES = %w(
     core RCSLOG tags TAGS .make.state
     .nse_depinfo #* .#* cvslog.* ,* .del-* *.olb
     *~ *.old *.bak *.BAK *.orig *.rej _$* *$

data/spec/classes.rb

@@ -22,4 +22,4 @@ end
 class UntaggedModel
   include DataMapper::Resource
   property :id, Integer, :serial => true
-end
+end

data/spec/dm-setup.rb

@@ -1,2 +1,2 @@
 DataMapper.setup(:default, 'sqlite3::memory:')
-DataMapper.auto_migrate!
+DataMapper.auto_migrate!

data/spec/dm-tags/dm_tags_spec.rb

@@ -64,4 +64,4 @@ describe DataMapper::Tags do
       a.should_not respond_to(:skills)
     end
   end
-end
+end

data/spec/dm-tags/tag_spec.rb

@@ -4,19 +4,19 @@ describe Tag do
   before(:each) do
     @tag = Tag.new
   end
-  
+
   it "should have id and name properties" do
     @tag.attributes.should have_key(:id)
     @tag.attributes.should have_key(:name)
   end
-  
+
   it "should have many Taggings" do
     Tag.relationships.should have_key(:taggings)
   end
-  
+
   it "should validate the presence of name" do
     @tag.should_not be_valid
     @tag.name = "Meme"
     @tag.should be_valid
   end
-end
+end

data/spec/dm-tags/taggable_spec.rb

@@ -35,7 +35,7 @@ describe "Taggable" do
     @taggable = DefaultTaggedModel.first
     @taggable.tag_list.should == valid_array
   end
-  
+
   it "should set the associated collection of tags to those whose names
       are in the tag list upon saving, creating and deleting as necessary" do
     tag1 = Tag.create!(:name => 'tag1')
@@ -54,13 +54,13 @@ describe "Taggable" do
     @taggable.tags.sort_by{|tag| tag.id}.should == [tag3, Tag.first(:name => 'tag4')]
     @taggable.skills.sort_by{|skill| skill.id}.should_not == [tag3, Tag.first(:name => 'tag4')]
   end
-  
+
   describe ".tagged_with" do
     it "should have a class method .tagged_with" do
       DefaultTaggedModel.should respond_to(:tagged_with)
       UntaggedModel.should_not respond_to(:tagged_with)
     end
-    
+
     it "should return taggables tagged with the name given in the first argument" do
       @taggable.tag_list = 'tag1, tag2, tag3'
       @taggable.save
@@ -69,7 +69,7 @@ describe "Taggable" do
       taggable.save
       DefaultTaggedModel.tagged_with('tag1').sort_by{|t| t.id}.to_a.should == [@taggable, taggable]
     end
-    
+
     it "should return taggables of the context specified by the second argument" do
       taggable1 = TaggedModel.new
       taggable2 = TaggedModel.new
@@ -82,16 +82,16 @@ describe "Taggable" do
       TaggedModel.tagged_with('tag1', :on => 'tags').should == [taggable1]
     end
   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
   end
-  
+
   it "should have an instance method #taggable? which returns the same as the instance's class would" do
     UntaggedModel.new.taggable?.should == UntaggedModel.taggable?
     UntaggedModel.new.taggable?.should be_false
     TaggedModel.new.taggable?.should == TaggedModel.taggable?
     TaggedModel.new.taggable?.should be_true
   end
-end
+end

data/spec/dm-tags/tagging_spec.rb

@@ -20,7 +20,7 @@ describe Tagging do
     # @tagging.attributes.should have_key(:tagger_type)
     @tagging.attributes.should have_key(:tag_context)
   end
-  
+
   it "should validate the presence of tag_id, taggable_id, taggable_type and tag_context" do
     @tagging.should_not be_valid
     @tagging.tag_id = 1
@@ -37,7 +37,7 @@ describe Tagging do
     Tagging.relationships[:tag].should be
     Tagging.relationships[:tag].parent_model.should == Tag
   end
-  
+
   it "should have a method Tagging#taggable which returns the associated taggable instance" do
     @tagging.should respond_to(:taggable)
     @tagging.taggable.should_not be
@@ -46,4 +46,4 @@ describe Tagging do
     TaggedModel.should_receive(:get!).with(11111)
     @tagging.taggable
   end
-end
+end

data/spec/spec.opts

@@ -1 +1 @@
---colour
+--colour

data/spec/spec_helper.rb

@@ -5,4 +5,4 @@ require 'dm-core'
 require 'dm-validations'
 require File.dirname(__FILE__) + '/../lib/dm-tags'
 require File.dirname(__FILE__) + '/classes'
-require File.dirname(__FILE__) + '/dm-setup'
+require File.dirname(__FILE__) + '/dm-setup'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-tags
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.9.7
 platform: ruby
 authors: 
 - Bobby Calderwood
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-14 00:00:00 -06:00
+date: 2008-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,9 +20,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.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: []
@@ -56,7 +56,7 @@ files:
 - spec/spec_helper.rb
 - tasks/rspec.rake
 has_rdoc: true
-homepage: http://dm-tags.rubyforge.org
+homepage: http://datamapper.rubyforge.org
 post_install_message: ""
 rdoc_options: 
 - --main
@@ -77,11 +77,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: dm-tags
-rubygems_version: 1.2.0
+rubyforge_project: datamapper
+rubygems_version: 1.3.1
 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