acts-as-taggable-on 3.1.1 → 3.2.2

data/spec/spec_helper.rb

@@ -1,71 +1,18 @@
-$LOAD_PATH << "." unless $LOAD_PATH.include?(".")
+$LOAD_PATH << '.' unless $LOAD_PATH.include?('.')
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 require 'logger'
 
 require File.expand_path('../../lib/acts-as-taggable-on', __FILE__)
 I18n.enforce_available_locales = true
-require 'ammeter/init'
+require 'rails'
+require 'rspec/its'
+require 'ammeter/init'  # <= You are next
+require 'barrier'
+require 'database_cleaner'
 
-unless [].respond_to?(:freq)
-  class Array
-    def freq
-      k=Hash.new(0)
-      each {|e| k[e]+=1}
-      k
-    end
-  end
-end
-
-# set adapter to use, default is sqlite3
-# to use an alternative adapter run => rake spec DB='postgresql'
-db_name = ENV['DB'] || 'sqlite3'
-database_yml = File.expand_path('../database.yml', __FILE__)
-
-if File.exists?(database_yml)
-  active_record_configuration = YAML.load_file(database_yml)
-
-  ActiveRecord::Base.configurations = active_record_configuration
-  config = ActiveRecord::Base.configurations[db_name]
-
-  begin
-    ActiveRecord::Base.establish_connection(db_name)
-    ActiveRecord::Base.connection
-  rescue
-    case db_name
-    when /mysql/
-      ActiveRecord::Base.establish_connection(config.merge('database' => nil))
-      ActiveRecord::Base.connection.create_database(config['database'],  {:charset => 'utf8', :collation => 'utf8_unicode_ci'})
-    when 'postgresql'
-      ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
-      ActiveRecord::Base.connection.create_database(config['database'], config.merge('encoding' => 'utf8'))
-    end
-
-    ActiveRecord::Base.establish_connection(config)
-  end
-
-  logger = ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
-  ActiveRecord::Base.default_timezone = :utc
-
-  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')
-  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"
-end
+Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
 
-def clean_database!
-  models = [ActsAsTaggableOn::Tag, ActsAsTaggableOn::Tagging, TaggableModel, OtherTaggableModel, InheritingTaggableModel,
-            AlteredInheritingTaggableModel, User, UntaggableModel, OrderedTaggableModel]
-  models.each do |model|
-    ActiveRecord::Base.connection.execute "DELETE FROM #{model.table_name}"
-  end
+RSpec.configure do |config|
+  config.raise_errors_for_deprecations!
 end
 
-clean_database!

data/spec/support/array.rb

@@ -0,0 +1,9 @@
+unless [].respond_to?(:freq)
+  class Array
+    def freq
+      k=Hash.new(0)
+      each { |e| k[e]+=1 }
+      k
+    end
+  end
+end

data/spec/support/database.rb

@@ -0,0 +1,42 @@
+# set adapter to use, default is sqlite3
+# to use an alternative adapter run => rake spec DB='postgresql'
+db_name = ENV['DB'] || 'sqlite3'
+database_yml = File.expand_path('../../internal/config/database.yml', __FILE__)
+
+if File.exist?(database_yml)
+
+  ActiveRecord::Migration.verbose = false
+  ActiveRecord::Base.default_timezone = :utc
+  ActiveRecord::Base.configurations = YAML.load_file(database_yml)
+  ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), '../debug.log'))
+  ActiveRecord::Base.logger.level = ENV['TRAVIS'] ? ::Logger::ERROR : ::Logger::DEBUG
+  config = ActiveRecord::Base.configurations[db_name]
+
+  begin
+    #activerecord 4 uses symbol
+    #TODO, remove when activerecord 3 support is dropped
+    if ActsAsTaggableOn::Utils.active_record4?
+      ActiveRecord::Base.establish_connection(db_name.to_sym)
+    else
+      ActiveRecord::Base.establish_connection(db_name)
+    end
+    ActiveRecord::Base.connection
+  rescue
+    case db_name
+      when /mysql/
+        ActiveRecord::Base.establish_connection(config.merge('database' => nil))
+        ActiveRecord::Base.connection.create_database(config['database'], {charset: 'utf8', collation: 'utf8_unicode_ci'})
+      when 'postgresql'
+        ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+        ActiveRecord::Base.connection.create_database(config['database'], config.merge('encoding' => 'utf8'))
+    end
+
+    ActiveRecord::Base.establish_connection(config)
+  end
+
+  load(File.dirname(__FILE__) + '/../internal/db/schema.rb')
+  load(File.dirname(__FILE__) + '/../internal/app/models/models.rb')
+
+else
+  fail "Please create #{database_yml} first to configure your database. Take a look at: #{database_yml}.sample"
+end

data/spec/support/database_cleaner.rb

@@ -0,0 +1,21 @@
+RSpec.configure do |config|
+
+  config.before(:suite) do
+    DatabaseCleaner.clean_with(:truncation)
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean
+  end
+
+  config.after(:suite) do
+    DatabaseCleaner.clean
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -32,7 +32,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,27 +52,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -86,75 +94,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 3.0.0.beta2
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.0.0.beta2
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: ammeter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: ammeter
+  name: barrier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 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:
@@ -180,10 +202,10 @@ files:
 - db/migrate/1_acts_as_taggable_on_migration.rb
 - db/migrate/2_add_missing_unique_indices.rb
 - db/migrate/3_add_taggings_counter_cache_to_tags.rb
-- gemfiles/rails_3.2.gemfile
-- gemfiles/rails_4.0.gemfile
-- gemfiles/rails_4.1.gemfile
-- gemfiles/rails_edge.gemfile
+- gemfiles/activerecord_3.2.gemfile
+- gemfiles/activerecord_4.0.gemfile
+- gemfiles/activerecord_4.1.gemfile
+- gemfiles/activerecord_edge.gemfile
 - lib/acts-as-taggable-on.rb
 - lib/acts_as_taggable_on.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/cache.rb
@@ -214,16 +236,33 @@ files:
 - spec/acts_as_taggable_on/tagging_spec.rb
 - spec/acts_as_taggable_on/tags_helper_spec.rb
 - spec/acts_as_taggable_on/utils_spec.rb
-- spec/bm.rb
-- spec/database.yml.sample
-- spec/models.rb
+- spec/internal/app/models/altered_inheriting_taggable_model.rb
+- spec/internal/app/models/cached_model.rb
+- spec/internal/app/models/cached_model_with_array.rb
+- spec/internal/app/models/company.rb
+- spec/internal/app/models/inheriting_taggable_model.rb
+- spec/internal/app/models/market.rb
+- spec/internal/app/models/models.rb
+- spec/internal/app/models/non_standard_id_taggable_model.rb
+- spec/internal/app/models/ordered_taggable_model.rb
+- spec/internal/app/models/other_cached_model.rb
+- spec/internal/app/models/other_taggable_model.rb
+- spec/internal/app/models/student.rb
+- spec/internal/app/models/taggable_model.rb
+- spec/internal/app/models/untaggable_model.rb
+- spec/internal/app/models/user.rb
+- spec/internal/config/database.yml.sample
+- spec/internal/db/schema.rb
 - spec/schema.rb
 - spec/spec_helper.rb
+- spec/support/array.rb
+- spec/support/database.rb
+- spec/support/database_cleaner.rb
 homepage: https://github.com/mbleigh/acts-as-taggable-on
 licenses:
 - MIT
 metadata: {}
-post_install_message: |
+post_install_message: |-
   When upgrading
 
   Re-run the migrations generator
@@ -231,6 +270,12 @@ post_install_message: |
       rake acts_as_taggable_on_engine:install:migrations
 
   It will create any new migrations and skip existing ones
+
+
+  ##Breaking changes:
+
+    - ActsAsTaggableOn::Tag is not extend with ActsAsTaggableOn::Utils anymore.
+      Please use ActsAsTaggableOn::Utils instead
 rdoc_options: []
 require_paths:
 - lib
@@ -263,9 +308,26 @@ test_files:
 - spec/acts_as_taggable_on/tagging_spec.rb
 - spec/acts_as_taggable_on/tags_helper_spec.rb
 - spec/acts_as_taggable_on/utils_spec.rb
-- spec/bm.rb
-- spec/database.yml.sample
-- spec/models.rb
+- spec/internal/app/models/altered_inheriting_taggable_model.rb
+- spec/internal/app/models/cached_model.rb
+- spec/internal/app/models/cached_model_with_array.rb
+- spec/internal/app/models/company.rb
+- spec/internal/app/models/inheriting_taggable_model.rb
+- spec/internal/app/models/market.rb
+- spec/internal/app/models/models.rb
+- spec/internal/app/models/non_standard_id_taggable_model.rb
+- spec/internal/app/models/ordered_taggable_model.rb
+- spec/internal/app/models/other_cached_model.rb
+- spec/internal/app/models/other_taggable_model.rb
+- spec/internal/app/models/student.rb
+- spec/internal/app/models/taggable_model.rb
+- spec/internal/app/models/untaggable_model.rb
+- spec/internal/app/models/user.rb
+- spec/internal/config/database.yml.sample
+- spec/internal/db/schema.rb
 - spec/schema.rb
 - spec/spec_helper.rb
+- spec/support/array.rb
+- spec/support/database.rb
+- spec/support/database_cleaner.rb
 has_rdoc: 

data/gemfiles/rails_3.2.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 3.2"
-
-gemspec :path=>"../"

data/gemfiles/rails_4.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.0"
-
-gemspec :path=>"../"

data/gemfiles/rails_4.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.1.0.beta1"
-
-gemspec :path=>"../"

data/gemfiles/rails_edge.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", :github=>"rails/rails"
-
-gemspec :path=>"../"

data/spec/bm.rb

@@ -1,52 +0,0 @@
-require 'active_record'
-require 'action_view'
-require File.expand_path('../../lib/acts-as-taggable-on', __FILE__)
-
-if defined?(ActiveRecord::Acts::TaggableOn)
-  ActiveRecord::Base.send :include, ActiveRecord::Acts::TaggableOn
-  ActiveRecord::Base.send :include, ActiveRecord::Acts::Tagger
-  ActionView::Base.send :include, TagsHelper if defined?(ActionView::Base)
-end
-
-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
-
-ActiveRecord::Base.silence do
-  ActiveRecord::Migration.verbose = false
-  ActiveRecord::Schema.define :version => 0 do
-    create_table "taggings", :force => true do |t|
-      t.integer  "tag_id",        :limit => 11
-      t.integer  "taggable_id",   :limit => 11
-      t.string   "taggable_type"
-      t.string   "context"
-      t.datetime "created_at"
-      t.integer  "tagger_id",     :limit => 11
-      t.string   "tagger_type"
-    end
-
-    add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
-    add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
-
-    create_table "tags", :force => true do |t|
-      t.string "name"
-    end
-
-    create_table :taggable_models, :force => true do |t|
-      t.column :name, :string
-      t.column :type, :string
-      t.column :cached_tag_list, :string
-    end
-  end
-
-  class TaggableModel < ActiveRecord::Base
-    acts_as_taggable
-    acts_as_taggable_on :languages
-    acts_as_taggable_on :skills
-    acts_as_taggable_on :needs, :offerings
-  end
-end
-
-puts Benchmark.measure {
-  1000.times { TaggableModel.create :tag_list => "awesome, epic, neat" }
-}