tagtical 1.4.9 → 1.4.10

data/VERSION

@@ -1 +1 @@
-1.4.9
+1.4.10

data/lib/tagtical/tag.rb

@@ -18,6 +18,8 @@ module Tagtical
     before_validation :ensure_possible_values
     validate :validate_possible_values
 
+    class_attribute :relevance_range
+
     ### CLASS METHODS:
 
     class << self

data/lib/tagtical/taggable/core.rb

@@ -64,10 +64,9 @@ module Tagtical::Taggable
 
         scope "has_no_#{tag_type.has_many_name}", lambda { |*args|
           args << args.extract_options!.update(:sql => :append)
-
-          select("*").
-            joins("LEFT JOIN #{tagging_table} ON #{table_name}.`id` = #{tagging_table}.`taggable_id` AND #{tagging_table}.`taggable_type` = '#{sti_name}'").
-            joins(%{LEFT JOIN #{tag_table} ON #{tag_table}.`id` = #{tagging_table}.`tag_id` #{tag_type.finder_type_condition(*args)}}).
+          select("#{table_name}.*").
+            joins("LEFT OUTER JOIN #{tagging_table} ON ( #{tagging_table}.taggable_id = #{table_name}.id )").
+            joins(%{LEFT OUTER JOIN #{tag_table} ON ( #{tag_table}.id = #{tagging_table}.tag_id #{tag_type.finder_type_condition(*args)} )}).
             where("#{tag_table}.id IS NULL").
             group("#{table_name}.id")
           }
@@ -320,7 +319,7 @@ module Tagtical::Taggable
             end
 
             new_tags.each do |tag|
-              taggings.create!(:tag_id => tag.id, :taggable => self, :relevance => tag_value_lookup[tag].relevance) # Create new taggings:
+              taggings.create!(:tag => tag, :taggable => self, :relevance => tag_value_lookup[tag].relevance) # Create new taggings:
             end
           end
 

data/lib/tagtical/tagging.rb

@@ -3,33 +3,38 @@ module Tagtical
     include Tagtical::ActiveRecord::Backports if ::ActiveRecord::VERSION::MAJOR < 3
 
     attr_accessible :tag,
-                    :tag_id,
-                    :taggable,
-                    :taggable_type,
-                    :taggable_id,
-                    :tagger,
-                    :tagger_id,
-                    :relevance
+      :tag_id,
+      :taggable,
+      :taggable_type,
+      :taggable_id,
+      :tagger,
+      :tagger_id,
+      :relevance
 
     belongs_to :tag, :class_name => 'Tagtical::Tag'
     belongs_to :taggable, :polymorphic => true
 
-    validates_presence_of :tag_id
+    before_validation  { |record| record.relevance ||= default_relevance }
+
+    validates_presence_of :tag_id, :relevance
     validates_uniqueness_of :tag_id, :scope => [:taggable_type, :taggable_id, :tagger_id]
 
+    validate :validate_relevance
+
     if Tagtical.config.polymorphic_tagger?
       attr_accessible :tagger_type
-       belongs_to :tagger, :polymorphic => true
+      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}
+      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
     self.default_relevance = 1
 
@@ -45,7 +50,16 @@ module Tagtical
       end
       set_tag_target_without_relevance(tag)
     end
+
     alias_method_chain :set_tag_target, :relevance
 
+    private
+
+    def validate_relevance
+      if range = Tagtical::Tag.relevance_range
+        errors[:relevance] = "must be between #{range.begin} and #{range.end}" unless range.include?(relevance)
+      end
+    end
+
   end
 end

data/spec/tagtical/taggable_spec.rb

@@ -88,11 +88,11 @@ describe Tagtical::Taggable do
       @taggables[1].update_attributes!(:language_list => "Spanish, French", :craft_list => "Pottery", :need_list => "Food")
     end
 
-    # These *should* be working, but we are having trouble in sqlite3, perhaps in mysql it will preform better.
-    #it "should omit the classes we don't want" do
-    #  TaggableModel.has_no_needs.all.should==[@taggables[0]]
-    #  TaggableModel.has_no_tags(:needs, :<).all.should==[]
-    #end
+    # These *should* be working, but we are having trouble in sqlite3, but we've confirmed it works in mysql
+#    it "should omit the classes we don't want" do
+#      TaggableModel.has_no_needs.all.should==[@taggables[0]]
+#      TaggableModel.has_no_tags(:needs, :<).all.should==[]
+#    end
 
   end
 

data/spec/tagtical/tagging_spec.rb

@@ -12,12 +12,12 @@ describe Tagtical::Tagging do
     context "when no relevance set" do
       before do
         @tagging.relevance = nil
-        @tagging.run_callbacks(:create)
+        @tagging.run_callbacks(:validation)
       end
       its(:relevance) { should == @klass.default_relevance }
     end
     context "when relevance set" do
-      before { @tagging.run_callbacks(:create) }
+      before { @tagging.run_callbacks(:validation) }
       its(:relevance) { should == @tagging.relevance }
     end
   end
@@ -60,4 +60,17 @@ describe Tagtical::Tagging do
     end
   end
 
+  describe "relevance_range" do
+    before do
+      @taggable = TaggableModel.create(:name => "Bob Jones")
+      Tagtical::Tag.relevance_range = (0..10)
+    end
+
+    it "should throw an error if the relevance is out of range" do
+      @taggable.set_tag_list "car:11"
+
+      expect { @taggable.save }.to raise_error
+    end
+  end
+
 end

metadata

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