has_handle_fallback 0.0.13 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.1.0

data/lib/has_handle_fallback.rb

@@ -24,16 +24,21 @@ module HasHandleFallback
   end
   
   module ActiveRecordBaseMethods
-    def has_handle_fallback(fallback_column, options = {})
+    def has_handle_fallback(*args)
       include InstanceMethods
       extend ClassMethods
+
+      fallback_column = args.first.respond_to?(:[]) ? nil : args.shift.to_s
+      options = args.shift || {}
       
       class_eval do
         cattr_accessor :has_handle_fallback_options
         self.has_handle_fallback_options = {}
         has_handle_fallback_options[:required] = options.delete(:required) || false
-        has_handle_fallback_options[:fallback_column] = fallback_column.to_s
+        has_handle_fallback_options[:fallback_column] = fallback_column
         has_handle_fallback_options[:handle_column] = options.delete(:handle_column) || 'handle'
+        has_handle_fallback_options[:validates_format] = 
+          options.include?(:validates_format) ? options.delete(:validates_format) : true
         
         validate :handle_is_valid
       end
@@ -54,12 +59,21 @@ module HasHandleFallback
   end
 
   module InstanceMethods
+    def fallback_handle_is_valid?
+      fallback_column = self.class.has_handle_fallback_options[:fallback_column]
+      # only check if we need to actually generate a fallback
+      if handle.blank? and fallback_column.present?
+        handle_fallback =~ HasHandleFallback::REGEXP and HasHandleFallback::LENGTH_RANGE.include?(handle_fallback.length)
+      else
+        true
+      end
+    end
+
     def handle_is_valid
       raw = read_attribute self.class.has_handle_fallback_options[:handle_column]
-      cooked = handle_fallback
 
       # inline check to make sure the handle_fallback method works
-      unless cooked =~ HasHandleFallback::REGEXP and HasHandleFallback::LENGTH_RANGE.include?(cooked.length)
+      unless fallback_handle_is_valid?
         raise "Dear Developer: your handle_fallback method is not generating valid handles (generated '#{handle_fallback}' for '#{raw}')"
       end
       
@@ -77,7 +91,7 @@ module HasHandleFallback
       end
       
       # validates_format_of :handle, :with => HasHandleFallback::REGEXP, :allow_nil => true
-      unless raw =~ HasHandleFallback::REGEXP
+      if has_handle_fallback_options[:validates_format] and raw !~ HasHandleFallback::REGEXP
         errors.add self.class.has_handle_fallback_options[:handle_column], "contains invalid characters"
       end
       
@@ -106,9 +120,11 @@ module HasHandleFallback
     end
 
     def handle_fallback
-      fallback = read_attribute self.class.has_handle_fallback_options[:fallback_column]
-      fallback = fallback.split('@').first if fallback.to_s.include? '@'
-      HasHandleFallback.str2handle fallback
+      column = self.class.has_handle_fallback_options[:fallback_column]
+      if column and fallback = read_attribute(column)
+        fallback = fallback.split('@').first if fallback.to_s.include? '@'
+        HasHandleFallback.str2handle fallback
+      end
     end
     
     def to_param

data/test/test_has_handle_fallback.rb

@@ -10,6 +10,16 @@ ActiveRecord::Schema.define(:version => 20090819143429) do
     t.string :name
     t.string :moniker
   end
+
+  create_table 'dogs', :force => true do |t|
+    t.string :email
+    t.string :handle
+  end
+  
+  create_table 'ferrets', :force => true do |t|
+    t.string :email
+    t.string :handle
+  end
 end
 
 class Person < ActiveRecord::Base
@@ -20,6 +30,15 @@ class Cat < ActiveRecord::Base
   has_handle_fallback :name, :handle_column => 'moniker', :required => true
 end
 
+class Dog < ActiveRecord::Base
+  has_handle_fallback :email, :validates_format => false
+  validates_format_of :handle, :with => /Astro/
+end
+
+class Ferret < ActiveRecord::Base
+  has_handle_fallback :validates_format => false
+end
+
 class TestHasHandleFallback < Test::Unit::TestCase
   def setup
     Person.delete_all
@@ -45,6 +64,11 @@ class TestHasHandleFallback < Test::Unit::TestCase
     pierre = Cat.new :name => 'Pierre Bourdieu'
     assert_equal false, pierre.valid?
   end
+
+  def test_nil_handle_and_email
+    abe = Person.new :email => nil, :handle => nil
+    assert_nil abe.handle
+  end
   
   def test_has_validations
     assert_equal true, Person.new(:email => 'pierre.bourdieu@example.com', :handle => 'Pierre-Bourdieu_99').valid?
@@ -110,4 +134,17 @@ class TestHasHandleFallback < Test::Unit::TestCase
     a = Person.create!(:email => 'pierre.bourdieu@example.com', :handle => handle.upcase)
     assert_equal a, Person[handle.downcase]
   end
+
+  def test_disables_validation_with_option
+    d = Dog.new :handle => 'Astro Jetson'
+    assert d.valid?
+
+    d = Dog.new :handle => 'Scooby Doo'
+    assert !d.valid?
+  end
+
+  def test_no_fallback_column
+    friedrich = Ferret.new :handle => nil, :email => 'friedrich@example.com'
+    assert_nil friedrich.handle
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_handle_fallback
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 13
-  version: 0.0.13
+  version: 0.1.0
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 -04:00
+date: 2010-06-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency