acts-as-taggable-on 4.0.0.pre → 7.0.0

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

@@ -0,0 +1,5 @@
+class ColumnsOverrideModel < ActiveRecord::Base
+  def self.columns
+    super.reject { |c| c.name == 'ignored_column' }
+  end
+end

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

@@ -12,4 +12,4 @@ class Company < ActiveRecord::Base
       super
     end
   end
-end
+end

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

@@ -1,2 +1,4 @@
+require_relative 'taggable_model'
+
 class InheritingTaggableModel < TaggableModel
 end

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

@@ -1,2 +1,2 @@
 class Market < ActsAsTaggableOn::Tag
-end
+end

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

@@ -1,5 +1,5 @@
 class NonStandardIdTaggableModel < ActiveRecord::Base
-  self.primary_key = 'an_id'
+  self.primary_key = :an_id
   acts_as_taggable
   acts_as_taggable_on :languages
   acts_as_taggable_on :skills

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

@@ -1,2 +1,4 @@
+require_relative 'user'
+
 class Student < User
 end

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

@@ -6,6 +6,7 @@ class TaggableModel < ActiveRecord::Base
   has_many :untaggable_models
 
   attr_reader :tag_list_submethod_called
+
   def tag_list=(v)
     @tag_list_submethod_called = true
     super

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

@@ -1,3 +1,3 @@
 class User < ActiveRecord::Base
   acts_as_tagger
-end
+end

data/spec/internal/db/schema.rb

@@ -1,12 +1,12 @@
 ActiveRecord::Schema.define version: 0 do
-  create_table :tags, force: true do |t|
+  create_table ActsAsTaggableOn.tags_table, force: true do |t|
     t.string :name
     t.integer :taggings_count, default: 0
     t.string :type
   end
-  add_index 'tags', ['name'], name: 'index_tags_on_name', unique: true
+  add_index ActsAsTaggableOn.tags_table, ['name'], name: 'index_tags_on_name', unique: true
 
-  create_table :taggings, force: true do |t|
+  create_table ActsAsTaggableOn.taggings_table, force: true do |t|
     t.integer :tag_id
 
     # You should make sure that the column created is
@@ -23,10 +23,10 @@ ActiveRecord::Schema.define version: 0 do
 
     t.datetime :created_at
   end
-  add_index 'taggings',
+  add_index ActsAsTaggableOn.taggings_table,
             ['tag_id', 'taggable_id', 'taggable_type', 'context', 'tagger_id', 'tagger_type'],
             unique: true, name: 'taggings_idx'
-  add_index 'taggings', :tag_id , name: 'index_taggings_on_tag_id'
+  add_index ActsAsTaggableOn.taggings_table, :tag_id , name: 'index_taggings_on_tag_id'
 
   # above copied from
   # generators/acts_as_taggable_on/migration/migration_generator
@@ -36,6 +36,12 @@ ActiveRecord::Schema.define version: 0 do
     t.column :type, :string
   end
 
+  create_table :columns_override_models, force: true do |t|
+    t.column :name, :string
+    t.column :type, :string
+    t.column :ignored_column, :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
@@ -78,6 +84,9 @@ ActiveRecord::Schema.define version: 0 do
     t.column :type, :string
   end
 
+  create_table :cache_methods_injected_models, force: true do |t|
+    t.column :cached_tag_list, :string
+  end
 
   # Special cases for postgresql
   if using_postgresql?

data/spec/spec_helper.rb

@@ -18,4 +18,3 @@ Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
 RSpec.configure do |config|
   config.raise_errors_for_deprecations!
 end
-

data/spec/support/database.rb

@@ -10,7 +10,7 @@ if File.exist?(database_yml)
   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]
+  config = ActiveSupport::HashWithIndifferentAccess.new(ActiveRecord::Base.configurations[db_name])
 
   begin
     ActiveRecord::Base.establish_connection(db_name.to_sym)
@@ -28,9 +28,9 @@ if File.exist?(database_yml)
     ActiveRecord::Base.establish_connection(config)
   end
 
-  load(File.dirname(__FILE__) + '/../internal/db/schema.rb')
-  load(File.dirname(__FILE__) + '/../internal/app/models/models.rb')
+  require File.dirname(__FILE__) + '/../internal/db/schema.rb'
+  Dir[File.dirname(__dir__) + '/internal/app/models/*.rb'].each { |f| require f }
 
 else
   fail "Please create #{database_yml} first to configure your database. Take a look at: #{database_yml}.sample"
-end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre
+  version: 7.0.0
 platform: ruby
 authors:
 - Michael Bleigh
 - Joost Baaij
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-17 00:00:00.000000000 Z
+date: 2020-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,56 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  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: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '5.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
+        version: '6.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '5.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -164,11 +128,12 @@ files:
 - db/migrate/3_add_taggings_counter_cache_to_tags.rb
 - db/migrate/4_add_missing_taggable_index.rb
 - db/migrate/5_change_collation_for_tag_names.rb
-- db/migrate/6_add_missing_indexes.rb
-- gemfiles/activerecord_4.0.gemfile
-- gemfiles/activerecord_4.1.gemfile
-- gemfiles/activerecord_4.2.gemfile
+- db/migrate/6_add_missing_indexes_on_taggings.rb
 - gemfiles/activerecord_5.0.gemfile
+- gemfiles/activerecord_5.1.gemfile
+- gemfiles/activerecord_5.2.gemfile
+- gemfiles/activerecord_6.0.gemfile
+- gemfiles/activerecord_6.1.gemfile
 - lib/acts-as-taggable-on.rb
 - lib/acts_as_taggable_on.rb
 - lib/acts_as_taggable_on/default_parser.rb
@@ -180,9 +145,14 @@ files:
 - 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/taggable/tag_list_type.rb
+- lib/acts_as_taggable_on/taggable/tagged_with_query.rb
+- lib/acts_as_taggable_on/taggable/tagged_with_query/all_tags_query.rb
+- lib/acts_as_taggable_on/taggable/tagged_with_query/any_tags_query.rb
+- lib/acts_as_taggable_on/taggable/tagged_with_query/exclude_tags_query.rb
+- lib/acts_as_taggable_on/taggable/tagged_with_query/query_base.rb
 - lib/acts_as_taggable_on/tagger.rb
 - lib/acts_as_taggable_on/tagging.rb
 - lib/acts_as_taggable_on/tags_helper.rb
@@ -193,12 +163,12 @@ files:
 - spec/acts_as_taggable_on/acts_as_tagger_spec.rb
 - spec/acts_as_taggable_on/caching_spec.rb
 - spec/acts_as_taggable_on/default_parser_spec.rb
+- spec/acts_as_taggable_on/dirty_spec.rb
 - spec/acts_as_taggable_on/generic_parser_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/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
@@ -207,10 +177,10 @@ files:
 - 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/columns_override_model.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
@@ -246,16 +216,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Advanced tagging for Rails.
 test_files:
@@ -263,12 +232,12 @@ test_files:
 - spec/acts_as_taggable_on/acts_as_tagger_spec.rb
 - spec/acts_as_taggable_on/caching_spec.rb
 - spec/acts_as_taggable_on/default_parser_spec.rb
+- spec/acts_as_taggable_on/dirty_spec.rb
 - spec/acts_as_taggable_on/generic_parser_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/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
@@ -277,10 +246,10 @@ test_files:
 - 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/columns_override_model.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

data/db/migrate/6_add_missing_indexes.rb

@@ -1,12 +0,0 @@
-class AddMissingIndexes < ActiveRecord::Migration
-  def change
-    add_index :taggings, :tag_id
-    add_index :taggings, :taggable_id
-    add_index :taggings, :taggable_type
-    add_index :taggings, :tagger_id
-    add_index :taggings, :context
-
-    add_index :taggings, [:tagger_id, :tagger_type]
-    add_index :taggings, [:taggable_id, :taggable_type, :tagger_id, :context], name: 'taggings_idy'
-  end
-end

data/gemfiles/activerecord_4.0.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.0.0"
-gem "mysql2", "~> 0.3.21"
-
-group :local_development do
-  gem "guard"
-  gem "guard-rspec"
-  gem "appraisal"
-  gem "rake"
-  gem "byebug", :platforms => [:mri_21, :mri_22, :mri_23]
-end
-
-gemspec :path => "../"

data/gemfiles/activerecord_4.1.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.1.0"
-gem "mysql2", "~> 0.3.21"
-
-group :local_development do
-  gem "guard"
-  gem "guard-rspec"
-  gem "appraisal"
-  gem "rake"
-  gem "byebug", :platforms => [:mri_21, :mri_22, :mri_23]
-end
-
-gemspec :path => "../"

data/gemfiles/activerecord_4.2.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.2.0"
-
-group :local_development do
-  gem "guard"
-  gem "guard-rspec"
-  gem "appraisal"
-  gem "rake"
-  gem "byebug", :platforms => [:mri_21, :mri_22, :mri_23]
-end
-
-gemspec :path => "../"

data/lib/acts_as_taggable_on/taggable/dirty.rb

@@ -1,36 +0,0 @@
-module ActsAsTaggableOn::Taggable
-  module Dirty
-    def self.included(base)
-      base.extend ActsAsTaggableOn::Taggable::Dirty::ClassMethods
-
-      base.initialize_acts_as_taggable_on_dirty
-    end
-
-    module ClassMethods
-      def initialize_acts_as_taggable_on_dirty
-        tag_types.map(&:to_s).each do |tags_type|
-          tag_type         = tags_type.to_s.singularize
-
-          class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{tag_type}_list_changed?
-              changed_attributes.include?("#{tag_type}_list")
-            end
-
-            def #{tag_type}_list_was
-              changed_attributes.include?("#{tag_type}_list") ? changed_attributes["#{tag_type}_list"] : __send__("#{tag_type}_list")
-            end
-
-            def #{tag_type}_list_change
-              [changed_attributes['#{tag_type}_list'], __send__('#{tag_type}_list')] if changed_attributes.include?("#{tag_type}_list")
-            end
-
-            def #{tag_type}_list_changes
-              [changed_attributes['#{tag_type}_list'], __send__('#{tag_type}_list')] if changed_attributes.include?("#{tag_type}_list")
-            end
-          RUBY
-
-        end
-      end
-    end
-  end
-end

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

@@ -1,90 +0,0 @@
-class TaggableModel < ActiveRecord::Base
-  acts_as_taggable
-  acts_as_taggable_on :languages
-  acts_as_taggable_on :skills
-  acts_as_taggable_on :needs, :offerings
-  has_many :untaggable_models
-
-  attr_reader :tag_list_submethod_called
-
-  def tag_list=(v)
-    @tag_list_submethod_called = true
-    super
-  end
-end
-
-class CachedModel < ActiveRecord::Base
-  acts_as_taggable
-end
-
-class OtherCachedModel < ActiveRecord::Base
-  acts_as_taggable_on :languages, :statuses, :glasses
-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 Market < ActsAsTaggableOn::Tag
-end
-
-class Company < ActiveRecord::Base
-  acts_as_taggable_on :locations, :markets
-
-  has_many :markets, :through => :market_taggings, :source => :tag
-
-  private
-
-  def find_or_create_tags_from_list_with_context(tag_list, context)
-    if context.to_sym == :markets
-      Market.find_or_create_all_with_like_by_name(tag_list)
-    else
-      super
-    end
-  end
-end
-
-class User < ActiveRecord::Base
-  acts_as_tagger
-end
-
-class Student < User
-end
-
-class UntaggableModel < ActiveRecord::Base
-  belongs_to :taggable_model
-end
-
-class NonStandardIdTaggableModel < ActiveRecord::Base
-  self.primary_key = :an_id
-  acts_as_taggable
-  acts_as_taggable_on :languages
-  acts_as_taggable_on :skills
-  acts_as_taggable_on :needs, :offerings
-  has_many :untaggable_models
-end
-
-class OrderedTaggableModel < ActiveRecord::Base
-  acts_as_ordered_taggable
-  acts_as_ordered_taggable_on :colours
-end
-
-if using_postgresql?
-  class CachedModelWithArray < ActiveRecord::Base
-    acts_as_taggable
-  end
-  if postgresql_support_json?
-    class TaggableModelWithJson < ActiveRecord::Base
-      acts_as_taggable
-      acts_as_taggable_on :skills
-    end
-  end
-end