acts-as-taggable-on 2.4.0 → 2.4.1

data/spec/acts_as_taggable_on/tagger_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Tagger" do
   before(:each) do
     clean_database!
-    @user = TaggableUser.create
+    @user = User.create
     @taggable = TaggableModel.create(:name => "Bob Jones")
   end
 
@@ -21,18 +21,43 @@ describe "Tagger" do
     @taggable2 = TaggableModel.create(:name => "Jim Jones")
     @taggable3 = TaggableModel.create(:name => "Jane Doe")
 
-    @user2 = TaggableUser.new
+    @user2 = User.new
     @user.tag(@taggable, :with => 'ruby, scheme', :on => :tags)
     @user2.tag(@taggable2, :with => 'ruby, scheme', :on => :tags)
     @user2.tag(@taggable3, :with => 'ruby, scheme', :on => :tags)
 
     TaggableModel.tagged_with(%w(ruby scheme), :owned_by => @user).count.should == 1
     TaggableModel.tagged_with(%w(ruby scheme), :owned_by => @user2).count.should == 2
+  end
+
+  it "only returns objects tagged by owned_by when any is true" do
+    @user2 = User.new
+    @taggable2 = TaggableModel.create(:name => "Jim Jones")
+    @taggable3 = TaggableModel.create(:name => "Jane Doe")
 
+    @user.tag(@taggable, :with => 'ruby', :on => :tags)
+    @user.tag(@taggable2, :with => 'java', :on => :tags)
+    @user2.tag(@taggable3, :with => 'ruby', :on => :tags)
+
+    tags = TaggableModel.tagged_with(%w(ruby java), :owned_by => @user, :any => true)
+    tags.should match_array [@taggable, @taggable2]
+  end
+
+  it "only returns objects tagged by owned_by when exclude is true" do
+    @user2 = User.new
+    @taggable2 = TaggableModel.create(:name => "Jim Jones")
+    @taggable3 = TaggableModel.create(:name => "Jane Doe")
+
+    @user.tag(@taggable, :with => 'ruby', :on => :tags)
+    @user.tag(@taggable2, :with => 'java', :on => :tags)
+    @user2.tag(@taggable3, :with => 'java', :on => :tags)
+
+    tags = TaggableModel.tagged_with(%w(ruby), :owned_by => @user, :exclude => true)
+    tags.should match_array [@taggable2]
   end
 
   it "should not overlap tags from different taggers" do
-    @user2 = TaggableUser.new
+    @user2 = User.new
     lambda{
       @user.tag(@taggable, :with => 'ruby, scheme', :on => :tags)
       @user2.tag(@taggable, :with => 'java, python, lisp, ruby', :on => :tags)
@@ -51,7 +76,7 @@ describe "Tagger" do
   end
 
   it "should not lose tags from different taggers" do
-    @user2 = TaggableUser.create
+    @user2 = User.create
     @user2.tag(@taggable, :with => 'java, python, lisp, ruby', :on => :tags)
     @user.tag(@taggable, :with => 'ruby, scheme', :on => :tags)
 
@@ -69,7 +94,7 @@ describe "Tagger" do
   end
 
   it "should not lose tags" do
-    @user2 = TaggableUser.create
+    @user2 = User.create
 
     @user.tag(@taggable, :with => 'awesome', :on => :tags)
     @user2.tag(@taggable, :with => 'awesome, epic', :on => :tags)
@@ -109,30 +134,4 @@ describe "Tagger" do
     }.should_not change(ActsAsTaggableOn::Tagging, :count)
   end
 
-  describe "Single Table Inheritance" do
-    before do
-      @user3 = InheritingTaggableUser.create
-    end
-
-    it "should have taggings" do
-      @user3.tag(@taggable, :with=>'ruby,scheme', :on=>:tags)
-      @user3.owned_taggings.size == 2
-    end
-
-    it "should have tags" do
-      @user3.tag(@taggable, :with=>'ruby,scheme', :on=>:tags)
-      @user3.owned_tags.size == 2
-    end
-
-    it "should return tags for the inheriting tagger" do
-      @user3.tag(@taggable, :with => 'ruby, scheme', :on => :tags)
-      @taggable.tags_from(@user3).sort.should == %w(ruby scheme).sort
-    end
-
-    it "should scope objects returned by tagged_with by owners" do
-      @user3.tag(@taggable, :with => 'ruby, scheme', :on => :tags)
-      TaggableModel.tagged_with(%w(ruby scheme), :owned_by => @user3).count.should == 1
-    end
-  end
-
-end
+end

data/spec/acts_as_taggable_on/tagging_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe ActsAsTaggableOn::Tagging do
   before(:each) do

data/spec/acts_as_taggable_on/tags_helper_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe ActsAsTaggableOn::TagsHelper do
   before(:each) do
@@ -41,4 +41,4 @@ describe ActsAsTaggableOn::TagsHelper do
     tags["c++"].should == "sucky"
     tags["php"].should == "sucky"
   end
-end
+end

data/spec/acts_as_taggable_on/utils_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe ActsAsTaggableOn::Utils do
   describe "like_operator" do
@@ -18,4 +18,4 @@ describe ActsAsTaggableOn::Utils do
       TaggableModel.send(:like_operator).should == "LIKE"
     end
   end
-end
+end

data/spec/models.rb

@@ -32,11 +32,11 @@ class AlteredInheritingTaggableModel < TaggableModel
   acts_as_taggable_on :parts
 end
 
-class TaggableUser < ActiveRecord::Base
+class User < ActiveRecord::Base
   acts_as_tagger
 end
 
-class InheritingTaggableUser < TaggableUser
+class Student < User
 end
 
 class UntaggableModel < ActiveRecord::Base

data/spec/schema.rb

@@ -45,7 +45,7 @@ ActiveRecord::Schema.define :version => 0 do
     t.column :cached_glass_list, :string
   end
   
-  create_table :taggable_users, :force => true do |t|
+  create_table :users, :force => true do |t|
     t.column :name, :string
   end
   

data/spec/spec_helper.rb

@@ -58,15 +58,18 @@ if File.exists?(database_yml)
     ActiveRecord::Base.establish_connection(config)
   end
     
-  ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
+  logger = ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
   ActiveRecord::Base.default_timezone = :utc
   
-  ActiveRecord::Base.silence do
+  begin
+    old_logger_level, logger.level = logger.level, ::Logger::ERROR
     ActiveRecord::Migration.verbose = false
     
     load(File.dirname(__FILE__) + '/schema.rb')
     load(File.dirname(__FILE__) + '/models.rb')
-  end  
+  ensure
+    logger.level = old_logger_level
+  end
   
 else
   raise "Please create #{database_yml} first to configure your database. Take a look at: #{database_yml}.sample"
@@ -74,7 +77,7 @@ end
 
 def clean_database!
   models = [ActsAsTaggableOn::Tag, ActsAsTaggableOn::Tagging, TaggableModel, OtherTaggableModel, InheritingTaggableModel,
-            AlteredInheritingTaggableModel, TaggableUser, UntaggableModel, OrderedTaggableModel]
+            AlteredInheritingTaggableModel, User, UntaggableModel, OrderedTaggableModel]
   models.each do |model|
     ActiveRecord::Base.connection.execute "DELETE FROM #{model.table_name}"
   end

metadata

@@ -1,29 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Michael Bleigh
+- Joost Baaij
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +63,16 @@ dependencies:
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +145,9 @@ dependencies:
         version: '0'
 description: With ActsAsTaggableOn, you can tag a single model on several contexts,
   such as skills, interests, and awards. It also provides other advanced functionality.
-email: michael@intridea.com
+email:
+- michael@intridea.com
+- joost@spacebabies.nl
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -132,18 +155,19 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
-- CHANGELOG.md
+- Appraisals
 - Gemfile
 - Guardfile
-- MIT-LICENSE.md
+- LICENSE.md
 - README.md
 - Rakefile
-- UPGRADING
 - acts-as-taggable-on.gemspec
+- gemfiles/rails_3.gemfile
+- gemfiles/rails_4.gemfile
 - lib/acts-as-taggable-on.rb
-- lib/acts-as-taggable-on/version.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/cache.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/collection.rb
+- lib/acts_as_taggable_on/acts_as_taggable_on/compatibility.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/core.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/ownership.rb
@@ -155,11 +179,13 @@ files:
 - lib/acts_as_taggable_on/tagging.rb
 - lib/acts_as_taggable_on/tags_helper.rb
 - lib/acts_as_taggable_on/utils.rb
+- lib/acts_as_taggable_on/version.rb
 - lib/generators/acts_as_taggable_on/migration/migration_generator.rb
 - lib/generators/acts_as_taggable_on/migration/templates/active_record/migration.rb
-- rails/init.rb
 - spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb
 - spec/acts_as_taggable_on/acts_as_tagger_spec.rb
+- spec/acts_as_taggable_on/related_spec.rb
+- spec/acts_as_taggable_on/single_table_inheritance_spec.rb
 - spec/acts_as_taggable_on/tag_list_spec.rb
 - spec/acts_as_taggable_on/tag_spec.rb
 - spec/acts_as_taggable_on/taggable_spec.rb
@@ -173,25 +199,11 @@ files:
 - spec/models.rb
 - spec/schema.rb
 - spec/spec_helper.rb
-- uninstall.rb
-homepage: ''
-licenses: []
+homepage: https://github.com/mbleigh/acts-as-taggable-on
+licenses:
+- MIT
 metadata: {}
-post_install_message: |2+
-
-  ** acts-as-taggable-on version 2.4.0
-
-  Hello! This version is the first one released by me (@tilsammans),
-  a new maintainer on the project. It's been a while since the last
-  release and I am not 100% sure if any breaking changes have been
-  introduced. Please test your tagging functionality carefully.
-
-  From now on things should stabilize. Please check the project's
-  milestones and compatibilities stated in the readme. If you have
-  any questions, feel free to create an issue on github.
-
-  https://github.com/mbleigh/acts-as-taggable-on
-
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -214,6 +226,8 @@ summary: Advanced tagging for Rails.
 test_files:
 - spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb
 - spec/acts_as_taggable_on/acts_as_tagger_spec.rb
+- spec/acts_as_taggable_on/related_spec.rb
+- spec/acts_as_taggable_on/single_table_inheritance_spec.rb
 - spec/acts_as_taggable_on/tag_list_spec.rb
 - spec/acts_as_taggable_on/tag_spec.rb
 - spec/acts_as_taggable_on/taggable_spec.rb

data/CHANGELOG.md

@@ -1,35 +0,0 @@
-## 2011-08-21
-* escape _ and % for mysql and postgres (@tilsammans)
-* Now depends on mysql2 gem
-* tagged_with :any is chainable now (@jeffreyiacono)
-* tagged_with(nil) returns scoped object
-* Case-insensitivity for TaggedModel.tagged_with for PostgreSQL database
-* tagged_with(' ') returns scoped object
-* remove warning for rails 3.1 about class_inheritable_attribute
-* use ActiveRecord migration_number to avoid clashs (@atd)
-
-## 2010-02-17
-* Converted the plugin to be compatible with Rails3
-
-## 2009-12-02
-
-* PostgreSQL is now supported (via morgoth)
-
-## 2008-07-17
-
-* Can now use a named_scope to find tags!
-
-## 2008-06-23
-
-* Can now find related objects of another class (tristanzdunn)
-* Removed extraneous down migration cruft (azabaj)
-
-## 2008-06-09
-
- * Added support for Single Table Inheritance
- * Adding gemspec and rails/init.rb for gemified plugin
-
-## 2007-12-12
-
- * Added ability to use dynamic tag contexts
- * Fixed missing migration generator

data/UPGRADING

@@ -1,14 +0,0 @@
-
-** acts-as-taggable-on version 2.4.0
-
-Hello! This version is the first one released by me (@tilsammans),
-a new maintainer on the project. It's been a while since the last
-release and I am not 100% sure if any breaking changes have been
-introduced. Please test your tagging functionality carefully.
-
-From now on things should stabilize. Please check the project's
-milestones and compatibilities stated in the readme. If you have
-any questions, feel free to create an issue on github.
-
-https://github.com/mbleigh/acts-as-taggable-on
-

data/rails/init.rb

@@ -1 +0,0 @@
-require 'acts-as-taggable-on'

data/uninstall.rb

@@ -1 +0,0 @@
-# Uninstall hook code here