tagtical 1.4.3 → 1.4.5

data/VERSION

@@ -1 +1 @@
-1.4.3
+1.4.5

data/lib/tagtical/taggable/core.rb

@@ -72,14 +72,13 @@ module Tagtical::Taggable
           alias_method_chain :tags, :finder_type_options
         else # handle the Tagtical::Tag subclasses
           define_method(tag_type.scope_name) do |*args|
-            if args.empty?
-              instance_variable_get(tag_type.scope_ivar) || instance_variable_set(tag_type.scope_ivar,
-                tags.scoped.merge(tag_type.scoping).tap do |scope|
-                  if (loaded_parent_scope = tag_type.expand_tag_types(:parents).map { |t| tag_scope(t) }.detect(&:loaded?))
-                    scope.instance_variable_set(:@loaded, true)
-                    scope.instance_variable_set(:@records, loaded_parent_scope.select { |t| t.class <= tag_type.klass })
-                  end
-                end)
+            if tags.loaded?
+              cache = instance_variable_get(tag_type.scope_ivar) || instance_variable_set(tag_type.scope_ivar, {})
+              tag_type_classes = expand_tag_types(tag_type, *args).map(&:klass)
+              cache[tag_type_classes] ||= tags_with_type_scoping(tag_type, *args).tap do |scope|
+                scope.instance_variable_set(:@loaded, true)
+                scope.instance_variable_set(:@records, tags.select { |t| tag_type_classes.include?(t.class) })
+              end
             else
               tags_with_type_scoping(tag_type, *args)
             end

data/spec/spec_helper.rb

@@ -25,7 +25,7 @@ end
 
 RSpec::Matchers.define :have_only_tag_values do |expected|
   match do |actual|
-    actual = actual.tags if actual.respond_to?(:tags)
+    actual = actual.tags if actual.class.respond_to?(:taggable?) && actual.class.taggable?
     actual.map(&:value).should have_same_elements(expected)
   end
 end

data/spec/tagtical/tag_spec.rb

@@ -385,11 +385,10 @@ describe Tagtical::Tag do
 
     describe "#derive_class_candidates" do
       specify do
-        subject.send(:derive_class_candidates).should == [
-          "Tagtical::Tag::TaggableModel::Skill", "Tagtical::Tag::TaggableModel::SkillTag",
-          "Tagtical::Tag::Skill", "Tagtical::Tag::SkillTag", "Tag::TaggableModel::SkillTag", "Tag::TaggableModel::Skill", "TaggableModel::SkillTag",
-          "Tag::SkillTag", "TaggableModel::Skill", "Tag::Skill",
-          "SkillTag", "Skill"]
+        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"]
       end
     end
 

data/spec/tagtical/taggable_spec.rb

@@ -67,7 +67,11 @@ describe Tagtical::Taggable do
       it "should not access the database when top level tags are already loaded" do
         ActiveRecord::Base.connection.expects(:execute).never
         @taggable.skills.to_a
-        @taggable.crafts.to_a
+        @taggable.skills.should have_only_tag_values %w{basketball pottery}
+        @taggable.crafts(:current).should have_only_tag_values %w{pottery}
+        @taggable.skills(:current).should have_only_tag_values %w{basketball}
+        @taggable.skills(:children).should have_only_tag_values %w{pottery}
+        @taggable.tags.should have_only_tag_values %w{train tree basketball pottery}
       end
 
       it "should select the correct tags" do
@@ -75,11 +79,6 @@ describe Tagtical::Taggable do
         @taggable.crafts.each { |tag| tag.should be_craft }
       end
 
-      it "should access the database when args are passed in" do
-        ActiveRecord::Base.connection.expects(:execute).once.returns([])
-        @taggable.skills(:conditions => "value='Foo'").to_a
-      end
-
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagtical
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152194660 !ruby/object:Gem::Requirement
+  requirement: &2154072140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2152194660
+  version_requirements: *2154072140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152194180 !ruby/object:Gem::Requirement
+  requirement: &2154071660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -32,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152194180
+  version_requirements: *2154071660
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2152193700 !ruby/object:Gem::Requirement
+  requirement: &2154071180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152193700
+  version_requirements: *2154071180
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2152193220 !ruby/object:Gem::Requirement
+  requirement: &2154070700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152193220
+  version_requirements: *2154070700
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152192740 !ruby/object:Gem::Requirement
+  requirement: &2154070220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152192740
+  version_requirements: *2154070220
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152192260 !ruby/object:Gem::Requirement
+  requirement: &2154069740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152192260
+  version_requirements: *2154069740
 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.