rocket_tag 0.3.1 → 0.4.0

data/Gemfile

@@ -3,14 +3,14 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem "activerecord", ">= 3.2.0"
-gem "squeel", :require => false
+gem "squeel", '~> 1.0.0', :require => false
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec", "~> 2.3.0"
   gem "yard", "~> 0.6.0"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", "~> 1.1.0"
   gem "jeweler", "~> 1.6.4"
   #gem "rcov", ">= 0"
   gem 'sqlite3'

data/Gemfile.lock

@@ -1,18 +1,18 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.0)
-      activesupport (= 3.2.0)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-    activerecord (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-      arel (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.0)
+    activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.0)
+    arel (3.0.2)
     builder (3.0.0)
     diff-lcs (1.1.3)
     git (1.2.5)
@@ -21,7 +21,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    multi_json (1.0.4)
+    multi_json (1.3.4)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     rake (0.9.2.2)
@@ -34,11 +34,11 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
     sqlite3 (1.3.5)
-    squeel (0.9.5)
+    squeel (1.0.1)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
       polyamorous (~> 0.5.0)
-    tzinfo (0.3.31)
+    tzinfo (0.3.33)
     yard (0.6.8)
 
 PLATFORMS
@@ -46,10 +46,10 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (>= 3.2.0)
-  bundler (~> 1.0.0)
+  bundler (~> 1.1.0)
   jeweler (~> 1.6.4)
   rake
   rspec (~> 2.3.0)
   sqlite3
-  squeel
+  squeel (~> 1.0.0)
   yard (~> 0.6.0)

data/README.md

@@ -33,60 +33,69 @@ Usage
 	item.habits = ["forking", "talking"]
 
 
-	# Match any tag across any contexts
-	TaggableModel.tagged_with ["forking", "kiting"]  
+Match any tag across any contexts
 
-	# Match all tags across any contexts
-	TaggableModel.tagged_with ["forking", "kiting"], :all => true
+    TaggableModel.tagged_with ["forking", "kiting"]  
 
-	# Match any tag on a specific context
-	TaggableModel.tagged_with ["math", "kiting"], :on => "skills"
+Match all tags across any contexts
 
-	# Match all tags on a specific context
-	TaggableModel.tagged_with ["math", "kiting"], :all => true, :on => "skills"
+    TaggableModel.tagged_with ["forking", "kiting"], :all => true
+
+Match any tag on a specific context
+
+    TaggableModel.tagged_with ["math", "kiting"], :on => "skills"
+
+Match all tags on a specific context
+
+    TaggableModel.tagged_with ["math", "kiting"], :all => true, :on => "skills"
 	
-	# Match a miniumum number of tags
-	TaggableModel.tagged_with ["math", "kiting", "coding", "sleeping"], :min => 2, :on => "skills"
+Match a miniumum number of tags
+
+    TaggableModel.tagged_with ["math", "kiting", "coding", "sleeping"], :min => 2, :on => "skills"
 	
-	# Take advantage of the tags_count synthetic column returned with every query
-	TaggableModel.tagged_with(["math", "kiting", "coding", "sleeping"], :on => "skills").where{tags_count>=2}	
-
-	# Mix with active relation 
-	TaggableModel.tagged_with(["forking", "kiting"]).where( ["created_at > ?", Time.zone.now.ago(5.hours)])  
-
-  # Find similar models based on tags on a specific context and return in decending order
-  # of 'tags_count'
-  model.find_similar :on => "skills"
-  model.find_similar :on => "habits"
-
-  # Find similar models based on tags on every context and return in decending order
-  # of 'tags_count'. Note that each tag is still scoped according to it's context
-  model.find_similar  
-
-  # For reference the SQL generated for model.find_similar when there are
-  # context [:skills, :languages] available is
-
-  SELECT "taggable_models".* FROM   
-        (
-          SELECT COUNT("taggable_models"."id") AS tags_count, 
-                 taggable_models.* 
-          FROM   "taggable_models" 
-                 INNER JOIN "taggings" 
-                   ON "taggings"."taggable_id" = "taggable_models"."id" 
-                      AND "taggings"."taggable_type" = 'TaggableModel' 
-                 INNER JOIN "tags" 
-                   ON "tags"."id" = "taggings"."tag_id" 
-          WHERE  "taggable_models"."id" != 2 
-                 AND ((   ( "tags"."name" IN ( 'german', 'french' ) AND "taggings"."context" = 'languages' ) 
-                       OR ( "tags"."name" IN ( 'a', 'b', 'x' )      AND "taggings"."context" = 'skills' ) 
-                     )) 
-          GROUP  BY "taggable_models"."id" 
-          ORDER  BY tags_count DESC
-        ) taggable_models 
-
-
-    # Note the aliasing of the inner select to shield the GROUP BY from downstream active relation
-    # queries
+Take advantage of the tags_count synthetic column returned with every query
+
+    TaggableModel.tagged_with(["math", "kiting", "coding", "sleeping"], :on => "skills").where{tags_count>=2}	
+
+Mix with active relation 
+
+    TaggableModel.tagged_with(["forking", "kiting"]).where( ["created_at > ?", Time.zone.now.ago(5.hours)])  
+
+Find similar models based on tags on a specific context and return in decending order
+of 'tags_count'
+
+    model.tagged_similar :on => "skills"
+    model.tagged_similar :on => "habits"
+
+Find similar models based on tags on every context and return in decending order
+of 'tags_count'. Note that each tag is still scoped according to it's context
+
+    model.tagged_similar  
+
+For reference the SQL generated for model.tagged_similar when there are
+context [:skills, :languages] available is
+
+      SELECT "taggable_models".* FROM   
+            (
+              SELECT COUNT("taggable_models"."id") AS tags_count, 
+                     taggable_models.* 
+              FROM   "taggable_models" 
+                     INNER JOIN "taggings" 
+                       ON "taggings"."taggable_id" = "taggable_models"."id" 
+                          AND "taggings"."taggable_type" = 'TaggableModel' 
+                     INNER JOIN "tags" 
+                       ON "tags"."id" = "taggings"."tag_id" 
+              WHERE  "taggable_models"."id" != 2 
+                     AND ((   ( "tags"."name" IN ( 'german', 'french' ) AND "taggings"."context" = 'languages' ) 
+                           OR ( "tags"."name" IN ( 'a', 'b', 'x' )      AND "taggings"."context" = 'skills' ) 
+                         )) 
+              GROUP  BY "taggable_models"."id" 
+              ORDER  BY tags_count DESC
+            ) taggable_models 
+
+
+Note the aliasing of the inner select to shield the GROUP BY from downstream active relation
+queries
 
 == Contributing to rocket_tag
  
@@ -103,3 +112,5 @@ Usage
 Copyright (c) 2011 Brad Phelan. See LICENSE.txt for
 further details.
 
+Available for hire for your next ROR project at <a href="http://xtargets.com" title="XTargets: Ruby On Rails Solutions" rel="author">XTargets: Ruby On Rails Solutions</a>
+

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/rocket_tag/taggable.rb

@@ -23,7 +23,7 @@ module RocketTag
           # but must be
           #
           #     hello,"foo"
-
+          return [] if list.empty?
           list = list.gsub /,\s+"/, ',"'
           list = list.parse_csv.map &:strip
         else
@@ -52,13 +52,13 @@ module RocketTag
     end
 
     module InstanceMethods
-      def reload
-        super
+      def reload_with_tags(options = nil)
         self.class.rocket_tag.contexts.each do |context|
           write_context context, []
         end
         @tags_cached = false
         cache_tags
+        reload_without_tags(options)
       end
 
       def cache_tags
@@ -114,7 +114,7 @@ module RocketTag
         inner = self.class.select{count(~id).as(tags_count)}.
         select("#{self.class.table_name}.*").
         joins{tags}.where{condition}.
-        group{~id}.
+        group(self.class.column_names.map{|col| "#{self.class.table_name}.#{col}"}).
         where{~id != my{id}}.
         order("tags_count DESC")
 
@@ -153,12 +153,12 @@ module RocketTag
       def tagged_with tags_list, options = {}
         on = options.delete :on
 
-        inner = select{count(~id).as(tags_count)}
-            .select("#{self.table_name}.*").
+        inner = select{count(~id).as(tags_count)}.
+            select("#{self.table_name}.*").
             joins{tags}.
             where{tags.name.in(my{tags_list})}.
             _with_tag_context(on).
-            group{~id}
+            group(self.column_names.map{|col| "#{self.table_name}.#{col}"})
 
         # Wrap the inner query with an outer query to shield
         # the group and aggregate clauses from downstream
@@ -183,6 +183,50 @@ module RocketTag
 
       end
 
+      # Generates a query that returns list of popular tags
+      # for given model with an extra column :tags_count.
+      def popular_tags options={}
+        context = options.delete :on
+        if context
+          if context.class == Array
+            contexts = context
+          else
+            contexts = [context]
+          end
+        else
+          contexts = []
+        end
+
+        conditions = contexts.map do |context|
+          squeel do
+            (taggings.context == my{context})
+          end
+        end
+
+        condition = conditions.inject do |s, t|
+          s | t
+        end
+        inner = RocketTag::Tag.select{count(~id).as(tags_count)}.
+            select("#{RocketTag::Tag.table_name}.*").
+            joins{taggings.outer}.where{condition}.
+            where{ taggings.taggable_type == my{self.to_s} }.
+            group{~id} #.
+            #order("tags_count DESC")
+        r = from("(#{inner.to_sql}) #{table_name}")
+
+        if min = options.delete(:min)
+          r = r.where{tags_count>=my{min}}
+        end
+
+        if options.delete :sifter
+          squeel do
+            id.in(r.select{"id"})
+          end
+        else
+          r.select("*")
+        end
+      end
+
       def setup_for_rocket_tag
         unless @setup_for_rocket_tag
           @setup_for_rocket_tag = true
@@ -227,11 +271,11 @@ module RocketTag
         end
       end
 
-      @@acts_as_rocket_tag = false
       def attr_taggable *contexts
-        unless @@acts_as_rocket_tag
+        unless class_variable_defined?(:@@acts_as_rocket_tag)
           include RocketTag::Taggable::InstanceMethods
-          @@acts_as_rocket_tag = true
+          class_variable_set(:@@acts_as_rocket_tag, true)
+          alias_method_chain :reload, :tags
         end
 
         if contexts.blank?
@@ -284,8 +328,6 @@ module RocketTag
           end
         end
       end
-
     end
-
   end
 end

data/rocket_tag.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rocket_tag"
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brad Phelan"]
-  s.date = "2012-01-25"
+  s.date = "2012-06-18"
   s.description = ""
   s.email = "bradphelan@xtargets.com"
   s.extra_rdoc_files = [
@@ -50,29 +50,29 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 3.2.0"])
-      s.add_runtime_dependency(%q<squeel>, [">= 0"])
+      s.add_runtime_dependency(%q<squeel>, ["~> 1.0.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 3.2.0"])
-      s.add_dependency(%q<squeel>, [">= 0"])
+      s.add_dependency(%q<squeel>, ["~> 1.0.0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 3.2.0"])
-    s.add_dependency(%q<squeel>, [">= 0"])
+    s.add_dependency(%q<squeel>, ["~> 1.0.0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])

data/spec/rocket_tag/taggable_spec.rb

@@ -14,6 +14,11 @@ describe TaggableModel do
       m = TaggableModel.new :skills => %q%hello, "is it me, you are looking for", cat%
       m.skills.should == ["hello", "is it me, you are looking for", "cat"]
     end
+
+    it "parses an empty string to an empty array" do
+      m = TaggableModel.new :skills => ""
+      m.skills.should == []
+    end
   end
 
   describe "#save" do
@@ -317,8 +322,21 @@ describe TaggableModel do
         end
 
       end
-
+      
+      describe "#popular_tags" do
+        it "should return correct list (and correctly ordered) of popular tags for class and context" do
+          TaggableModel.popular_tags.all.length.should == RocketTag::Tag.all.count
+          TaggableModel.popular_tags.limit(10).all.length.should == 10
+          TaggableModel.popular_tags.order('tags_count desc, name desc').first.name.should == 'c'
+          TaggableModel.popular_tags.order('id asc').first.name.should == 'a'
+          TaggableModel.popular_tags.order('id asc').last.name.should == 'jinglish'
+          TaggableModel.popular_tags(:on=>:skills).order('name asc').first.name.should == 'a'
+          TaggableModel.popular_tags(:on=>:skills).order('name asc').last.name.should == 'y'
+          TaggableModel.popular_tags(:on=>[:skills, :languages]).order('id asc').first.name.should == 'a'
+          TaggableModel.popular_tags(:on=>[:skills, :languages]).order('id asc').last.name.should == 'jinglish'
+          TaggableModel.popular_tags(:min=>2).all.length.should == 6 ## dirty!
+        end
+      end
     end
   end
 end
-

metadata

@@ -2,7 +2,7 @@
 name: rocket_tag
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Brad Phelan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 Z
+date: 2012-06-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -28,9 +28,9 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -63,7 +63,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: *id005
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2545152122915663382
+      hash: -1357799826305458565
       segments: 
       - 0
       version: "0"