spraypaint 1.0.1 → 1.0.2

data/Rakefile

@@ -1,6 +1,6 @@
 $: << File.expand_path(File.join(File.dirname(__FILE__), "lib"))
 
-require 'spraypaint'
+require 'spraypaint/version'
 require 'spec/rake/spectask' rescue nil
 
 namespace :spraypaint do
@@ -15,6 +15,8 @@ namespace :spraypaint do
       gemspec.homepage = "http://github.com/tomafro/spraypaint.git"
       gemspec.authors = ['Tom Ward']
     end
+    
+    Jeweler::GemcutterTasks.new
   rescue LoadError
     puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
   end

data/lib/spraypaint.rb

@@ -47,13 +47,6 @@
 # 
 
 module Spraypaint
-  module Version
-    MAJOR = 1
-    MINOR = 0
-    PATCH = 1
-    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
-  end
-  
   def self.activate_plugin
     ActiveRecord::Base.extend(ClassMethods)
   end

data/lib/spraypaint/behaviour.rb

@@ -5,7 +5,7 @@ module Spraypaint::Behaviour
   
   def self.included(base)
     self.included_modules.each do |m|
-      m.__send__ :included, base
+      m.send :included, base
     end
   end
 end

data/lib/spraypaint/behaviour/manipulation.rb

@@ -61,7 +61,7 @@ module Spraypaint::Behaviour::Manipulation
   
   module ClassMethods
     def tag_sanitizer
-      @tag_sanitizer ||= Spraypaint::DefaultSanitizer.new
+      @tag_sanitizer ||= Spraypaint::Sanitizer.new
     end
     
     def tag_sanitizer=(sanitizer)

data/lib/spraypaint/sanitizer.rb

@@ -1,11 +1,17 @@
-module Spraypaint::Sanitizer
+class Spraypaint::Sanitizer
+  include Spraypaint::SanitizerSupport
   
-  # Sanitizes an array of tags, passing each one through #sanitize_tag and removing
-  # all nils and duplicates.
-  
-  def sanitize_array(array)
-    array.collect do |tag|
-      sanitize_tag(tag)
-    end.compact.uniq
+  attr_accessor :allowed_characters
+
+  def initialize(allowed_characters = /[\w -]/)
+    self.allowed_characters = allowed_characters
+  end
+
+  def sanitize_tag(tag)
+    return nil if tag.nil?
+    string = tag.strip
+    string = string.mb_chars.normalize(:d).gsub(/[^\0-\x80]/, '')
+    string = string.scan(self.allowed_characters).join
+    string.empty? ? nil : string.to_s
   end
 end

data/lib/spraypaint/sanitizer_support.rb

@@ -0,0 +1,11 @@
+module Spraypaint::SanitizerSupport
+  
+  # Sanitizes an array of tags, passing each one through #sanitize_tag and removing
+  # all nils and duplicates.
+  
+  def sanitize_array(array)
+    array.collect do |tag|
+      sanitize_tag(tag)
+    end.compact.uniq
+  end
+end

data/lib/spraypaint/version.rb

@@ -0,0 +1,8 @@
+module Spraypaint
+  module Version
+    MAJOR = 1
+    MINOR = 0
+    PATCH = 2
+    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
+  end
+end

data/spraypaint.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spraypaint}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Ward"]
-  s.date = %q{2009-11-04}
+  s.date = %q{2009-11-05}
   s.description = %q{Simple tagging in a can}
   s.email = %q{tom@popdog.net}
   s.files = [
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
      "MIT-LICENSE",
      "Rakefile",
      "TODO",
-     "VERSION.yml",
      "about.yml",
      "generators/spraypaint_migration/spraypaint_migration_generator.rb",
      "generators/spraypaint_migration/templates/spraypaint_migration.rb",
@@ -27,10 +26,11 @@ Gem::Specification.new do |s|
      "lib/spraypaint/behaviour/discovery.rb",
      "lib/spraypaint/behaviour/manipulation.rb",
      "lib/spraypaint/behaviour/persistence.rb",
-     "lib/spraypaint/default_sanitizer.rb",
      "lib/spraypaint/model/tag.rb",
      "lib/spraypaint/model/tagging.rb",
      "lib/spraypaint/sanitizer.rb",
+     "lib/spraypaint/sanitizer_support.rb",
+     "lib/spraypaint/version.rb",
      "rails/init.rb",
      "spraypaint.gemspec",
      "test/config/boot.rb",
@@ -38,14 +38,11 @@ Gem::Specification.new do |s|
      "test/config/environment.rb",
      "test/config/environments/test.rb",
      "test/db/schema.rb",
-     "test/spec/default_sanitizer_spec.rb",
      "test/spec/models/tag_spec.rb",
      "test/spec/models/tagging_spec.rb",
+     "test/spec/sanitizer_spec.rb",
      "test/spec/spec_helper.rb",
-     "test/spec/spraypaint_spec.rb",
-     "vendor/penknife/lib/penknife.rb",
-     "vendor/penknife/lib/penknife/rake.rb",
-     "vendor/penknife/lib/penknife/rake/plugin_tasks.rb"
+     "test/spec/spraypaint_spec.rb"
   ]
   s.homepage = %q{http://github.com/tomafro/spraypaint.git}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -57,9 +54,9 @@ Gem::Specification.new do |s|
      "test/config/environment.rb",
      "test/config/environments/test.rb",
      "test/db/schema.rb",
-     "test/spec/default_sanitizer_spec.rb",
      "test/spec/models/tag_spec.rb",
      "test/spec/models/tagging_spec.rb",
+     "test/spec/sanitizer_spec.rb",
      "test/spec/spec_helper.rb",
      "test/spec/spraypaint_spec.rb"
   ]

data/test/spec/{default_sanitizer_spec.rb → sanitizer_spec.rb}

@@ -1,9 +1,9 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe Spraypaint::DefaultSanitizer do
+describe Spraypaint::Sanitizer do
   describe '(with no arguments passed to constructor)' do
     before(:each) do
-      @it = Spraypaint::DefaultSanitizer.new
+      @it = Spraypaint::Sanitizer.new
     end
     
     it "should strip surrounding whitespace from tag" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spraypaint
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Tom Ward
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +00:00
+date: 2009-11-05 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -27,7 +27,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - TODO
-- VERSION.yml
 - about.yml
 - generators/spraypaint_migration/spraypaint_migration_generator.rb
 - generators/spraypaint_migration/templates/spraypaint_migration.rb
@@ -36,10 +35,11 @@ files:
 - lib/spraypaint/behaviour/discovery.rb
 - lib/spraypaint/behaviour/manipulation.rb
 - lib/spraypaint/behaviour/persistence.rb
-- lib/spraypaint/default_sanitizer.rb
 - lib/spraypaint/model/tag.rb
 - lib/spraypaint/model/tagging.rb
 - lib/spraypaint/sanitizer.rb
+- lib/spraypaint/sanitizer_support.rb
+- lib/spraypaint/version.rb
 - rails/init.rb
 - spraypaint.gemspec
 - test/config/boot.rb
@@ -47,9 +47,9 @@ files:
 - test/config/environment.rb
 - test/config/environments/test.rb
 - test/db/schema.rb
-- test/spec/default_sanitizer_spec.rb
 - test/spec/models/tag_spec.rb
 - test/spec/models/tagging_spec.rb
+- test/spec/sanitizer_spec.rb
 - test/spec/spec_helper.rb
 - test/spec/spraypaint_spec.rb
 has_rdoc: true
@@ -85,8 +85,8 @@ test_files:
 - test/config/environment.rb
 - test/config/environments/test.rb
 - test/db/schema.rb
-- test/spec/default_sanitizer_spec.rb
 - test/spec/models/tag_spec.rb
 - test/spec/models/tagging_spec.rb
+- test/spec/sanitizer_spec.rb
 - test/spec/spec_helper.rb
 - test/spec/spraypaint_spec.rb

data/VERSION.yml

@@ -1,4 +0,0 @@
---- 
-:patch: 0
-:major: 1
-:minor: 0

data/lib/spraypaint/default_sanitizer.rb

@@ -1,17 +0,0 @@
-class Spraypaint::DefaultSanitizer
-  include Spraypaint::Sanitizer
-  
-  attr_accessor :allowed_characters
-
-  def initialize(allowed_characters = /[\w -]/)
-    self.allowed_characters = allowed_characters
-  end
-
-  def sanitize_tag(tag)
-    return nil if tag.nil?
-    string = tag.strip
-    string = string.mb_chars.normalize(:d).gsub(/[^\0-\x80]/, '')
-    string = string.scan(self.allowed_characters).join
-    string.empty? ? nil : string.to_s
-  end
-end