ratatouille 1.3.2 → 1.3.4

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.3.4
+
+### Updates
+
+* :is\_a now available as an option in **ratify** to reduce unnecessary nesting
+
+### Corrections
+
+* Fixed logic error while processing missing methods. It will correctly call super on missing\_method if 
+  we do not catch expected methods
+
 ## 1.3.2
 
 ### Updates

data/lib/ratatouille.rb

@@ -11,6 +11,8 @@ module Ratatouille
 
   # @param [Hash, Array] obj Object to validate
   # @param [Hash] options
+  # @option options [Class] :is_a
+  # @option options [String, Symbol] :name
   # @return [Validatable::Ratifier]
   def ratify(obj, options={}, &block)
     Ratatouille::Ratifier.new(obj, options, &block)

data/lib/ratatouille/ratifier.rb

@@ -13,12 +13,18 @@ module Ratatouille
       @ratifiable_object = obj
       self.name = options[:name]
 
+      @is_a ||= options[:is_a]
+
       case obj
       when Hash  then extend Ratatouille::HashMethods
       when Array then extend Ratatouille::ArrayMethods
       end
 
-      instance_eval( &block ) if block_given?
+      unless @is_a.nil?
+        is_a?(@is_a, &block)
+      else
+        instance_eval( &block ) if block_given?
+      end
 
       cleanup_errors
 
@@ -174,16 +180,24 @@ module Ratatouille
         if @ratifiable_object.respond_to?("#{$1}?")
           if @ratifiable_object.send("#{$1}?") == true
             validation_error("is #{$1}")
+            return
           end
         end
       when id.to_s =~ /^is_(.*)$/
         if @ratifiable_object.respond_to?("#{$1}?")
           if @ratifiable_object.send("#{$1}?") == false
             validation_error("is not #{$1}")
+            return
           end
         end
       else
-        validation_error("#{id} is not supported for the given object (#{@ratifiable_object.class})")
+        begin
+          super
+          return
+        rescue Exception => e
+          validation_error("#{id} is not supported for the given object (#{@ratifiable_object.class})")
+          return e
+        end
       end
 
       instance_eval(&block) if block_given?

data/lib/ratatouille/version.rb

@@ -1,4 +1,4 @@
 module Ratatouille
   # Gem Version
-  VERSION = "1.3.2"
+  VERSION = "1.3.4"
 end

data/spec/lib/ratatouille/ratifier_spec.rb

@@ -9,6 +9,20 @@ describe Ratatouille::Ratifier do
     e.should be_valid
   end
 
+  it "should not progress into block if :is_a validation fails" do
+    f = false
+    RatifierTest.new({}, :is_a => String) { f = true }
+    f.should be_false
+
+    g = false
+    RatifierTest.new({}, :is_a => Hash) { g = true }
+    g.should be_true
+
+    h = false
+    RatifierTest.new({}) { h = true }
+    h.should be_true
+  end
+
   it "errors should contain one key within block of new instance" do
     x = {}
     e = RatifierTest.new({}){ x = @errors }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ratatouille
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 4
+  version: 1.3.4
 platform: ruby
 authors: 
 - Ryan Johnson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-23 00:00:00 Z
+date: 2012-04-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec