acts-as-taggable-on 6.0.0 → 8.1.0

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,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
@@ -21,12 +21,14 @@ ActiveRecord::Schema.define version: 0 do
     # 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 '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
@@ -34,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|

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2021-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -104,9 +110,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/spec.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -115,7 +121,6 @@ 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
@@ -123,9 +128,12 @@ files:
 - db/migrate/4_add_missing_taggable_index.rb
 - db/migrate/5_change_collation_for_tag_names.rb
 - 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/default_parser.rb
@@ -139,6 +147,7 @@ files:
 - lib/acts_as_taggable_on/taggable/core.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
@@ -168,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
@@ -191,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
@@ -207,15 +208,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.7
+      version: 2.3.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Advanced tagging for Rails.
@@ -238,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,33 +0,0 @@
-language: ruby
-cache: bundler
-
-rvm:
-  - ruby-head
-  - 2.5.1
-  - 2.4.4
-  - 2.3.7
-  - 2.2.7
-
-env:
-  - DB=sqlite3
-  - DB=mysql
-  - DB=postgresql
-
-gemfile:
-  - gemfiles/activerecord_5.2.gemfile
-  - gemfiles/activerecord_5.1.gemfile
-  - gemfiles/activerecord_5.0.gemfile
-
-sudo: false
-
-bundler_args: '--without local_development --jobs 3 --retry 3'
-
-before_install:
-   - gem install bundler
-
-script: bundle exec rake
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-  fast_finish: true

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/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