acts-as-taggable-on 6.5.0 → 9.0.0

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -109,6 +109,10 @@ describe 'Taggable' do
     expect(@taggable.tag_types).to eq(TaggableModel.tag_types)
   end
 
+  it 'should have tenant column' do
+    expect(TaggableModel.tenant_column).to eq(:tenant_id)
+  end
+
   it 'should have tag_counts_on' do
     expect(TaggableModel.tag_counts_on(:tags)).to be_empty
 
@@ -477,7 +481,7 @@ describe 'Taggable' do
 
       expect(TaggableModel.tagged_with(%w(bob tricia), wild: true, any: true).to_a.sort_by { |o| o.id }).to eq([bob, frank, steve])
       expect(TaggableModel.tagged_with(%w(bob tricia), wild: true, exclude: true).to_a).to eq([jim])
-      expect(TaggableModel.tagged_with('ji', wild: true, any: true).to_a =~ [frank, jim])
+      expect(TaggableModel.tagged_with('ji', wild: true, any: true).to_a).to match_array([frank, jim])
     end
   end
 
@@ -676,11 +680,11 @@ describe 'Taggable' do
     end
 
     it 'should return all column names joined for TaggableModel GROUP clause' do
-      expect(@taggable.grouped_column_names_for(TaggableModel)).to eq('taggable_models.id, taggable_models.name, taggable_models.type')
+      expect(@taggable.grouped_column_names_for(TaggableModel)).to eq('taggable_models.id, taggable_models.name, taggable_models.type, taggable_models.tenant_id')
     end
 
     it 'should return all column names joined for NonStandardIdTaggableModel GROUP clause' do
-      expect(@taggable.grouped_column_names_for(TaggableModel)).to eq("taggable_models.#{TaggableModel.primary_key}, taggable_models.name, taggable_models.type")
+      expect(@taggable.grouped_column_names_for(TaggableModel)).to eq("taggable_models.#{TaggableModel.primary_key}, taggable_models.name, taggable_models.type, taggable_models.tenant_id")
     end
   end
 

data/spec/acts_as_taggable_on/tagging_spec.rb

@@ -49,6 +49,22 @@ describe ActsAsTaggableOn::Tagging do
     ActsAsTaggableOn.remove_unused_tags = previous_setting
   end
 
+  it 'should destroy unused tags after tagging destroyed when not using tags_counter' do
+    remove_unused_tags_previous_setting = ActsAsTaggableOn.remove_unused_tags
+    tags_counter_previous_setting = ActsAsTaggableOn.tags_counter
+    ActsAsTaggableOn.remove_unused_tags = true
+    ActsAsTaggableOn.tags_counter = false
+
+    ActsAsTaggableOn::Tag.destroy_all
+    @taggable = TaggableModel.create(name: 'Bob Jones')
+    @taggable.update_attribute :tag_list, 'aaa,bbb,ccc'
+    @taggable.update_attribute :tag_list, ''
+    expect(ActsAsTaggableOn::Tag.count).to eql(0)
+
+    ActsAsTaggableOn.remove_unused_tags = remove_unused_tags_previous_setting
+    ActsAsTaggableOn.tags_counter = tags_counter_previous_setting
+  end
+
   describe 'context scopes' do
     before do
       @tagging_2 = ActsAsTaggableOn::Tagging.new
@@ -61,12 +77,14 @@ describe ActsAsTaggableOn::Tagging do
       @tagging.tag = ActsAsTaggableOn::Tag.create(name: "Physics")
       @tagging.tagger = @tagger
       @tagging.context = 'Science'
+      @tagging.tenant = 'account1'
       @tagging.save
 
       @tagging_2.taggable = TaggableModel.create(name: "Satellites")
       @tagging_2.tag = ActsAsTaggableOn::Tag.create(name: "Technology")
       @tagging_2.tagger = @tagger_2
       @tagging_2.context = 'Science'
+      @tagging_2.tenant = 'account1'
       @tagging_2.save
 
       @tagging_3.taggable = TaggableModel.create(name: "Satellites")
@@ -98,6 +116,14 @@ describe ActsAsTaggableOn::Tagging do
       end
     end
 
+    describe '.by_tenant' do
+      it "should find taggings by tenant" do
+        expect(ActsAsTaggableOn::Tagging.by_tenant('account1').length).to eq(2);
+        expect(ActsAsTaggableOn::Tagging.by_tenant('account1').first).to eq(@tagging);
+        expect(ActsAsTaggableOn::Tagging.by_tenant('account1').second).to eq(@tagging_2);
+      end
+    end
+
     describe '.not_owned' do
       before do
         @tagging_4 = ActsAsTaggableOn::Tagging.new

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

@@ -3,6 +3,8 @@ 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

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

@@ -21,6 +21,8 @@ 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 ActsAsTaggableOn.taggings_table,
@@ -34,6 +36,7 @@ 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|

data/spec/support/database.rb

@@ -1,36 +1,46 @@
+# frozen_string_literal: true
+
 # 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__)
+database_yml = File.expand_path('../internal/config/database.yml', __dir__)
 
-if File.exist?(database_yml)
+unless File.exist?(database_yml)
+  raise "Please create #{database_yml} first to configure your database. Take a look at: #{database_yml}.sample"
+end
 
-  ActiveRecord::Migration.verbose = false
+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['CI'] ? ::Logger::ERROR : ::Logger::DEBUG
+ActiveRecord::Migration.verbose = false
+if ActiveRecord.version >= Gem::Version.new('7.0.0.alpha2')
+  ActiveRecord.default_timezone = :utc
+else
   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::Base.establish_connection(db_name.to_sym)
-    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
+end
+config = if ActiveRecord.version >= Gem::Version.new('6.1.0')
+           ActiveRecord::Base.configurations.configs_for(env_name: db_name)
+         else
+           ActiveSupport::HashWithIndifferentAccess.new(ActiveRecord::Base.configurations[db_name])
+         end
 
-    ActiveRecord::Base.establish_connection(config)
+begin
+  ActiveRecord::Base.establish_connection(db_name.to_sym)
+  ActiveRecord::Base.connection
+rescue StandardError
+  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
 
-  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"
+  ActiveRecord::Base.establish_connection(config)
 end
+
+require "#{File.dirname(__FILE__)}/../internal/db/schema.rb"
+Dir["#{File.dirname(__dir__)}/internal/app/models/*.rb"].each { |f| require f }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Michael Bleigh
 - Joost Baaij
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -110,9 +110,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/spec.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -121,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
@@ -129,10 +128,11 @@ 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
-- gemfiles/activerecord_5.0.gemfile
-- gemfiles/activerecord_5.1.gemfile
-- gemfiles/activerecord_5.2.gemfile
+- db/migrate/7_add_tenant_to_taggings.rb
+- docker-compose.yml
 - gemfiles/activerecord_6.0.gemfile
+- gemfiles/activerecord_6.1.gemfile
+- gemfiles/activerecord_7.0.gemfile
 - lib/acts-as-taggable-on.rb
 - lib/acts_as_taggable_on.rb
 - lib/acts_as_taggable_on/default_parser.rb
@@ -199,15 +199,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
@@ -215,15 +207,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.7
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Advanced tagging for Rails.
 test_files:

data/.travis.yml

@@ -1,43 +0,0 @@
-language: ruby
-cache: bundler
-
-addons:
-  postgresql: '10'
-
-services:
-  - mysql
-  - postgresql
-
-rvm:
-  - 2.6.5
-  - 2.5.5
-  - 2.4.6
-  - 2.3.7
-
-env:
-  - DB=sqlite3
-  - DB=mysql
-  - DB=postgresql
-
-gemfile:
-  - gemfiles/activerecord_5.2.gemfile
-  - gemfiles/activerecord_5.1.gemfile
-  - gemfiles/activerecord_5.0.gemfile
-  - gemfiles/activerecord_6.0.gemfile
-
-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
-  exclude:
-    - rvm: 2.3.7
-      gemfile: gemfiles/activerecord_6.0.gemfile
-    - rvm: 2.4.6
-      gemfile: gemfiles/activerecord_6.0.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_5.1.gemfile

@@ -1,21 +0,0 @@
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.1.1"
-case ENV["DB"]
-when "postgresql"
-  gem 'pg'
-when "mysql"
-  gem 'mysql2', '~> 0.3'
-else
-  gem "sqlite3", "~> 1.3", "< 1.4"
-end
-
-group :local_development do
-  gem "guard"
-  gem "guard-rspec"
-  gem "appraisal"
-  gem "rake"
-  gem "byebug", platforms: [:mri]
-end
-
-gemspec path: "../"