acts-as-taggable-on 4.0.0 → 5.0.0

data/lib/acts_as_taggable_on/taggable/tagged_with_query/exclude_tags_query.rb

@@ -0,0 +1,82 @@
+module ActsAsTaggableOn::Taggable::TaggedWithQuery
+  class ExcludeTagsQuery < QueryBase
+    def build
+      taggable_model.joins(owning_to_tagger)
+                    .where(tags_not_in_list)
+                    .having(tags_that_matches_count)
+                    .readonly(false)
+    end
+
+    private
+
+    def tags_not_in_list
+      return taggable_arel_table[:id].not_in(
+            tagging_arel_table
+              .project(tagging_arel_table[:taggable_id])
+              .join(tag_arel_table)
+              .on(
+                  tagging_arel_table[:tag_id].eq(tag_arel_table[:id])
+                  .and(tagging_arel_table[:taggable_type].eq(taggable_model.base_class.name))
+                  .and(tags_match_type)
+                )
+          )
+
+        # FIXME: missing time scope, this is also missing in the original implementation
+    end
+
+
+    def owning_to_tagger
+      return [] unless options[:owned_by].present?
+
+      owner = options[:owned_by]
+
+      arel_join = taggable_arel_table
+        .join(tagging_arel_table)
+        .on(
+            tagging_arel_table[:tagger_id].eq(owner.id)
+            .and(tagging_arel_table[:tagger_type].eq(owner.class.base_class.to_s))
+            .and(tagging_arel_table[:taggable_id].eq(taggable_arel_table[taggable_model.primary_key]))
+            .and(tagging_arel_table[:taggable_type].eq(taggable_model.base_class.name))
+          )
+
+      if options[:match_all].present?
+        arel_join = arel_join
+          .join(tagging_arel_table, Arel::Nodes::OuterJoin)
+          .on(
+            match_all_on_conditions
+          )
+      end
+
+      return arel_join.join_sources
+    end
+
+    def match_all_on_conditions
+      on_condition = tagging_arel_table[:taggable_id].eq(taggable_arel_table[taggable_model.primary_key])
+        .and(tagging_arel_table[:taggable_type].eq(taggable_model.base_class.name))
+
+      if options[:start_at].present?
+        on_condition = on_condition.and(tagging_arel_table[:created_at].gteq(options[:start_at]))
+      end
+
+      if options[:end_at].present?
+        on_condition = on_condition.and(tagging_arel_table[:created_at].lteq(options[:end_at]))
+      end
+
+      if options[:on].present?
+        on_condition = on_condition.and(tagging_arel_table[:context].lteq(options[:on]))
+      end
+
+      on_condition
+    end
+
+    def tags_that_matches_count
+      return [] unless options[:match_all].present?
+
+      taggable_model.find_by_sql(tag_arel_table.project(Arel.star.count).where(tags_match_type).to_sql)
+
+      tagging_arel_table[:taggable_id].count.eq(
+        tag_arel_table.project(Arel.star.count).where(tags_match_type)
+      )
+    end
+  end
+end

data/lib/acts_as_taggable_on/taggable/tagged_with_query/query_base.rb

@@ -0,0 +1,61 @@
+module ActsAsTaggableOn::Taggable::TaggedWithQuery
+  class QueryBase
+    def initialize(taggable_model, tag_model, tagging_model, tag_list, options)
+      @taggable_model = taggable_model
+      @tag_model      = tag_model
+      @tagging_model  = tagging_model
+      @tag_list       = tag_list
+      @options        = options
+    end
+
+    private
+
+    attr_reader :taggable_model, :tag_model, :tagging_model, :tag_list, :options
+
+    def taggable_arel_table
+      @taggable_arel_table ||= taggable_model.arel_table
+    end
+
+    def tag_arel_table
+      @tag_arel_table ||= tag_model.arel_table
+    end
+
+    def tagging_arel_table
+      @tagging_arel_table ||=tagging_model.arel_table
+    end
+
+    def tag_match_type(tag)
+      matches_attribute = tag_arel_table[:name]
+      matches_attribute = matches_attribute.lower unless ActsAsTaggableOn.strict_case_match
+
+      if options[:wild].present?
+        tag_arel_table[:name].matches("%#{escaped_tag(tag)}%", "!")
+      else
+        tag_arel_table[:name].matches(escaped_tag(tag), "!")
+      end
+    end
+
+    def tags_match_type
+      matches_attribute = tag_arel_table[:name]
+      matches_attribute = matches_attribute.lower unless ActsAsTaggableOn.strict_case_match
+
+      if options[:wild].present?
+        matches_attribute.matches_any(tag_list.map{|tag| "%#{escaped_tag(tag)}%"}, "!")
+      else
+        matches_attribute.matches_any(tag_list.map{|tag| "#{escaped_tag(tag)}"}, "!")
+      end
+    end
+
+    def escaped_tag(tag)
+      tag = tag.downcase unless ActsAsTaggableOn.strict_case_match
+      tag.gsub(/[!%_]/) { |x| '!' + x }
+    end
+
+    def adjust_taggings_alias(taggings_alias)
+      if taggings_alias.size > 75
+        taggings_alias = 'taggings_alias_' + Digest::SHA1.hexdigest(taggings_alias)
+      end
+      taggings_alias
+    end
+  end
+end

data/lib/acts_as_taggable_on/tagger.rb

@@ -20,12 +20,12 @@ module ActsAsTaggableOn
           has_many :owned_taggings, owned_taggings_scope,
                    opts.merge(
                      as: :tagger,
-                     class_name: ::ActsAsTaggableOn::Tagging,
+                     class_name: '::ActsAsTaggableOn::Tagging',
                      dependent: :destroy
                    )
 
           has_many :owned_tags, -> { distinct },
-                   class_name: ::ActsAsTaggableOn::Tag,
+                   class_name: '::ActsAsTaggableOn::Tag',
                    source: :tag,
                    through: :owned_taggings
         end

data/lib/acts_as_taggable_on/tagging.rb

@@ -1,5 +1,6 @@
 module ActsAsTaggableOn
   class Tagging < ::ActiveRecord::Base #:nodoc:
+    DEFAULT_CONTEXT = 'tags'
     belongs_to :tag, class_name: '::ActsAsTaggableOn::Tag', counter_cache: ActsAsTaggableOn.tags_counter
     belongs_to :taggable, polymorphic: true
 
@@ -8,8 +9,8 @@ module ActsAsTaggableOn
     scope :owned_by, ->(owner) { where(tagger: owner) }
     scope :not_owned, -> { where(tagger_id: nil, tagger_type: nil) }
 
-    scope :by_contexts, ->(contexts) { where(context: (contexts || 'tags')) }
-    scope :by_context, ->(context = 'tags') { by_contexts(context.to_s) }
+    scope :by_contexts, ->(contexts) { where(context: (contexts || DEFAULT_CONTEXT)) }
+    scope :by_context, ->(context = DEFAULT_CONTEXT) { by_contexts(context.to_s) }
 
     validates_presence_of :context
     validates_presence_of :tag_id

data/lib/acts_as_taggable_on/version.rb

@@ -1,4 +1,4 @@
 module ActsAsTaggableOn
-  VERSION = '4.0.0'
+  VERSION = '5.0.0'
 end
 

data/spec/acts_as_taggable_on/caching_spec.rb

@@ -99,6 +99,24 @@ describe 'Acts As Taggable On' do
     end
   end
 
+  describe 'Cache methods initialization on new models' do
+    before(:all) do
+      ActiveRecord::Base.connection.execute(
+        'INSERT INTO cache_methods_injected_models (cached_tag_list) VALUES (\'ciao\')'
+      )
+      class CacheMethodsInjectedModel < ActiveRecord::Base
+        acts_as_taggable
+      end
+    end
+    after(:all) { Object.send(:remove_const, :CacheMethodsInjectedModel) }
+
+    it 'cached_tag_list_on? get injected correctly' do
+      expect do
+        CacheMethodsInjectedModel.first.tag_list
+      end.not_to raise_error
+    end
+  end
+
   describe 'CachingWithArray' do
     pending '#TODO'
   end

data/spec/acts_as_taggable_on/single_table_inheritance_spec.rb

@@ -170,11 +170,27 @@ describe 'Single Table Inheritance' do
       expect(taggable.tags_from(student)).to eq(%w(ruby scheme))
     end
 
+    it 'returns all owner tags on the taggable' do
+      student.tag(taggable, with: 'ruby, scheme', on: :tags)
+      student.tag(taggable, with: 'skill_one', on: :skills)
+      student.tag(taggable, with: 'english, spanish', on: :language)
+      expect(taggable.owner_tags(student).count).to eq(5)
+      expect(taggable.owner_tags(student).sort == %w(english ruby scheme skill_one spanish))
+    end
+
+
     it 'returns owner tags on the tagger' do
       student.tag(taggable, with: 'ruby, scheme', on: :tags)
       expect(taggable.owner_tags_on(student, :tags).count).to eq(2)
     end
 
+    it 'returns owner tags on the taggable for an array of contexts' do
+      student.tag(taggable, with: 'ruby, scheme', on: :tags)
+      student.tag(taggable, with: 'skill_one, skill_two', on: :skills)
+      expect(taggable.owner_tags_on(student, [:tags, :skills]).count).to eq(4)
+      expect(taggable.owner_tags_on(student, [:tags, :skills]).sort == %w(ruby scheme skill_one skill_two))
+    end
+
     it 'should scope objects returned by tagged_with by owners' do
       student.tag(taggable, with: 'ruby, scheme', on: :tags)
       expect(TaggableModel.tagged_with(%w(ruby scheme), owned_by: student).count).to eq(1)
@@ -208,4 +224,3 @@ describe 'Single Table Inheritance' do
     end
   end
 end
-

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -247,7 +247,7 @@ describe 'Taggable' do
     expect(TaggableModel.tagged_with("ruby", :start_at => today, :end_at => tomorrow).count).to eq(1)
   end
 
-    it "shouldn't be able to find a tag outside date range" do
+  it "shouldn't be able to find a tag outside date range" do
     @taggable.skill_list = "ruby"
     @taggable.save
 

data/spec/internal/db/schema.rb

@@ -78,6 +78,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?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2017-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.2.8
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -164,11 +164,10 @@ 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
+- db/migrate/6_add_missing_indexes_on_taggings.rb
 - gemfiles/activerecord_4.2.gemfile
 - gemfiles/activerecord_5.0.gemfile
+- gemfiles/activerecord_5.1.gemfile
 - lib/acts-as-taggable-on.rb
 - lib/acts_as_taggable_on.rb
 - lib/acts_as_taggable_on/default_parser.rb
@@ -183,6 +182,11 @@ files:
 - 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/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
@@ -246,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -254,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Advanced tagging for Rails.

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.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 => "../"