dm-tags 0.10.1 → 0.10.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Bobby Calderwood
+Copyright (c) 2009 Bobby Calderwood
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -117,7 +117,7 @@ This package brings tagging to DataMapper.  It is inspired by Acts As Taggable O
 
 (The MIT License)
 
-Copyright (c) 2008 Bobby Calderwood
+Copyright (c) 2009 Bobby Calderwood
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,24 +1,30 @@
-require 'pathname'
+require 'rubygems'
+require 'rake'
 
-ROOT    = Pathname(__FILE__).dirname.expand_path
-JRUBY   = RUBY_PLATFORM =~ /java/
-WINDOWS = Gem.win_platform?
-SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
+begin
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
 
-require ROOT + 'lib/dm-tags/version'
+  Jeweler::Tasks.new do |gem|
+    gem.name        = 'dm-tags'
+    gem.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."
+    gem.description = gem.summary
+    gem.email       = 'bobby_calderwood [a] me [d] com'
+    gem.homepage    = 'http://github.com/datamapper/dm-more/tree/master/%s' % gem.name
+    gem.authors     = [ 'Bobby Calderwood' ]
 
-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_CLEAN = %w[ log pkg coverage ]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.rdoc LICENSE TODO History.rdoc ] }
+    gem.rubyforge_project = 'datamapper'
 
-PROJECT_NAME = 'datamapper'
-PROJECT_URL  = "http://github.com/datamapper/dm-more/tree/master/#{GEM_NAME}"
-PROJECT_DESCRIPTION = PROJECT_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."
+    gem.add_dependency 'dm-core',        '~> 0.10.2'
+    gem.add_dependency 'dm-validations', '~> 0.10.2'
 
-[ ROOT, ROOT.parent ].each do |dir|
-  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
+    gem.add_development_dependency 'rspec', '~> 1.2.9'
+    gem.add_development_dependency 'yard',  '~> 0.4.0'
+  end
+
+  Jeweler::GemcutterTasks.new
+
+  FileList['tasks/**/*.rake'].each { |task| import task }
+rescue LoadError
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
 end

data/VERSION

@@ -0,0 +1 @@
+0.10.2

data/dm-tags.gemspec

@@ -0,0 +1,73 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{dm-tags}
+  s.version = "0.10.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Bobby Calderwood"]
+  s.date = %q{2009-12-11}
+  s.description = %q{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.}
+  s.email = %q{bobby_calderwood [a] me [d] com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "dm-tags.gemspec",
+     "lib/dm-tags.rb",
+     "lib/dm-tags/dm_tags.rb",
+     "lib/dm-tags/tag.rb",
+     "lib/dm-tags/tagging.rb",
+     "spec/dm-tags/dm_tags_spec.rb",
+     "spec/dm-tags/tag_spec.rb",
+     "spec/dm-tags/taggable_spec.rb",
+     "spec/dm-tags/tagging_spec.rb",
+     "spec/dm-tags/updating_spec.rb",
+     "spec/rcov.opts",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "tasks/ci.rake",
+     "tasks/metrics.rake",
+     "tasks/spec.rake",
+     "tasks/yard.rake",
+     "tasks/yardstick.rake"
+  ]
+  s.homepage = %q{http://github.com/datamapper/dm-more/tree/master/dm-tags}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{datamapper}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{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.}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<dm-core>, ["~> 0.10.2"])
+      s.add_runtime_dependency(%q<dm-validations>, ["~> 0.10.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
+      s.add_development_dependency(%q<yard>, ["~> 0.4.0"])
+    else
+      s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
+      s.add_dependency(%q<dm-validations>, ["~> 0.10.2"])
+      s.add_dependency(%q<rspec>, ["~> 1.2.9"])
+      s.add_dependency(%q<yard>, ["~> 0.4.0"])
+    end
+  else
+    s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
+    s.add_dependency(%q<dm-validations>, ["~> 0.10.2"])
+    s.add_dependency(%q<rspec>, ["~> 1.2.9"])
+    s.add_dependency(%q<yard>, ["~> 0.4.0"])
+  end
+end
+

data/lib/dm-tags/dm_tags.rb

@@ -16,11 +16,12 @@ module DataMapper
       # Class Methods
       def tagged_with(string, options = {})
         tag = Tag.first(:name => string)
-        conditions = {}
-        conditions['taggings.tag_id'] = tag.id
-        conditions['taggings.tag_context'] = options.delete(:on) if options[:on]
-        conditions.merge!(options)
-        all(conditions)
+        conditions = {
+          'taggings.tag_id'        => tag.kind_of?(Tag) ? tag.id : nil,
+          'taggings.taggable_type' => self,
+        }
+        conditions['taggings.tag_context'] = options.delete(:on) if options.key?(:on)
+        all(conditions.update(options))
       end
 
       def taggable?
@@ -72,19 +73,11 @@ module DataMapper
             alias #{singular}_collection= #{singular}_list=
 
             def update_#{association}
-              remove_tags = self.frozen_#{singular}_list.to_s.split(',') - self.#{singular}_list
-              tags        = self.#{association}
-
-              tags.all(:name => remove_tags).each do |tag|
-                tags.delete(tag)
-              end
-
-              self.#{singular}_list.each do |name|
-                tag = Tag.first_or_new(:name => name)
-                tags << tag unless tags.include?(tag)
+              self.#{association} = self.#{singular}_list.map do |name|
+                Tag.first_or_new(:name => name)
               end
 
-              self.frozen_#{singular}_list = tags.map { |tag| tag.name }.join(',')
+              self.frozen_#{singular}_list = #{singular}_collection
             end
 
             ##

data/lib/dm-tags/tag.rb

@@ -2,7 +2,7 @@ class Tag
   include DataMapper::Resource
 
   property :id,   Serial
-  property :name, String, :nullable => false, :unique => true, :unique_index => true
+  property :name, String, :required => true, :unique => true, :unique_index => true
 
   has n, :taggings
 

data/lib/dm-tags/tagging.rb

@@ -2,16 +2,12 @@ class Tagging
   include DataMapper::Resource
 
   property :id,            Serial
-  property :taggable_id,   Integer, :nullable => false
-  property :taggable_type, Class,   :nullable => false
-  property :tag_context,   String,  :nullable => false
+  property :taggable_id,   Integer, :required => true
+  property :taggable_type, Class,   :required => true
+  property :tag_context,   String,  :required => true
 
   belongs_to :tag
 
-  if respond_to?(:validates_present)
-    validates_present :taggable_type, :taggable_id
-  end
-
   def taggable
     taggable_type.get!(taggable_id)
   end

data/spec/dm-tags/tag_spec.rb

@@ -5,11 +5,6 @@ describe Tag 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

data/spec/dm-tags/taggable_spec.rb

@@ -5,10 +5,6 @@ describe "Taggable" do
     @taggable = DefaultTaggedModel.new
   end
 
-  it "should have an id property" do
-    @taggable.attributes.should have_key(:id)
-  end
-
   it "should return an alphabetically sorted array of the tag names when sent #tag_list" do
     tag_names = %w[ tag1 tag2 tag3 ]
 
@@ -48,9 +44,11 @@ describe "Taggable" do
     @taggable.tags.sort_by{|tag| tag.id}.should == [tag1, tag2]
     @taggable.tag_list = 'tag3, tag4'
     @taggable.save.should be_true
-    @taggable = TaggedModel.first
-    @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')]
+    @taggable = @taggable.model.get(*@taggable.key)
+    pending 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
   end
 
   it "should set tags with a string, and return a string (form helpers)" do
@@ -122,6 +120,25 @@ describe "Taggable" do
     TaggedModel.taggable?.should be_true
   end
 
+  it 'should return an empty list if tag is not present (should not continue on nil tag)' do
+    taggable = DefaultTaggedModel.new
+    taggable.tag_list = 'tag1, tag2, tag3'
+    taggable.save
+
+    DefaultTaggedModel.tagged_with('tag5').should == []
+  end
+
+  it 'should return an empty list nothing if tag is present but not associated with model' do
+    taggable1 = DefaultTaggedModel.new
+    taggable1.tag_list = 'tag1, tag2, tag3'
+    taggable1.save
+    taggable2 = TaggedModel.new
+    taggable2.tag_list = 'tag1, tag2, tag5'
+    taggable2.save
+
+    DefaultTaggedModel.tagged_with('tag5').should == []
+  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

data/spec/dm-tags/tagging_spec.rb

@@ -12,14 +12,6 @@ describe Tagging do
     Tagging.should include(DataMapper::Resource)
   end
 
-  it "should have properties: id, tag_id, taggable_id, taggable_type, tagger_id, tagger_type, and tag_context" do
-    @tagging.attributes.should have_key(:id)
-    @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(: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

data/spec/rcov.opts

@@ -0,0 +1,6 @@
+--exclude "spec"
+--sort coverage
+--callsites
+--xrefs
+--profile
+--text-summary

data/spec/spec.opts

@@ -1,2 +1,4 @@
 --colour
 --loadby random
+--format profile
+--backtrace

data/tasks/ci.rake

@@ -0,0 +1 @@
+task :ci => [ :verify_measurements, 'metrics:all' ]

data/tasks/metrics.rake

@@ -0,0 +1,36 @@
+begin
+  require 'metric_fu'
+rescue LoadError
+  namespace :metrics do
+    task :all do
+      abort 'metric_fu is not available. In order to run metrics:all, you must: gem install metric_fu'
+    end
+  end
+end
+
+begin
+  require 'reek/adapters/rake_task'
+
+  Reek::RakeTask.new do |t|
+    t.fail_on_error = true
+    t.verbose       = false
+    t.source_files  = 'lib/**/*.rb'
+  end
+rescue LoadError
+  task :reek do
+    abort 'Reek is not available. In order to run reek, you must: gem install reek'
+  end
+end
+
+begin
+  require 'roodi'
+  require 'roodi_task'
+
+  RoodiTask.new do |t|
+    t.verbose = false
+  end
+rescue LoadError
+  task :roodi do
+    abort 'Roodi is not available. In order to run roodi, you must: gem install roodi'
+  end
+end

data/tasks/spec.rake

@@ -0,0 +1,41 @@
+spec_defaults = lambda do |spec|
+  spec.pattern    = 'spec/**/*_spec.rb'
+  spec.libs      << 'lib' << 'spec'
+  spec.spec_opts << '--options' << 'spec/spec.opts'
+end
+
+begin
+  require 'spec/rake/spectask'
+
+  Spec::Rake::SpecTask.new(:spec, &spec_defaults)
+rescue LoadError
+  task :spec do
+    abort 'rspec is not available. In order to run spec, you must: gem install rspec'
+  end
+end
+
+begin
+  require 'rcov'
+  require 'spec/rake/verify_rcov'
+
+  Spec::Rake::SpecTask.new(:rcov) do |rcov|
+    spec_defaults.call(rcov)
+    rcov.rcov      = true
+    rcov.rcov_opts = File.read('spec/rcov.opts').split(/\s+/)
+  end
+
+  RCov::VerifyTask.new(:verify_rcov => :rcov) do |rcov|
+    rcov.threshold = 100
+  end
+rescue LoadError
+  %w[ rcov verify_rcov ].each do |name|
+    task name do
+      abort "rcov is not available. In order to run #{name}, you must: gem install rcov"
+    end
+  end
+end
+
+task :spec => :check_dependencies
+task :rcov => :check_dependencies
+
+task :default => :spec

data/tasks/yard.rake

@@ -0,0 +1,9 @@
+begin
+  require 'yard'
+
+  YARD::Rake::YardocTask.new
+rescue LoadError
+  task :yard do
+    abort 'YARD is not available. In order to run yard, you must: gem install yard'
+  end
+end

data/tasks/yardstick.rake

@@ -0,0 +1,19 @@
+begin
+  require 'pathname'
+  require 'yardstick/rake/measurement'
+  require 'yardstick/rake/verify'
+
+  # yardstick_measure task
+  Yardstick::Rake::Measurement.new
+
+  # verify_measurements task
+  Yardstick::Rake::Verify.new do |verify|
+    verify.threshold = 100
+  end
+rescue LoadError
+  %w[ yardstick_measure verify_measurements ].each do |name|
+    task name.to_s do
+      abort "Yardstick is not available. In order to run #{name}, you must: gem install yardstick"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-tags
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors: 
 - Bobby Calderwood
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-30 00:00:00 -07:00
+date: 2009-12-11 00:00:00 -08: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.10.1
+        version: 0.10.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-validations
@@ -28,52 +28,70 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.1
+        version: 0.10.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: yard
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.4.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.
-email: 
-- bobby_calderwood [a] me [d] com
+email: bobby_calderwood [a] me [d] com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
 - LICENSE
-- TODO
-- History.rdoc
+- README.rdoc
 files: 
 - .gitignore
-- History.rdoc
 - LICENSE
-- Manifest.txt
 - README.rdoc
 - Rakefile
-- TODO
+- VERSION
+- dm-tags.gemspec
 - lib/dm-tags.rb
 - lib/dm-tags/dm_tags.rb
 - lib/dm-tags/tag.rb
 - lib/dm-tags/tagging.rb
-- lib/dm-tags/version.rb
 - spec/dm-tags/dm_tags_spec.rb
 - spec/dm-tags/tag_spec.rb
 - spec/dm-tags/taggable_spec.rb
 - spec/dm-tags/tagging_spec.rb
 - spec/dm-tags/updating_spec.rb
+- spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/install.rb
-- tasks/spec.rb
+- tasks/ci.rake
+- tasks/metrics.rake
+- tasks/spec.rake
+- tasks/yard.rake
+- tasks/yardstick.rake
 has_rdoc: true
 homepage: http://github.com/datamapper/dm-more/tree/master/dm-tags
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/History.rdoc

@@ -1,43 +0,0 @@
-=== 0.10.1 / 2009-09-30
-
-* No changes this version
-
-=== 0.10.0 / 2009-09-15
-
-* Updated to work with dm-core 0.10.0
-
-=== 0.9.11 / 2009-03-29
-
-* No changes this version
-
-=== 0.9.10 / 2009-01-19
-
-* No changes this version
-
-=== 0.9.9 / 2009-01-04
-
-* No changes this version
-
-=== 0.9.8 / 2008-12-07
-
-* 2 minor enhancements:
-
-  * Added dm-validations dependency.  Tag names must be non-nil
-  * Added safe tagging destroy
-
-* 2 bug fixes:
-
-  * Ensure Model#tagged_with scopes the query to just include itself [#606 state:resolved]
-  * internal cleanups
-
-=== 0.0.2 / 2008-07-30
-
-* 1 major enhancement:
-
-  * Added contextual finding to Model.tagged_with
-
-=== 0.0.1 / 2008-07-29
-
-* 1 major enhancement:
-
-  * Initial release

data/Manifest.txt

@@ -1,21 +0,0 @@
-.gitignore
-History.rdoc
-LICENSE
-Manifest.txt
-README.rdoc
-Rakefile
-TODO
-lib/dm-tags.rb
-lib/dm-tags/dm_tags.rb
-lib/dm-tags/tag.rb
-lib/dm-tags/tagging.rb
-lib/dm-tags/version.rb
-spec/dm-tags/dm_tags_spec.rb
-spec/dm-tags/tag_spec.rb
-spec/dm-tags/taggable_spec.rb
-spec/dm-tags/tagging_spec.rb
-spec/dm-tags/updating_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-tasks/install.rb
-tasks/spec.rb

data/lib/dm-tags/version.rb

@@ -1,5 +0,0 @@
-module DataMapper
-  class Tags
-    VERSION = '0.10.1'.freeze
-  end
-end

data/tasks/install.rb

@@ -1,13 +0,0 @@
-def sudo_gem(cmd)
-  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
-end
-
-desc "Install #{GEM_NAME} #{GEM_VERSION}"
-task :install => [ :package ] do
-  sudo_gem "install pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
-end
-
-desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"
-task :uninstall => [ :clobber ] do
-  sudo_gem "uninstall #{GEM_NAME} -v#{GEM_VERSION} -Ix"
-end

data/tasks/spec.rb

@@ -1,25 +0,0 @@
-begin
-  require 'spec/rake/spectask'
-
-  task :default => [ :spec ]
-
-  desc 'Run specifications'
-  Spec::Rake::SpecTask.new(:spec) do |t|
-    t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.libs      << 'lib' << 'spec' # needed for CI rake spec task, duplicated in spec_helper
-
-    begin
-      require 'rcov'
-      t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
-      t.rcov_opts << '--exclude' << 'spec'
-      t.rcov_opts << '--text-summary'
-      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-    rescue LoadError
-      # rcov not installed
-    rescue SyntaxError
-      # rcov syntax invalid
-    end
-  end
-rescue LoadError
-  # rspec not installed
-end