gutentag 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41b7dca53fda65125a90143737854b6fefda5156
-  data.tar.gz: b0a453c0aa5aa9f40455f3f656c4f74376cdf828
+  metadata.gz: a963454a3117dc737b8d4e70e8a02c22c2c2693e
+  data.tar.gz: bc7c540a51edbabb378370b9157451a29dcbbfdb
 SHA512:
-  metadata.gz: 7331fcc7c2865f3eb6c9c734b7abcbe9e1ae16fc570868b978a78b6d26467ddf04235810f788dcec3e915faed6f7927009e2ccc4bbe0e7fc2e3473521cbcfa70
-  data.tar.gz: 64b42b9c53f92897b833464b5040bc2fa698f39cbe31c8142d9f5367a137fdc23def53960da25e4ebae6e579bb2395f44586259b0033e9423d0b48eb1bf9b270
+  metadata.gz: aaf39b46f22f2348b87dbc8d574d17d5d2b5728810980c16b1c344d894900701ff3434e43f2794c6ce3ce2515039de6fe887161110ee0aa4f0aa54db8152b1b1
+  data.tar.gz: 835f63c380604816cd1e5014960f3e75e199f167705635f45cea36467c288b0da7e504c1fa4ad8d35763aec26714cb6a754d58821ed54a244ca906e39cac7d0d

data/.travis.yml

@@ -2,7 +2,9 @@ language: ruby
 script: bundle exec appraisal rspec
 rvm:
   - 2.0.0
-  - 2.2.0
+  - 2.2.2
+  - 2.3.3
+  - 2.4.0
 before_install:
   - gem install bundler
 before_script:

data/Appraisals

@@ -1,15 +1,27 @@
 appraise 'rails_3_2' do
-  gem 'rails',  '~> 3.2.21'
-end if RUBY_VERSION < '2.2.0'
+  gem 'rails',    '~> 3.2.22.5'
+  gem 'rack',     '~> 1.0',   :platforms => [:ruby_20, :ruby_21]
+  gem 'nokogiri', '~> 1.6.0', :platforms => [:ruby_20]
+end if RUBY_VERSION.to_f < 2.2
 
 appraise 'rails_4_0' do
-  gem 'rails', '~> 4.0.13'
-end
+  gem 'rails',    '~> 4.0.13'
+  gem 'rack',     '~> 1.0', :platforms => [:ruby_20, :ruby_21]
+  gem 'nokogiri', '~> 1.6.0', :platforms => [:ruby_20]
+end if RUBY_VERSION.to_f < 2.4
 
 appraise 'rails_4_1' do
-  gem 'rails', '~> 4.1.13'
-end
+  gem 'rails',    '~> 4.1.16'
+  gem 'rack',     '~> 1.0', :platforms => [:ruby_20, :ruby_21]
+  gem 'nokogiri', '~> 1.6.0', :platforms => [:ruby_20]
+end if RUBY_VERSION.to_f < 2.4
 
 appraise 'rails_4_2' do
-  gem 'rails', '~> 4.2.4'
-end
+  gem 'rails',    '~> 4.2.7'
+  gem 'rack',     '~> 1.0',   :platforms => [:ruby_20, :ruby_21]
+  gem 'nokogiri', '~> 1.6.0', :platforms => [:ruby_20]
+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

data/Gemfile

@@ -3,3 +3,5 @@ source 'https://rubygems.org'
 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

data/README.md

@@ -12,7 +12,7 @@ This was built partly as a proof-of-concept, and partly to see how a tagging gem
 
 Get it into your Gemfile - and don't forget the version constraint!
 
-    gem 'gutentag', '~> 0.7.0'
+    gem 'gutentag', '~> 0.8.0'
 
 Next: your tags get persisted to your database, so let's import and run the migrations to get the tables set up:
 
@@ -44,6 +44,14 @@ If you want to use Gutentag outside of Rails, you can. However, this means you l
 
 ## Upgrading
 
+### 0.8.0
+
+No breaking changes.
+
+### 0.7.0
+
+No breaking changes.
+
 ### 0.6.0
 
 Rails 4.2 is supported as of Gutentag 0.6.0 - but please note that due to internal changes in ActiveRecord, changes to tag_names will no longer be tracked by your model's dirty state. This feature will continue to work in Rails 3.2 through to 4.1 though.
@@ -80,6 +88,12 @@ Changes to tag_names are not persisted immediately - you must save your taggable
     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">]
+
 ## Contribution
 
 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.

data/app/models/gutentag/tag.rb

@@ -8,7 +8,7 @@ class Gutentag::Tag < ActiveRecord::Base
 
   scope :by_weight, ->{ order('gutentag_tags.taggings_count DESC') }
 
-  validates :name, :presence => true, :uniqueness => {:case_sensitive => false}
+  Gutentag.tag_validations.call self
 
   before_validation :normalise_name
 

data/gemfiles/rails_3_2.gemfile

@@ -3,6 +3,8 @@
 source "https://rubygems.org"
 
 gem "test-unit", :platform => :ruby_22
-gem "rails", "~> 3.2.21"
+gem "rack", "~> 1.0", :platforms => [:ruby_20, :ruby_21]
+gem "rails", "~> 3.2.22.5"
+gem "nokogiri", "~> 1.6.0", :platforms => [:ruby_20]
 
 gemspec :path => "../"

data/gemfiles/rails_4_0.gemfile

@@ -4,5 +4,7 @@ source "https://rubygems.org"
 
 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]
 
 gemspec :path => "../"

data/gemfiles/rails_4_1.gemfile

@@ -3,6 +3,8 @@
 source "https://rubygems.org"
 
 gem "test-unit", :platform => :ruby_22
-gem "rails", "~> 4.1.13"
+gem "rails", "~> 4.1.16"
+gem "rack", "~> 1.0", :platforms => [:ruby_20, :ruby_21]
+gem "nokogiri", "~> 1.6.0", :platforms => [:ruby_20]
 
 gemspec :path => "../"

data/gemfiles/rails_4_2.gemfile

@@ -3,6 +3,8 @@
 source "https://rubygems.org"
 
 gem "test-unit", :platform => :ruby_22
-gem "rails", "~> 4.2.4"
+gem "rails", "~> 4.2.7"
+gem "rack", "~> 1.0", :platforms => [:ruby_20, :ruby_21]
+gem "nokogiri", "~> 1.6.0", :platforms => [:ruby_20]
 
 gemspec :path => "../"

data/gemfiles/rails_5_0.gemfile

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

data/gutentag.gemspec

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

data/lib/gutentag/active_record.rb

@@ -3,6 +3,8 @@ require 'active_support/concern'
 module Gutentag::ActiveRecord
   extend ActiveSupport::Concern
 
+  UNIQUENESS_METHOD = ActiveRecord::VERSION::MAJOR == 3 ? :uniq : :distinct
+
   module ClassMethods
     def has_many_tags
       has_many :taggings, :class_name => 'Gutentag::Tagging', :as => :taggable,
@@ -10,7 +12,13 @@ module Gutentag::ActiveRecord
       has_many :tags,     :class_name => 'Gutentag::Tag',
         :through => :taggings
 
-      after_save { |instance| Gutentag::Persistence.new(instance).persist  }
+      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
 
@@ -27,4 +35,10 @@ module Gutentag::ActiveRecord
 
     @tag_names = names
   end
+
+  private
+
+  def persist_tags
+    Gutentag::Persistence.new(self).persist
+  end
 end

data/lib/gutentag/tag_names.rb

@@ -0,0 +1,21 @@
+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/lib/gutentag/tag_validations.rb

@@ -0,0 +1,18 @@
+class Gutentag::TagValidations
+  def self.call(klass)
+    new(klass).call
+  end
+
+  def initialize(klass)
+    @klass = klass
+  end
+
+  def call
+    klass.validates :name, :presence => true,
+      :uniqueness => {:case_sensitive => false}
+  end
+
+  private
+
+  attr_reader :klass
+end

data/lib/gutentag.rb

@@ -16,12 +16,22 @@ module Gutentag
   def self.normaliser=(normaliser)
     @normaliser = normaliser
   end
+
+  def self.tag_validations
+    @tag_validations ||= Gutentag::TagValidations
+  end
+
+  def self.tag_validations=(tag_validations)
+    @tag_validations = tag_validations
+  end
 end
 
 require 'gutentag/active_record'
 require 'gutentag/dirty'
 require 'gutentag/persistence'
 require 'gutentag/tag_name'
+require 'gutentag/tag_names'
+require 'gutentag/tag_validations'
 
 if ActiveRecord::VERSION::MAJOR == 3
   Gutentag.dirtier = Gutentag::Dirty
@@ -33,7 +43,7 @@ if defined?(Rails::Engine)
   require 'gutentag/engine'
 else
   require 'active_record'
-  ActiveRecord::Base.include Gutentag::ActiveRecord
+  ActiveRecord::Base.send :include, Gutentag::ActiveRecord
   require File.expand_path(
     './../app/models/gutentag/tag', File.dirname(__FILE__)
   )

data/spec/gutentag/active_record_spec.rb

@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe Gutentag::ActiveRecord do
+  describe '.tagged_with' do
+    let!(:melborne_article) do
+      article = Article.create :title => 'Overview'
+      article.tag_names << 'melborne'
+      article.save!
+      article
+    end
+
+    let!(:oregon_article) do
+      article = Article.create
+      article.tag_names << 'oregon'
+      article.save!
+      article
+    end
+
+    let!(:melborne_oregon_article) do
+      article = Article.create
+      article.tag_names = %w(oregon melborne)
+      article.save!
+      article
+    end
+
+    context 'given a single tag name' do
+      subject { Article.tagged_with('melborne') }
+
+      it { expect(subject.count).to eq 2 }
+      it { is_expected.to include melborne_article, melborne_oregon_article }
+      it { is_expected.not_to include oregon_article }
+    end
+
+    context 'given a single tag name[symbol]' do
+      subject { Article.tagged_with(:melborne) }
+
+      it { expect(subject.count).to eq 2 }
+      it { is_expected.to include melborne_article, melborne_oregon_article }
+      it { is_expected.not_to include oregon_article }
+    end
+
+    context 'given multiple tag names' do
+      subject { Article.tagged_with('melborne', 'oregon') }
+
+      it { expect(subject.count).to eq 3 }
+      it { is_expected.to include melborne_article, oregon_article, melborne_oregon_article }
+    end
+
+    context 'given an array of tag names' do
+      subject { Article.tagged_with(%w(melborne oregon)) }
+
+      it { expect(subject.count).to eq 3 }
+      it { is_expected.to include melborne_article, oregon_article, melborne_oregon_article }
+    end
+
+    context 'given a single tag instance' do
+      subject { Article.tagged_with(Gutentag::Tag.find_by_name('melborne')) }
+
+      it { expect(subject.count).to eq 2 }
+      it { is_expected.to include melborne_article, melborne_oregon_article }
+      it { is_expected.not_to include oregon_article }
+    end
+
+    context 'given multiple tag objects' do
+      subject { Article.tagged_with(Gutentag::Tag.where(name: %w(melborne oregon))) }
+
+      it { expect(subject.count).to eq 3 }
+      it { is_expected.to include melborne_article, oregon_article, melborne_oregon_article }
+    end
+
+    context 'chaining where clause' do
+      subject { Article.tagged_with(%w(melborne oregon)).where(title: 'Overview') }
+
+      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 }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,10 +1,5 @@
 require 'bundler'
 
-# Get Bundler set up
-Bundler.setup :default, :development
-# Require Rails first
-require 'rails'
-# Then require everything else
 Bundler.require :default, :development
 
 Combustion.initialize! :active_record
@@ -12,5 +7,9 @@ Combustion.initialize! :active_record
 require 'rspec/rails'
 
 RSpec.configure do |config|
-  config.use_transactional_fixtures = true
+  if config.respond_to?(:use_transactional_tests)
+    config.use_transactional_tests = true
+  else
+    config.use_transactional_fixtures = true
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gutentag
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +131,7 @@ files:
 - gemfiles/rails_4_0.gemfile
 - gemfiles/rails_4_1.gemfile
 - gemfiles/rails_4_2.gemfile
+- gemfiles/rails_5_0.gemfile
 - gutentag.gemspec
 - lib/gutentag.rb
 - lib/gutentag/active_record.rb
@@ -138,8 +139,11 @@ files:
 - lib/gutentag/engine.rb
 - lib/gutentag/persistence.rb
 - lib/gutentag/tag_name.rb
+- lib/gutentag/tag_names.rb
+- lib/gutentag/tag_validations.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/internal/app/models/article.rb
 - spec/internal/config/database.yml
@@ -168,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Good Tags