dm-taggings 1.0.0 → 1.0.1

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/dm-taggings.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-taggings}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Piotr Solnica"]
-  s.date = %q{2011-03-17}
+  s.date = %q{2011-03-25}
   s.description = %q{DataMapper plugin providing taggable and tagger models}
   s.email = %q{piotr.solnica@gmail.com}
   s.extra_rdoc_files = [

data/lib/dm-taggings/is/taggable.rb

@@ -30,8 +30,9 @@ module DataMapper
         include DataMapper::Is::Taggable::InstanceMethods
 
         class << self
-          attr_reader :tagging_parent_name, :tagging_relationship_name, :tagging_relationship,
-            :tagging_class, :taggable_relationship_name, :taggable_options
+          attr_reader :tagging_parent_name, :tagging_relationship_name,
+            :tagging_relationship, :tagging_class, :taggable_relationship_name,
+            :tagging_name, :taggable_options
         end
 
         # set up options hash
@@ -63,7 +64,8 @@ module DataMapper
           belongs_to tagging_parent_name, model_name
 
           options[:by].each do |tagger_class|
-            belongs_to inflector.underscore(inflector.demodulize(tagger_class.name)), tagger_class.name, :required => false
+            belongs_to inflector.underscore(inflector.demodulize(tagger_class.name)),
+              tagger_class.name, :required => false
           end
         end
 
@@ -102,16 +104,8 @@ module DataMapper
         #   A collection of taggables
         #
         # @api public
-        def tagged_with(tags_or_names)
-          tags_or_names = [tags_or_names] unless tags_or_names.kind_of?(Array)
-
-          tag_ids = if tags_or_names.all? { |tag| tag.kind_of?(Tag) }
-                   tags_or_names
-                 else
-                   Tag.all(:name => tags_or_names)
-                 end.map { |tag| tag.id }
-
-          all("#{tagging_relationship_name}.tag_id" => tag_ids)
+        def tagged_with(tag_names)
+          tagging_class.all("tag.name" => tag_names).send(taggable_relationship_name)
         end
       end # ClassMethods
 

data/lib/dm-taggings/spec/taggable_shared_spec.rb

@@ -54,7 +54,7 @@ share_examples_for 'A taggable resource' do
 
     describe ".tagged_with" do
       let(:resource_one) { create_taggable(:tag_list => "red, green, blue") }
-      let(:resource_two) { create_taggable(:tag_list => "orange, yellow") }
+      let(:resource_two) { create_taggable(:tag_list => "red, orange, yellow") }
 
       before do
         resource_one

metadata

@@ -2,7 +2,7 @@
 name: dm-taggings
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Piotr Solnica
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 +01:00
+date: 2011-03-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -520652013
+      hash: 837854607
       segments: 
       - 0
       version: "0"