dzl 1.0.0.rc3 → 1.0.0.rc4

data/config.ru

@@ -45,12 +45,12 @@ end
 #   run Dzl::Examples::FunWithScopes
 # end
 
-# require 'dzl/examples/fun_with_hashes'
-# map '/' do
-#   run Dzl::Examples::FunWithHashes
-# end
-
-require 'dzl/examples/fun_with_pblocks'
+require 'dzl/examples/fun_with_hashes'
 map '/' do
-  run Dzl::Examples::FunWithPblocks
-end
+  run Dzl::Examples::FunWithHashes
+end
+
+# require 'dzl/examples/fun_with_pblocks'
+# map '/' do
+#   run Dzl::Examples::FunWithPblocks
+# end

data/lib/dzl/dsl_proxies/parameter.rb

@@ -43,10 +43,16 @@ class Dzl::DSLProxies::Parameter < Dzl::DSLProxy
     @subject.validations[:type] = type
     @subject.opts[:type_opts] = type_opts
 
-    if type == Hash && !type_opts.try_keys(:validator).is_a?(HashValidator)
-      raise ArgumentError.new("Must pass :validator, an instance of HashValidator")
-    elsif type == Hash && block_given?
-      type_opts[:validator].instance_exec(&Proc.new)
+    if type == Hash && type_opts.has_key?(:validator)
+      raise Dzl::Deprecated.new("The hash validator syntax is no longer supported.")
+    end
+
+    if type == Hash
+      raise Dzl::RetryBlockPlease.new(
+        subject: HashValidator.new(
+          @subject.opts.except(:type_opts).reverse_merge(format: :json)
+        )
+      )
     end
   end
 

data/lib/dzl/dsl_proxies/parameter_block.rb

@@ -1,19 +1,28 @@
 class Dzl::DSLProxies::ParameterBlock < Dzl::DSLProxy
-  def parameter(*names)
+  def parameter(*names, &block)
     opts = names.last.is_a?(Hash) ? names.pop : {required: false}
 
     names.each do |name|
-      if @subject.params[name]
-        # Don't clobber params we already know about
-        @subject.params[name].overwrite_opts(opts)
-      else
-        @subject.params[name] = Dzl::DSLSubjects::Parameter.new(name, opts, @subject.router)
-      end
+      single_parameter(name, opts, &block)
+    end
+  end
+  alias_method :param, :parameter
 
+  def single_parameter(name, opts, &block)
+    if @subject.params[name] && !opts[:retry]
+      # Don't clobber params we already know about
+      @subject.params[name].overwrite_opts(opts)
+    else
+      @subject.params[name] = opts[:subject] || Dzl::DSLSubjects::Parameter.new(name, opts, @subject.router)
+    end
+
+    begin
       @subject.router.call_with_subject(Proc.new, @subject.params[name]) if block_given?
+    rescue Dzl::RetryBlockPlease => e
+      @subject.router.__evil_subject_pop
+      single_parameter(name, opts.merge(retry: true, subject: e[:subject]), &block)
     end
   end
-  alias_method :param, :parameter
 
   def required(*names, &block)
     opts = names.last.is_a?(Hash) ? names.pop : {}

data/lib/dzl/dsl_subjects/parameter_block.rb

@@ -16,10 +16,31 @@ class Dzl::DSLSubjects::ParameterBlock < Dzl::DSLSubject
     errors = @params.each_with_object({}) do |pary, errors|
       pname, param = pary
       parandidate_key = param.opts[:header] ? :headers : :params
+      parandidate = parandidates[parandidate_key][pname]
 
-      param = @params[pname].validate(parandidates[parandidate_key][pname], {
-        preformatted: request.preformatted_keys.include?(pname)
-      })
+      if param.opts[:type] == Hash
+        param = if parandidate.nil? && param.opts[:required]
+          Dzl::ValueOrError.new(e: param.opts[:header] ? :missing_required_header : :missing_required_param)
+        else
+          unless parandidate.is_a?(Hash)
+            if param.opts[:format] == :json
+              parandidate = JSON.parse(parandidate).recursively_symbolize_keys! rescue nil
+            end
+          end
+
+          if parandidate.nil?
+            Dzl::ValueOrError.new(e: :type_conversion_failed)
+          elsif param.valid?(parandidate)
+            Dzl::ValueOrError.new(v: parandidate)
+          else
+            Dzl::ValueOrError.new(e: :hash_validation_failed)
+          end
+        end
+      else
+        param = param.validate(parandidate, {
+          preformatted: request.preformatted_keys.include?(pname)
+        })
+      end
 
       if param.error?
         errors[pname] = param.error

data/lib/dzl/dsl_subjects/router.rb

@@ -24,6 +24,10 @@ class Dzl::DSLSubjects::Router < Dzl::DSLSubject
     @stack.pop
   end
 
+  def __evil_subject_pop
+    @stack.pop
+  end
+
   def subject
     @stack.last
   end

data/lib/dzl/errors.rb

@@ -6,6 +6,10 @@ class Dzl::Error < StandardError
     @status = 500
   end
 
+  def [](key)
+    @data[key]
+  end
+
   def to_json
     {
       status: @status,
@@ -30,4 +34,7 @@ class Dzl::BadRequest < Dzl::RequestError
     super(data)
     @status = 400
   end
-end
+end
+
+class Dzl::RetryBlockPlease < Dzl::Error; end
+class Dzl::Deprecated < Dzl::Error; end

data/lib/dzl/examples/fun_with_hashes.rb

@@ -3,18 +3,29 @@ require 'dzl/examples/base'
 class Dzl::Examples::FunWithHashes < Dzl::Examples::Base
   post '/h' do
     required :foo do
-      type Hash, validator: HashValidator.new do
-        required :str
-        required :ary do
-          type Array
-          allowed_values [3, 5, 7]
-        end
+      type Hash
+      required :str
+      required :ary do
+        type Array
+        allowed_values [3, 5, 7]
+      end
 
-        required :nest do
-          type Hash
-          required(:int) { type Fixnum }
-        end
+      required :nest do
+        type Hash
+        required(:int) { type Fixnum }
       end
     end
   end
+
+  post '/mixed', :get do
+    required :hsh do
+      type Hash
+      required :zim, :zam
+    end
+
+    required :ary do
+      type Array, separator: '|'
+      allowed_values %w{one two three}
+    end
+  end
 end

data/lib/dzl/rack_interface.rb

@@ -89,8 +89,9 @@ module Dzl::RackInterface
   end
 
   def log_request(request, response, seconds)
-    logger.info "#{request.request_method} #{request.path}"
-    logger.info "PARAMS: #{request.params}"
-    logger.info "#{response[0]} in #{seconds * 1000}ms"
+    logger.info  "#{request.request_method} #{request.path}"
+    logger.info  "PARAMS: #{request.params}"
+    logger.debug "BODY: #{request.body}" unless request.body.blank?
+    logger.info  "#{response[0]} in #{seconds * 1000}ms"
   end
 end

data/lib/dzl/request.rb

@@ -20,9 +20,13 @@ class Dzl::Request < Rack::Request
     end
   end
 
+  alias_method :orig_body, :body
+  def body
+    @request_body ||= orig_body.read
+  end
+
   def params
     @params ||= begin
-      @request_body = body.read
       unless preformatted_params.empty?
         @preformatted_keys = preformatted_params.keys
       end
@@ -65,7 +69,7 @@ class Dzl::Request < Rack::Request
   def preformatted_params
     @preformatted_params ||= begin
       if content_type == "application/json"
-        JSON.parse(@request_body).recursively_symbolize_keys!
+        JSON.parse(body).recursively_symbolize_keys!
       else
         {}
       end

data/lib/dzl/version.rb

@@ -1,3 +1,3 @@
 module Dzl
-  VERSION = "1.0.0.rc3"
+  VERSION = "1.0.0.rc4"
 end

data/lib/hash_validator/hash_validator.rb

@@ -1,4 +1,6 @@
 class HashValidator
+  attr_reader :dsl_proxy
+
   class << self
     alias_method :orig_new, :new
     def new(*args)
@@ -8,15 +10,20 @@ class HashValidator
     end
   end
 
-  def initialize
+  def initialize(opts = {})
     @template = {
-      keys: {}
+      keys: {},
+      opts: opts
     }
 
     @key_stack = []
     @dsl_proxy = DSLProxy.new(self)
   end
 
+  def opts
+    @template[:opts]
+  end
+
   def valid?(hsh)
     top[:keys].each do |k, v|
       if !hsh.has_key?(k)
@@ -88,6 +95,8 @@ class HashValidator
   end
 
   class DSLProxy
+    attr_reader :subject
+
     def initialize(subject)
       @subject = subject
     end
@@ -100,12 +109,18 @@ class HashValidator
       @subject.key(k, opts, &block)
     end
 
-    def optional(k, opts = {}, &block)
-      key(k, opts.merge({required: false}), &block)
+    def optional(*args, &block)
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+      args.each do |key|
+        key(key, opts.merge({required: false}), &block)
+      end
     end
 
-    def required(k, opts = {}, &block)
-      key(k, opts.merge({required: true}), &block)
+    def required(*args, &block)
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+      args.each do |key|
+        key(key, opts.merge({required: true}), &block)
+      end
     end
 
     def type(klass)

data/spec/fun_with_hashes_spec.rb

@@ -7,7 +7,7 @@ describe 'hash parameters' do
   def app; Dzl::Examples::FunWithHashes; end
 
   context 'DSL' do
-    specify 'hash parameters must have a validator, for now' do
+    specify 'DEPRECATED: hash parameters must have a validator, for now' do
       expect {
         class T1 < Dzl::Examples::Base
           get '/foo' do
@@ -16,7 +16,7 @@ describe 'hash parameters' do
             end
           end
         end
-      }.to raise_exception(ArgumentError)
+      }.to_not raise_exception(ArgumentError)
 
       expect {
         class T1 < Dzl::Examples::Base
@@ -26,7 +26,53 @@ describe 'hash parameters' do
             end
           end
         end
-      }.to_not raise_exception(ArgumentError)
+      }.to raise_exception(Dzl::Deprecated)
+    end
+
+    specify 'hash parameters retry their blocks against a hash validator' do
+      HashValidator.any_instance.should_receive(:key).with(:key, {required: true, type: String})
+      class T1 < Dzl::Examples::Base
+        get '/foo' do
+          required :bar do
+            type Hash
+            required(:key) do
+              type Array
+            end
+          end
+        end
+      end
+    end
+
+    specify 'hash validator is built properly for required params' do
+      class T1 < Dzl::Examples::Base
+        get '/foo' do
+          required :bar do
+            type Hash
+            self.subject.opts.should == {type: Hash, required: true, format: :json}
+
+            required(:key) do
+              self.subject.should_receive(:add_option).with(:type, Array)
+              type Array
+            end
+          end
+        end
+      end
+    end
+
+    specify 'nested hashes do not retry their blocks against a new hash validator' do
+      class T1 < Dzl::Examples::Base
+        get '/foo' do
+          required :bar do
+            type Hash
+            HashValidator.any_instance.should_receive(:key)
+            required(:nested) do
+              HashValidator.any_instance.should_not_receive(:new)
+              HashValidator.any_instance.should_receive(:add_option).with(:type, Hash)
+              type Hash
+            end
+          end
+        end
+      end
     end
   end
 
@@ -68,4 +114,33 @@ describe 'hash parameters' do
       post('/h', invalid_body.to_json).status.should == 404
     end
   end
+
+  context 'mixed input' do
+    specify 'is fine' do
+      valid = {
+        hsh: {
+          zim: 'ok',
+          zam: 'sweet'
+        }.to_json,
+        ary: ['one', 'three'].join('|')
+      }
+
+      get('/mixed', valid).status.should == 200
+      JSON.parse(get('/mixed', valid.except(:ary)).body)['errors']['/mixed'].should == {
+        'ary' => 'missing_required_param'
+      }
+    end
+
+    specify 'hashes can have & and = and ? in them' do
+      valid = {
+        hsh: {
+          zim: 'ok?',
+          zam: 'swe&et=omg'
+        }.to_json,
+        ary: ['one', 'three'].join('|')
+      }
+
+      get('/mixed', valid).status.should == 200
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dzl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70197974289540 !ruby/object:Gem::Requirement
+  requirement: &70105711904460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70197974289540
+  version_requirements: *70105711904460
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70197974289020 !ruby/object:Gem::Requirement
+  requirement: &70105711903860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70197974289020
+  version_requirements: *70105711903860
 description: Small, fast racktivesupport web framework with handy DSL and explicit
   parameter validation.
 email: