dzl 1.0.0.rc11 → 1.0.0.rc12

data/lib/dzl/dsl_subjects/parameter_block.rb

@@ -23,7 +23,7 @@ class Dzl::DSLSubjects::ParameterBlock < Dzl::DSLSubject
           Dzl::ValueOrError.new(e: param.opts[:header] ? :missing_required_header : :missing_required_param)
         elsif parandidate.nil?
           # TODO HashValidator with default values
-          Dzl::ValueOrError.new(v: :__no_value__)
+          Dzl::ValueOrError.new(v: param.default_value)
         else
           unless parandidate.is_a?(Hash)
             if param.opts[:format] == :json

data/lib/dzl/examples/fun_with_hashes.rb

@@ -57,4 +57,17 @@ class Dzl::Examples::FunWithHashes < Dzl::Examples::Base
       optional(:id) { type Fixnum }
     end
   end
+
+  post '/hash_with_default' do
+    optional :hash do
+      type Hash
+      default({
+        default: 'v1'
+      })
+
+      required :default do
+        allowed_values %w{v1 v2 v3}
+      end
+    end
+  end
 end

data/lib/dzl/version.rb

@@ -1,3 +1,3 @@
 module Dzl
-  VERSION = "1.0.0.rc11"
+  VERSION = "1.0.0.rc12"
 end

data/lib/hash_validator/hash_validator.rb

@@ -1,5 +1,6 @@
 class HashValidator
   attr_reader :dsl_proxy
+  attr_accessor :default_value
 
   class << self
     alias_method :orig_new, :new
@@ -18,6 +19,7 @@ class HashValidator
 
     @key_stack = []
     @dsl_proxy = DSLProxy.new(self)
+    @default_value = :__no_value__
   end
 
   def opts
@@ -146,5 +148,10 @@ class HashValidator
     def forbidden_values(ary)
       @subject.add_option(:forbidden_values, ary)
     end
+
+    def default(hsh)
+      raise ArgumentError unless hsh.is_a?(Hash)
+      @subject.default_value = hsh
+    end
   end
 end

data/spec/fun_with_hashes_spec.rb

@@ -188,4 +188,27 @@ describe 'hash parameters' do
       end
     end
   end
+
+  context 'default values' do
+    specify 'are not used when the parameter is present' do
+      post('/hash_with_default', {hash: {default: 'v2'}.to_json}) do |response|
+        response.status.should == 200
+        JSON.parse(response.body)['params']['hash']['default'].should == 'v2'
+      end
+    end
+
+    specify 'are used when the parameter is omitted' do
+      post('/hash_with_default') do |response|
+        response.status.should == 200
+        JSON.parse(response.body)['params']['hash']['default'].should == 'v1'
+      end
+    end
+
+    specify 'validations on provided parameter still work as expected' do
+      post('/hash_with_default', {hash: {default: 'bad'}.to_json}) do |response|
+        response.status.should == 404
+        JSON.parse(response.body)['errors']['/hash_with_default']['hash'].should == 'hash_validation_failed'
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dzl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc11
+  version: 1.0.0.rc12
   prerelease: 6
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70317751225820 !ruby/object:Gem::Requirement
+  requirement: &70160812208580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70317751225820
+  version_requirements: *70160812208580
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70317751225320 !ruby/object:Gem::Requirement
+  requirement: &70160812208080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70317751225320
+  version_requirements: *70160812208080
 description: Small, fast racktivesupport web framework with handy DSL and explicit
   parameter validation.
 email: