gutentag 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a963454a3117dc737b8d4e70e8a02c22c2c2693e
-  data.tar.gz: bc7c540a51edbabb378370b9157451a29dcbbfdb
+  metadata.gz: d6dfcf9cc249f5d24513e805b16a351641f06520
+  data.tar.gz: 819247c5802512d2de7cccaea882f6faa8caa3cb
 SHA512:
-  metadata.gz: aaf39b46f22f2348b87dbc8d574d17d5d2b5728810980c16b1c344d894900701ff3434e43f2794c6ce3ce2515039de6fe887161110ee0aa4f0aa54db8152b1b1
-  data.tar.gz: 835f63c380604816cd1e5014960f3e75e199f167705635f45cea36467c288b0da7e504c1fa4ad8d35763aec26714cb6a754d58821ed54a244ca906e39cac7d0d
+  metadata.gz: dd5025ccfab3083978980ea492d725235f550cec508d9a955c36ca8bb8337f44027aff7b56fc7d165b96d3fea0fb944369c54917d44ea050dcf243004748d84c
+  data.tar.gz: '0191ae96a804109c49e990f2bde2e6192d2f0ae37f8f8bea68a12a1294e3e0ce717a179162793982a889332ef80c125bfb9955c004cc9979fc86ca4787dd578a'

data/.travis.yml

@@ -9,3 +9,7 @@ before_install:
   - gem install bundler
 before_script:
   - bundle exec appraisal install
+env:
+  - DATABASE=postgres
+  - DATABASE=mysql
+  - DATABASE=sqlite

data/Appraisals

@@ -2,18 +2,21 @@ appraise 'rails_3_2' do
   gem 'rails',    '~> 3.2.22.5'
   gem 'rack',     '~> 1.0',   :platforms => [:ruby_20, :ruby_21]
   gem 'nokogiri', '~> 1.6.0', :platforms => [:ruby_20]
+  gem 'mysql2',   '~> 0.3.10'
 end if RUBY_VERSION.to_f < 2.2
 
 appraise 'rails_4_0' do
   gem 'rails',    '~> 4.0.13'
   gem 'rack',     '~> 1.0', :platforms => [:ruby_20, :ruby_21]
   gem 'nokogiri', '~> 1.6.0', :platforms => [:ruby_20]
+  gem 'mysql2',   '~> 0.3.10'
 end if RUBY_VERSION.to_f < 2.4
 
 appraise 'rails_4_1' do
   gem 'rails',    '~> 4.1.16'
   gem 'rack',     '~> 1.0', :platforms => [:ruby_20, :ruby_21]
   gem 'nokogiri', '~> 1.6.0', :platforms => [:ruby_20]
+  gem 'mysql2',   '~> 0.3.13'
 end if RUBY_VERSION.to_f < 2.4
 
 appraise 'rails_4_2' do
@@ -25,3 +28,7 @@ end if RUBY_VERSION.to_f < 2.4
 appraise 'rails_5_0' do
   gem 'rails', '~> 5.0.1'
 end if RUBY_VERSION.to_f >= 2.2
+
+appraise 'rails_5_1' do
+  gem 'rails', '~> 5.1.0'
+end if RUBY_VERSION.to_f >= 2.2

data/Gemfile

@@ -5,3 +5,8 @@ gemspec
 gem 'test-unit', :platform => :ruby_22
 gem 'rack',       '~> 1.0'   if RUBY_VERSION.to_f <= 2.1
 gem 'nokogiri',   '~> 1.6.0' if RUBY_VERSION.to_f <= 2.0
+
+gem 'combustion', '~> 0.6',
+  :git    => 'https://github.com/pat/combustion.git',
+  :branch => 'master',
+  :ref    => 'ef434634d7'

data/README.md

@@ -8,41 +8,109 @@ A good, simple, solid tagging extension for ActiveRecord.
 
 This was built partly as a proof-of-concept, and partly to see how a tagging gem could work when it's not all stuffed within models, and partly just because I wanted a simpler tagging library. If you want to know more, read [this blog post](http://freelancing-gods.com/posts/gutentag_simple_rails_tagging).
 
-## Installation
+## Contents
+
+* [Usage](#usage)
+* [Installation](#installation)
+* [Upgrading](#upgrading)
+* [Contribution](#contribution)
+* [Licence](#licence)
+
+<h2 id="usage">Usage</h2>
+
+The first step is easy: add the tag associations to whichever models should have tags (in these examples, the Article model):
+
+```Ruby
+class Article < ActiveRecord::Base
+  # ...
+  Gutentag::ActiveRecord.call self
+  # ...
+end
+```
+
+That's all it takes to get a tags association on each article. Of course, populating tags can be a little frustrating, unless you want to manage Gutentag::Tag instances yourself? As an alternative, just use the tag_names accessor to get/set tags via string representations.
+
+```Ruby
+article.tag_names #=> ['pancakes', 'melbourne', 'ruby']
+article.tag_names << 'portland'
+article.tag_names #=> ['pancakes', 'melbourne', 'ruby', 'portland']
+article.tag_names -= ['ruby']
+article.tag_names #=> ['pancakes', 'melbourne', 'portland']
+```
+
+Changes to tag_names are not persisted immediately - you must save your taggable object to have the tag changes reflected in your database:
+
+```Ruby
+article.tag_names << 'ruby'
+article.save
+```
+
+You can also query for instances with specified tags. The default `:match` mode is `:any`, and so provides OR logic, not AND - it'll match any instances that have _any_ of the tags or tag names:
+
+```Ruby
+Article.tagged_with(:names => ['tag1', 'tag2'], :match => :any)
+Article.tagged_with(
+  :tags  => Gutentag::Tag.where(name: ['tag1', 'tag2']),
+  :match => :any
+)
+Article.tagged_with(:ids => [tag_id], :match => :any)
+```
+
+To return records that have _all_ specified tags, use `:match => :all`:
+
+```ruby
+# Returns all articles that have *both* tag_a and tag_b.
+Article.tagged_with(:ids => [tag_a.id, tag_b.id], :match => :all)
+```
+
+<h2 id="installation">Installation</h2>
 
 Get it into your Gemfile - and don't forget the version constraint!
 
-    gem 'gutentag', '~> 0.8.0'
+```Ruby
+gem 'gutentag', '~> 0.9.0'
+```
 
 Next: your tags get persisted to your database, so let's import and run the migrations to get the tables set up:
 
-    rake gutentag:install:migrations
-    rake db:migrate
+```Bash
+rake gutentag:install:migrations
+rake db:migrate
+```
 
 If you want to use Gutentag outside of Rails, you can. However, this means you lose the migration import rake task. As a workaround, here's the expected schema (as of 0.7.0):
 
-    create_table :gutentag_taggings do |t|
-      t.integer :tag_id,        :null => false
-      t.integer :taggable_id,   :null => false
-      t.string  :taggable_type, :null => false
-      t.timestamps :null => false
-    end
+```Ruby
+create_table :gutentag_taggings do |t|
+  t.integer :tag_id,        null: false
+  t.integer :taggable_id,   null: false
+  t.string  :taggable_type, null: false
+  t.timestamps null: false
+end
 
-    add_index :gutentag_taggings, :tag_id
-    add_index :gutentag_taggings, [:taggable_type, :taggable_id]
-    add_index :gutentag_taggings, [:taggable_type, :taggable_id, :tag_id],
-      :unique => true, :name => 'unique_taggings'
+add_index :gutentag_taggings, :tag_id
+add_index :gutentag_taggings, [:taggable_type, :taggable_id]
+add_index :gutentag_taggings, [:taggable_type, :taggable_id, :tag_id],
+  unique: true, name: 'unique_taggings'
 
-    create_table :gutentag_tags do |t|
-      t.string  :name,           :null => false
-      t.integer :taggings_count, :null => false, :default => 0
-      t.timestamps :null => false
-    end
+create_table :gutentag_tags do |t|
+  t.string  :name,           null: false
+  t.integer :taggings_count, null: false, default: 0
+  t.timestamps null: false
+end
 
-    add_index :gutentag_tags, :name, :unique => true
-    add_index :gutentag_tags, :taggings_count
+add_index :gutentag_tags, :name, unique: true
+add_index :gutentag_tags, :taggings_count
+```
 
-## Upgrading
+<h2 id="upgrading">Upgrading</h2>
+
+### 0.9.0
+
+* In your models with tags, change `has_many_tags` to `Gutentag::ActiveRecord.call self`.
+* Any calls to `tagged_with` should change from `Model.tagged_with('ruby', 'pancakes')` to `Model.tagged_with(:names => ['ruby', 'pancakes'])`.
+
+In both of the above cases, the old behaviour will continue to work for 0.9.x releases, but with a deprecation warning.
 
 ### 0.8.0
 
@@ -62,42 +130,15 @@ Between 0.4.0 and 0.5.0, Gutentag switched table names from `tags` and `taggings
 
 If you were using Gutentag 0.4.0 (or older) and now want to upgrade, you'll need to create a migration manually that renames these tables:
 
-    rename_table :tags,     :gutentag_tags
-    rename_table :taggings, :gutentag_taggings
-
-## Usage
-
-The first step is easy: add the tag associations to whichever models should have tags (in these examples, the Article model):
-
-    class Article < ActiveRecord::Base
-      # ...
-      has_many_tags
-      # ...
-    end
-
-That's all it takes to get a tags association on each article. Of course, populating tags can be a little frustrating, unless you want to manage Gutentag::Tag instances yourself? As an alternative, just use the tag_names accessor to get/set tags via string representations.
-
-    article.tag_names #=> ['pancakes', 'melbourne', 'ruby']
-    article.tag_names << 'portland'
-    article.tag_names #=> ['pancakes', 'melbourne', 'ruby', 'portland']
-    article.tag_names -= ['ruby']
-    article.tag_names #=> ['pancakes', 'melbourne', 'portland']
-
-Changes to tag_names are not persisted immediately - you must save your taggable object to have the tag changes reflected in your database:
-
-    article.tag_names << 'ruby'
-    article.save
-
-You can also query for instances with specified tags. This is OR logic, not AND - it'll match any instances that have *any* of the tags or tag names.
-
-    Article.tagged_with('tag1', 'tag2')
-    Article.tagged_with(Gutentag::Tag.where(name: ['tag1', 'tag2'])
-    # => [#<Article id: "123">]
+```Ruby
+rename_table :tags,     :gutentag_tags
+rename_table :taggings, :gutentag_taggings
+```
 
-## Contribution
+<h2 id="contribution">Contribution</h2>
 
 Please note that this project now has a [Contributor Code of Conduct](http://contributor-covenant.org/version/1/0/0/). By participating in this project you agree to abide by its terms.
 
-## Licence
+<h2 id="licence">Licence</h2>
 
 Copyright (c) 2013-2015, Gutentag is developed and maintained by Pat Allan, and is released under the open MIT Licence.

data/Rakefile

@@ -1,3 +1,8 @@
-require 'bundler'
+require 'bundler/setup'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
-Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => [:test]
+task :test    => [:spec]

data/db/migrate/1_gutentag_tables.rb

@@ -1,4 +1,6 @@
-class GutentagTables < ActiveRecord::Migration
+superclass = ActiveRecord::VERSION::MAJOR < 5 ?
+  ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+class GutentagTables < superclass
   def up
     create_table :gutentag_taggings do |t|
       t.integer :tag_id,        :null => false

data/db/migrate/2_gutentag_cache_counter.rb

@@ -1,4 +1,6 @@
-class GutentagCacheCounter < ActiveRecord::Migration
+superclass = ActiveRecord::VERSION::MAJOR < 5 ?
+  ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+class GutentagCacheCounter < superclass
   def up
     add_column :gutentag_tags, :taggings_count, :integer, :default => 0
     add_index  :gutentag_tags, :taggings_count

data/db/migrate/3_no_null_counters.rb

@@ -1,4 +1,6 @@
-class NoNullCounters < ActiveRecord::Migration
+superclass = ActiveRecord::VERSION::MAJOR < 5 ?
+  ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+class NoNullCounters < superclass
   def up
     change_column :gutentag_tags, :taggings_count, :integer, :default => 0,
       :null => false

data/gemfiles/rails_3_2.gemfile

@@ -6,5 +6,6 @@ gem "test-unit", :platform => :ruby_22
 gem "rack", "~> 1.0", :platforms => [:ruby_20, :ruby_21]
 gem "rails", "~> 3.2.22.5"
 gem "nokogiri", "~> 1.6.0", :platforms => [:ruby_20]
+gem "mysql2", "~> 0.3.10"
 
 gemspec :path => "../"

data/gemfiles/rails_4_0.gemfile

@@ -6,5 +6,6 @@ gem "test-unit", :platform => :ruby_22
 gem "rails", "~> 4.0.13"
 gem "rack", "~> 1.0", :platforms => [:ruby_20, :ruby_21]
 gem "nokogiri", "~> 1.6.0", :platforms => [:ruby_20]
+gem "mysql2", "~> 0.3.10"
 
 gemspec :path => "../"

data/gemfiles/rails_4_1.gemfile

@@ -6,5 +6,6 @@ gem "test-unit", :platform => :ruby_22
 gem "rails", "~> 4.1.16"
 gem "rack", "~> 1.0", :platforms => [:ruby_20, :ruby_21]
 gem "nokogiri", "~> 1.6.0", :platforms => [:ruby_20]
+gem "mysql2", "~> 0.3.13"
 
 gemspec :path => "../"

data/gemfiles/rails_5_1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "test-unit", :platform => :ruby_22
+gem "rails", "~> 5.1.0"
+
+gemspec :path => "../"

data/gutentag.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'gutentag'
-  s.version     = '0.8.0'
+  s.version     = '0.9.0'
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']
   s.homepage    = 'https://github.com/pat/gutentag'
@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'appraisal',    '~> 2.1.0'
   s.add_development_dependency 'bundler',      '>= 1.7.12'
   s.add_development_dependency 'combustion',   '0.5.5'
+  s.add_development_dependency 'mysql2'
+  s.add_development_dependency 'pg'
   s.add_development_dependency 'rails'
   s.add_development_dependency 'rspec-rails',  '~> 3.1'
   s.add_development_dependency 'sqlite3',      '~> 1.3.7'

data/lib/gutentag.rb

@@ -1,4 +1,5 @@
 require 'active_record/version'
+require 'active_support/deprecation'
 
 module Gutentag
   def self.dirtier
@@ -10,7 +11,7 @@ module Gutentag
   end
 
   def self.normaliser
-    @normaliser ||= Gutentag::TagName
+    @normaliser ||= lambda { |tag_name| tag_name.to_s.downcase }
   end
 
   def self.normaliser=(normaliser)
@@ -28,10 +29,10 @@ end
 
 require 'gutentag/active_record'
 require 'gutentag/dirty'
+require 'gutentag/has_many_tags'
 require 'gutentag/persistence'
-require 'gutentag/tag_name'
-require 'gutentag/tag_names'
 require 'gutentag/tag_validations'
+require 'gutentag/tagged_with'
 
 if ActiveRecord::VERSION::MAJOR == 3
   Gutentag.dirtier = Gutentag::Dirty
@@ -43,11 +44,7 @@ if defined?(Rails::Engine)
   require 'gutentag/engine'
 else
   require 'active_record'
-  ActiveRecord::Base.send :include, Gutentag::ActiveRecord
-  require File.expand_path(
-    './../app/models/gutentag/tag', File.dirname(__FILE__)
-  )
-  require File.expand_path(
-    './../app/models/gutentag/tagging', File.dirname(__FILE__)
-  )
+  ActiveRecord::Base.extend Gutentag::HasManyTags
+  require_relative '../app/models/gutentag/tag'
+  require_relative '../app/models/gutentag/tagging'
 end

data/lib/gutentag/active_record.rb

@@ -1,44 +1,16 @@
-require 'active_support/concern'
+class Gutentag::ActiveRecord
+  def self.call(model)
+    model.has_many :taggings, :class_name => 'Gutentag::Tagging',
+      :as => :taggable, :dependent => :destroy
+    model.has_many :tags,     :class_name => 'Gutentag::Tag',
+      :through => :taggings
 
-module Gutentag::ActiveRecord
-  extend ActiveSupport::Concern
+    model.after_save :persist_tags
 
-  UNIQUENESS_METHOD = ActiveRecord::VERSION::MAJOR == 3 ? :uniq : :distinct
-
-  module ClassMethods
-    def has_many_tags
-      has_many :taggings, :class_name => 'Gutentag::Tagging', :as => :taggable,
-        :dependent => :destroy
-      has_many :tags,     :class_name => 'Gutentag::Tag',
-        :through => :taggings
-
-      after_save :persist_tags
-    end
-
-    def tagged_with(*tags)
-      joins(:tags).where(
-        Gutentag::Tag.table_name => {:name => Gutentag::TagNames.call(tags)}
-      ).public_send UNIQUENESS_METHOD
-    end
-  end
-
-  def reset_tag_names
-    @tag_names = nil
-  end
-
-  def tag_names
-    @tag_names ||= tags.pluck(:name)
-  end
-
-  def tag_names=(names)
-    Gutentag.dirtier.call self, names if Gutentag.dirtier
-
-    @tag_names = names
-  end
-
-  private
-
-  def persist_tags
-    Gutentag::Persistence.new(self).persist
+    model.send :extend,  Gutentag::ActiveRecord::ClassMethods
+    model.send :include, Gutentag::ActiveRecord::InstanceMethods
   end
 end
+
+require 'gutentag/active_record/class_methods'
+require 'gutentag/active_record/instance_methods'

data/lib/gutentag/active_record/class_methods.rb

@@ -0,0 +1,19 @@
+module Gutentag::ActiveRecord::ClassMethods
+  def tagged_with(*arguments)
+    arguments.flatten!
+
+    case arguments.first
+    when Hash
+      Gutentag::TaggedWith.call(self, arguments.first)
+    when Integer
+      ActiveSupport::Deprecation.warn "Calling tagged_with with an array of integers will not be supported in Gutentag 1.0. Please use tagged_with :ids => [1, 2] instead."
+      Gutentag::TaggedWith.call(self, :ids => arguments)
+    when Gutentag::Tag
+      ActiveSupport::Deprecation.warn "Calling tagged_with with an array of tags will not be supported in Gutentag 1.0. Please use tagged_with :tags => [tag_a, tag_b] instead."
+      Gutentag::TaggedWith.call(self, :tags => arguments)
+    else
+      ActiveSupport::Deprecation.warn "Calling tagged_with with an array of strings will not be supported in Gutentag 1.0. Please use tagged_with :names => [\"melbourne\", \"ruby\"] instead."
+      Gutentag::TaggedWith.call(self, :names => arguments)
+    end
+  end
+end

data/lib/gutentag/active_record/instance_methods.rb

@@ -0,0 +1,21 @@
+module Gutentag::ActiveRecord::InstanceMethods
+  def reset_tag_names
+    @tag_names = nil
+  end
+
+  def tag_names
+    @tag_names ||= tags.pluck(:name)
+  end
+
+  def tag_names=(names)
+    Gutentag.dirtier.call self, names if Gutentag.dirtier
+
+    @tag_names = names
+  end
+
+  private
+
+  def persist_tags
+    Gutentag::Persistence.new(self).persist
+  end
+end

data/lib/gutentag/engine.rb

@@ -2,6 +2,6 @@ class Gutentag::Engine < Rails::Engine
   engine_name :gutentag
 
   ActiveSupport.on_load :active_record do
-    include Gutentag::ActiveRecord
+    extend Gutentag::HasManyTags
   end
 end

data/lib/gutentag/has_many_tags.rb

@@ -0,0 +1,10 @@
+module Gutentag::HasManyTags
+  def has_many_tags
+    ActiveSupport::Deprecation.warn <<-TXT
+has_many_tags is now deprecated, and will be removed in Gutentag v1.0.0.
+Replace it with Gutentag::ActiveRecord.call(self), and everything will continue
+to work as expected.
+    TXT
+    Gutentag::ActiveRecord.call self
+  end
+end

data/lib/gutentag/tagged_with.rb

@@ -0,0 +1,38 @@
+class Gutentag::TaggedWith
+  def self.call(model, options)
+    new(model, options).call
+  end
+
+  def initialize(model, options)
+    @model   = model
+    @options = options
+  end
+
+  def call
+    query_class.new(model, values, match).call
+  end
+
+  private
+
+  attr_reader :model, :options
+
+  def match
+    options[:match] || :any
+  end
+
+  def query_class
+    options[:names] ? NameQuery : IDQuery
+  end
+
+  def values
+    if options[:tags]
+      Array(options[:tags]).collect(&:id)
+    else
+      options[:ids] || options[:names]
+    end
+  end
+end
+
+require 'gutentag/tagged_with/query'
+require 'gutentag/tagged_with/id_query'
+require 'gutentag/tagged_with/name_query'

data/lib/gutentag/tagged_with/id_query.rb

@@ -0,0 +1,9 @@
+class Gutentag::TaggedWith::IDQuery < Gutentag::TaggedWith::Query
+  private
+
+  def taggable_ids_query
+    Gutentag::Tagging.select(:taggable_id).
+      where(:taggable_type => model.name).
+      where(:tag_id => values)
+  end
+end

data/lib/gutentag/tagged_with/name_query.rb

@@ -0,0 +1,15 @@
+class Gutentag::TaggedWith::NameQuery < Gutentag::TaggedWith::Query
+  def initialize(model, values, match)
+    super
+
+    @values = @values.collect { |tag| Gutentag.normaliser.call(tag) }
+  end
+
+  private
+
+  def taggable_ids_query
+    Gutentag::Tagging.joins(:tag).select(:taggable_id).
+      where(:taggable_type => model.name).
+      where(Gutentag::Tag.table_name => {:name => values})
+  end
+end

data/lib/gutentag/tagged_with/query.rb

@@ -0,0 +1,25 @@
+class Gutentag::TaggedWith::Query
+  def initialize(model, values, match)
+    @model  = model
+    @values = Array values
+    @match  = match
+  end
+
+  def call
+    model.where "#{model_id} IN (#{query.to_sql})"
+  end
+
+  private
+
+  attr_reader :model, :values, :match
+
+  def model_id
+    "#{model.quoted_table_name}.#{model.quoted_primary_key}"
+  end
+
+  def query
+    return taggable_ids_query if match == :any || values.length == 1
+
+    taggable_ids_query.having("COUNT(*) = #{values.length}").group(:taggable_id)
+  end
+end

data/spec/gutentag/active_record_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe Gutentag::ActiveRecord do
   describe '.tagged_with' do
-    let!(:melborne_article) do
+    let!(:melbourne_article) do
       article = Article.create :title => 'Overview'
-      article.tag_names << 'melborne'
+      article.tag_names << 'melbourne'
       article.save!
       article
     end
@@ -16,64 +16,191 @@ describe Gutentag::ActiveRecord do
       article
     end
 
-    let!(:melborne_oregon_article) do
+    let!(:melbourne_oregon_article) do
       article = Article.create
-      article.tag_names = %w(oregon melborne)
+      article.tag_names = %w(oregon melbourne)
       article.save!
       article
     end
 
     context 'given a single tag name' do
-      subject { Article.tagged_with('melborne') }
+      subject { Article.tagged_with(:names => 'melbourne') }
 
       it { expect(subject.count).to eq 2 }
-      it { is_expected.to include melborne_article, melborne_oregon_article }
+      it { is_expected.to include melbourne_article, melbourne_oregon_article }
       it { is_expected.not_to include oregon_article }
     end
 
     context 'given a single tag name[symbol]' do
-      subject { Article.tagged_with(:melborne) }
+      subject { Article.tagged_with(:names => :melbourne) }
 
       it { expect(subject.count).to eq 2 }
-      it { is_expected.to include melborne_article, melborne_oregon_article }
+      it { is_expected.to include melbourne_article, melbourne_oregon_article }
+      it { is_expected.not_to include oregon_article }
+    end
+
+    context 'given a denormalized tag name' do
+      subject { Article.tagged_with(:names => "MelbournE") }
+
+      it { expect(subject.count).to eq 2 }
+      it { is_expected.to include melbourne_article, melbourne_oregon_article }
       it { is_expected.not_to include oregon_article }
     end
 
     context 'given multiple tag names' do
-      subject { Article.tagged_with('melborne', 'oregon') }
+      subject { Article.tagged_with(:names => ['melbourne', 'oregon']) }
 
       it { expect(subject.count).to eq 3 }
-      it { is_expected.to include melborne_article, oregon_article, melborne_oregon_article }
+      it { is_expected.to include melbourne_article, oregon_article, melbourne_oregon_article }
     end
 
     context 'given an array of tag names' do
-      subject { Article.tagged_with(%w(melborne oregon)) }
+      subject { Article.tagged_with(:names => %w(melbourne oregon)) }
 
       it { expect(subject.count).to eq 3 }
-      it { is_expected.to include melborne_article, oregon_article, melborne_oregon_article }
+      it { is_expected.to include melbourne_article, oregon_article, melbourne_oregon_article }
     end
 
     context 'given a single tag instance' do
-      subject { Article.tagged_with(Gutentag::Tag.find_by_name('melborne')) }
+      subject { Article.tagged_with(:tags => Gutentag::Tag.find_by_name!('melbourne')) }
+
+      it { expect(subject.count).to eq 2 }
+      it { is_expected.to include melbourne_article, melbourne_oregon_article }
+      it { is_expected.not_to include oregon_article }
+      it { expect(subject.to_sql).not_to include 'gutentag_tags' }
+    end
+
+    context 'given a single tag id' do
+      subject { Article.tagged_with(:ids => Gutentag::Tag.find_by_name!('melbourne').id) }
 
       it { expect(subject.count).to eq 2 }
-      it { is_expected.to include melborne_article, melborne_oregon_article }
+      it { is_expected.to include melbourne_article, melbourne_oregon_article }
       it { is_expected.not_to include oregon_article }
+      it { expect(subject.to_sql).not_to include 'gutentag_tags' }
     end
 
     context 'given multiple tag objects' do
-      subject { Article.tagged_with(Gutentag::Tag.where(name: %w(melborne oregon))) }
+      subject { Article.tagged_with(:tags => Gutentag::Tag.where(name: %w(melbourne oregon))) }
 
       it { expect(subject.count).to eq 3 }
-      it { is_expected.to include melborne_article, oregon_article, melborne_oregon_article }
+      it { is_expected.to include melbourne_article, oregon_article, melbourne_oregon_article }
+      it { expect(subject.to_sql).not_to include 'gutentag_tags' }
     end
 
     context 'chaining where clause' do
-      subject { Article.tagged_with(%w(melborne oregon)).where(title: 'Overview') }
+      subject { Article.tagged_with(:names => %w(melbourne oregon)).where(title: 'Overview') }
+
+      it { expect(subject.count).to eq 1 }
+      it { is_expected.to include melbourne_article }
+      it { is_expected.not_to include oregon_article, melbourne_oregon_article }
+    end
+
+    context 'appended onto a relation' do
+      subject { Article.where(title: 'Overview').tagged_with(:names => %w(melbourne oregon)) }
+
+      it { expect(subject.count).to eq 1 }
+      it { is_expected.to include melbourne_article }
+      it { is_expected.not_to include oregon_article, melbourne_oregon_article }
+    end
+
+    context 'matching against all tags' do
+      subject { Article.tagged_with(:names => %w(melbourne oregon), :match => :all) }
 
       it { expect(subject.count).to eq 1 }
-      it { is_expected.to include melborne_article }
-      it { is_expected.not_to include oregon_article, melborne_oregon_article }
+      it { is_expected.to include melbourne_oregon_article }
+      it { is_expected.not_to include oregon_article, melbourne_article }
+    end
+
+    context 'matching against all tag ids' do
+      subject { Article.tagged_with(:ids => Gutentag::Tag.where(:name => %w(melbourne oregon)).pluck(:id), :match => :all) }
+
+      it { expect(subject.count).to eq 1 }
+      it { is_expected.to include melbourne_oregon_article }
+      it { is_expected.not_to include oregon_article, melbourne_article }
+    end
+
+    context 'matching against all one tag is the same as any' do
+      subject { Article.tagged_with(:names => %w(melbourne), :match => :all) }
+
+      it { expect(subject.count).to eq 2 }
+      it { is_expected.to include melbourne_article, melbourne_oregon_article }
+      it { is_expected.not_to include oregon_article }
+    end
+
+    context "deprecated" do
+      before { expect(ActiveSupport::Deprecation).to receive(:warn) }
+
+      context 'given a single tag name' do
+        subject { Article.tagged_with('melbourne') }
+
+        it { expect(subject.count).to eq 2 }
+        it { is_expected.to include melbourne_article, melbourne_oregon_article }
+        it { is_expected.not_to include oregon_article }
+      end
+
+      context 'given a single tag name[symbol]' do
+        subject { Article.tagged_with(:melbourne) }
+
+        it { expect(subject.count).to eq 2 }
+        it { is_expected.to include melbourne_article, melbourne_oregon_article }
+        it { is_expected.not_to include oregon_article }
+      end
+
+      context 'given a denormalized tag name' do
+        subject { Article.tagged_with("MelbournE") }
+
+        it { expect(subject.count).to eq 2 }
+        it { is_expected.to include melbourne_article, melbourne_oregon_article }
+        it { is_expected.not_to include oregon_article }
+      end
+
+      context 'given multiple tag names' do
+        subject { Article.tagged_with('melbourne', 'oregon') }
+
+        it { expect(subject.count).to eq 3 }
+        it { is_expected.to include melbourne_article, oregon_article, melbourne_oregon_article }
+      end
+
+      context 'given an array of tag names' do
+        subject { Article.tagged_with(%w(melbourne oregon)) }
+
+        it { expect(subject.count).to eq 3 }
+        it { is_expected.to include melbourne_article, oregon_article, melbourne_oregon_article }
+      end
+
+      context 'given a single tag instance' do
+        subject { Article.tagged_with(Gutentag::Tag.find_by_name!('melbourne')) }
+
+        it { expect(subject.count).to eq 2 }
+        it { is_expected.to include melbourne_article, melbourne_oregon_article }
+        it { is_expected.not_to include oregon_article }
+        it { expect(subject.to_sql).not_to include 'gutentag_tags' }
+      end
+
+      context 'given a single tag id' do
+        subject { Article.tagged_with(Gutentag::Tag.find_by_name!('melbourne').id) }
+
+        it { expect(subject.count).to eq 2 }
+        it { is_expected.to include melbourne_article, melbourne_oregon_article }
+        it { is_expected.not_to include oregon_article }
+        it { expect(subject.to_sql).not_to include 'gutentag_tags' }
+      end
+
+      context 'given multiple tag objects' do
+        subject { Article.tagged_with(Gutentag::Tag.where(name: %w(melbourne oregon))) }
+
+        it { expect(subject.count).to eq 3 }
+        it { is_expected.to include melbourne_article, oregon_article, melbourne_oregon_article }
+        it { expect(subject.to_sql).not_to include 'gutentag_tags' }
+      end
+
+      context 'chaining where clause' do
+        subject { Article.tagged_with(%w(melbourne oregon)).where(title: 'Overview') }
+
+        it { expect(subject.count).to eq 1 }
+        it { is_expected.to include melbourne_article }
+        it { is_expected.not_to include oregon_article, melbourne_oregon_article }
+      end
     end
   end
 end

data/spec/gutentag_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Gutentag do
+  describe '.normalizer' do
+    it "downcases the provided name" do
+      expect(Gutentag.normaliser.call('Tasty Pancakes')).to eq('tasty pancakes')
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 class Article < ActiveRecord::Base
-  has_many_tags
+  Gutentag::ActiveRecord.call self
 end

data/spec/internal/config/database.yml

@@ -1,3 +1,14 @@
+<% if ENV["DATABASE"] == "mysql" %>
 test:
-  adapter:  sqlite3
-  database: db/combustion_test.sqlite
+  adapter: mysql2
+  database: gutentag
+  username: root
+<% elsif ENV["DATABASE"] == "postgres" %>
+test:
+  adapter: postgresql
+  database: gutentag
+<% else %>
+test:
+  adapter: sqlite3
+  database: db/gutentag.sqlite
+<% end %>

data/spec/models/gutentag/tag_spec.rb

@@ -39,11 +39,11 @@ describe Gutentag::Tag, :type => :model do
 
   describe '#name' do
     before :each do
-      allow(Gutentag::TagName).to receive(:call).and_return('waffles')
+      allow(Gutentag.normaliser).to receive(:call).and_return('waffles')
     end
 
     it "normalises the provided name" do
-      expect(Gutentag::TagName).to receive(:call).with('Pancakes').
+      allow(Gutentag.normaliser).to receive(:call).with('Pancakes').
         and_return('waffles')
 
       Gutentag::Tag.create!(:name => 'Pancakes')

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'bundler'
+require 'bundler/setup'
 
 Bundler.require :default, :development
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gutentag
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,6 +66,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.5.5
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  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: 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'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -132,19 +160,25 @@ files:
 - gemfiles/rails_4_1.gemfile
 - gemfiles/rails_4_2.gemfile
 - gemfiles/rails_5_0.gemfile
+- gemfiles/rails_5_1.gemfile
 - gutentag.gemspec
 - lib/gutentag.rb
 - lib/gutentag/active_record.rb
+- lib/gutentag/active_record/class_methods.rb
+- lib/gutentag/active_record/instance_methods.rb
 - lib/gutentag/dirty.rb
 - lib/gutentag/engine.rb
+- lib/gutentag/has_many_tags.rb
 - lib/gutentag/persistence.rb
-- lib/gutentag/tag_name.rb
-- lib/gutentag/tag_names.rb
 - lib/gutentag/tag_validations.rb
+- lib/gutentag/tagged_with.rb
+- lib/gutentag/tagged_with/id_query.rb
+- lib/gutentag/tagged_with/name_query.rb
+- lib/gutentag/tagged_with/query.rb
 - spec/acceptance/tag_names_spec.rb
 - spec/acceptance/tags_spec.rb
 - spec/gutentag/active_record_spec.rb
-- spec/gutentag/tag_name_spec.rb
+- spec/gutentag_spec.rb
 - spec/internal/app/models/article.rb
 - spec/internal/config/database.yml
 - spec/internal/db/schema.rb
@@ -172,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Good Tags

data/lib/gutentag/tag_name.rb

@@ -1,17 +0,0 @@
-class Gutentag::TagName
-  def self.call(name)
-    new(name).to_s
-  end
-
-  def initialize(name)
-    @name = name
-  end
-
-  def to_s
-    name.downcase
-  end
-
-  private
-
-  attr_reader :name
-end

data/lib/gutentag/tag_names.rb

@@ -1,21 +0,0 @@
-class Gutentag::TagNames
-  def self.call(*names)
-    new(names).call
-  end
-
-  def initialize(names)
-    @names = names.flatten
-  end
-
-  def call
-    name_values.collect { |name| Gutentag::TagName.call name }
-  end
-
-  private
-
-  attr_reader :names
-
-  def name_values
-    names.collect { |name| name.respond_to?(:name) ? name.name : name.to_s }
-  end
-end

data/spec/gutentag/tag_name_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe Gutentag::TagName do
-  describe '.call' do
-    it "downcases the provided name" do
-      expect(Gutentag::TagName.call('Tasty Pancakes')).to eq('tasty pancakes')
-    end
-  end
-end