tagtical 1.0.6 → 1.0.7

data/Gemfile

@@ -4,8 +4,8 @@ source :gemcutter
 
 # Cannot require these as dependency until there the fix is released:
 # 
-#gem 'rails', '3.0.5'
-#gem 'rspec', '2.6.0'
+gem 'rails', '<=3.0.5'
+gem 'rspec', '<=2.6.0'
 # http://rubyforge.org/tracker/?func=detail&atid=575&aid=29163&group_id=126
 
 gem 'sqlite3-ruby', :require => 'sqlite3'
@@ -17,4 +17,4 @@ gem 'rcov'
 
 group :test do
   gem "mocha"
-end
+end

data/README.rdoc

@@ -115,8 +115,11 @@ rake spec:plugins
     @user.save
 
     @user.activities # => [<Tag::Activity value:"joking">,<Tag::Activity value:"clowning">,<Tag::Sport value:"boxing">]
-    @user.activities(:only => :children) # => [<Tag::Sport value:"boxing">] - look at only the STI subclasses
-    @user.activities(:only => :current) # => [<Tag::Activity value:"joking">,<Tag::Activity value:"clowning">] - look at only the current STI class
+    @user.activities(:type => :children) # => [<Tag::Sport value:"boxing">] - look at only the STI subclasses
+    @user.activities(:type => :<) # => [<Tag::Sport value:"boxing">] - look at only the STI subclasses
+    @user.activities(:type => :current) # => [<Tag::Activity value:"joking">,<Tag::Activity value:"clowning">] - look at only the current STI class
+    @user.activities(:type => :==) # => [<Tag::Activity value:"joking">,<Tag::Activity value:"clowning">] - look at only the current STI class
+
     @user.activities.first.athletic? # => false
     @user.sports.all(&:ball?) # => true
 

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/lib/tagtical/tag.rb

@@ -60,7 +60,15 @@ module Tagtical
 
       def sti_name
         return @sti_name if instance_variable_defined?(:@sti_name)
-        @sti_name = Tagtical::Tag==self ? nil : Type.new(name.demodulize).to_sti_name
+        @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
       end
 
       protected
@@ -94,7 +102,7 @@ module Tagtical
     end
 
     def relevance
-      (v = self["relevance"]) && v.to_f
+      (v = self[:relevance]) && v.to_f
     end
 
     # Try to sort by the relevance if provided.
@@ -110,23 +118,15 @@ module Tagtical
       value
     end
 
-    # Overwrite these methods to provide your own storage mechanism for a tag.
-    def load_value(value) value end
-    def dump_value(value) value end
-
-    def value
-      @value ||= load_value(self[:value])
-    end
-
-    def value=(value)
-      @value = nil
-      self[:value] = dump_value(value)
+    def inspect
+      super.tap do |str|
+        str[-2] = "relevance: #{attribute_for_inspect(:relevance)}" if has_attribute?(:relevance)
+      end
     end
 
     # We return nil if we are *not* an STI class.
     def type
-      type = self[:type]
-      type && Type[type]
+      (type = self[:type]) && Type.new(type)
     end
 
     def count
@@ -146,17 +146,19 @@ module Tagtical
       # "tag" should always correspond with demodulize name of the base Tag class (ie Tagtical::Tag).
       BASE = "tag".freeze
 
-      # Default to simply "tag", if none is provided. This will return Tagtical::Tag on calls to #klass
-      def initialize(arg)
-        super(arg.to_s.singularize.underscore.gsub(/_tag$/, ''))
-      end
-
       class << self
         def find(input)
           return input.map { |c| self[c] } if input.is_a?(Array)
-          input.is_a?(self) ? input : new(input)
+          input.is_a?(self) ? input : new(sanitize(input))
         end
         alias :[] :find
+
+        private
+
+        # Sanitize the input for type name consistency.
+        def sanitize(input)
+          input.to_s.singularize.underscore.gsub(/_tag$/, '')
+        end
       end
 
       # The STI name for the Tag model is the same as the tag type.
@@ -172,24 +174,24 @@ module Tagtical
       #   <tt>only</tt> - An array of the following: :parents, :current, :children. Will construct conditions to query the current, parent, and/or children STI classes.
       #
       def finder_type_condition(options={})
-        only = Array.wrap(options[:only] || (klass ? [:current, :children] : :current))
+        type = convert_type_options(options[:type])
 
         # If we want [:current, :children] or [:current, :children, :parents] and we don't need the finder type condition,
         # then that means we don't need a condition at all since we are at the top-level sti class and we are essentially
         # searching the whole range of sti classes.
         if klass && !klass.finder_needs_type_condition?
-          only.delete(:parents) # we are at the topmost level.
-          only = [] if only==[:current, :children] # no condition is required if we want the current AND the children.
+          type.delete(:parents) # we are at the topmost level.
+          type = [] if type==[:current, :children] # no condition is required if we want the current AND the children.
         end
 
         sti_names = []
-        if only.include?(:current)
+        if type.include?(:current)
           sti_names << (klass ? klass.sti_name : to_sti_name)
         end
-        if only.include?(:children) && klass
+        if type.include?(:children) && klass
           sti_names.concat(klass.descendants.map(&:sti_name))
         end
-        if only.include?(:parents) && klass # include searches up the STI chain
+        if type.include?(:parents) && klass # include searches up the STI chain
           parent_class = klass.superclass
           while parent_class <= Tagtical::Tag
             sti_names << parent_class.sti_name
@@ -283,6 +285,19 @@ module Tagtical
         end
       end
 
+      # Take operator types (ie <, >, =) and convert them into :children, :current, or :parents.
+      def convert_type_options(input)
+        Array.wrap(input || (klass ? [:current, :children] : :current)).map do |type, i|
+          if (t = type.to_s)=~/^[=><]+$/
+            {"=" => :current, ">" => :parents, "<" => :children}.map do |operator, val|
+              val if t.include?(operator)
+            end.compact
+          else
+            type
+          end
+        end.flatten.uniq
+      end
+
       def find_tag_class
         candidates = derive_class_candidates
 

data/lib/tagtical/taggable/core.rb

@@ -24,14 +24,14 @@ 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.scope(tag_type.scope_name, Proc.new { |options| tag_type.scoping(options || {}) }) unless Tagtical::Tag.respond_to?(tag_type.scope_name)
+          Tagtical::Tag.define_methods_for_type(tag_type)
 
           # If the tag_type is base? (type=="tag"), then we add additional functionality to the AR
           # has_many :tags.
           #
-          #   taggable_model.tags(:only => :children)
+          #   taggable_model.tags(:type => :children)
           #   taggable_model.tags <-- still works like normal has_many
-          #   taggable_model.tags(true, :only => :current) <-- reloads the tags association and appends scope for only current type.
+          #   taggable_model.tags(true, :type => :current) <-- reloads the tags association and appends scope for only current type.
           if tag_type.has_many_name==:tags
             define_method("tags_with_finder_type_options") do |*args|
               options = args.pop if args.last.is_a?(Hash)
@@ -99,7 +99,7 @@ module Tagtical::Taggable
 
         options[:on] ||= Tagtical::Tag::Type::BASE
         tag_type = Tagtical::Tag::Type.find(options.delete(:on))
-        finder_type_condition_options = options.extract!(:only)
+        finder_type_condition_options = options.extract!(:type)
 
         tag_table, tagging_table = Tagtical::Tag.table_name, Tagtical::Tagging.table_name
 
@@ -259,7 +259,7 @@ module Tagtical::Taggable
           tag_value_lookup = tag_type.scoping { find_or_create_tags(tag_list) }
           tags = tag_value_lookup.keys
 
-          current_tags = tags_on(tag_type, :only => [:current, :parents, :children])
+          current_tags = tags_on(tag_type, :type => [:current, :parents, :children])
           old_tags     = current_tags - tags
           new_tags     = tags         - current_tags
 

data/lib/tagtical/taggable/ownership.rb

@@ -72,7 +72,7 @@ module Tagtical::Taggable
             tag_value_lookup = tag_type.scoping { find_or_create_tags(tag_list) }
             tags = tag_value_lookup.keys
 
-            owned_tags = owner_tags_on(owner, tag_type, :only => [:current, :parents, :children])
+            owned_tags = owner_tags_on(owner, tag_type, :type => [:current, :parents, :children])
             old_tags   = owned_tags - tags
             new_tags   = tags       - owned_tags
 

data/spec/spec_helper.rb

@@ -25,7 +25,12 @@ end
 
 RSpec::Matchers.define :have_tag_values do |expected|
   match do |actual|
-    actual.map(&:value).sort == expected.sort
+    actual.map(&:value).should have_same_elements(expected)
+  end
+end
+RSpec::Matchers.define :have_same_elements do |expected|
+  match do |actual|
+    actual.sort == expected.sort
   end
 end
 

data/spec/tagtical/tag_spec.rb

@@ -57,7 +57,7 @@ describe Tagtical::Tag do
 
   end
 
-  describe "tag scopes" do
+  describe "tag scopes Type#finder_type_conditions" do
     before do
       Tagtical::Tag.create(:value => "Plane")
       Tag::Skill.create(:value => "Kung Fu")
@@ -65,40 +65,71 @@ describe Tagtical::Tag do
       NeedTag.create(:value => "chair") 
     end
 
-    it "should retrieve tags finder type conditions" do
-      Tagtical::Tag.skills.should have_tag_values ["Kung Fu", "Painting"]
-      Tagtical::Tag.skills(:only => :current).should have_tag_values ["Kung Fu"]
-      Tagtical::Tag.crafts(:only => :parents).should have_tag_values ["Kung Fu", "Plane"]
+    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"]
+        Tagtical::Tag.skills(:type => :current).should have_tag_values ["Kung Fu"]
+        Tagtical::Tag.skills(:type => :==).should have_tag_values ["Kung Fu"]
+      end
     end
 
-  end
+    context "when :type => :parent or the alias :>" do
+      it "should retrieve parent STI level tags" do
+        Tagtical::Tag.skills.should have_tag_values ["Kung Fu", "Painting"]
+        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
 
-  describe "#dump_value" do
-    before do
-      @tag = Tagtical::Tag::PartTag.new(:value => "FOO")
+    context "when :type => :childern or the alias :<" do
+      it "should retrieve child STI level tags" do
+        Tagtical::Tag.skills.should have_tag_values ["Kung Fu", "Painting"]
+        Tagtical::Tag.skills(:type => :children).should have_tag_values ["Painting"]
+        Tagtical::Tag.skills(:type => :<).should have_tag_values ["Painting"]
+      end
     end
 
-    its(:value) { should == "foo" }
+    context "when :type => :\"><\"" do
+      it "should retrieve parent and child STI level tags" do
+        Tagtical::Tag.skills.should have_tag_values ["Kung Fu", "Painting"]
+        Tagtical::Tag.skills(:type => :"><").should have_tag_values ["Plane", "Painting"]
+      end
+    end
 
-    it "should accept a nil value" do
-      lambda { @tag.value = nil }.should_not raise_error
-      @tag.value.should be_nil
+    context "when :type => :>=" do
+      it "should retrieve current and parent STI level tags" do
+        Tagtical::Tag.skills.should have_tag_values ["Kung Fu", "Painting"]
+        Tagtical::Tag.skills(:type => :>=).should have_tag_values ["Kung Fu", "Plane"]
+      end
+    end
+
+    context "when :type => :<=" do
+      it "should retrieve current and child STI level tags" do
+        Tagtical::Tag.skills.should have_tag_values ["Kung Fu", "Painting"]
+        Tagtical::Tag.skills(:type => :<=).should have_tag_values ["Kung Fu", "Painting"]
+      end
     end
   end
-  
-  describe "#load_value" do
+
+  describe ".define_methods_for_type" do
     before do
-      @tag = Tag::Skill.new(:value => "basketball")
+      @skill = Tag::Skill.new(:value => "baskeball")
+      @craft = Tag::Craft.new(:value => "pottery")
     end
 
-    specify  { @tag[:value].should == "basketball" }
-    
-    its(:value) { should == "basketballer" }
+    it "should have a quester method" do
+      @skill.tag?.should be_true
+      @skill.skill?.should be_true
+      @skill.craft?.should be_false
+    end
 
-    it "should accept a nil value" do
-      lambda { @tag.value = nil }.should_not raise_error
-      @tag.value.should be_nil
+    it "should have a quester method that considers inheritance" do
+      @craft.tag?.should be_true
+      @craft.skill?.should be_true
+      @craft.craft?.should be_true
     end
+    
   end
 
   it "should refresh @value on value setter" do
@@ -254,10 +285,10 @@ describe Tagtical::Tag do
     its(:klass) { should == Tag::Skill }
     its(:scope_name) { should == :skills }
 
-    describe "initialize" do
+    describe ".find" do
       it "converts string into correct format" do
         {"ClassNames" => "class_name", "photo_tags" => "photo", :photo => "photo"}.each do |input, result|
-          @klass.new(input).should == result
+          @klass.find(input).should == result
         end
       end
     end
@@ -273,6 +304,21 @@ describe Tagtical::Tag do
       end
     end
 
+    describe "#convert_type_options" do
+      {:<=   => [:children, :current],
+       :>=   => [:parents, :current],
+       :"<>" => [:children, :parents],
+       :==   => [:current],
+       "=="  => [:current], # should work with strings as well.
+       :">"  => [:parents],
+       :"<"  => [:children]
+      }.each do |operator, expected|
+        it "should convert #{operator.inspect} to #{expected.inspect}" do
+          subject.send(:convert_type_options, operator).should have_same_elements(expected)
+        end
+      end
+    end
+
     describe "#derive_class_candidates" do
       specify do
         subject.send(:derive_class_candidates).should include(

data/spec/tagtical/taggable_spec.rb

@@ -64,24 +64,35 @@ describe Tagtical::Taggable do
     end
 
     it "should be able to query tags" do
-      @taggables[0].tags(:only => :current).should have_tag_values %w{bob}
+      @taggables[0].tags(:type => :current).should have_tag_values %w{bob}
+      @taggables[0].tags(:type => :==).should have_tag_values %w{bob}
       @taggables[0].tags.should have_tag_values %w{bob knitting ruby}
-      @taggables[0].tags(:only => :children).should have_tag_values %w{knitting ruby}
-      @taggables[1].crafts(:only => :parents).should have_tag_values %w{charlie css}
-      @taggables[1].crafts(:only => [:parents, :current]).should have_tag_values %w{charlie css pottery}
-      @taggables[1].skills(:only => [:parents, :children]).should have_tag_values %w{charlie pottery}
+      @taggables[0].tags(:type => :children).should have_tag_values %w{knitting ruby}
+      @taggables[0].tags(:type => :<).should have_tag_values %w{knitting ruby}
+      @taggables[1].crafts(:type => :parents).should have_tag_values %w{charlie css}
+      @taggables[1].crafts(:type => :>).should have_tag_values %w{charlie css}
+
+      @taggables[1].crafts(:type => [:parents, :current]).should have_tag_values %w{charlie css pottery}
+      @taggables[1].crafts(:type => :>=).should have_tag_values %w{charlie css pottery}
+      @taggables[1].skills(:type => [:parents, :children]).should have_tag_values %w{charlie pottery}
+      @taggables[1].skills(:type => :"><").should have_tag_values %w{charlie pottery}
     end
 
     it "should be able to select taggables by subset of tags using ActiveRelation methods" do
       TaggableModel.with_tags("bob").should == [@taggables[0]]
       TaggableModel.with_skills("ruby").should == [@taggables[0]]
       TaggableModel.with_tags("rUBy").should == [@taggables[0]]
-      TaggableModel.with_tags("ruby", :only => :current).should == []
+      TaggableModel.with_tags("ruby", :type => :current).should == []
+      TaggableModel.with_tags("ruby", :type => :==).should == []
       TaggableModel.with_skills("knitting").should == [@taggables[0]]
-      TaggableModel.with_skills("KNITTING", :only => :current).should == []
-      TaggableModel.with_skills("knitting", :only => :parents).should == []
-      TaggableModel.with_tags("bob", :only => :current).should == [@taggables[0]]
-      TaggableModel.with_skills("bob", :only => :parents).should == [@taggables[0]]
+      TaggableModel.with_skills("KNITTING", :type => :current).should == []
+      TaggableModel.with_skills("KNITTING", :type => :==).should == []
+      TaggableModel.with_skills("knitting", :type => :parents).should == []
+      TaggableModel.with_skills("knitting", :type => :>).should == []
+      TaggableModel.with_tags("bob", :type => :current).should == [@taggables[0]]
+      TaggableModel.with_tags("bob", :type => :==).should == [@taggables[0]]
+      TaggableModel.with_skills("bob", :type => :parents).should == [@taggables[0]]
+      TaggableModel.with_skills("bob", :type => :>).should == [@taggables[0]]
       TaggableModel.with_crafts("knitting").should == [@taggables[0]]
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagtical
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-10 00:00:00.000000000Z
+date: 2011-07-12 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &2152043280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 3.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152043280
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2152042800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152042800
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2161646020 !ruby/object:Gem::Requirement
+  requirement: &2152042320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161646020
+  version_requirements: *2152042320
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2161645540 !ruby/object:Gem::Requirement
+  requirement: &2152041840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161645540
+  version_requirements: *2152041840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2161645060 !ruby/object:Gem::Requirement
+  requirement: &2152041360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161645060
+  version_requirements: *2152041360
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2161644580 !ruby/object:Gem::Requirement
+  requirement: &2152040880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161644580
+  version_requirements: *2152040880
 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.
@@ -66,7 +88,6 @@ extra_rdoc_files:
 files:
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile

data/Gemfile.lock

@@ -1,25 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    git (1.2.5)
-    jeweler (1.6.2)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    mocha (0.9.12)
-    mysql (2.8.1)
-    rake (0.9.2)
-    rcov (0.9.9)
-    sqlite3 (1.3.3)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  jeweler
-  mocha
-  mysql
-  rcov
-  sqlite3-ruby