validate_block 0.1.0 → 0.2.0

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.2.0 2010-09-13
+
+* changed method_missing to accept params in *args to fix bug where
+  'validates_presence_of' would fail if more than one attribute was
+  given.
+
+=== 0.1.1 2010-09-10
+
+* added specs from justinbaker
+
 === 0.1 2010-08-20
 
 * Initial release

data/README.rdoc

@@ -8,14 +8,14 @@ This gem allows similar ActiveRecord validates_* commands to be grouped together
 
 How often have you had a block of validation commands in an ActiveRecord object that are repeated, especially :id or :unless options?  Does this look familiar?
 
-  validates_presence_of  :hair, :unless => :bald?
+  validates_presence_of  :hair, :hair_color, :unless => :bald?
   validates_length_of    :hair, :within => 3..15, :unless => :bald?
   validates_inclusion_of :hair_color, :in => HAIR_COLORS, :unless => bald?
   
 Instead, this gem will allow you to replace the above code with:
 
   validate_block :unless => :bald? do
-    presence_of  :hair
+    presence_of  :hair, :hair_color
     length_of    :hair, :within => 3..15
     inclusion_of :hair_color, :in => HAIR_COLORS
   end
@@ -24,29 +24,26 @@ Instead, this gem will allow you to replace the above code with:
 
 Basically, this gem 1) removes the requirement to have 'validates_' on the front of the commands and 2) passes the options on the validate_block command to each validation command inside the block.
 
-The syntax of the validation commands remains the same.  Keeping the 'validate_*' prefix on the commands inside the block _will_ work but it is not required.
-
-WARNING: There are no specs for this yet because I suck.  Actually, it's because I don't properly understand how to spec a module like this so any help on that front would be appreciated.
+The syntax of the validation commands remains the same.  Keeping the 'validates_*' prefix on the commands inside the block _will_ work but it is not required.
 
 == SYNOPSIS:
 
-require 'rubygems'
-require 'activerecord'
-require 'validate_block'
+  require 'rubygems'
+  require 'activerecord'
+  require 'validate_block'
 
-class SomeObject < ActiveRecord::Base
+  class SomeObject < ActiveRecord::Base
 
-  validate_block :if => :some_method? do
-    presence_of :some_field
-    inclusion_of :some_other_field, :in => SOME_VALUES
-  end
+    validate_block :if => :some_method? do
+      presence_of :some_field
+      inclusion_of :some_other_field, :in => SOME_VALUES
+    end
   
-end
+  end
 
 == REQUIREMENTS:
 
-ActiveRecord >= 2.1.0
-Rspec (for specs)
+  ActiveRecord >= 2.1.0
 
 == INSTALL:
 

data/Rakefile

@@ -6,7 +6,7 @@ require 'hoe'
 require 'fileutils'
 require './lib/validate_block'
 
-VERSION = "0.1.0"
+VERSION = "0.2.0"
 
 Hoe.plugin :newgem
 

data/lib/validate_block.rb

@@ -9,11 +9,17 @@ module ActiveRecord
         yield
       end
 
-      def method_missing(name, attrib, opts = {}, &block)
+      def method_missing(name, *args, &block)
+        if args.last.class == Hash
+          args.last.merge!(@block_opts)
+        else
+          args << @block_opts
+        end
+        
         if name.to_s =~ /^validates_/
-          send(name, attrib, opts.merge(@block_opts))
+          send(name, *args)
         elsif respond_to?(("validates_"+name.to_s).to_sym)
-          send(("validates_"+name.to_s).to_sym, attrib, opts.merge(@block_opts))
+          send(("validates_"+name.to_s).to_sym, *args)
         else
           super
         end

data/spec/spec_helper.rb

@@ -7,4 +7,21 @@ rescue LoadError
 end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
+require 'rubygems'
+require 'active_record'
+require 'active_record/version'
+require 'action_controller'
+require 'action_view'
+require 'action_mailer'
+
+
+ActiveRecord::Migration.verbose = false
+ActiveRecord::Base.establish_connection({:adapter => 'sqlite3', :database => ':memory:'})
+ActiveRecord::Schema.define do
+    create_table :people do |table|
+        table.column :hair, :string
+        table.column :hair_color, :string
+    end
+end
+
 require 'validate_block'

data/spec/validate_block_spec.rb

@@ -1,5 +1,40 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
+class Person < ActiveRecord::Base 
+
+  HAIR_COLORS = %w{blond brown black}
+
+  def bald?
+    hair.nil?
+  end
+
+  validate_block :unless => :bald? do
+    presence_of  :hair, :hair_color
+    length_of    :hair, :within => 3..15
+    inclusion_of :hair_color, :in => HAIR_COLORS
+  end
+
+end
 describe "validate_block" do
-  # there wer currently no specs, I'm lazy and don't understand how to spec a module like this.
+
+  before(:each) do
+    @person = Person.new
+  end
+
+   it "returns true" do
+     @person.save.should == true #:nohair:
+   end
+
+   it "returns an error for long hair" do
+     @person.hair = "a lot of effin hair mannnnn"
+     @person.save.should == false
+   end
+
+   it "returns an error for red hair" do
+
+     @person.hair = "short"
+     @person.hair_color = "red"
+     @person.save.should == false
+   end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: validate_block
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Matthew Nielsen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 -06:00
+date: 2010-09-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,14 +55,14 @@ description: |-
   
   How often have you had a block of validation commands in an ActiveRecord object that are repeated, especially :id or :unless options?  Does this look familiar?
   
-    validates_presence_of  :hair, :unless => :bald?
+    validates_presence_of  :hair, :hair_color, :unless => :bald?
     validates_length_of    :hair, :within => 3..15, :unless => :bald?
     validates_inclusion_of :hair_color, :in => HAIR_COLORS, :unless => bald?
     
   Instead, this gem will allow you to replace the above code with:
   
     validate_block :unless => :bald? do
-      presence_of  :hair
+      presence_of  :hair, :hair_color
       length_of    :hair, :within => 3..15
       inclusion_of :hair_color, :in => HAIR_COLORS
     end
@@ -71,9 +71,7 @@ description: |-
   
   Basically, this gem 1) removes the requirement to have 'validates_' on the front of the commands and 2) passes the options on the validate_block command to each validation command inside the block.
   
-  The syntax of the validation commands remains the same.  Keeping the 'validate_*' prefix on the commands inside the block _will_ work but it is not required.
-  
-  WARNING: There are no specs for this yet because I suck.  Actually, it's because I don't properly understand how to spec a module like this so any help on that front would be appreciated.
+  The syntax of the validation commands remains the same.  Keeping the 'validates_*' prefix on the commands inside the block _will_ work but it is not required.
 email: 
 - xunker@pyxidis.org
 executables: []