tagtical 1.0.7 → 1.0.8

data/Gemfile.lock

@@ -0,0 +1,97 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    arel (2.0.10)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    git (1.2.5)
+    i18n (0.6.0)
+    jeweler (1.6.2)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    mocha (0.9.12)
+    mysql (2.8.1)
+    polyglot (0.3.1)
+    rack (1.2.3)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
+      bundler (~> 1.0)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.9.2)
+    rcov (0.9.9)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.29)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler
+  mocha
+  mysql
+  rails (<= 3.0.5)
+  rcov
+  rspec (<= 2.6.0)
+  sqlite3-ruby

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.0.8

data/lib/tagtical/tag.rb

@@ -3,15 +3,15 @@ module Tagtical
     
     attr_accessible :value
 
-    ### ASSOCIATIONS:
-
     has_many :taggings, :dependent => :destroy, :class_name => 'Tagtical::Tagging'
 
-    ### VALIDATIONS:
-    
-    validates :value, :uniqueness => {:scope => :type}, :presence => true # type is not required, it can be blank
+    scope(:type, lambda do |context, *args|
+      options = args.extract_options!
+      options[:type] = args[0] if args[0]
+      Type[context].scoping(options)
+    end)
 
-    ## POSSIBLE_VALUES SUPPORT:
+    validates :value, :uniqueness => {:scope => :type}, :presence => true # type is not required, it can be blank
 
     class_attribute :possible_values
     validate :validate_possible_values
@@ -63,12 +63,8 @@ module Tagtical
         @sti_name = Tagtical::Tag==self ? nil : Type[name.demodulize].to_sti_name
       end
 
-      def define_methods_for_type(tag_type)
-        (@define_methods_for_type ||= {})[tag_type] ||= begin
-          scope(tag_type.scope_name, Proc.new { |options| tag_type.scoping(options || {}) })
-          define_method(:"#{tag_type}?") { is_a?(tag_type.klass!) }
-          true
-        end
+      def define_scope_for_type(tag_type)
+        scope(tag_type.scope_name, lambda { |*args| type(tag_type, *args) }) unless respond_to?(tag_type.scope_name)
       end
 
       protected
@@ -120,7 +116,7 @@ module Tagtical
 
     def inspect
       super.tap do |str|
-        str[-2] = "relevance: #{attribute_for_inspect(:relevance)}" if has_attribute?(:relevance)
+        str[-1] = ", relevance: #{relevance}>" if relevance
       end
     end
 
@@ -135,6 +131,18 @@ module Tagtical
 
     private
 
+    def method_missing(method_name, *args, &block)
+      if method_name[-1]=="?"
+        lambda = (klass = Type.new(method_name[0..-2]).klass) ?
+          lambda { is_a?(klass) } :
+          lambda { method_name[0..-2]==type }
+        self.class.send(:define_method, method_name, &lambda)
+        send(method_name)
+      else
+        super
+      end
+    end
+
     def validate_possible_values
       if possible_values && !possible_values.include?(value)
         errors.add(:value, %{Value "#{value}" not found in list: #{possible_values.inspect}})
@@ -308,7 +316,7 @@ module Tagtical
             return constant
           end
         end
-
+        
         # Logic comes from ActiveRecord::Base#compute_type.
         candidates.each do |candidate|
           begin

data/lib/tagtical/taggable/core.rb

@@ -24,7 +24,7 @@ module Tagtical::Taggable
           # This keeps your reflections cleaner.
 
           # In the case of the base tag type, it will just use the :tags association defined above.
-          Tagtical::Tag.define_methods_for_type(tag_type)
+          Tagtical::Tag.define_scope_for_type(tag_type)
 
           # If the tag_type is base? (type=="tag"), then we add additional functionality to the AR
           # has_many :tags.

data/spec/tagtical/tag_spec.rb

@@ -57,7 +57,17 @@ describe Tagtical::Tag do
 
   end
 
-  describe "tag scopes Type#finder_type_conditions" do
+  describe ".type" do
+
+    it "should accept :type condition as argument" do
+      @klass::Type.any_instance.expects(:scoping).with(:key => :value, :type => :>=)
+      @klass.type(:skills, :">=", :key => :value)
+    end
+
+  end
+
+  describe "dynamic type scopes" do
+    
     before do
       Tagtical::Tag.create(:value => "Plane")
       Tag::Skill.create(:value => "Kung Fu")
@@ -65,6 +75,12 @@ describe Tagtical::Tag do
       NeedTag.create(:value => "chair") 
     end
 
+    it "should accept :type condition separately from the options" do
+      Tagtical::Tag.skills(:current).should have_tag_values ["Kung Fu"]
+      Tagtical::Tag.skills(:==).should have_tag_values ["Kung Fu"]
+      Tagtical::Tag.crafts(:>).should have_tag_values ["Kung Fu", "Plane"]
+    end
+
     context "when :type => :current or the alias :==" do
       it "should retrieve current STI level tags" do
         Tagtical::Tag.skills.should have_tag_values ["Kung Fu", "Painting"]
@@ -79,7 +95,7 @@ describe Tagtical::Tag do
         Tagtical::Tag.crafts(:type => :parents).should have_tag_values ["Kung Fu", "Plane"]
         Tagtical::Tag.crafts(:type => :>).should have_tag_values ["Kung Fu", "Plane"]
         Tagtical::Tag.skills(:type => :>).should have_tag_values ["Plane"]
-      end
+      end 
     end
 
     context "when :type => :childern or the alias :<" do
@@ -112,7 +128,7 @@ describe Tagtical::Tag do
     end
   end
 
-  describe ".define_methods_for_type" do
+  describe ".define_scope_for_type" do
     before do
       @skill = Tag::Skill.new(:value => "baskeball")
       @craft = Tag::Craft.new(:value => "pottery")
@@ -129,7 +145,7 @@ describe Tagtical::Tag do
       @craft.skill?.should be_true
       @craft.craft?.should be_true
     end
-    
+
   end
 
   it "should refresh @value on value setter" do
@@ -139,14 +155,24 @@ describe Tagtical::Tag do
     @tag.value.should == "bar"
   end
 
+  describe "#inspect" do
+
+    it "should append relevance when provided" do
+      @tag["relevance"] = "0.45"
+      @tag.inspect.should == "#<Tagtical::Tag id: nil, value: \"train\", type: nil, relevance: 0.45>"
+    end
+
+  end
+
   describe "sort" do
+
     before do
       @tag1 = @klass.new(:value => "car").tap { |x| x["relevance"] = "2.5" }
       @tag2 = @klass.new(:value => "plane").tap { |x| x["relevance"] = "1.7" }
       @tag3 = @klass.new(:value => "bike").tap { |x| x["relevance"] = "1.1" }
       @tags = [@tag1, @tag2, @tag3]
     end
-    
+
     it "should sort by relevance if all tags have them" do
       @tags.sort.map(&:value).should == ["bike", "plane", "car"]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagtical
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-12 00:00:00.000000000Z
+date: 2011-07-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152043280 !ruby/object:Gem::Requirement
+  requirement: &2158000180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2152043280
+  version_requirements: *2158000180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152042800 !ruby/object:Gem::Requirement
+  requirement: &2157999700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -32,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152042800
+  version_requirements: *2157999700
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2152042320 !ruby/object:Gem::Requirement
+  requirement: &2157999220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152042320
+  version_requirements: *2157999220
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2152041840 !ruby/object:Gem::Requirement
+  requirement: &2157998740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152041840
+  version_requirements: *2157998740
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152041360 !ruby/object:Gem::Requirement
+  requirement: &2157998260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152041360
+  version_requirements: *2157998260
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152040880 !ruby/object:Gem::Requirement
+  requirement: &2157997780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152040880
+  version_requirements: *2157997780
 description: Tagtical allows you do create subclasses for Tag and add additional functionality
   in an STI fashion. For example. You could do Tag::Color.find_by_name('blue').to_rgb.
   It also supports storing weights or relevance on the taggings.
@@ -88,6 +88,7 @@ extra_rdoc_files:
 files:
 - CHANGELOG
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile