tagtical 1.4.10 → 1.4.11

data/VERSION

@@ -1 +1 @@
-1.4.10
+1.4.11

data/lib/tagtical/tag.rb

@@ -363,18 +363,22 @@ module Tagtical
       # Returns an array of potential class names for this specific type.
       def derive_class_candidates
         [].tap do |arr|
-          suffixes = [classify]
+          sti_level = 0
+          suffixes = [[classify, sti_level]]
           klass = taggable_class
           while klass < ActiveRecord::Base
-            suffixes.concat ["#{klass}#{classify}", "#{klass}::#{classify}"]
+            suffixes.concat [["#{klass}#{classify}", "#{klass}::#{classify}", sti_level += 1]]
             klass = klass.superclass
           end
-          suffixes.map { |s| [s, "#{s}Tag"] }.flatten.each do |name| # support Interest and InterestTag class names.
-            "Tagtical::Tag".tap do |longest_candidate|
-              longest_candidate << "::#{name}" unless name=="Tag"
-            end.scan(/^|::/) { arr << $' } # Klass, Tag::Klass, Tagtical::Tag::Klass
+          suffixes.map! { |s| s[0..-2].map { |t| [t, "#{t}Tag"] }.flatten << s.last } # expand with "Tag" suffix
+          suffixes.each do |names| # support Interest and InterestTag class names
+            names[0..-2].map do |name|
+              "Tagtical::Tag".tap do |longest_candidate|
+                longest_candidate << "::#{name}" unless name=="Tag"
+              end.scan(/^|::/) { arr << [$', names.last] } # Klass, Tag::Klass, Tagtical::Tag::Klass
+            end
           end
-        end.uniq.sort_by { |candidate| [candidate.split("::").size, candidate.length] }.reverse # more nested classnames first
+        end.sort_by { |candidate, sti_level| [-candidate.split("::").size, sti_level] }.map(&:first).uniq # More nested classnames first
       end
 
       # Take operator types (ie <, >, =) and convert them into :children, :current, or :parents.

data/spec/tagtical/tag_spec.rb

@@ -384,12 +384,29 @@ describe Tagtical::Tag do
     end
 
     describe "#derive_class_candidates" do
-      specify do
-        subject.send(:derive_class_candidates).should == ["Tagtical::Tag::TaggableModel::SkillTag", "Tagtical::Tag::TaggableModel::Skill", "Tagtical::Tag::TaggableModelSkillTag",
-          "Tagtical::Tag::TaggableModelSkill", "Tag::TaggableModel::SkillTag", "Tag::TaggableModel::Skill", "Tagtical::Tag::SkillTag",
-          "Tagtical::Tag::Skill", "Tag::TaggableModelSkillTag", "Tag::TaggableModelSkill", "TaggableModel::SkillTag",
-          "TaggableModel::Skill", "Tag::SkillTag", "Tag::Skill", "TaggableModelSkillTag", "TaggableModelSkill", "SkillTag", "Skill"]
+      before(:all) do
+        # use an inheriting tag model so we can test the building up the sti chain.
+        @candidates = Tagtical::Tag::Type.new("skill", InheritingTaggableModel).send(:derive_class_candidates)
       end
+      subject { @candidates }
+      
+      it do
+        should == ["Tagtical::Tag::InheritingTaggableModel::Skill", "Tagtical::Tag::InheritingTaggableModel::SkillTag",
+          "Tagtical::Tag::TaggableModel::SkillTag", "Tagtical::Tag::TaggableModel::Skill", "Tagtical::Tag::SkillTag",
+          "Tagtical::Tag::Skill", "Tagtical::Tag::InheritingTaggableModelSkill", "Tag::InheritingTaggableModel::Skill",
+          "Tagtical::Tag::InheritingTaggableModelSkillTag", "Tag::InheritingTaggableModel::SkillTag",
+          "Tagtical::Tag::TaggableModelSkill", "Tag::TaggableModel::Skill", "Tagtical::Tag::TaggableModelSkillTag",
+          "Tag::TaggableModel::SkillTag", "Tag::SkillTag", "Tag::Skill", "Tag::InheritingTaggableModelSkillTag",
+          "InheritingTaggableModel::Skill", "InheritingTaggableModel::SkillTag", "Tag::InheritingTaggableModelSkill",
+          "TaggableModel::Skill", "Tag::TaggableModelSkill", "TaggableModel::SkillTag", "Tag::TaggableModelSkillTag",
+          "SkillTag", "Skill", "InheritingTaggableModelSkill", "InheritingTaggableModelSkillTag", "TaggableModelSkill", "TaggableModelSkillTag"]
+      end
+
+      it "should be favor deeper sti levels" do
+        nesting_counts = @candidates.map { |x| x.split("::").size }
+        nesting_counts.sort_by { |c| -c }.should == nesting_counts
+      end
+
     end
 
     describe "#tag_list_name" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagtical
 version: !ruby/object:Gem::Version
-  version: 1.4.10
+  version: 1.4.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-30 00:00:00.000000000Z
+date: 2011-08-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2164277000 !ruby/object:Gem::Requirement
+  requirement: &2161698740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2164277000
+  version_requirements: *2161698740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164276520 !ruby/object:Gem::Requirement
+  requirement: &2161698260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -32,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164276520
+  version_requirements: *2161698260
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2164276040 !ruby/object:Gem::Requirement
+  requirement: &2161697780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164276040
+  version_requirements: *2161697780
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2164275560 !ruby/object:Gem::Requirement
+  requirement: &2161697300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164275560
+  version_requirements: *2161697300
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2164275080 !ruby/object:Gem::Requirement
+  requirement: &2161696820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164275080
+  version_requirements: *2161696820
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2164303500 !ruby/object:Gem::Requirement
+  requirement: &2161696340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164303500
+  version_requirements: *2161696340
 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.