tagtical 1.5.5 → 1.5.6

data/VERSION

@@ -1 +1 @@
-1.5.5
+1.5.6

data/lib/tagtical/tag.rb

@@ -220,7 +220,11 @@ module Tagtical
           case input
           when self then input
           when String, Symbol then new(sanitize(input), taggable_class)
-          when Hash  then input.map { |input, klass| new(sanitize(input), taggable_class, :klass => klass) }
+          when Hash
+            input.map do |input, class_or_string|
+              class_key = class_or_string.is_a?(String) ? :class_name : :klass
+              new(sanitize(input), taggable_class, class_key => class_or_string)
+            end
           when Array then input.map { |c| find(c, taggable_class) }.flatten
           end
         end
@@ -416,6 +420,7 @@ module Tagtical
       end
 
       def find_tag_class!
+        return ActiveSupport::Dependencies.constantize(@class_name) if @class_name
         return Tagtical::Tag if base?
 
         # Logic comes from ActiveRecord::Base#compute_type.

data/spec/models.rb

@@ -27,11 +27,13 @@ class NeedTag < Tagtical::Tag # Tag subclass ending in "Tag"
 end
 class Offering < Tagtical::Tag # Top level
 end
+class BarCraft < Tagtical::Tag
+end
 
 ### END Tag Subclasses ###
 
 class TaggableModel < ActiveRecord::Base
-  acts_as_taggable(:languages, :skills, {:crafts => Tag::FooCraft}, :needs, :offerings)
+  acts_as_taggable(:languages, :skills, {:crafts => Tag::FooCraft}, :needs, :offerings, {:styles => "BarCraft"})
   has_many :untaggable_models
 end
 

data/spec/tagtical/tag_spec.rb

@@ -356,6 +356,15 @@ describe Tagtical::Tag do
     its(:klass) { should == Tag::Skill }
     its(:scope_name) { should == :skills }
 
+    it "should be initialized by a class name if the name is provided" do
+      type = @klass.new("style", @taggable_model, :class_name => "BarCraft")
+      type.klass.should == BarCraft
+    end
+
+    it "should be able to provide class name through acts_as_taggable" do
+      @klass.cache["style"].first.klass.should == BarCraft
+    end
+
     describe ".find" do
       it "converts string into correct format" do
         {"ClassNames" => "class_name", "photo_tags" => "photo", :photo => "photo"}.each do |input, result|

metadata

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