rocket_tag 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/rocket_tag/taggable.rb

@@ -62,37 +62,55 @@ module RocketTag
         @rocket_tag ||= RocketTag::Taggable::Manager.new(self)
       end
 
-      def with_tag_context context
+      def _with_tag_context context
         if context
           where{taggings.context == my{context} }
         else
-          where{}
+          where{ }
         end
       end
 
-      def tagged_with tags_list, options = {}
+      def _with_all condition, tags_list
+          if condition
+              group{~id}.
+              having{count(~id)==my{tags_list.length}}
+          else
+              where{}
+          end
+      end
 
+      # Generates a sifter or a where clause depending on options.
+      # The sifter generates a subselect with the body of the
+      # clause wrapped up so that it can be used as a condition
+      # within another squeel statement. 
+      #
+      # Query optimization is left up to the SQL engine.
+      def tagged_with_sifter tags_list, options = {}
         on = options.delete :on
         all = options.delete :all
 
-        q = if all
-              joins{tags}.where{
-                id.in( 
-                    my{self}.
-                      select{id}.
-                      joins{tags}.
-                      where{tags.name.in(my{tags_list})}.
-                      group{~id}.
-                      having{count(~id)==my{tags_list.length}}.
-                      with_tag_context(my{on})
-                )
-              }
-        else
-          joins{tags}.where{tags.name.in(my{tags_list})}.with_tag_context(on)
-        end
+        proc do |&block|
+            if options.delete :where
+              where &block
+            else
+              squeel &block
+            end
+        end.call {
+          id.in( 
+              my{self}.
+                select{id}.
+                joins{tags}.
+                where{ tags.name.in(my{tags_list})}.
+                _with_tag_context(my{on}).
+                _with_all(my{all}, my{tags_list})
+          )
+        }
 
-        q.select{"distinct #{my{table_name}}.*"}
+      end
 
+      def tagged_with tags_list, options = {}
+        options[:where] = true
+        tagged_with_sifter(tags_list, options)
       end
 
       def attr_taggable *contexts

data/rocket_tag.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rocket_tag}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Brad Phelan}]
-  s.date = %q{2011-09-16}
+  s.date = %q{2011-09-19}
   s.description = %q{}
   s.email = %q{bradphelan@xtargets.com}
   s.extra_rdoc_files = [

data/spec/rocket_tag/taggable_spec.rb

@@ -56,55 +56,6 @@ describe TaggableModel do
     end
   end
 
-
-  it "allows me to get funky with Squeel and ActiveRelation" do
-
-    sql = <<-EOF.gsub(/\s+/, ' ').strip
-      SELECT "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" 
-        AND taggings.context = 'skills' 
-      WHERE 
-        "tags"."name" = 'foo'
-    EOF
-
-    TaggableModel.joins{skills_tags}.where{skills_tags.name == "foo"}.to_sql.should == sql
-
-    sql = <<-EOF.gsub(/\s+/, ' ').strip
-        SELECT distinct 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" IN 
-            (SELECT "taggable_models"."id" 
-              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 "tags"."name" 
-              IN ('a', 'b') 
-              GROUP BY "taggable_models"."id" 
-              HAVING count("taggable_models"."id") = 2) 
-          AND 
-            (created_at > '2011-09-16 05:41')
-       EOF
-    
-    TaggableModel.tagged_with(["a", "b"], :all =>true).where(["created_at > ?", "2011-09-16 05:41"]).to_sql.should == sql
-  end
-
-
   describe "combining with active relation" do
     before :each do
       TaggableModel.create :name => "test 0", :needs => %w[x y z]

metadata

@@ -2,7 +2,7 @@
 name: rocket_tag
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Brad Phelan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-16 00:00:00 Z
+date: 2011-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3759555627206033387
+      hash: -1469878759169325224
       segments: 
       - 0
       version: "0"