acts-as-taggable-on 3.2.1 → 3.3.0

data/spec/internal/app/models/models.rb

@@ -77,11 +77,11 @@ class OrderedTaggableModel < ActiveRecord::Base
   acts_as_ordered_taggable_on :colours
 end
 
-if ActsAsTaggableOn::Utils.using_postgresql?
+if using_postgresql?
   class CachedModelWithArray < ActiveRecord::Base
     acts_as_taggable
   end
-  if ActsAsTaggableOn::Utils.postgresql_support_json?
+  if postgresql_support_json?
     class TaggableModelWithJson < ActiveRecord::Base
       acts_as_taggable
       acts_as_taggable_on :skills

data/spec/internal/db/schema.rb

@@ -76,7 +76,7 @@ ActiveRecord::Schema.define version: 0 do
 
 
   # Special cases for postgresql
-  if ActsAsTaggableOn::Utils.using_postgresql?
+  if using_postgresql?
 
     create_table :other_cached_with_array_models, force: true do |t|
       t.column :name, :string
@@ -86,7 +86,7 @@ ActiveRecord::Schema.define version: 0 do
       t.column :cached_glass_list, :string, array: true
     end
 
-    if self.
+    if postgresql_support_json?
       create_table :taggable_model_with_jsons, :force => true do |t|
         t.column :name, :string
         t.column :type, :string

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ require File.expand_path('../../lib/acts-as-taggable-on', __FILE__)
 I18n.enforce_available_locales = true
 require 'rails'
 require 'rspec/its'
-require 'ammeter/init'  # <= You are next
 require 'barrier'
 require 'database_cleaner'
 

data/spec/support/0-helpers.rb

@@ -0,0 +1,32 @@
+def using_sqlite?
+  ActsAsTaggableOn::Utils.connection && ActsAsTaggableOn::Utils.connection.adapter_name == 'SQLite'
+end
+
+def supports_concurrency?
+  !using_sqlite?
+end
+
+def using_postgresql?
+  ActsAsTaggableOn::Utils.using_postgresql?
+end
+
+def postgresql_version
+  if using_postgresql?
+    ActsAsTaggableOn::Utils.connection.execute('SHOW SERVER_VERSION').first['server_version'].to_f
+  else
+    0.0
+  end
+end
+
+def postgresql_support_json?
+  postgresql_version >= 9.2
+end
+
+
+def using_mysql?
+  ActsAsTaggableOn::Utils.using_mysql?
+end
+
+def using_case_insensitive_collation?
+  using_mysql? && ActsAsTaggableOn::Utils.connection.collation =~ /_ci\Z/
+end

data/spec/support/database_cleaner.rb

@@ -6,6 +6,10 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
+  config.after(:suite) do
+    DatabaseCleaner.clean
+  end
+
   config.before(:each) do
     DatabaseCleaner.start
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -31,26 +31,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -135,20 +115,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ammeter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: barrier
   requirement: !ruby/object:Gem::Requirement
@@ -202,23 +168,25 @@ 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
+- db/migrate/4_add_missing_taggable_index.rb
 - 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
-- 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
-- lib/acts_as_taggable_on/acts_as_taggable_on/related.rb
+- lib/acts_as_taggable_on/compatibility.rb
 - lib/acts_as_taggable_on/engine.rb
 - lib/acts_as_taggable_on/tag.rb
 - lib/acts_as_taggable_on/tag_list.rb
+- lib/acts_as_taggable_on/tag_list_parser.rb
 - lib/acts_as_taggable_on/taggable.rb
+- lib/acts_as_taggable_on/taggable/cache.rb
+- lib/acts_as_taggable_on/taggable/collection.rb
+- lib/acts_as_taggable_on/taggable/core.rb
+- lib/acts_as_taggable_on/taggable/dirty.rb
+- lib/acts_as_taggable_on/taggable/ownership.rb
+- lib/acts_as_taggable_on/taggable/related.rb
 - lib/acts_as_taggable_on/tagger.rb
 - lib/acts_as_taggable_on/tagging.rb
 - lib/acts_as_taggable_on/tags_helper.rb
@@ -229,14 +197,15 @@ files:
 - spec/acts_as_taggable_on/caching_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_parser_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/dirty_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/acts_as_taggable_on/utils_spec.rb
-- spec/bm.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
@@ -254,8 +223,8 @@ files:
 - 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/0-helpers.rb
 - spec/support/array.rb
 - spec/support/database.rb
 - spec/support/database_cleaner.rb
@@ -302,14 +271,15 @@ test_files:
 - spec/acts_as_taggable_on/caching_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_parser_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/dirty_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/acts_as_taggable_on/utils_spec.rb
-- spec/bm.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
@@ -327,8 +297,8 @@ test_files:
 - 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/0-helpers.rb
 - spec/support/array.rb
 - spec/support/database.rb
 - spec/support/database_cleaner.rb

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" }
-}

data/spec/schema.rb

@@ -1,82 +0,0 @@
-ActiveRecord::Schema.define :version => 0 do
-  create_table :tags, :force => true do |t|
-    t.string :name
-    t.integer :taggings_count, :default => 0
-  end
-  add_index "tags", ["name"], name: "index_tags_on_name", unique: true
-
-  create_table :taggings, :force => true do |t|
-    t.references :tag
-
-    # You should make sure that the column created is
-    # long enough to store the required class names.
-    t.references :taggable, :polymorphic => true
-    t.references :tagger, :polymorphic => true
-
-    # Limit is created to prevent MySQL error on index
-    # length for MyISAM table type: http://bit.ly/vgW2Ql
-    t.string :context, :limit => 128
-
-    t.datetime :created_at
-  end
-  add_index "taggings",
-            ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"],
-            unique: true, name: "taggings_idx"
-
-  # above copied from
-  # generators/acts_as_taggable_on/migration/migration_generator
-
-  create_table :taggable_models, :force => true do |t|
-    t.column :name, :string
-    t.column :type, :string
-  end
-
-  create_table :non_standard_id_taggable_models, :primary_key => "an_id", :force => true do |t|
-    t.column :name, :string
-    t.column :type, :string
-  end
-
-  create_table :untaggable_models, :force => true do |t|
-    t.column :taggable_model_id, :integer
-    t.column :name, :string
-  end
-
-  create_table :cached_models, :force => true do |t|
-    t.column :name, :string
-    t.column :type, :string
-    t.column :cached_tag_list, :string
-  end
-
-  create_table :other_cached_models, :force => true do |t|
-    t.column :name, :string
-    t.column :type, :string
-    t.column :cached_language_list, :string
-    t.column :cached_status_list, :string
-    t.column :cached_glass_list, :string
-  end
-
-  create_table :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
-  end
-
-  create_table :ordered_taggable_models, :force => true do |t|
-    t.column :name, :string
-    t.column :type, :string
-  end
-
-  create_table :taggable_model_with_jsons, :force => true do |t|
-    t.column :name, :string
-    t.column :type, :string
-    if self.connection.adapter_name == 'PostgreSQL' && self.connection.execute("SHOW SERVER_VERSION").first["server_version"].to_f >= 9.2
-      type = :json
-    else
-      type = :string
-    end
-    t.column :opts, type
-  end
-end