acts-as-taggable-on 3.5.0 → 8.1.0

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

@@ -2,4 +2,10 @@ 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

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

@@ -3,9 +3,12 @@ class TaggableModel < ActiveRecord::Base
   acts_as_taggable_on :languages
   acts_as_taggable_on :skills
   acts_as_taggable_on :needs, :offerings
+  acts_as_taggable_tenant :tenant_id
+
   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/config/database.yml.sample

@@ -4,16 +4,12 @@ sqlite3:
 
 mysql:
   adapter: mysql2
-  host: localhost
+  host: 127.0.0.1
   username: root
   password:
   database: acts_as_taggable_on
-  charset: utf8
+  encoding: utf8
   
 postgresql:
-  adapter: postgresql
-  hostname: localhost
-  username: postgres
-  password:
-  database: acts_as_taggable_on
-  encoding: utf8
+  # Needs to be given as a URL to force connection via TCP
+  url: postgresql://postgres:postgres@127.0.0.1:5432/acts_as_taggable_on?encoding=utf8

data/spec/internal/db/schema.rb

@@ -1,28 +1,34 @@
 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|
-    t.references :tag
+  create_table ActsAsTaggableOn.taggings_table, force: true do |t|
+    t.integer :tag_id
 
     # 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
+    t.string :taggable_type
+    t.integer :taggable_id
+
+    t.string :tagger_type
+    t.integer :tagger_id
 
     # Limit is created to prevent MySQL error on index
     # length for MyISAM table type: http://bit.ly/vgW2Ql
     t.string :context, limit: 128
 
+    t.string :tenant , limit: 128
+
     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 ActsAsTaggableOn.taggings_table, :tag_id , name: 'index_taggings_on_tag_id'
 
   # above copied from
   # generators/acts_as_taggable_on/migration/migration_generator
@@ -30,6 +36,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 :tenant_id, :integer
+  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|
@@ -74,6 +87,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,16 +10,10 @@ 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 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.establish_connection(db_name.to_sym)
     ActiveRecord::Base.connection
   rescue
     case db_name
@@ -34,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2021-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,62 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
-- !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:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.7
-- !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:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -152,9 +110,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/spec.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -163,33 +121,38 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- UPGRADING.md
 - acts-as-taggable-on.gemspec
 - 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
 - db/migrate/5_change_collation_for_tag_names.rb
-- gemfiles/activerecord_3.2.gemfile
-- gemfiles/activerecord_4.0.gemfile
-- gemfiles/activerecord_4.1.gemfile
-- gemfiles/activerecord_4.2.gemfile
+- db/migrate/6_add_missing_indexes_on_taggings.rb
+- db/migrate/7_add_tenant_to_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/compatibility.rb
 - lib/acts_as_taggable_on/default_parser.rb
 - lib/acts_as_taggable_on/engine.rb
 - lib/acts_as_taggable_on/generic_parser.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/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
@@ -200,13 +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_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
@@ -215,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
@@ -238,15 +200,7 @@ homepage: https://github.com/mbleigh/acts-as-taggable-on
 licenses:
 - MIT
 metadata: {}
-post_install_message: |-
-  When upgrading
-
-  Re-run the migrations generator
-
-      rake acts_as_taggable_on_engine:install:migrations
-
-  This will create any new migrations and skip existing ones
-  Version 3.5.0 has a migration for mysql adapter
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -254,15 +208,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.3.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Advanced tagging for Rails.
@@ -271,13 +224,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_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
@@ -286,10 +238,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/.travis.yml

@@ -1,40 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.1
-  - 2.2
-  - 2.0.0
-  - 1.9.3
-  - rbx-2
-
-env:
-  - DB=sqlite3
-  - DB=mysql
-  - DB=postgresql
-
-gemfile:
-  - gemfiles/activerecord_3.2.gemfile
-  - gemfiles/activerecord_4.0.gemfile
-  - gemfiles/activerecord_4.1.gemfile
-
-sudo: false
-
-bundler_args: '--without local_development --jobs 3 --retry 3'
-
-script: bundle exec rake
-
-matrix:
-  fast_finish: true
-  allow_failures:
-      - gemfile: gemfiles/activerecord_edge.gemfile
-      - rvm: rbx-2
-  exclude:
-      - rvm: 2.2
-        gemfile: gemfiles/activerecord_3.2.gemfile
-      - rvm: 1.9.3
-        gemfile: gemfiles/activerecord_4.0.gemfile
-      - rvm: 1.9.3
-        gemfile: gemfiles/activerecord_4.1.gemfile
-      - rvm: rbx-2
-        gemfile: gemfiles/activerecord_3.2.gemfile
-

data/UPGRADING.md

@@ -1,8 +0,0 @@
-When upgrading
-
-Re-run the migrations generator
-
-    rake acts_as_taggable_on_engine:install:migrations
-
-This will create any new migrations and skip existing ones
-Version 3.5.0 has a migration for mysql adapter

data/gemfiles/activerecord_3.2.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", :github => "rails/rails", :branch => "3-2-stable"
-
-group :local_development do
-  gem "guard"
-  gem "guard-rspec"
-  gem "appraisal"
-  gem "rake"
-  gem "byebug", :platform => :mri_21
-end
-
-gemspec :path => "../"

data/gemfiles/activerecord_4.0.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", :github => "rails/rails", :branch => "4-0-stable"
-
-group :local_development do
-  gem "guard"
-  gem "guard-rspec"
-  gem "appraisal"
-  gem "rake"
-  gem "byebug", :platform => :mri_21
-end
-
-gemspec :path => "../"

data/gemfiles/activerecord_4.1.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", :github => "rails/rails", :branch => "4-1-stable"
-
-group :local_development do
-  gem "guard"
-  gem "guard-rspec"
-  gem "appraisal"
-  gem "rake"
-  gem "byebug", :platform => :mri_21
-end
-
-gemspec :path => "../"

data/gemfiles/activerecord_4.2.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "railties", :github => "rails/rails", :branch => "4-2-stable"
-gem "activerecord", :github => "rails/rails", :branch => "4-2-stable"
-
-group :local_development do
-  gem "guard"
-  gem "guard-rspec"
-  gem "appraisal"
-  gem "rake"
-  gem "byebug", :platform => :mri_21
-end
-
-gemspec :path => "../"

data/lib/acts_as_taggable_on/compatibility.rb

@@ -1,35 +0,0 @@
-module ActsAsTaggableOn::Compatibility
-  def has_many_with_taggable_compatibility(name, options = {}, &extention)
-    if ActsAsTaggableOn::Utils.active_record4?
-      scope, opts = build_taggable_scope_and_options(options)
-      has_many(name, scope, opts, &extention)
-    else
-      has_many(name, options, &extention)
-    end
-  end
-
-  def build_taggable_scope_and_options(opts)
-    scope_opts, opts = parse_taggable_options(opts)
-
-    unless scope_opts.empty?
-      scope = -> {
-        scope_opts.inject(self) { |result, hash| result.send(*hash) }
-      }
-      return [scope, opts]
-    end
-
-    [nil, opts]
-  end
-
-  def parse_taggable_options(opts)
-    scope_opts = {}
-    [:order, :having, :select, :group, :limit, :offset, :readonly].each do |o|
-      scope_opts[o] = opts.delete o if opts[o]
-    end
-    scope_opts[:where] = opts.delete :conditions if opts[:conditions]
-    scope_opts[:joins] = opts.delete :include if opts [:include]
-    scope_opts[:distinct] = opts.delete :uniq if opts[:uniq]
-
-    [scope_opts, opts]
-  end
-end

data/lib/acts_as_taggable_on/tag_list_parser.rb

@@ -1,21 +0,0 @@
-module ActsAsTaggableOn
-  ##
-  # Returns a new TagList using the given tag string.
-  #
-  # Example:
-  #   tag_list = ActsAsTaggableOn::TagListParser.parse("One , Two,  Three")
-  #   tag_list # ["One", "Two", "Three"]
-  module TagListParser
-    class << self
-      ## DEPRECATED
-      def parse(string)
-        ActiveRecord::Base.logger.warn <<WARNING
-ActsAsTaggableOn::TagListParser.parse is deprecated \
-and will be removed from v4.0+, use  \
-ActsAsTaggableOn::TagListParser.new instead
-WARNING
-        DefaultParser.new(string).parse
-      end
-    end
-  end
-end

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