tagtical 1.5.4 → 1.5.5

data/VERSION

@@ -1 +1 @@
-1.5.4
+1.5.5

data/lib/tagtical/tag.rb

@@ -51,16 +51,24 @@ module Tagtical
       # Method used to ensure list of tags for the given Tag class.
       # Returns a hash with the key being the value from the tag list and the value being the saved tag.
       def find_or_create_tags(*tag_list)
+        find_or_build_or_create_tags(:create!, *tag_list)
+      end
+
+      def find_or_build_tags(*tag_list)
+        find_or_build_or_create_tags(:new, *tag_list)
+      end
+
+      def find_or_build_or_create_tags(operation, *tag_list)
         tag_list = [tag_list].flatten
         return {} if tag_list.empty?
 
         existing_tags = where_any_like(tag_list).all
         tag_list.each_with_object({}) do |value, tag_lookup|
-          tag_lookup[detect_comparable(existing_tags, value) || create!(:value => value)] = value
+          tag_lookup[detect_comparable(existing_tags, value) || send(operation, :value => value)] = value
         end
       end
 
-        # Save disc space by not having to put in "Tagtical::Tag" repeatedly
+      # Save disc space by not having to put in "Tagtical::Tag" repeatedly
       def sti_name
         Tagtical::Tag==self ? nil : super
       end

data/lib/tagtical/taggable/core.rb

@@ -335,8 +335,23 @@ module Tagtical::Taggable
         true
       end
 
+
       private
 
+      def must_have_valid_tags
+        tags = []
+        tag_types.each do |tag_type|
+          tag_lists = tag_list_cache_on(tag_type) || {}
+          tag_lists.each do |expanded_tag_types, tag_list|
+            next unless expanded_tag_types.include?(tag_type)
+            tags += tag_type.klass.find_or_build_tags(tag_list.uniq).keys
+          end
+        end
+        tags.each do |tag|
+          tag.errors.to_a.each { |error| self.errors.add(:tags, error) } unless tag.valid?
+        end
+      end
+
       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|

data/lib/tagtical/taggable.rb

@@ -32,6 +32,7 @@ module Tagtical
 
         has_many :taggings, :as => :taggable, :dependent => :destroy, :include => :tag, :class_name => "Tagtical::Tagging"
         has_many :tags, :through => :taggings, :class_name => "Tagtical::Tag"
+        validate :must_have_valid_tags
         
         class_eval do
           def self.taggable?
@@ -49,4 +50,4 @@ module Tagtical
       
     end
   end
-end 
+end

data/spec/tagtical/tagtical_spec.rb

@@ -76,6 +76,29 @@ describe Tagtical do
     end
   end
 
+  describe "Validating" do
+    when_possible_values_specified(:klass => Tag::Skill) do
+
+      before do
+        @taggable = TaggableModel.new(:name => "taggable")
+      end
+
+      it "should not be valid if the tag is not valid and self is a new record" do
+        @taggable.skill_list = "knife, foo"
+        @taggable.should_not be_valid
+        @taggable.errors[:tags].should be_present
+      end
+
+      it "should not be valid if the tag is not valid and self is not a new record" do
+        @taggable.save!
+        @taggable.set_tag_list_on("skill", "knife, foo")
+        @taggable.should_not be_valid
+        @taggable.errors[:tags].should be_present
+      end
+
+    end
+  end
+
   describe "Reloading" do
     it "should save a model instantiated by Model.find" do
       taggable = TaggableModel.create!(:name => "Taggable")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagtical
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000 -08:00
+date: 2012-01-14 00:00:00.000000000 -08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156267300 !ruby/object:Gem::Requirement
+  requirement: &2166180240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2156267300
+  version_requirements: *2166180240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156266820 !ruby/object:Gem::Requirement
+  requirement: &2166179760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156266820
+  version_requirements: *2166179760
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2156266340 !ruby/object:Gem::Requirement
+  requirement: &2166179280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156266340
+  version_requirements: *2166179280
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2156265860 !ruby/object:Gem::Requirement
+  requirement: &2166178800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156265860
+  version_requirements: *2166178800
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156265380 !ruby/object:Gem::Requirement
+  requirement: &2166178320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156265380
+  version_requirements: *2166178320
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156264900 !ruby/object:Gem::Requirement
+  requirement: &2166194980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156264900
+  version_requirements: *2166194980
 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.