gutentag 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dda4e9077e5d19af15ad0ae9bab60a64147f4c11
-  data.tar.gz: dcd0271e7e842c8edf3fc25ba1f4254c4853369a
+  metadata.gz: fc8dba706d5b7e3075cf6043b26ab140b622fcb3
+  data.tar.gz: ac691b782f055f9f6d204731ba8b64d5ff21eb18
 SHA512:
-  metadata.gz: fc49c2eaa8236fd2991c5213fb53bce4077890135185f0cf5730331603a384813fe0ecf3427d370719e11931044095ba65297c38052a43a4343e396311e77d68
-  data.tar.gz: b734e64f5731e2458af240c09a26e650a2d103d5d9bdb8649c52a0cf9d868cb1d06f1fd0fd61271c93b4764c3a7ea0dfa79b3f61ae5e6e932e042bd6321977ff
+  metadata.gz: 245dc0526ff19021c898615a041e8938056ff459cd863e1a896b0990a0130826c4af08c5362e1e13806014d09c45939e7066af7b7a3fe8feda8f8475be3eb27d
+  data.tar.gz: cc4364399ddd4ec9d7dc1964f3359a02e32f1cf5af13baf2da3bee8b88f7a721a5e162f978c6f961c95401e201b9a26df581545e15b23d22134356545ffa553e

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.3.0'
+    gem 'gutentag', '~> 0.4.0'
 
 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

@@ -4,6 +4,8 @@ class Gutentag::Tag < ActiveRecord::Base
 
   attr_accessible :name if Rails.version.to_s < '4.0.0'
 
+  scope :by_weight, ->{ order('tags.taggings_count DESC') }
+
   validates :name, :presence => true, :uniqueness => {:case_sensitive => false}
 
   before_validation :normalise_name

data/app/models/gutentag/tagging.rb

@@ -1,6 +1,6 @@
 class Gutentag::Tagging < ActiveRecord::Base
   belongs_to :taggable, :polymorphic => true
-  belongs_to :tag, :class_name => 'Gutentag::Tag'
+  belongs_to :tag, :class_name => 'Gutentag::Tag', :counter_cache => true
 
   validates :taggable, :presence => true
   validates :tag,      :presence => true

data/db/migrate/2_gutentag_cache_counter.rb

@@ -0,0 +1,15 @@
+class GutentagCacheCounter < ActiveRecord::Migration
+  def up
+    add_column :tags, :taggings_count, :integer, :default => 0
+    add_index  :tags, :taggings_count
+
+    Gutentag::Tag.reset_column_information
+    Gutentag::Tag.pluck(:id).each do |tag_id|
+      Gutentag::Tag.reset_counters tag_id, :taggings
+    end
+  end
+
+  def down
+    remove_column :tags, :taggings_count
+  end
+end

data/db/migrate/3_no_null_counters.rb

@@ -0,0 +1,11 @@
+class NoNullCounters < ActiveRecord::Migration
+  def up
+    change_column :tags, :taggings_count, :integer, :default => 0,
+      :null => false
+  end
+
+  def down
+    change_column :tags, :taggings_count, :integer, :default => 0,
+      :null => true
+  end
+end

data/gutentag.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'gutentag'
-  s.version     = '0.3.0'
+  s.version     = '0.4.0'
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']
   s.homepage    = 'https://github.com/pat/gutentag'

data/lib/gutentag/active_record.rb

@@ -10,9 +10,7 @@ module Gutentag::ActiveRecord
       has_many :tags,     :class_name => 'Gutentag::Tag',
         :through => :taggings
 
-      after_save Gutentag::Persistence
-
-      attr_writer :tag_names
+      after_save { |instance| Gutentag::Persistence.new(instance).persist  }
     end
   end
 
@@ -23,4 +21,8 @@ module Gutentag::ActiveRecord
   def tag_names
     @tag_names ||= tags.collect(&:name)
   end
+
+  def tag_names=(names)
+    @tag_names = names
+  end
 end

data/lib/gutentag/persistence.rb

@@ -1,7 +1,6 @@
 class Gutentag::Persistence
-  def self.after_save(taggable)
-    new(taggable).persist
-  end
+
+  attr_writer :tagger, :normaliser
 
   def initialize(taggable)
     @taggable = taggable
@@ -22,17 +21,25 @@ class Gutentag::Persistence
 
   def add_new
     (changes - existing).each do |name|
-      taggable.tags << Gutentag::Tag.find_or_create(name)
+      taggable.tags << tagger.find_or_create(name)
     end
   end
 
   def normalised(names)
-    names.collect { |name| Gutentag::TagName.normalise(name) }.uniq
+    names.collect { |name| normaliser.call(name) }.uniq
   end
 
   def remove_old
     (existing - changes).each do |name|
-      taggable.tags.delete Gutentag::Tag.find_by_name(name)
+      taggable.tags.delete tagger.find_by_name(name)
     end
   end
+
+  def tagger
+    @tagger ||= Gutentag::Tag
+  end
+
+  def normaliser
+    @normaliser ||= Proc.new { |name| Gutentag::TagName.normalise(name) }
+  end
 end

data/spec/acceptance/tag_names_spec.rb

@@ -94,4 +94,8 @@ describe "Managing tags via names" do
 
     article.tag_names.should == ['melbourne', 'pancakes']
   end
+
+  it "allows overriding of tag_names=" do
+    Article.instance_methods(false).should_not include(:tag_names=)
+  end
 end

data/spec/acceptance/tags_spec.rb

@@ -35,4 +35,16 @@ describe 'Adding and removing tags' do
 
     Gutentag::Tagging.where(:tag_id => pancakes.id).count.should be_zero
   end
+
+  it 'should have a mean tag cloud' do
+    gorillas = Gutentag::Tag.create(:name => 'gorillas')
+    another_article = Article.create
+
+    article.tags << pancakes
+    Gutentag::Tag.by_weight.first.should == pancakes
+
+    article.tags << gorillas
+    another_article.tags << gorillas
+    Gutentag::Tag.by_weight.first.should == gorillas
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gutentag
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -82,6 +82,8 @@ files:
 - app/models/gutentag/tag.rb
 - app/models/gutentag/tagging.rb
 - db/migrate/1_gutentag_tables.rb
+- db/migrate/2_gutentag_cache_counter.rb
+- db/migrate/3_no_null_counters.rb
 - gutentag.gemspec
 - lib/gutentag.rb
 - lib/gutentag/active_record.rb