dm-tags 0.10.2 → 1.0.0.rc1

data/.gitignore

@@ -1 +1,36 @@
-pkg/*
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## Rubinius
+*.rbc
+
+## PROJECT::GENERAL
+*.gem
+coverage
+rdoc
+pkg
+tmp
+doc
+log
+.yardoc
+measurements
+
+## BUNDLER
+.bundle
+Gemfile.local
+Gemfile.lock
+
+## PROJECT::SPECIFIC
+spec/db/

data/Gemfile

@@ -0,0 +1,143 @@
+# If you're working on more than one datamapper gem at a time, then it's
+# recommended to create a local Gemfile and use this instead of the git
+# sources. This will make sure that you are  developing against your
+# other local datamapper sources that you currently work on. Gemfile.local
+# will behave identically to the standard Gemfile apart from the fact that
+# it fetches the datamapper gems from local paths. This means that you can use
+# the same environment variables, like ADAPTER(S) or PLUGIN(S) when running
+# bundle commands. Gemfile.local is added to .gitignore, so you don't need to
+# worry about accidentally checking local development paths into git.
+# In order to create a local Gemfile, all you need to do is run:
+#
+#   bundle exec rake local_gemfile
+#
+# This will give you a Gemfile.local file that points to your local clones of
+# the various datamapper gems. It's assumed that all datamapper repo clones
+# reside in the same directory. You can use the Gemfile.local like so for
+# running any bundle command:
+#
+#   BUNDLE_GEMFILE=Gemfile.local bundle foo
+#
+# You can also specify which adapter(s) should be part of the bundle by setting
+# an environment variable. This of course also works when using the Gemfile.local
+#
+#   bundle foo                        # dm-sqlite-adapter
+#   ADAPTER=mysql bundle foo          # dm-mysql-adapter
+#   ADAPTERS=sqlite,mysql bundle foo  # dm-sqlite-adapter and dm-mysql-adapter
+#
+# Of course you can also use the ADAPTER(S) variable when using the Gemfile.local
+# and running specs against selected adapters.
+#
+# For easily working with adapters supported on your machine, it's recommended
+# that you first install all adapters that you are planning to use or work on
+# by doing something like
+#
+#   ADAPTERS=sqlite,mysql,postgres bundle install
+#
+# This will clone the various repositories and make them available to bundler.
+# Once you have them installed you can easily switch between adapters for the
+# various development tasks. Running something like
+#
+#   ADAPTER=mysql bundle exec rake spec
+#
+# will make sure that the dm-mysql-adapter is part of the bundle, and will be used
+# when running the specs.
+#
+# You can also specify which plugin(s) should be part of the bundle by setting
+# an environment variable. This also works when using the Gemfile.local
+#
+#   bundle foo                                 # dm-migrations
+#   PLUGINS=dm-validations bundle foo          # dm-migrations and dm-validations
+#   PLUGINS=dm-validations,dm-types bundle foo # dm-migrations, dm-validations and dm-types
+#
+# Of course you can combine the PLUGIN(S) and ADAPTER(S) env vars to run specs
+# for certain adapter/plugin combinations.
+#
+# Finally, to speed up running specs and other tasks, it's recommended to run
+#
+#   bundle lock
+#
+# after running 'bundle install' for the first time. This will make 'bundle exec' run
+# a lot faster compared to the unlocked version. With an unlocked bundle you would
+# typically just run 'bundle install' from time to time to fetch the latest sources from
+# upstream. When you locked your bundle, you need to run
+#
+#   bundle install --relock
+#
+# to make sure to fetch the latest updates and then lock the bundle again. Gemfile.lock
+# is added to the .gitignore file, so you don't need to worry about accidentally checking
+# it into version control.
+
+source 'http://rubygems.org'
+
+DATAMAPPER = 'git://github.com/datamapper'
+DM_VERSION = '~> 1.0.0.rc1'
+
+group :runtime do # Runtime dependencies (as in the gemspec)
+
+  if ENV['EXTLIB']
+    gem 'extlib',        '~> 0.9.15',      :git => "#{DATAMAPPER}/extlib.git"
+  else
+    gem 'activesupport', '~> 3.0.0.beta3', :git => 'git://github.com/rails/rails.git', :require => nil
+  end
+
+  gem 'dm-core',         DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
+
+end
+
+group(:development) do # Development dependencies (as in the gemspec)
+
+  gem 'dm-validations', DM_VERSION, :git => "#{DATAMAPPER}/dm-validations.git"
+
+  gem 'rake',           '~> 0.8.7'
+  gem 'rspec',          '~> 1.3'
+  gem 'jeweler',        '~> 1.4'
+
+end
+
+group :quality do # These gems contain rake tasks that check the quality of the source code
+
+  gem 'metric_fu',      '~> 1.3'
+  gem 'rcov',           '~> 0.9.7'
+  gem 'reek',           '~> 1.2.7'
+  gem 'roodi',          '~> 2.1'
+  gem 'yard',           '~> 0.5'
+  gem 'yardstick',      '~> 0.1'
+
+end
+
+group :datamapper do # We need this because we want to pin these dependencies to their git master sources
+
+  adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
+  adapters = adapters.to_s.gsub(',',' ').split(' ') - ['in_memory']
+
+  unless adapters.empty?
+
+    DO_VERSION     = '~> 0.10.2'
+    DM_DO_ADAPTERS = %w[sqlite postgres mysql oracle sqlserver]
+
+    gem 'data_objects',  DO_VERSION, :git => "#{DATAMAPPER}/do.git"
+
+    adapters.each do |adapter|
+      if DM_DO_ADAPTERS.any? { |dm_do_adapter| dm_do_adapter =~ /#{adapter}/  }
+        adapter = 'sqlite3' if adapter == 'sqlite'
+        gem "do_#{adapter}", DO_VERSION, :git => "#{DATAMAPPER}/do.git"
+      end
+    end
+
+    gem 'dm-do-adapter', DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
+
+    adapters.each do |adapter|
+      gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
+    end
+
+  end
+
+  plugins = ENV['PLUGINS'] || ENV['PLUGIN']
+  plugins = (plugins.to_s.gsub(',',' ').split(' ') + ['dm-migrations']).uniq
+
+  plugins.each do |plugin|
+    gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
+  end
+
+end

data/Rakefile

@@ -15,11 +15,10 @@ begin
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core',        '~> 0.10.2'
-    gem.add_dependency 'dm-validations', '~> 0.10.2'
+    gem.add_dependency 'dm-core',                    '~> 1.0.0.rc1'
 
-    gem.add_development_dependency 'rspec', '~> 1.2.9'
-    gem.add_development_dependency 'yard',  '~> 0.4.0'
+    gem.add_development_dependency 'rspec',          '~> 1.3'
+    gem.add_development_dependency 'dm-validations', '~> 1.0.0.rc1'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.10.2
+1.0.0.rc1

data/dm-tags.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-tags}
-  s.version = "0.10.2"
+  s.version = "1.0.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bobby Calderwood"]
-  s.date = %q{2009-12-11}
+  s.date = %q{2010-05-19}
   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 = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -36,6 +37,7 @@ Gem::Specification.new do |s|
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "tasks/ci.rake",
+     "tasks/local_gemfile.rake",
      "tasks/metrics.rake",
      "tasks/spec.rake",
      "tasks/yard.rake",
@@ -45,29 +47,34 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   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.}
+  s.test_files = [
+    "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_helper.rb"
+  ]
 
   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"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.0.0.rc1"])
     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"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
+      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.0.0.rc1"])
     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"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
+    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.0.0.rc1"])
   end
 end
 

data/lib/dm-tags.rb

@@ -1,3 +1,6 @@
+require 'dm-core'
+require 'dm-validations'
+
 require 'dm-tags/tagging'
 require 'dm-tags/tag'
 require 'dm-tags/dm_tags'

data/lib/dm-tags/dm_tags.rb

@@ -1,17 +1,6 @@
-module DataMapper
-  module Resource
-    class << self
-      # FIXME: remove alias method chain like code
-      alias_method :old_included, :included
-      def included(receiver)
-        old_included(receiver)
-        receiver.send(:include, DataMapper::Tags)
-      end
-    end
-  end
-end
 module DataMapper
   module Tags
+
     module SingletonMethods
       # Class Methods
       def tagged_with(string, options = {})
@@ -52,7 +41,7 @@ module DataMapper
 
         associations.each do |association|
           association = association.to_s
-          singular    = association.singular
+          singular    = association.singularize
 
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
             property :frozen_#{singular}_list, Text
@@ -63,7 +52,7 @@ module DataMapper
             before :save, :update_#{association}
 
             def #{singular}_list
-              @#{singular}_list ||= self.#{association}.map { |tag| tag.name }
+              @#{singular}_list ||= #{association}.map { |tag| tag.name }
             end
 
             def #{singular}_list=(string)
@@ -73,7 +62,7 @@ module DataMapper
             alias #{singular}_collection= #{singular}_list=
 
             def update_#{association}
-              self.#{association} = self.#{singular}_list.map do |name|
+              self.#{association} = #{singular}_list.map do |name|
                 Tag.first_or_new(:name => name)
               end
 
@@ -84,7 +73,7 @@ module DataMapper
             # Helper methods to make setting tags easier
             #
             def #{singular}_collection
-              self.#{association}.map { |tag| tag.name }.join(', ')
+              #{association}.map { |tag| tag.name }.join(', ')
             end
 
             ##
@@ -92,8 +81,7 @@ module DataMapper
             #
             def add_#{singular}(string)
               tag_names = string.to_s.split(',').map { |name| name.gsub(/[^\\w\\s_-]/i, '').strip }
-              tag_names.concat(self.#{singular}_list)
-              @#{singular}_list = tag_names.uniq.sort
+              @#{singular}_list = tag_names.concat(#{singular}_list).uniq.sort
             end
           RUBY
         end
@@ -118,5 +106,9 @@ module DataMapper
       base.send(:include, InstanceMethods)
       base.extend(ClassMethods)
     end
-  end
-end
+
+  end # module Tags
+
+  Model.append_inclusions DataMapper::Tags
+
+end # module DataMapper

data/lib/dm-tags/tagging.rb

@@ -2,7 +2,7 @@ class Tagging
   include DataMapper::Resource
 
   property :id,            Serial
-  property :taggable_id,   Integer, :required => true
+  property :taggable_id,   Integer, :required => true, :min => 1
   property :taggable_type, Class,   :required => true
   property :tag_context,   String,  :required => true
 

data/spec/dm-tags/taggable_spec.rb

@@ -1,96 +1,114 @@
 require 'spec_helper'
 
 describe "Taggable" do
-  before do
-    @taggable = DefaultTaggedModel.new
-  end
-
-  it "should return an alphabetically sorted array of the tag names when sent #tag_list" do
-    tag_names = %w[ tag1 tag2 tag3 ]
-
-    # @taggable.tags = tag_names.map { |name| { :name => name } }
-
-    tag_names.each do |name|
-      @taggable.tag_taggings.new(:tag => Tag.create(:name => name))
+  supported_by :sqlite, :mysql, :postgres do
+    before do
+      @taggable = DefaultTaggedModel.new
     end
 
-    @taggable.save.should be_true
+    it "should return an alphabetically sorted array of the tag names when sent #tag_list" do
+      tag_names = %w[ tag1 tag2 tag3 ]
 
-    @taggable = @taggable.model.get!(@taggable.key)
-    @taggable.tag_list.should == tag_names
-  end
+      # @taggable.tags = tag_names.map { |name| { :name => name } }
 
-  it "should set the tag list to a sanitized, stripped, alphabetized, unique array of tag names" do
-    @taggable.tag_list = "tags, !$%^&* !@more-stuff' &, tags , me_again9,  et tu   " # Must check for redundancy
-    valid_array = ["et tu", "me_again9", "more-stuff", "tags"]
-    @taggable.tag_list.should == valid_array
-    @taggable.instance_variable_get(:@tag_list).should == valid_array
-    @taggable.save
-    @taggable = DefaultTaggedModel.first
-    @taggable.tag_list.should == valid_array
-  end
+      tag_names.each do |name|
+        @taggable.tag_taggings.new(:tag => Tag.create(:name => name))
+      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')
-    tag2 = Tag.create(:name => 'tag2')
-    tag3 = Tag.create(:name => 'tag3')
-    @taggable = TaggedModel.new
-    @taggable.tag_list = 'tag1, tag2, tag3'
-    @taggable.save.should be_true
-    @taggable.tags.sort_by{|tag| tag.id}.should == [tag1, tag2, tag3]
-    @taggable.tag_list = 'tag1, tag2'
-    @taggable.save.should be_true # Should dirty the model when changed.
-    @taggable.tags.sort_by{|tag| tag.id}.should == [tag1, tag2]
-    @taggable.tag_list = 'tag3, tag4'
-    @taggable.save.should be_true
-    @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')]
+      @taggable.save.should be_true
+
+      @taggable = @taggable.model.get!(@taggable.key)
+      @taggable.tag_list.should == tag_names
     end
-  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 set the tag list to a sanitized, stripped, alphabetized, unique array of tag names" do
+      @taggable.tag_list = "tags, !$%^&* !@more-stuff' &, tags , me_again9,  et tu   " # Must check for redundancy
+      valid_array = ["et tu", "me_again9", "more-stuff", "tags"]
+      @taggable.tag_list.should == valid_array
+      @taggable.instance_variable_get(:@tag_list).should == valid_array
+      @taggable.save
+      @taggable = DefaultTaggedModel.first
+      @taggable.tag_list.should == valid_array
+    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
+    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')
+      tag2 = Tag.create(:name => 'tag2')
+      tag3 = Tag.create(:name => 'tag3')
+      @taggable = TaggedModel.new
+      @taggable.tag_list = 'tag1, tag2, tag3'
+      @taggable.save.should be_true
+      @taggable.tags.sort_by{|tag| tag.id}.should == [tag1, tag2, tag3]
+      @taggable.tag_list = 'tag1, tag2'
+      @taggable.save.should be_true # Should dirty the model when changed.
+      pending do
+        @taggable.tags.sort_by{|tag| tag.id}.should == [tag1, tag2]
+      end
+      @taggable.tag_list = 'tag3, tag4'
+      @taggable.save.should be_true
+      @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
 
-  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)
+    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 return taggables tagged with the name given in the first argument" do
-      @taggable.tag_list = 'tag1, tag2, tag3'
+    it "should be able to add tags and not overwrite old tags" do
+      @taggable = TaggedModel.new
+      @taggable.add_tag("tag-1")
       @taggable.save
-      taggable = DefaultTaggedModel.new
-      taggable.tag_list = 'tag1, goat, fish'
-      taggable.save
-      DefaultTaggedModel.tagged_with('tag1').sort_by{|t| t.id}.to_a.should == [@taggable, taggable]
+      @taggable.tags.size.should == 1
+      @taggable.add_tag("tag-2, tag-3")
+      @taggable.save
+      pending do
+        @taggable.tags.size.should == 3
+      end
+      @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)
+        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
+        taggable = DefaultTaggedModel.new
+        taggable.tag_list = 'tag1, goat, fish'
+        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
+        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', :on => 'skills').should == [taggable2]
+        TaggedModel.tagged_with('tag1', :on => 'tags').should == [taggable1]
+      end
     end
 
-    it "should return taggables of the context specified by the second argument" do
+    it "should allow extra conditions for the query" do
       taggable1 = TaggedModel.new
       taggable2 = TaggedModel.new
       taggable1.tag_list = 'tag1, tag2, tag3'
@@ -98,61 +116,48 @@ describe "Taggable" do
       taggable1.save
       taggable2.save
       TaggedModel.tagged_with('tag1').should == [taggable1, taggable2]
-      TaggedModel.tagged_with('tag1', :on => 'skills').should == [taggable2]
-      TaggedModel.tagged_with('tag1', :on => 'tags').should == [taggable1]
+      TaggedModel.tagged_with('tag1', :id => taggable1.id).should == [taggable1]
     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
-  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 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
+    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
+      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
+    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
+      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
-    TaggedModel.new.taggable?.should == TaggedModel.taggable?
-    TaggedModel.new.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
 
-  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 == []
+    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
-
 end

data/spec/dm-tags/updating_spec.rb

@@ -1,42 +1,46 @@
 require 'spec_helper'
 
 describe "Tag", "when updating" do
-  before do
-    @tagged_model = TaggedModel.new
-  end
-
-  it "should create itself" do
-    @tagged_model.tag_list = "abc, def, ghi"
-    @tagged_model.skill_list = "Casablanca, Morocco"
-    @tagged_model.save.should be_true
-    @tagged_model.should be_saved
-
-    @tagged_model.reload
-    @tagged_model.tags.map { |t| t.name }.should == %w[ abc def ghi ]
-    @tagged_model.skills.map { |t| t.name }.should == %w[ Casablanca Morocco ]
-  end
-
-  it "should update itself" do
-    @tagged_model.save.should be_true
-    @tagged_model.should be_saved
-
-    @tagged_model.reload
-    @tagged_model.tags.should be_empty
-    @tagged_model.skills.should be_empty
-
-    @tagged_model.tag_list = "abc, def, xyz, jkl"
-    @tagged_model.skill_list = "Sahara, Morocco"
-    @tagged_model.save.should be_true
-
-    @tagged_model.reload
-    @tagged_model.tags.map { |t| t.name }.should == %w[ abc def jkl xyz ]
-    @tagged_model.skills.map { |t| t.name }.should == %w[ Morocco Sahara ]
-
-    @tagged_model.tag_list = ""
-    @tagged_model.skill_list = ""
-    @tagged_model.save
-
-    @tagged_model.tags.should == []
-    @tagged_model.skills.should == []
+  supported_by :sqlite, :mysql, :postgres do
+    before do
+      @tagged_model = TaggedModel.new
+    end
+
+    it "should create itself" do
+      @tagged_model.tag_list = "abc, def, ghi"
+      @tagged_model.skill_list = "Casablanca, Morocco"
+      @tagged_model.save.should be_true
+      @tagged_model.should be_saved
+
+      @tagged_model.reload
+      @tagged_model.tags.map { |t| t.name }.should == %w[ abc def ghi ]
+      @tagged_model.skills.map { |t| t.name }.should == %w[ Casablanca Morocco ]
+    end
+
+    it "should update itself" do
+      @tagged_model.save.should be_true
+      @tagged_model.should be_saved
+
+      @tagged_model.reload
+      @tagged_model.tags.should be_empty
+      @tagged_model.skills.should be_empty
+
+      @tagged_model.tag_list = "abc, def, xyz, jkl"
+      @tagged_model.skill_list = "Sahara, Morocco"
+      @tagged_model.save.should be_true
+
+      @tagged_model.reload
+      pending do
+        @tagged_model.tags.map { |t| t.name }.should == %w[ abc def jkl xyz ]
+      end
+      @tagged_model.skills.map { |t| t.name }.should == %w[ Morocco Sahara ]
+
+      @tagged_model.tag_list = ""
+      @tagged_model.skill_list = ""
+      @tagged_model.save
+
+      @tagged_model.tags.should == []
+      @tagged_model.skills.should == []
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,41 +1,16 @@
-require 'rubygems'
-
-# Use local dm-core if running from a typical dev checkout.
-lib = File.join('..', '..', 'dm-core', 'lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib)
-require 'dm-core'
-
-# Use local dm-validations if running from a typical dev checkout.
-lib = File.join('..', 'dm-validations', 'lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib)
-require 'dm-validations'
-
-# Support running specs with 'rake spec' and 'spec'
-$LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
+require 'dm-core/spec/setup'
+require 'dm-core/spec/lib/adapter_helpers'
 
 require 'dm-tags'
+require 'dm-migrations'
+require 'dm-validations'
 
-def load_driver(name, default_uri)
-  return false if ENV['ADAPTER'] != name.to_s
-
-  begin
-    DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
-    DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]
-    true
-  rescue LoadError => e
-    warn "Could not load do_#{name}: #{e}"
-    false
-  end
-end
-
-ENV['ADAPTER'] ||= 'sqlite3'
+DataMapper::Spec.setup
 
-HAS_SQLITE3  = load_driver(:sqlite3,  'sqlite3::memory:')
-HAS_MYSQL    = load_driver(:mysql,    'mysql://localhost/dm_core_test')
-HAS_POSTGRES = load_driver(:postgres, 'postgres://postgres@localhost/dm_core_test')
+Spec::Runner.configure do |config|
 
+  config.extend(DataMapper::Spec::Adapters::Helpers)
 
-Spec::Runner.configure do |config|
   config.before do
     Object.send(:remove_const, :TaggedModel) if defined?(TaggedModel)
     class ::TaggedModel
@@ -73,4 +48,5 @@ Spec::Runner.configure do |config|
 
     DataMapper.auto_migrate!
   end
+
 end

data/tasks/local_gemfile.rake

@@ -0,0 +1,18 @@
+desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
+task :local_gemfile do |t|
+
+  root              = Pathname(__FILE__).dirname.parent
+  datamapper        = root.parent
+
+  source_regex     = /DATAMAPPER = 'git:\/\/github.com\/datamapper'/
+  gem_source_regex = /:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/
+
+  root.join('Gemfile.local').open('w') do |f|
+    root.join('Gemfile').open.each do |line|
+      line.sub!(source_regex,     "DATAMAPPER = '#{datamapper}'")
+      line.sub!(gem_source_regex, ':path => "#{DATAMAPPER}/\1"')
+      f.puts line
+    end
+  end
+
+end

data/tasks/spec.rake

@@ -35,7 +35,4 @@ rescue LoadError
   end
 end
 
-task :spec => :check_dependencies
-task :rcov => :check_dependencies
-
 task :default => :spec

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-tags
 version: !ruby/object:Gem::Version 
-  version: 0.10.2
+  prerelease: true
+  segments: 
+  - 1
+  - 0
+  - 0
+  - rc1
+  version: 1.0.0.rc1
 platform: ruby
 authors: 
 - Bobby Calderwood
@@ -9,49 +15,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-11 00:00:00 -08:00
+date: 2010-05-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-validations
+        segments: 
+        - 1
+        - 0
+        - 0
+        - rc1
+        version: 1.0.0.rc1
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.10.2
-    version: 
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: yard
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: dm-validations
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.0
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 0
+        - rc1
+        version: 1.0.0.rc1
+  type: :development
+  version_requirements: *id003
 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
 executables: []
@@ -63,6 +72,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -81,6 +91,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/ci.rake
+- tasks/local_gemfile.rake
 - tasks/metrics.rake
 - tasks/spec.rake
 - tasks/yard.rake
@@ -98,20 +109,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 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: []
-
+test_files: 
+- 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_helper.rb