rocket_tag 0.2.0 → 0.3.1

data/README.md

@@ -48,10 +48,45 @@ Usage
 	# 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
 
 == Contributing to rocket_tag
  

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.1

data/lib/rocket_tag/taggable.rb

@@ -4,7 +4,7 @@ module RocketTag
   module Taggable
     def self.included(base)
       base.extend ClassMethods
-      base.send :include, InstanceMethods
+      #base.send :include, InstanceMethods
     end
 
     class Manager
@@ -80,19 +80,45 @@ module RocketTag
         @contexts ||= {}
         @contexts[context.to_sym] || []
       end
-    end
 
-    module InstanceMethods
       def tagged_similar options = {}
         context = options.delete :on
-        raise Exception.new("#{context} is not a valid tag context for #{self.class}") unless self.class.rocket_tag.contexts.include? context
+        if context
+          raise Exception.new("#{context} is not a valid tag context for #{self.class}") unless self.class.rocket_tag.contexts.include? context
+        end
         if context
           contexts = [context]
         else
           contexts = self.class.rocket_tag.contexts
         end
-        tags = send context.to_sym
-        self.class.tagged_with(tags, options).where{id != my{id}}
+
+        if contexts.size > 1
+          contexts = contexts.delete :tag
+        end
+
+        contexts = contexts.reject do |c|
+          send(c.to_sym).size == 0
+        end
+
+        conditions = contexts.map do |context|
+          _tags = send context.to_sym
+          self.class.squeel do
+            (tags.name.in(my{_tags}) & (taggings.context == my{context}))
+          end
+        end
+
+        condition = conditions.inject do |s, t|
+          s | t
+        end
+
+        inner = self.class.select{count(~id).as(tags_count)}.
+        select("#{self.class.table_name}.*").
+        joins{tags}.where{condition}.
+        group{~id}.
+        where{~id != my{id}}.
+        order("tags_count DESC")
+
+        r = self.class.from("(#{inner.to_sql}) #{self.class.table_name}")
       end
     end
 
@@ -201,7 +227,12 @@ module RocketTag
         end
       end
 
+      @@acts_as_rocket_tag = false
       def attr_taggable *contexts
+        unless @@acts_as_rocket_tag
+          include RocketTag::Taggable::InstanceMethods
+          @@acts_as_rocket_tag = true
+        end
 
         if contexts.blank?
           contexts = [:tag]

data/rocket_tag.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rocket_tag"
-  s.version = "0.2.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brad Phelan"]
-  s.date = "2012-01-24"
+  s.date = "2012-01-25"
   s.description = ""
   s.email = "bradphelan@xtargets.com"
   s.extra_rdoc_files = [

data/spec/rocket_tag/taggable_spec.rb

@@ -100,6 +100,7 @@ describe TaggableModel do
       @t01.languages =  [ "german" , "italian"]
 
       @t10.skills    =  [ "a"      , "c"]
+      @t10.languages =  [ "french" , "hebrew"]
 
       @t11.skills    =  [ "a"      , "c"]
 
@@ -165,9 +166,47 @@ describe TaggableModel do
     end
 
     describe "#tagged_similar" do
-      it "should work" do
+      it "should return similar items" do
         @t00.tagged_similar(:on => :skills).count.should == 3
+        @t00.tagged_similar(:on => :languages).count.should == 3
+        @t00.tagged_similar.count.should == 4
       end
+
+      it "should return similar items in the correct order with the correct tags_count" do 
+
+        # ----
+        similar = @t00.tagged_similar(:on => :skills).all
+        similar[0].id.should == @t01.id
+        similar[1].id.should == @t10.id
+        similar[2].id.should == @t11.id
+
+        similar[0].tags_count.should == 2
+        similar[1].tags_count.should == 1
+        similar[2].tags_count.should == 1
+
+        # ----
+        similar = @t00.tagged_similar(:on => :languages).all
+        similar[0].id.should == @t01.id
+        similar[1].id.should == @t10.id
+        similar[2].id.should == @t21.id
+
+        similar[0].tags_count.should == 1
+        similar[1].tags_count.should == 1
+        similar[2].tags_count.should == 1
+
+        # ----
+        similar = @t00.tagged_similar.all
+        similar[0].id.should == @t01.id
+        similar[1].id.should == @t10.id
+        similar[2].id.should == @t11.id
+        similar[3].id.should == @t21.id
+
+        similar[0].tags_count.should == 3
+        similar[1].tags_count.should == 2
+        similar[2].tags_count.should == 1
+        similar[3].tags_count.should == 1
+      end
+
     end
 
     describe "#tagged_with" do
@@ -237,8 +276,9 @@ describe TaggableModel do
               l_t[:user_id].count.as("count_all")
           ).as "foo"
 
-          puts TaggableModel.joins("JOIN " + counts.to_sql ).to_sql
+          #puts TaggableModel.joins("JOIN " + counts.to_sql ).to_sql
         end
+
         it "should" do
           u_t = Arel::Table::new :users
           l_t = Arel::Table::new :logs
@@ -256,7 +296,7 @@ describe TaggableModel do
             eq(counts[:user_id])).
             project("*").project(counts[:count_all])
 
-          puts users.to_sql
+          # puts users.to_sql
           
         end
       end
@@ -270,7 +310,6 @@ describe TaggableModel do
           x = TaggableModel.where do
             TaggableModel.tagged_with_sifter(["a", "b"]) & TaggableModel.tagged_with_sifter(["c"])
           end.to_sql
-          puts x
 
           TaggableModel.where do
             TaggableModel.tagged_with_sifter(["a", "b"])

metadata

@@ -2,7 +2,7 @@
 name: rocket_tag
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Brad Phelan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-24 00:00:00 Z
+date: 2012-01-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1107478710277863404
+      hash: 2545152122915663382
       segments: 
       - 0
       version: "0"