ratatouille 1.2.5 → 1.2.6

data/CHANGELOG.md

@@ -0,0 +1,44 @@
+## 1.2.6
+
+* CHANGELOG added
+* required\_key logic moved to given\_key and triggered with a :required => true option
+  * required\_key now calls given_key with :required => true
+
+## 1.2.5
+
+* required\_key fixed so that block behaves like given\_key block, by diving into the context of the key value
+
+## 1.2.4
+
+* required\_key added to HashMethods
+* Additional Tests
+
+## 1.2.2
+
+* is\_a? method added to HashMethods
+* Additional Tests
+
+## 1.2.0
+
+* Added Ratatouille::Ratifier name attribute for use with dynamically changing scoped errors.
+* The current Ratifier name (in scope of the validation block) will be appended to errors created
+  in the direct context of that block.
+* The name attribute is automatically set when using a given_key block. However, you may pass a :name
+  option to the given\_key method to manually set it.
+
+## 1.1.1
+
+* choice\_of validation errors show semantically correct key names (Symbols, Strings, etc.)
+* choice\_of tweaked/fixed to perform proper validation on list of keys
+
+## 1.0.0
+
+* Not to be mistaken by 0.1.0
+* Plethora of tests added
+* Refactoring Code
+* Organization and Documentation
+
+## 0.9.2
+
+* Initial Release
+  * Strange, I know, but this library was being production tested prior to becoming a gem.

data/lib/ratatouille/hash.rb

@@ -9,6 +9,13 @@ module Ratatouille
     def given_key(key, options={}, &block)
       options[:name] = options.fetch(:name, (Symbol === key ? ":#{key}" : key.to_s) )
 
+      if options.fetch(:required, false) == true
+        unless @ratifiable_object.has_key?(key)
+          validation_error("Missing key #{key.inspect}")
+          return
+        end
+      end
+
       if @ratifiable_object.has_key?(key) && block_given?
         child_object = Ratatouille::Ratifier.new(@ratifiable_object[key], options, &block)
         @errors[key] = child_object.errors unless child_object.valid?
@@ -64,12 +71,7 @@ module Ratatouille
 
       unless common_keys.size == req_keys.size
         (req_keys - common_keys).each do |missed| 
-          case missed
-          when Symbol then validation_error("Missing :#{missed}")
-          when String then validation_error("Missing #{missed}")
-          when respond_to?(:to_s)
-            validation_error("Missing #{missed.to_s}")
-          end
+          validation_error("Missing #{missed.inspect}")
         end
         return
       end
@@ -83,25 +85,12 @@ module Ratatouille
     # Perform validation on a key that must be present in the Hash to validate. Otherwise,
     # an error will be added.
     #
-    # @param [String,Symbol] req_key Required Key
+    # @param key Required Key
     # @return [void]
-    def required_key(req_key, options={}, &block)
-      if req_key.nil?
-        validation_error("required_key needs key argument")
-        return
-      end
-
-      unless @ratifiable_object.has_key?(req_key)
-        case req_key
-        when Symbol then validation_error("Missing key :#{req_key}")
-        when String then validation_error("Missing key #{req_key}")
-        when respond_to?(:to_s)
-          validation_error("Missing key #{req_key.to_s}")
-        end
-        return
-      end
-
-      given_key(req_key, options, &block) if block_given?
+    def required_key(key, options={}, &block)
+      options[:required] = true
+      # Pass on processing to given_key with :required => true option
+      given_key(key, options, &block)
     rescue Exception => e
       validation_error("#{e.message}")
     end

data/lib/ratatouille/version.rb

@@ -1,4 +1,4 @@
 module Ratatouille
   # Gem Version
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ratatouille
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 2
-  - 5
-  version: 1.2.5
+  - 6
+  version: 1.2.6
 platform: ruby
 authors: 
 - Ryan Johnson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-15 00:00:00 Z
+date: 2012-04-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -60,6 +60,7 @@ files:
 - .gitignore
 - .travis-yml
 - .yardopts
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md