acts-as-taggable-on 2.0.0.pre1 → 2.0.0.pre3

data/spec/acts_as_taggable_on/tagger_spec.rb

@@ -30,10 +30,26 @@ describe "Tagger" do
     @taggable.tags_from(@user).sort.should == %w(ruby scheme).sort
     @taggable.tags_from(@user2).sort.should == %w(java lisp python ruby).sort
     
-    @taggable.all_tags_list_on(:tags).sort.should == %w(ruby scheme java python lisp).sort
+    @taggable.all_tags_list.sort.should == %w(ruby scheme java python lisp).sort
     @taggable.all_tags_on(:tags).size.should == 6
   end
 
+  it "should not lose tags" do
+    @taggable.update_attributes(:tag_list => 'ruby')
+    @user.tag(@taggable, :with => 'ruby, scheme', :on => :tags)
+    
+    [@taggable, @user].each(&:reload)
+    @taggable.tag_list.should == %w(ruby)
+    @taggable.all_tags_list.sort.should == %w(ruby scheme).sort
+    
+    lambda {
+      @taggable.update_attributes(:tag_list => "")
+    }.should change(Tagging, :count).by(-1)
+    
+    @taggable.tag_list.should == []
+    @taggable.all_tags_list.sort.should == %w(ruby scheme).sort
+  end
+
   it "is tagger" do
     @user.is_tagger?.should(be_true)
   end  

data/spec/acts_as_taggable_on/tagging_spec.rb

@@ -12,7 +12,12 @@ describe Tagging do
     @tagging.context = "tags"
 
     @tagging.should_not be_valid
-    @tagging.errors[:tag_id].should == ["can't be blank"]
+    
+    if ActiveRecord::VERSION::MAJOR >= 3
+      @tagging.errors[:tag_id].should == ["can't be blank"]
+    else
+      @tagging.errors[:tag_id].should == "can't be blank"
+    end
   end
 
   it "should not create duplicate taggings" do

data/spec/acts_as_taggable_on/tags_helper_spec.rb

@@ -11,8 +11,6 @@ describe TagsHelper do
     @helper = class Helper
       include TagsHelper
     end.new
-    
-    
   end
   
   it "should yield the proper css classes" do 

data/spec/models.rb

@@ -0,0 +1,32 @@
+class TaggableModel < ActiveRecord::Base
+  acts_as_taggable
+  acts_as_taggable_on :languages
+  acts_as_taggable_on :skills
+  acts_as_taggable_on :needs, :offerings
+end
+
+class OtherTaggableModel < ActiveRecord::Base
+  acts_as_taggable_on :tags, :languages
+  acts_as_taggable_on :needs, :offerings
+end
+
+class InheritingTaggableModel < TaggableModel
+end
+
+class AlteredInheritingTaggableModel < TaggableModel
+  acts_as_taggable_on :parts
+end
+
+class TaggableUser < ActiveRecord::Base
+  acts_as_tagger
+end
+
+class UntaggableModel < ActiveRecord::Base
+end
+
+if ActiveRecord::VERSION::MAJOR < 3
+  [TaggableModel, OtherTaggableModel, InheritingTaggableModel,
+   AlteredInheritingTaggableModel, TaggableUser, UntaggableModel].each do |klass|
+    klass.send(:include, ActsAsTaggableOn::ActiveRecord::Backports)
+  end
+end

data/spec/schema.rb

@@ -19,11 +19,13 @@ ActiveRecord::Schema.define :version => 0 do
   create_table :taggable_models, :force => true do |t|
     t.column :name, :string
     t.column :type, :string
-    #t.column :cached_tag_list, :string
+    t.column :cached_tag_list, :string
   end
+  
   create_table :taggable_users, :force => true do |t|
     t.column :name, :string
   end
+  
   create_table :other_taggable_models, :force => true do |t|
     t.column :name, :string
     t.column :type, :string

data/spec/spec_helper.rb

@@ -1,8 +1,20 @@
+begin
+  # Try to require the preresolved locked set of gems.
+  require File.expand_path("../.bundle/environment", __FILE__)
+rescue LoadError
+  # Fall back on doing an unlocked resolve at runtime.
+  require "rubygems" unless RUBY_VERSION >= "1.9"
+  require "bundler"
+  Bundler.setup
+end
+
+Bundler.require
 require File.expand_path('../../lib/acts-as-taggable-on', __FILE__)
-Bundler.require :test
 
-module Rspec::Core::ExampleGroupSubject
-  alias :context :describe
+if defined?(Rspec::Core::ExampleGroupSubject)
+  module Rspec::Core::ExampleGroupSubject
+    alias :context :describe
+  end
 end
 
 class Array
@@ -13,46 +25,15 @@ class Array
   end
 end
 
+# Setup a database
 TEST_DATABASE_FILE = File.join(File.dirname(__FILE__), '..', 'test.sqlite3')
-
 File.unlink(TEST_DATABASE_FILE) if File.exist?(TEST_DATABASE_FILE)
-ActiveRecord::Base.establish_connection(
-  "adapter" => "sqlite3", "database" => TEST_DATABASE_FILE
-)
-
-Rails.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
+ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => TEST_DATABASE_FILE
 
 ActiveRecord::Base.silence do
   ActiveRecord::Migration.verbose = false
   load(File.dirname(__FILE__) + '/schema.rb')
-end
-
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
-
-class TaggableModel < ActiveRecord::Base
-  acts_as_taggable
-  acts_as_taggable_on :languages
-  acts_as_taggable_on :skills
-  acts_as_taggable_on :needs, :offerings
-end
-
-class OtherTaggableModel < ActiveRecord::Base
-  acts_as_taggable_on :tags, :languages
-  acts_as_taggable_on :needs, :offerings
-end
-
-class InheritingTaggableModel < TaggableModel
-end
-
-class AlteredInheritingTaggableModel < TaggableModel
-  acts_as_taggable_on :parts
-end
-
-class TaggableUser < ActiveRecord::Base
-  acts_as_tagger
-end
-
-class UntaggableModel < ActiveRecord::Base
+  load(File.dirname(__FILE__) + '/models.rb')
 end
 
 def clean_database!

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 0
   - 0
-  - pre1
-  version: 2.0.0.pre1
+  - pre3
+  version: 2.0.0.pre3
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 +01:00
+date: 2010-03-22 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -36,8 +36,16 @@ files:
 - VERSION
 - lib/acts-as-taggable-on.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on.rb
+- lib/acts_as_taggable_on/acts_as_taggable_on/aggregate.rb
+- lib/acts_as_taggable_on/acts_as_taggable_on/cache.rb
+- lib/acts_as_taggable_on/acts_as_taggable_on/core.rb
+- lib/acts_as_taggable_on/acts_as_taggable_on/ownership.rb
+- lib/acts_as_taggable_on/acts_as_taggable_on/related.rb
 - lib/acts_as_taggable_on/acts_as_tagger.rb
-- lib/acts_as_taggable_on/group_helper.rb
+- lib/acts_as_taggable_on/compatibility/Gemfile
+- lib/acts_as_taggable_on/compatibility/active_record_backports.rb
+- lib/acts_as_taggable_on/compatibility/tag.rb
+- lib/acts_as_taggable_on/compatibility/tagging.rb
 - lib/acts_as_taggable_on/tag.rb
 - lib/acts_as_taggable_on/tag_list.rb
 - lib/acts_as_taggable_on/tagging.rb
@@ -46,13 +54,13 @@ files:
 - lib/generators/acts_as_taggable_on/migration/templates/active_record/migration.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/group_helper_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
 - spec/acts_as_taggable_on/tagger_spec.rb
 - spec/acts_as_taggable_on/tagging_spec.rb
 - spec/acts_as_taggable_on/tags_helper_spec.rb
+- spec/models.rb
 - spec/schema.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -91,12 +99,12 @@ summary: ActsAsTaggableOn is a tagging plugin for Rails that provides multiple t
 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/group_helper_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
 - spec/acts_as_taggable_on/tagger_spec.rb
 - spec/acts_as_taggable_on/tagging_spec.rb
 - spec/acts_as_taggable_on/tags_helper_spec.rb
+- spec/models.rb
 - spec/schema.rb
 - spec/spec_helper.rb

data/lib/acts_as_taggable_on/group_helper.rb

@@ -1,14 +0,0 @@
-module ActiveRecord
-  module Acts
-    module TaggableOn
-      module GroupHelper
-
-        # all column names are necessary for PostgreSQL group clause
-        def grouped_column_names_for(object)
-          object.column_names.map { |column| "#{object.table_name}.#{column}" }.join(", ")
-        end
-
-      end
-    end
-  end
-end

data/spec/acts_as_taggable_on/group_helper_spec.rb

@@ -1,21 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe "Group Helper" do
-  before(:each) do
-    clean_database!    
-  end
-
-  describe "grouped_column_names_for method" do
-    before(:each) do
-      @taggable = TaggableModel.new(:name => "Bob Jones")
-    end
-
-    it "should return all column names joined for Tag GROUP clause" do
-      @taggable.grouped_column_names_for(Tag).should == "tags.id, tags.name"
-    end
-
-    it "should return all column names joined for TaggableModel GROUP clause" do
-      @taggable.grouped_column_names_for(TaggableModel).should == "taggable_models.id, taggable_models.name, taggable_models.type"
-    end
-  end
-end