tagtical 1.3.1 → 1.4.0

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.4.0

data/lib/tagtical/tag.rb

@@ -141,6 +141,11 @@ module Tagtical
       !!tag_types_for_questioner_method(method_id) || super
     end
 
+    # Carried over from tagging.
+    def has_tagger?
+      !self[:tagger_id].nil?
+    end
+
     private
 
     def tag_types_for_questioner_method(method_name)
@@ -297,6 +302,14 @@ module Tagtical
         "@#{tag_list_name(*args)}"
       end
 
+      def all_tag_list_ivar
+        tag_list_ivar(:all)
+      end
+
+      def scope_ivar
+        "@#{scope_name}"
+      end
+
       # Returns the level from which it extends from Tagtical::Tag
       def active_record_sti_level
         @active_record_sti_level ||= begin

data/lib/tagtical/taggable/core.rb

@@ -15,7 +15,7 @@ module Tagtical::Taggable
       def initialize_tagtical_core
         has_many :taggings, :as => :taggable, :dependent => :destroy, :include => :tag, :class_name => "Tagtical::Tagging"
         has_many :tags, :through => :taggings, :source => :tag, :class_name => "Tagtical::Tag",
-                 :select => "#{Tagtical::Tag.table_name}.*, #{Tagtical::Tagging.table_name}.relevance" # include the relevance on the tags
+                 :select => "#{Tagtical::Tag.table_name}.*, #{Tagtical::Tagging.table_name}.relevance, #{Tagtical::Tagging.table_name}.tagger_id" # include the relevance on the tags
 
         tag_types.each do |tag_type| # has_many :tags gets created here
 
@@ -67,18 +67,21 @@ module Tagtical::Taggable
           define_method("tags_with_finder_type_options") do |*args|
             bool = args.shift if [true, false].include?(args.first)
             tags = tags_without_finder_type_options(bool)
-            args.empty? ? tags : tags.scoped.merge(tag_type.scoping(*args))
+            args.empty? ? tags : tags_with_type_scoping(tag_type, *args)
           end
           alias_method_chain :tags, :finder_type_options
-        else
-          define_method(tag_type.has_many_name) do |*args|
-            tags.scoped.merge(tag_type.scoping(*args)).tap do |scope|
-              if args.empty? &&
-                (loaded_parent_scope = tag_type.expand_tag_types(:parents).map { |t| send(t.has_many_name) }.detect(&:loaded?))
-
-                scope.instance_variable_set(:@loaded, true)
-                scope.instance_variable_set(:@records, loaded_parent_scope.select { |t| t.class <= tag_type.klass })
-              end
+        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)
+            else
+              tags_with_type_scoping(tag_type, *args)
             end
           end
         end
@@ -249,16 +252,17 @@ module Tagtical::Taggable
       ##
       # Returns all tags that aren't owned.
       def tags_on(context, *args)
-        tag_scope(context, *args).where("#{Tagtical::Tagging.table_name}.tagger_id IS NULL").all
-      end
-
-      def reload(*args)
-        tag_types.each do |tag_type|
-          instance_variable_set(tag_type.tag_list_ivar, nil)
-          instance_variable_set(tag_type.tag_list_ivar(:all), nil)
+        scope = tag_scope(context, *args)
+        if args.empty?
+          scope.reject(&:has_tagger?)
+        else
+          scope.where("#{Tagtical::Tagging.table_name}.tagger_id IS NULL").all
         end
+      end
 
-        super(*args)
+      def reload(*)
+        remove_tag_caches_on(tag_types)
+        super
       end
 
       def save_tags
@@ -279,7 +283,7 @@ module Tagtical::Taggable
             current_tags = tags_on(tag_type, :types => expanded_tag_types, :scope => :parents) # add in the parents because we need them later on down.
             old_tags     = current_tags - tags
             new_tags     = tags         - current_tags
-            
+
             unowned_taggings = taggings.where(:tagger_id => nil)
 
             # If relevances are specified on current tags, make sure to update those
@@ -303,7 +307,7 @@ module Tagtical::Taggable
               taggings.create!(:tag_id => tag.id, :taggable => self, :relevance => tag_value_lookup[tag].relevance) # Create new taggings:
             end
           end
-          
+
           # Force tag lists to reload to integrate any new tags from inheritance.
           remove_tag_caches_on(tag_type)
         end
@@ -313,15 +317,17 @@ module Tagtical::Taggable
 
       private
 
-      def remove_tag_caches_on(tag_type)
-        [nil, :all].each do |prefix|
-          ivar = tag_type.tag_list_ivar(prefix)
-          remove_instance_variable(ivar) if instance_variable_defined?(ivar)
+      def remove_tag_caches_on(tag_types)
+        Array(tag_types).each do |tag_type|
+          [:all_tag_list_ivar, :tag_list_ivar, :scope_ivar].each do |ivar_method|
+            ivar = tag_type.send(ivar_method)
+            remove_instance_variable(ivar) if instance_variable_defined?(ivar)
+          end
         end
       end
 
       def tag_scope(input, *args)
-        tags.where(find_tag_type!(input).finder_type_condition(*args))
+        send(find_tag_type!(input).scope_name, *args)
       end
 
       def find_tag_type!(input)
@@ -332,6 +338,11 @@ module Tagtical::Taggable
         (@expand_tag_types ||= {})[[input, args]] ||= find_tag_type!(input).expand_tag_types(*args)
       end
 
+
+      def tags_with_type_scoping(tag_type, *args)
+        tags.scoped.merge(tag_type.scoping(*args))
+      end
+      
       # Lets say tag class A inherits from B and B has a tag with value "foo". If we tag A with value "foo",
       # we want B to have only one instance of "foo" and that tag should be an instance of A (a subclass of B).
       def update_tagging_with_inherited_tag!(tagging, tags, tag_value_lookup)

data/lib/tagtical/taggable/ownership.rb

@@ -57,7 +57,8 @@ module Tagtical::Taggable
 
       def reload(*args)
         tag_types.each do |tag_type|
-          instance_variable_set(tag_type.tag_list_ivar(:owned), nil)
+          ivar = tag_type.tag_list_ivar(:owned)
+          remove_instance_variable(ivar) if instance_variable_defined?(ivar)
         end
 
         super(*args)

data/lib/tagtical/tagging.rb

@@ -22,13 +22,12 @@ module Tagtical
        belongs_to :tagger, :polymorphic => true
     else
       belongs_to :tagger, case Tagtical.config.tagger
-       when Hash then Tagtical.config.tagger
-       when true then {:class_name => "User"} # default to using User class.
-       when String then {:class_name => Tagtical.config.tagger}
-                           end
+      when Hash then Tagtical.config.tagger
+      when true then {:class_name => "User"} # default to using User class.
+      when String then {:class_name => Tagtical.config.tagger}
+      end
     end
 
-
     before_create { |record| record.relevance ||= default_relevance }
 
     class_attribute :default_relevance, :instance_writer => false
@@ -38,5 +37,14 @@ module Tagtical
       relevance <=> tagging.relevance
     end
 
+    def set_tag_target_with_relevance(tag)
+      if tag
+        tag.relevance = relevance
+        tag[:tagger_id] = tagger_id
+      end
+      set_tag_target_without_relevance(tag)
+    end
+    alias_method_chain :set_tag_target, :relevance
+
   end
 end

data/spec/tagtical/taggable_spec.rb

@@ -187,6 +187,25 @@ describe Tagtical::Taggable do
     end
   end
 
+  describe "Eager Loading Tags" do
+    before do
+      @taggable.update_attributes!(:craft_list => "foo:0.9, bar, car")
+
+      @taggables = TaggableModel.all(:include => :tags)
+    end
+
+    it "should leverage eager loaded tags for tag_list" do
+      ActiveRecord::Base.connection.expects(:execute).never
+      @taggables[0].tag_list
+      @taggables[0].craft_list
+      @taggables[0].skill_list
+    end
+
+    it "should populate relevance on tags" do
+      @taggables[0].craft_list.find("foo").relevance==0.9
+    end
+  end
+
   describe "tag_list scoping behavior" do
     before do
       @taggables[0].tag_list = "bob"

data/spec/tagtical/tagging_spec.rb

@@ -4,7 +4,7 @@ describe Tagtical::Tagging do
   before(:each) do
     clean_database!
     @klass = Tagtical::Tagging
-    @tagging = @klass.new
+    @tagging = @klass.new(:relevance => 4.0)
   end
   subject { @tagging }
 
@@ -48,5 +48,16 @@ describe Tagtical::Tagging do
       2.times { @klass.create(:taggable => @taggable, :tag => @tag, :context => 'tags') }
     }.should change(@klass, :count).by(1)
   end
-  
+
+  describe "#set_tag_target" do
+    before do
+      @tag = Tagtical::Tag.new(:value => "foo")
+      @tagging.set_tag_target(@tag)
+    end
+
+    it "should set relevance on tag" do
+      @tag.relevance.should==4.0
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagtical
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2161694760 !ruby/object:Gem::Requirement
+  requirement: &2152083200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2161694760
+  version_requirements: *2152083200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161694280 !ruby/object:Gem::Requirement
+  requirement: &2152082720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -32,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2161694280
+  version_requirements: *2152082720
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2161693800 !ruby/object:Gem::Requirement
+  requirement: &2152082240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161693800
+  version_requirements: *2152082240
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2161693320 !ruby/object:Gem::Requirement
+  requirement: &2152081760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161693320
+  version_requirements: *2152081760
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2161692840 !ruby/object:Gem::Requirement
+  requirement: &2152081280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161692840
+  version_requirements: *2152081280
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2161692360 !ruby/object:Gem::Requirement
+  requirement: &2152080800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161692360
+  version_requirements: *2152080800
 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.