rocket_tag 0.0.4 → 0.1.0

data/.rvmrc

@@ -0,0 +1,2 @@
+rvm ruby-1.9.2@rocket_tag
+

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem "activerecord", ">= 3.1.0"
+gem "activerecord", ">= 3.2.0"
 gem "squeel", :require => false
 
 # Add dependencies to develop your gem here.
@@ -12,6 +12,7 @@ group :development do
   gem "yard", "~> 0.6.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  #gem "rcov", ">= 0"
   gem 'sqlite3'
+  gem "rake"
 end

data/Gemfile.lock

@@ -1,20 +1,18 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
+    activemodel (3.2.0)
+      activesupport (= 3.2.0)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
+    activerecord (3.2.0)
+      activemodel (= 3.2.0)
+      activesupport (= 3.2.0)
+      arel (~> 3.0.0)
       tzinfo (~> 0.3.29)
-    activesupport (3.1.0)
+    activesupport (3.2.0)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
-    bcrypt-ruby (3.0.1)
+    arel (3.0.0)
     builder (3.0.0)
     diff-lcs (1.1.3)
     git (1.2.5)
@@ -23,11 +21,10 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    multi_json (1.0.3)
+    multi_json (1.0.4)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
-    rake (0.9.2)
-    rcov (0.9.10)
+    rake (0.9.2.2)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -36,22 +33,22 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    sqlite3 (1.3.4)
-    squeel (0.9.0)
+    sqlite3 (1.3.5)
+    squeel (0.9.5)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
       polyamorous (~> 0.5.0)
-    tzinfo (0.3.29)
+    tzinfo (0.3.31)
     yard (0.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 3.1.0)
+  activerecord (>= 3.2.0)
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
-  rcov
+  rake
   rspec (~> 2.3.0)
   sqlite3
   squeel

data/README.md

@@ -44,6 +44,10 @@ Usage
 
 	# 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"
+	
 
 	# Mix with active relation 
 	TaggableModel.tagged_with(["forking", "kiting"]).where( ["created_at > ?", Time.zone.now.ago(5.hours)])  

data/Rakefile

@@ -38,5 +38,5 @@ end
 
 task :default => :spec
 
-require 'yard'
-YARD::Rake::YardocTask.new
+# require 'yard'
+# YARD::Rake::YardocTask.new

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.1.0

data/lib/rocket_tag/taggable.rb

@@ -4,6 +4,7 @@ module RocketTag
   module Taggable
     def self.included(base)
       base.extend ClassMethods
+      base.send :include, InstanceMethods
     end
 
     class Manager
@@ -40,8 +41,6 @@ module RocketTag
         klass.has_many :taggings , :dependent => :destroy , :as => :taggable, :class_name => "RocketTag::Tagging"
         klass.has_many :tags     , :source => :tag, :through => :taggings, :class_name => "RocketTag::Tag"
       end
-
-
     end
 
     def tags_for_context context
@@ -56,6 +55,37 @@ module RocketTag
       taggings_for_context(context).delete_all
     end
 
+    module InstanceMethods
+      def reload
+        super
+        self.class.rocket_tag.contexts.each do |context|
+          write_context context, []
+        end
+        @tags_cached = false
+        cache_tags
+      end
+
+      def cache_tags
+        unless @tags_cached
+          tags_by_context ||= send("taggings").group_by{|f| f.context }
+          tags_by_context.each do |context,v|
+            write_context context, v.map{|t| t.tag.name}
+          end
+          @tags_cached = true
+        end
+      end
+
+      def write_context context, list
+        @contexts ||= {}
+        @contexts[context.to_sym] = list
+      end
+
+      def read_context context
+        @contexts ||= {}
+        @contexts[context.to_sym] || []
+      end
+    end
+
     module ClassMethods
 
       def rocket_tag
@@ -70,13 +100,13 @@ module RocketTag
         end
       end
 
-      def _with_all condition, tags_list
-          if condition
-              group{~id}.
-              having{count(~id)==my{tags_list.length}}
-          else
-              where{}
-          end
+      def _with_min min, tags_list
+        if min and min > 1
+          group{~id}.
+            having{count(~id)>=my{min}}
+        else
+          where{}
+        end
       end
 
       # Generates a sifter or a where clause depending on options.
@@ -88,62 +118,49 @@ module RocketTag
       def tagged_with_sifter tags_list, options = {}
         on = options.delete :on
         all = options.delete :all
+        min = options.delete(:min)
+        if all
+          min = tags_list.length
+        end
 
-        proc do |&block|
-            if options.delete :where
-              where &block
-            else
-              squeel &block
-            end
-        end.call {
-          id.in( 
-              my{self}.
-                select{distinct(id)}.
-                joins{tags}.
-                where{ tags.name.in(my{tags_list})}.
-                _with_tag_context(my{on}).
-                _with_all(my{all}, my{tags_list})
+        lambda do |&block|
+        if options.delete :where
+          where &block
+        else
+          squeel &block
+        end
+        end.call do
+          id.in(
+            my{self}.
+            select{id}.
+            joins{tags}.
+            where{tags.name.in(my{tags_list})}.
+            _with_tag_context(on).
+            _with_min(min, tags_list)
           )
-        }
+        end
 
       end
 
+      # We need to overide the default count
+      # and do a sub select as we are using gr
+      def count
+      end
+
+
       def tagged_with tags_list, options = {}
         options[:where] = true
         tagged_with_sifter(tags_list, options)
       end
 
-      def attr_taggable *contexts
-
-        if contexts.blank?
-          contexts = [:tag]
-        end
-
-        rocket_tag.contexts += contexts
-
-        contexts.each do |context|
+      def setup_for_rocket_tag
+        unless @setup_for_rocket_tag
+          @setup_for_rocket_tag = true
           class_eval do
-
             default_scope do
               preload{taggings}.preload{tags}
             end
 
-            has_many "#{context}_taggings".to_sym, 
-              :source => :taggable,  
-              :as => :taggable,
-              :conditions => { :context => context }
-
-            has_many "#{context}_tags".to_sym,
-              :source => :tag,
-              :through => :taggings,
-              :conditions => [ "taggings.context = ?", context ]
-
-
-            validate context do
-              if not send(context).kind_of? Enumerable
-                errors.add context, :invalid
-              end
-            end
             before_save do
               @tag_dirty ||= Set.new
 
@@ -176,30 +193,45 @@ module RocketTag
               end
               @tag_dirty = Set.new
             end
+          end
+        end
+      end
 
-            def reload
-              super
-              self.class.rocket_tag.contexts.each do |context|
-                write_attribute context, []
-              end
-              @tags_cached = false
-              cache_tags
-            end
+      def attr_taggable *contexts
 
-            define_method "cache_tags" do
-              unless @tags_cached
-                tags_by_context ||= send("taggings").group_by{|f| f.context }
-                tags_by_context.each do |context,v|
-                  write_attribute context, v.map{|t| t.tag.name}
-                end
-                @tags_cached = true
+        if contexts.blank?
+          contexts = [:tag]
+        end
+
+        rocket_tag.contexts += contexts
+
+        setup_for_rocket_tag
+
+        contexts.each do |context|
+          class_eval do
+
+            has_many "#{context}_taggings".to_sym, 
+              :source => :taggable,  
+              :as => :taggable,
+              :conditions => { :context => context }
+
+            has_many "#{context}_tags".to_sym,
+              :source => :tag,
+              :through => :taggings,
+              :conditions => [ "taggings.context = ?", context ]
+
+
+            validate context do
+              if not send(context).kind_of? Enumerable
+                errors.add context, :invalid
               end
             end
 
+
             # Return an array of RocketTag::Tags for the context
             define_method "#{context}" do
               cache_tags
-              r = read_attribute(context) || []
+              read_context(context)
             end
 
 
@@ -208,11 +240,11 @@ module RocketTag
 
               # Ensure the tags are loaded
               cache_tags
-              write_attribute(context, list)
+              write_context(context, list)
 
               (@tag_dirty ||= Set.new) << context
 
-                
+
             end
           end
         end

data/rocket_tag.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{rocket_tag}
-  s.version = "0.0.4"
+  s.name = "rocket_tag"
+  s.version = "0.1.0"
 
   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-19}
-  s.description = %q{}
-  s.email = %q{bradphelan@xtargets.com}
+  s.authors = ["Brad Phelan"]
+  s.date = "2012-01-24"
+  s.description = ""
+  s.email = "bradphelan@xtargets.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -38,43 +39,43 @@ Gem::Specification.new do |s|
     "spec/schema.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/bradphelan/rocket_tag}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.8}
-  s.summary = %q{A modern fast tagging framework for Rails 3.1+}
+  s.homepage = "http://github.com/bradphelan/rocket_tag"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.15"
+  s.summary = "A modern fast tagging framework for Rails 3.1+"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.1.0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.2.0"])
       s.add_runtime_dependency(%q<squeel>, [">= 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<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, [">= 3.1.0"])
+      s.add_dependency(%q<activerecord>, [">= 3.2.0"])
       s.add_dependency(%q<squeel>, [">= 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<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 3.1.0"])
+    s.add_dependency(%q<activerecord>, [">= 3.2.0"])
     s.add_dependency(%q<squeel>, [">= 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<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
   end
 end
 

data/spec/rocket_tag/taggable_spec.rb

@@ -7,13 +7,13 @@ describe TaggableModel do
   end
 
   describe "parsing" do
-      it "converts strings to arrays using ruby core lib CSV" 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"]
+    it "converts strings to arrays using ruby core lib CSV" 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"]
 
-          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
+      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
   end
 
   describe "#save" do
@@ -93,10 +93,10 @@ describe TaggableModel do
       @t20 = TaggableModel.create :name => "20", :foo => "A"
       @t21 = TaggableModel.create :name => "21", :foo => "B"
 
-      @t00.skills    =  [ "a"      , "b"]
+      @t00.skills    =  [ "a"      , "b",  "x"]
       @t00.languages =  [ "german" , "french"]
 
-      @t01.skills    =  [ "a"      , "b"]
+      @t01.skills    =  [ "a"      , "b", "y"]
       @t01.languages =  [ "german" , "italian"]
 
       @t10.skills    =  [ "a"      , "c"]
@@ -141,7 +141,7 @@ describe TaggableModel do
           q0.should include @t21
 
           q0.should_not include @t20 # as it has neither "a" nor "german" tagged
-                                     # on any context
+          # on any context
         end
       end
 
@@ -175,6 +175,36 @@ describe TaggableModel do
           q0.should_not include @t01
         end
       end
+
+      describe "#tagged_with_sifter" do
+        it "should be the work horse of #tagged_with but returns a sifter that can be composed into other queries" do
+          TaggableModel.where do
+            TaggableModel.tagged_with_sifter(["a", "b"]) & TaggableModel.tagged_with_sifter(["c"])
+          end.count.should == 2
+
+          TaggableModel.where do
+            TaggableModel.tagged_with_sifter(["a", "b"])
+          end.count.should == 4
+        end
+
+        it "should have the options from #tagged_with passed through" do
+            tags_list = ["a", "b"]
+            options = {:x=>10, :y=>20}
+            TaggableModel.should_receive(:tagged_with_sifter).with(tags_list, options)
+            TaggableModel.tagged_with(tags_list, options)
+        end
+      end
+
+      describe "option :min" do
+        it "should return records where the number of matching tags >= :min" do
+          TaggableModel.tagged_with(["a", "b", "x"], :on => :skills).count.should == 4
+
+          TaggableModel.tagged_with(["a", "b", "x"], :on => :skills, :min => 1).count.should == 4
+          TaggableModel.tagged_with(["a", "b", "x"], :on => :skills, :min => 2).count.should == 2
+          TaggableModel.tagged_with(["a", "b", "x"], :on => :skills, :min => 3).count.should == 1
+        end
+      end
     end
   end
 end
+

metadata

@@ -2,7 +2,7 @@
 name: rocket_tag
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Brad Phelan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-19 00:00:00 Z
+date: 2012-01-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -79,7 +79,7 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: sqlite3
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -90,7 +90,7 @@ dependencies:
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: rake
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -112,6 +112,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .rspec
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -143,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1104045043849403616
+      hash: -3706512005983090004
       segments: 
       - 0
       version: "0"
@@ -156,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A modern fast tagging framework for Rails 3.1+