tagtical 1.5.7 → 1.5.8

data/Gemfile

@@ -3,8 +3,8 @@ source :gemcutter
 # Rails 3.0
 
 # Cannot require these as dependency until there the fix is released:
-# 
-gem 'rails', '<=3.0.5'
+#
+gem 'rails', '<= 3.0.11'
 gem 'rspec'
 # http://rubyforge.org/tracker/?func=detail&atid=575&aid=29163&group_id=126
 

data/Gemfile.lock

@@ -2,73 +2,77 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.5)
-      actionpack (= 3.0.5)
-      mail (~> 2.2.15)
-    actionpack (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
+    actionmailer (3.0.11)
+      actionpack (= 3.0.11)
+      mail (~> 2.2.19)
+    actionpack (3.0.11)
+      activemodel (= 3.0.11)
+      activesupport (= 3.0.11)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
+      rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    activemodel (3.0.11)
+      activesupport (= 3.0.11)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-      arel (~> 2.0.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.11)
+      activemodel (= 3.0.11)
+      activesupport (= 3.0.11)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-    activesupport (3.0.5)
+    activeresource (3.0.11)
+      activemodel (= 3.0.11)
+      activesupport (= 3.0.11)
+    activesupport (3.0.11)
     arel (2.0.10)
     builder (2.1.2)
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     git (1.2.5)
-    i18n (0.6.0)
+    i18n (0.5.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    json (1.6.5)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.16)
+    mime-types (1.17.2)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
     mysql (2.8.1)
-    polyglot (0.3.2)
-    rack (1.2.4)
+    polyglot (0.3.3)
+    rack (1.2.5)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.5)
-      actionmailer (= 3.0.5)
-      actionpack (= 3.0.5)
-      activerecord (= 3.0.5)
-      activeresource (= 3.0.5)
-      activesupport (= 3.0.5)
+    rails (3.0.11)
+      actionmailer (= 3.0.11)
+      actionpack (= 3.0.11)
+      activerecord (= 3.0.11)
+      activeresource (= 3.0.11)
+      activesupport (= 3.0.11)
       bundler (~> 1.0)
-      railties (= 3.0.5)
-    railties (3.0.5)
-      actionpack (= 3.0.5)
-      activesupport (= 3.0.5)
+      railties (= 3.0.11)
+    railties (3.0.11)
+      actionpack (= 3.0.11)
+      activesupport (= 3.0.11)
       rake (>= 0.8.7)
+      rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.8.7)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
       rspec-expectations (~> 2.7.0)
@@ -93,6 +97,6 @@ DEPENDENCIES
   jeweler
   mocha
   mysql
-  rails (<= 3.0.5)
+  rails (<= 3.0.11)
   rspec
   sqlite3-ruby

data/README.rdoc

@@ -1,5 +1,7 @@
 = Tagtical
 
+{<img src="https://secure.travis-ci.org/Mixbook/tagtical.png" />}[http://travis-ci.org/Mixbook/tagtical]
+
 This plugin was originally based on acts_as_taggable_on by Michael Bleigh (http://mbleigh.com/). That plugin
 was based on acts_as_taggable_on_steroids by Jonathan Viney.
 

data/Rakefile

@@ -10,50 +10,50 @@ begin
 
   Spec::Rake::SpecTask.new('rcov') do |t|
     t.spec_files = FileList["spec/**/*_spec.rb"]
-    t.rcov = true
-    t.rcov_opts = ['--exclude', 'spec']
+    t.rcov       = true
+    t.rcov_opts  = ['--exclude', 'spec']
   end
-  
+
 rescue LoadError
   # RSpec 2.0
   require 'rspec/core/rake_task'
 
   desc 'Default: run specs'
-  task :default => :spec  
+  task :default => :spec
   RSpec::Core::RakeTask.new do |t|
     t.pattern = "spec/**/*_spec.rb"
   end
-  
+
   RSpec::Core::RakeTask.new('rcov') do |t|
-    t.pattern = "spec/**/*_spec.rb"
-    t.rcov = true
+    t.pattern   = "spec/**/*_spec.rb"
+    t.rcov      = true
     t.rcov_opts = ['--exclude', 'spec']
   end
 
 rescue LoadError
-  puts "RSpec not available. Install it with: gem install rspec"  
+  puts "RSpec not available. Install it with: gem install rspec"
 end
 
 namespace 'rails2.3' do
   task :spec do
     gemfile = File.join(File.dirname(__FILE__), 'lib', 'tagtical', 'compatibility', 'Gemfile')
     ENV['BUNDLE_GEMFILE'] = gemfile
-    Rake::Task['spec'].invoke    
+    Rake::Task['spec'].invoke
   end
 end
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "tagtical"
-    gemspec.summary = "Tagtical is a tagging plugin for Rails that provides weighting, contexts, and inheritance for tags."
+    gemspec.name        = "tagtical"
+    gemspec.summary     = "Tagtical is a tagging plugin for Rails that provides weighting, contexts, and inheritance for tags."
     gemspec.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."
-    gemspec.email = "aryk@mixbook.com"
-    gemspec.homepage = "https://github.com/Mixbook/tagtical"
-    gemspec.authors = ["Aryk Grosz"]
-    gemspec.files =  FileList["[A-Z]*", "{generators,lib,spec,rails}/**/*"] - FileList["**/*.log"]
+    gemspec.email       = "aryk@mixbook.com"
+    gemspec.homepage    = "https://github.com/Mixbook/tagtical"
+    gemspec.authors     = ["Aryk Grosz"]
+    gemspec.files       = FileList["[A-Z]*", "{generators,lib,spec,rails}/**/*"] - FileList["**/*.log"]
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"
-end
+end

data/VERSION

@@ -1 +1 @@
-1.5.7
+1.5.8

data/lib/tagtical/tag.rb

@@ -50,19 +50,23 @@ 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)
+      def find_or_create_tags(tag_list, tag_types = [])
+        find_or_build_or_create_tags(:create!, tag_list, tag_types)
       end
 
-      def find_or_build_tags(*tag_list)
-        find_or_build_or_create_tags(:new, *tag_list)
+      def find_or_build_tags(tag_list, tag_types = [])
+        find_or_build_or_create_tags(:new, tag_list, tag_types)
       end
 
-      def find_or_build_or_create_tags(operation, *tag_list)
+      def find_or_build_or_create_tags(operation, tag_list, tag_types)
         tag_list = [tag_list].flatten
         return {} if tag_list.empty?
 
-        existing_tags = where_any_like(tag_list).all
+        existing_tags = where_any_like(tag_list)
+        if tag_types.present?
+          existing_tags = existing_tags.where(["type IS NULL OR type IN (?)", tag_types.map(&:klass).map(&:to_s)])
+        end
+        existing_tags = existing_tags.all
         tag_list.each_with_object({}) do |value, tag_lookup|
           tag_lookup[detect_comparable(existing_tags, value) || send(operation, :value => value)] = value
         end

data/lib/tagtical/taggable/core.rb

@@ -296,7 +296,7 @@ module Tagtical::Taggable
             tag_list = tag_list.uniq
 
             # Find existing tags or create non-existing tags:
-            tag_value_lookup = tag_type.klass.find_or_create_tags(tag_list)
+            tag_value_lookup = tag_type.klass.find_or_create_tags(tag_list, expanded_tag_types)
             tags = tag_value_lookup.keys
 
 

data/spec/tagtical/tag_spec.rb

@@ -246,7 +246,7 @@ describe Tagtical::Tag do
 
     it "should find both tags" do
       lambda {
-        @klass.find_or_create_tags("awesome", "epic")
+        @klass.find_or_create_tags(["awesome", "epic"])
       }.should change(@klass, :count).by(0)
     end
   end
@@ -310,7 +310,7 @@ describe Tagtical::Tag do
 
     it "should find or create by name" do
       lambda {
-        @klass.find_or_create_tags("awesome", "epic").keys.map(&:value).should == ["awesome", "epic"]
+        @klass.find_or_create_tags(["awesome", "epic"]).keys.map(&:value).should == ["awesome", "epic"]
       }.should change(@klass, :count).by(1)
     end
 

data/spec/tagtical/taggable_spec.rb

@@ -7,6 +7,14 @@ describe Tagtical::Taggable do
   end
   subject { @taggable }
 
+  it "should not use not registered tags" do
+    Tag::Skill.create!(:value => "chess")
+    taggable = OtherTaggableModel.create!
+    taggable.tag_list = "chess, basketball"
+    taggable.save!
+    taggable.tags.any? { |t| t.is_a?(Tag::Skill) }.should be_false
+  end
+
   it "should have tag types" do
     TaggableModel.tag_types.should include("tag", "language", "skill", "craft", "need", "offering")
     @taggable.tag_types.should == TaggableModel.tag_types
@@ -696,7 +704,7 @@ describe Tagtical::Taggable do
     @taggable.tag_list_on(:skills).should == ["hello"]
   end
 
-    #it "should be able to set a custom tag context list" do
+  #it "should be able to set a custom tag context list" do
   #  bob = TaggableModel.create(:name => "Bob")
   #  bob.set_tag_list_on(:rotors, "spinning, jumping")
   #  bob.tag_list_on(:rotors).should == ["spinning","jumping"]

data/spec/tagtical/tagging_spec.rb

@@ -29,7 +29,7 @@ describe Tagtical::Tagging do
 
   it "should not be valid with a invalid tag" do
     @tagging.taggable = TaggableModel.create(:name => "Bob Jones")
-    @tagging.tag = Tagtical::Tag.new(:value => "") 
+    @tagging.tag = Tagtical::Tag.new(:value => "")
 
     @tagging.should_not be_valid
 
@@ -69,7 +69,7 @@ describe Tagtical::Tagging do
     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
+      expect { @taggable.save! }.to raise_error
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagtical
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,23 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 -08:00
+date: 2012-02-23 00:00:00.000000000 -08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2154015420 !ruby/object:Gem::Requirement
+  requirement: &2154054300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 3.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *2154015420
+  version_requirements: *2154054300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154014880 !ruby/object:Gem::Requirement
+  requirement: &2154053820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154014880
+  version_requirements: *2154053820
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2154014400 !ruby/object:Gem::Requirement
+  requirement: &2154053340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154014400
+  version_requirements: *2154053340
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2154013920 !ruby/object:Gem::Requirement
+  requirement: &2154052860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154013920
+  version_requirements: *2154052860
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2154013440 !ruby/object:Gem::Requirement
+  requirement: &2154052380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154013440
+  version_requirements: *2154052380
 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.