dm-tags 0.9.7 → 0.9.8

data/.gitignore

@@ -0,0 +1 @@
+pkg/*

data/History.txt

@@ -1,9 +1,23 @@
-== 0.0.1 2008-07-29
+=== 0.9.8 / 2008-12-07
 
-* 1 major enhancement:
-  * Initial release
+* 2 minor enhancements:
+
+  * Added dm-validations dependency.  Tag names must be non-nil
+  * Added safe tagging destroy
 
-== 0.0.2 2008-07-30
+* 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,20 +1,21 @@
+.gitignore
 History.txt
-License.txt
+LICENSE
 Manifest.txt
 README.txt
 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
-setup.rb
-spec/classes.rb
-spec/dm-setup.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/rspec.rake
+tasks/install.rb
+tasks/spec.rb

data/README.txt

@@ -28,7 +28,7 @@ This package brings tagging to DataMapper.  It is inspired by Acts As Taggable O
 
   class MyModel
     include DataMapper::Resource
-    property :id, Integer, :serial => true
+    property :id, Serial
     has_tags_on :tags, :skills
   end
 
@@ -65,7 +65,7 @@ This package brings tagging to DataMapper.  It is inspired by Acts As Taggable O
 
   class TagsOnly
     include DataMapper::Resource
-    property :id, Integer, :serial => true
+    property :id, Serial
     has_tags
   end
 

data/Rakefile

@@ -1,4 +1,25 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
+require 'pathname'
+require 'rubygems'
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+ROOT    = Pathname(__FILE__).dirname.expand_path
+JRUBY   = RUBY_PLATFORM =~ /java/
+WINDOWS = Gem.win_platform?
+SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
+
+require ROOT + 'lib/dm-tags/version'
+
+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.txt LICENSE TODO History.txt ] }
+
+PROJECT_NAME = 'datamapper'
+PROJECT_URL  = "http://github.com/sam/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."
+
+[ ROOT, ROOT.parent ].each do |dir|
+  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
+end

data/lib/dm-tags/dm_tags.rb

@@ -1,7 +1,12 @@
+require 'rubygems'
+
+gem 'dm-core', '~>0.9.8'
 require 'dm-core'
+
 module DataMapper
   module Resource
     class << self
+      # FIXME: remove alias method chain like code
       alias_method :old_included, :included
       def included(receiver)
         old_included(receiver)
@@ -12,86 +17,95 @@ module DataMapper
 end
 module DataMapper
   module Tags
+    module SingletonMethods
+      # Class Methods
+      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 }
+      end
+
+      def taggable?
+        true
+      end
+    end
+
     module ClassMethods
-      def has_tags_on(*args)
-        args.flatten!
-        args.uniq!
+      def has_tags_on(*associations)
+        associations.flatten!
+        associations.uniq!
 
         self.extend(DataMapper::Tags::SingletonMethods)
 
-        args.map{|arg| arg.to_sym}.each do |arg|
+        associations.each do |association|
+          association = association.to_s
+          singular    = association.singular
+
           class_eval <<-RUBY
-          property :frozen_#{arg.to_s.singular}_list, String
-          has n, :#{arg.to_s.singular}_taggings, :class_name => "Tagging", :child_key => [:taggable_id],
-          :taggable_type => self.to_s, :tag_context => "#{arg}"
-          before :save, :update_#{arg}
-
-          def #{arg}
-            #{arg.to_s.singular}_taggings.map{|tagging| tagging.tag}
-          end
-
-          def #{arg.to_s.singular}_list
-            @#{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)
-            @#{arg.to_s.singular}_list = string.to_s.split(",").map{|name| name.gsub(/[^\\w\\s_-]/i,"").strip}.uniq.sort
-          end
-
-          def update_#{arg}
-            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
+            property :frozen_#{singular}_list, String
+
+            has n, :#{singular}_taggings, :class_name => "Tagging", :child_key => [:taggable_id], :taggable_type => self.to_s, :tag_context => "#{association}"
+
+            before :create, :update_#{association}
+            before :update, :update_#{association}
+
+            def #{association}
+              #{singular}_taggings.map { |tagging| tagging.tag }.sort_by { |tag| tag.name }
             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}")
+
+            def #{singular}_list
+              @#{singular}_list ||= #{association}.map { |tag| tag.name }
             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
-  end
+            def #{singular}_list=(string)
+              @#{singular}_list = string.to_s.split(',').map { |name| name.gsub(/[^\\w\\s_-]/i, '').strip }.uniq.sort
+            end
 
-  def taggable?
-    false
-  end
-end
+            def update_#{association}
+              return if #{singular}_list.empty?
 
-module SingletonMethods
-  # Class Methods
-  def tagged_with(string, options = {})
-    tag = Tag.first(:name => string)
-    conditions = {}
-    conditions[:tag_id] = tag.id
-    conditions[:tag_context] = options[:on] if options[:on]
-    Tagging.all(conditions).map{|tagging| tagging.taggable}
-  end
+              Tag.all(:name => frozen_#{singular}_list.to_s.split(',') - #{singular}_list).each do |tag|
+                if tagging = #{singular}_taggings.first(:tag_id => tag.id)
+                  tagging.destroy
+                end
+              end
 
-  def taggable?
-    true
-  end
-end
+              #{singular}_taggings.reload
 
-module InstanceMethods
-  def taggable?
-    self.class.taggable?
-  end
-end
+              #{singular}_list.each do |name|
+                tag = Tag.first(:name => name)
+                next if tag && #{association}.include?(tag)
+                tag ||= Tag.create(:name => name)
+                #{singular}_taggings << Tagging.new(:tag => tag, :taggable_type => self.class.to_s, :tag_context => "#{association}")
+              end
 
-def self.included(receiver)
-  receiver.send(:include, InstanceMethods)
-  receiver.extend(ClassMethods)
-end
-end
+              self.frozen_#{singular}_list = #{association}.map { |tag| tag.name }.join(',')
+            end
+          RUBY
+        end
+      end
+
+      def has_tags(*)
+        has_tags_on :tags
+      end
+
+      def taggable?
+        false
+      end
+    end
+
+    module InstanceMethods
+      def taggable?
+        self.class.taggable?
+      end
+    end
+
+    def self.included(base)
+      base.send(:include, InstanceMethods)
+      base.extend(ClassMethods)
+    end
+  end
 end

data/lib/dm-tags/tag.rb

@@ -1,11 +1,12 @@
 class Tag
   include DataMapper::Resource
-  property :id, Integer, :serial => true
-  property :name, String, :nullable => false, :unique => true
+
+  property :id,   Serial
+  property :name, String, :nullable => false, :unique => true, :unique_index => true
 
   has n, :taggings
 
   def taggables
-    taggings.map{|tagging| tagging.taggable}
+    taggings.map{ |tagging| tagging.taggable }
   end
 end

data/lib/dm-tags/tagging.rb

@@ -1,10 +1,11 @@
 class Tagging
   include DataMapper::Resource
-  property :id, Integer, :serial => true
-  property :tag_id, Integer, :nullable => false
-  property :taggable_id, Integer, :nullable => false
-  property :taggable_type, String, :nullable => false
-  property :tag_context, String, :nullable => false
+
+  property :id,            Serial
+  property :tag_id,        Integer, :nullable => false
+  property :taggable_id,   Integer, :nullable => false
+  property :taggable_type, String,  :nullable => false
+  property :tag_context,   String,  :nullable => false
 
   belongs_to :tag
 

data/lib/dm-tags/version.rb

@@ -1,10 +1,5 @@
-require 'dm-core'
-module DataMapper::Tags
-  module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 9
-    TINY  = 7
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
+module DataMapper
+  class Tags
+    VERSION = '0.9.8'
   end
 end

data/spec/dm-tags/dm_tags_spec.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require 'pathname'
+require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
 describe DataMapper::Tags do
   it "should add a .has_tags method to models which include DataMapper::Resource" do
@@ -17,17 +18,19 @@ describe DataMapper::Tags do
 
   describe ".has_tags_on" do
     it "should accept an array of context names" do
+      Object.send(:remove_const, :HasTagsOnTestModel) if defined?(HasTagsOnTestModel)
       class HasTagsOnTestModel
         include DataMapper::Resource
-        property :id, Integer, :serial => true
+        property :id, Serial
       end
       lambda{HasTagsOnTestModel.has_tags_on(:should, 'not', :raise)}.should_not raise_error(ArgumentError)
     end
 
     it "should create taggable functionality for each of the context names passed" do
+      Object.send(:remove_const, :TestModel) if defined?(TestModel)
       class TestModel
         include DataMapper::Resource
-        property :id, Integer, :serial => true
+        property :id, Serial
 
         has_tags_on(:pets, 'skills', :tags)
       end
@@ -45,9 +48,10 @@ describe DataMapper::Tags do
 
   describe ".has_tags" do
     it "should create a taggable with 'tags' context regardless of passed arguments" do
+      Object.send(:remove_const, :TagsOnly) if defined?(TagsOnly)
       class TagsOnly
         include DataMapper::Resource
-        property :id, Integer, :serial => true
+        property :id, Serial
         has_tags :pets, :skills
       end
       TagsOnly.should be_taggable

data/spec/dm-tags/tag_spec.rb

@@ -1,7 +1,8 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require 'pathname'
+require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
 describe Tag do
-  before(:each) do
+  before do
     @tag = Tag.new
   end
 

data/spec/dm-tags/taggable_spec.rb

@@ -1,12 +1,8 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require 'pathname'
+require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
 describe "Taggable" do
-  before(:each) do
-    TaggedModel.all.destroy!
-    AnotherTaggedModel.all.destroy!
-    DefaultTaggedModel.all.destroy!
-    UntaggedModel.all.destroy!
-    Tag.all.destroy!
+  before do
     @taggable = DefaultTaggedModel.new
   end
 

data/spec/dm-tags/tagging_spec.rb

@@ -1,8 +1,10 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require 'pathname'
+require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+
 include DataMapper::Tags
 
 describe Tagging do
-  before(:each) do
+  before do
     @tagging = Tagging.new
   end
 

data/spec/dm-tags/updating_spec.rb

@@ -0,0 +1,36 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.expand_path.parent + '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
+
+    @tagged_model.should_not be_new_record
+    @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
+    @tagged_model.should_not be_new_record
+    @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
+
+    @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 ]
+  end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,52 @@
+require 'pathname'
 require 'rubygems'
-require 'spec'
-# require 'merb-core'
+
+gem 'dm-core', '~>0.9.8'
 require 'dm-core'
+
+ROOT = Pathname(__FILE__).dirname.parent.expand_path
+
+# use local dm-validations if running from dm-more directly
+lib = ROOT.parent.join('dm-validations', 'lib').expand_path
+$LOAD_PATH.unshift(lib) if lib.directory?
 require 'dm-validations'
-require File.dirname(__FILE__) + '/../lib/dm-tags'
-require File.dirname(__FILE__) + '/classes'
-require File.dirname(__FILE__) + '/dm-setup'
+
+require ROOT + 'lib/dm-tags'
+
+DataMapper.setup(:default, 'sqlite3::memory:')
+
+Spec::Runner.configure do |config|
+  config.before(:each) do
+    Object.send(:remove_const, :TaggedModel) if defined?(TaggedModel)
+    class TaggedModel
+      include DataMapper::Resource
+      property :id, Serial
+
+      has_tags_on :skills, :interests, :tags
+    end
+
+    Object.send(:remove_const, :AnotherTaggedModel) if defined?(AnotherTaggedModel)
+    class AnotherTaggedModel
+      include DataMapper::Resource
+      property :id, Serial
+
+      has_tags_on :skills, :pets
+    end
+
+    Object.send(:remove_const, :DefaultTaggedModel) if defined?(DefaultTaggedModel)
+    class DefaultTaggedModel
+      include DataMapper::Resource
+      property :id, Serial
+
+      has_tags
+    end
+
+    Object.send(:remove_const, :UntaggedModel) if defined?(UntaggedModel)
+    class UntaggedModel
+      include DataMapper::Resource
+      property :id, Serial
+    end
+
+    DataMapper.auto_migrate!
+  end
+end

data/tasks/install.rb

@@ -0,0 +1,13 @@
+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 --local 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

@@ -0,0 +1,25 @@
+begin
+  gem 'rspec', '~>1.1.11'
+  require 'spec'
+  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.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+
+    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 << '--text-summary'
+      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+    rescue LoadError
+      # rcov not installed
+    end
+  end
+rescue LoadError
+  # rspec not installed
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-tags
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Bobby Calderwood
@@ -9,55 +9,66 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -08:00
+date: 2008-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
+  name: dm-core
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 0.9.8
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-validations
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.8
     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@me.com
+- bobby_calderwood [a] me [d] com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
 - README.txt
+- LICENSE
+- TODO
+- History.txt
 files: 
+- .gitignore
 - History.txt
-- License.txt
+- LICENSE
 - Manifest.txt
 - README.txt
 - 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
-- setup.rb
-- spec/classes.rb
-- spec/dm-setup.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/rspec.rake
+- tasks/install.rb
+- tasks/spec.rb
 has_rdoc: true
-homepage: http://datamapper.rubyforge.org
-post_install_message: ""
+homepage: http://github.com/sam/dm-more/tree/master/dm-tags
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
@@ -82,8 +93,5 @@ 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.
-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
+test_files: []
+