gutentag 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34f0e855c14d22751ac57bf0ddc8be91effd346c
-  data.tar.gz: 59c1247fd49e8cc37bb6e22b7fb3903567a8f5af
+  metadata.gz: 33f154c781133dc5cc122ae754f11216f6034916
+  data.tar.gz: 39d23400e618e07ec79d5ae0c211bedcaf8a78be
 SHA512:
-  metadata.gz: 03e82d9335afdbe03d9ac06625da1f2608d8394a6397ff405c293585ce38d3206f4bcc39285e8492ee4a49a8afabe101fe09f9772b557e88e8ab1c91999e9a97
-  data.tar.gz: ad34f1a97036b19f73d7e8edf48bac7a73bb8e1f25759107897ec2bfd43ad49943b7d61be7370b6f79756997b8bf646dadd9fbce4917d2ec96163b833eab806e
+  metadata.gz: ab28289725aecf21bbf6d620e83abb8acf90c579604e54c1bdaa851b888284380e0b3e031003fe621d30af8b31dc6fbe1dd12ee8fd7a118e8c67650c4991253c
+  data.tar.gz: ec3a116528231a1b3ddb9574c03df3e35b4592d88249b65d49ce992e2a4058cce9dc8316cdbdd2c613a4be986e6cd88370ab33ef3d6cce1b5c9d586005df8881

data/README.md

@@ -11,7 +11,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.2.0'
+    gem 'gutentag', '~> 0.2.1'
 
 Next: your tags get persisted to your database, so let's import and run the migrations to get the tables set up:
 

data/app/models/gutentag/tag.rb

@@ -2,10 +2,20 @@ class Gutentag::Tag < ActiveRecord::Base
   has_many :taggings, :class_name => 'Gutentag::Tagging',
     :dependent => :destroy
 
+  attr_accessible :name
+
   validates :name, :presence => true, :uniqueness => {:case_sensitive => false}
 
   before_validation :normalise_name
 
+  def self.find_by_name(name)
+    where(:name => Gutentag::TagName.normalise(name)).first
+  end
+
+  def self.find_or_create(name)
+    find_by_name(name) || create(:name => name)
+  end
+
   private
 
   def normalise_name

data/gutentag.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'gutentag'
-  s.version     = '0.2.0'
+  s.version     = '0.2.1'
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']
   s.homepage    = 'https://github.com/pat/gutentag'
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency     'activerecord', '>= 3.2.0'
-  s.add_development_dependency 'combustion',   '~> 0.4.0'
+  s.add_development_dependency 'combustion',   '~> 0.5.0'
   s.add_development_dependency 'rspec-rails',  '~> 2.13'
   s.add_development_dependency 'sqlite3',      '~> 1.3.7'
 end

data/lib/gutentag/tag_names.rb

@@ -2,10 +2,7 @@ class Gutentag::TagNames
   include Enumerable
 
   def self.new_with_names(taggable, names)
-    tag_names = new(taggable)
-    tag_names.clear
-    names.each { |name| tag_names << Gutentag::TagName.normalise(name) }
-    tag_names
+    new(taggable).replace names
   end
 
   def initialize(taggable)
@@ -17,7 +14,7 @@ class Gutentag::TagNames
   end
 
   def +(array)
-    (normalised(array) - to_a).each { |name| self.<< name }
+    normalised(array).each { |name| self.<< name }
 
     self
   end
@@ -29,9 +26,7 @@ class Gutentag::TagNames
   end
 
   def <<(name)
-    name = Gutentag::TagName.normalise name
-    tag  = Gutentag::Tag.where(:name => name).first ||
-           Gutentag::Tag.create(:name => name)
+    tag = Gutentag::Tag.find_or_create name
 
     taggable.tags << tag unless taggable.tags.include?(tag)
   end
@@ -49,13 +44,18 @@ class Gutentag::TagNames
   end
 
   def delete(name)
-    taggable.tags.delete Gutentag::Tag.where(:name => name).first
+    taggable.tags.delete Gutentag::Tag.find_by_name(name)
   end
 
   def each(&block)
     to_a.each &block
   end
 
+  def replace(names)
+    clear
+    self.+ names
+  end
+
   private
 
   attr_reader :taggable

data/spec/models/gutentag/tag_spec.rb

@@ -1,6 +1,42 @@
 require 'spec_helper'
 
 describe Gutentag::Tag do
+  describe '.find_by_name' do
+    it "returns a tag with the same name" do
+      existing = Gutentag::Tag.create! :name => 'pancakes'
+
+      Gutentag::Tag.find_by_name('pancakes').should == existing
+    end
+
+    it "returns a tag with the same normalised name" do
+      existing = Gutentag::Tag.create! :name => 'pancakes'
+
+      Gutentag::Tag.find_by_name('Pancakes').should == existing
+    end
+
+    it "otherwise returns nil" do
+      Gutentag::Tag.find_by_name('pancakes').should be_nil
+    end
+  end
+
+  describe '.find_or_create' do
+    it "returns a tag with the same name" do
+      existing = Gutentag::Tag.create! :name => 'pancakes'
+
+      Gutentag::Tag.find_or_create('pancakes').should == existing
+    end
+
+    it "returns a tag with the same normalised name" do
+      existing = Gutentag::Tag.create! :name => 'pancakes'
+
+      Gutentag::Tag.find_or_create('Pancakes').should == existing
+    end
+
+    it "creates a new tag if no matches exist" do
+      Gutentag::Tag.find_or_create('pancakes').should be_persisted
+    end
+  end
+
   describe '#name' do
     before :each do
       Gutentag::TagName.stub :normalise => 'waffles'

data/spec/models/gutentag/tagging_spec.rb

@@ -6,11 +6,15 @@ describe Gutentag::Tagging do
     let(:taggable) { Article.create! }
 
     it "ensures tags are unique for any given taggable" do
-      Gutentag::Tagging.create! :tag => tag, :taggable => taggable
+      tagging = Gutentag::Tagging.new
+      tagging.tag      = tag
+      tagging.taggable = taggable
+      tagging.save!
 
-      Gutentag::Tagging.create(
-        :tag => tag, :taggable => taggable
-      ).should have(1).error_on(:tag_id)
+      tagging = Gutentag::Tagging.new
+      tagging.tag      = tag
+      tagging.taggable = taggable
+      tagging.should have(1).error_on(:tag_id)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gutentag
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement