dzl 1.0.0.beta3 → 1.0.0.beta4

data/lib/dzl/dsl_proxies/router.rb

@@ -19,6 +19,7 @@ class Dzl::DSLProxies::Router < Dzl::DSLProxy
 
     @subject.call_with_scope(Proc.new, path)
   end
+  alias_method :namespace, :scope
 
   def endpoint(route, *request_methods)
     request_methods = [:get] if request_methods.empty?

data/lib/dzl/dsl_subjects/endpoint.rb

@@ -71,9 +71,9 @@ class Dzl::DSLSubjects::Endpoint < Dzl::DSLSubject
     @route_splits = @route.split('/').select{|s| not s.empty?}
 
     route_regex_string = @route_splits.collect do |route_part|
-      route_part.starts_with?(':') ? "/.*?" : "/#{route_part}"
-    end.push('$').join('')
+      route_part.starts_with?(':') ? "/[a-zA-Z0-9._~-]+" : "/#{route_part}"
+    end.push('/?$').join('')
 
     @route_regex = Regexp.new('^' + route_regex_string)
   end
-end
+end

data/lib/dzl/dsl_subjects/parameter.rb

@@ -47,7 +47,7 @@ class Dzl::DSLSubjects::Parameter < Dzl::DSLSubject
   # Returns a symbol describe the error if error,
   # returns the transformed value if not
   # TODO symbol values?
-  def validate(input)
+  def validate(input, opts = {})
     # Validate type
     unless input
       if @opts[:required]
@@ -61,7 +61,21 @@ class Dzl::DSLSubjects::Parameter < Dzl::DSLSubject
       end
     end
 
-    input = convert_type(input)
+    input = begin
+      if opts[:preformatted]
+        if input.is_a?(param_type)
+          Dzl::ValueOrError.new(
+            v: input
+          )
+        else
+          Dzl::ValueOrError.new(
+            e: :type_conversion_error
+          )
+        end
+      else
+        convert_type(input)
+      end
+    end
     return input if input.error?
 
     input = prevalidate_transform(input.value)

data/lib/dzl/dsl_subjects/parameter_block.rb

@@ -17,12 +17,14 @@ class Dzl::DSLSubjects::ParameterBlock < Dzl::DSLSubject
       pname, param = pary
       parandidate_key = param.opts[:header] ? :headers : :params
 
-      # verror = value or error.
-      verror = @params[pname].validate(parandidates[parandidate_key][pname])
-      if verror.error?
-        errors[pname] = verror.error
+      param = @params[pname].validate(parandidates[parandidate_key][pname], {
+        preformatted: request.preformatted_keys.include?(pname)
+      })
+
+      if param.error?
+        errors[pname] = param.error
       else
-        parandidates[parandidate_key][pname] = verror.value unless verror.value == :__no_value__
+        parandidates[parandidate_key][pname] = param.value unless param.value == :__no_value__
       end
     end || {}
 

data/lib/dzl/examples/fun_with_params.rb

@@ -68,4 +68,11 @@ class Dzl::Examples::FunWithParams < Dzl::Examples::Base
   end
 
   endpoint '/foo/:bar'
-end
+
+  endpoint '/rofl/:copter', :post do
+    optional(:candy) { type Array }
+    optional(:cookies, :sunshine) { type Fixnum }
+    optional :more
+    required :sunshine, :steak
+  end
+end

data/lib/dzl/request.rb

@@ -1,10 +1,12 @@
 class Dzl::Request < Rack::Request
   attr_accessor :silent
+  attr_reader :preformatted_keys
 
   def initialize(env)
     super(env)
 
     @endpoints = Hash.new({})
+    @preformatted_keys = []
   end
 
   def headers
@@ -19,7 +21,14 @@ class Dzl::Request < Rack::Request
   end
 
   def params
-    @params ||= super
+    @params ||= begin
+      @request_body = body.read
+      unless preformatted_params.empty?
+        @preformatted_keys = preformatted_params.keys.collect {|k| k.to_sym}
+      end
+
+      super.merge(preformatted_params)
+    end
   end
 
   def overwrite_headers(new_headers)
@@ -51,4 +60,9 @@ class Dzl::Request < Rack::Request
   def silent?
     @silent == true
   end
-end
+
+  protected
+  def preformatted_params
+    @preformatted_params ||= (content_type == "application/json") ? JSON.parse(@request_body) : {}
+  end
+end

data/lib/dzl/version.rb

@@ -1,3 +1,3 @@
 module Dzl
-  VERSION = "1.0.0.beta3"
+  VERSION = "1.0.0.beta4"
 end

data/spec/fun_with_params_spec.rb

@@ -200,4 +200,42 @@ describe Dzl::Examples::FunWithParams do
       end
     end
   end
-end
+
+  describe '/rofl/:copter' do
+    it 'infers json-encoded body parameters' do
+      example_body = {
+        'candy' => [1,3,4],
+        'cookies' => 7,
+        'steak' => 'eww',
+        'sunshine' => 9
+      }.to_json
+      header "Content-Type", "application/json"
+      post('/rofl/haha?more=vars', example_body) do |response|
+        response.successful?.should be_true
+        params = JSON.parse(response.body)['params']
+        params['copter'].should == 'haha'
+        params['candy'].should == [1, 3, 4]
+        params['sunshine'].should == 9
+        params['more'].should == "vars"
+      end
+    end
+
+    it 'still validates types' do
+      example_body = {
+        'candy' => 'this-will-be-a-one-element-array',
+        'cookies' => ['o', 'o', 'p', 's'],
+        'steak' => 'eww',
+        'sunshine' => 9
+      }.to_json
+      header "Content-Type", "application/json"
+      post('/rofl/haha?more=vars', example_body) do |response|
+        response.successful?.should be_false
+        errors = JSON.parse(response.body)['errors']['/rofl/:copter']
+        errors.should == {
+          'cookies' => 'type_conversion_error',
+          'candy' => 'type_conversion_error'
+        }
+      end
+    end
+  end
+end

data/spec/fun_with_requests_spec.rb

@@ -13,6 +13,13 @@ describe 'endpoint request method' do
     end
   end
 
+  it 'ignores an extra trailing slash' do
+    get('/foo/') do |response|
+      response.status.should == 200
+      response.body.should == 'get'
+    end
+  end
+
   it 'allows specification through endpoint options' do
     post('/post_op') do |response|
       response.status.should == 200
@@ -98,4 +105,4 @@ describe 'endpoint request method' do
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dzl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta3
+  version: 1.0.0.beta4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70140311025420 !ruby/object:Gem::Requirement
+  requirement: &70279829324860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70140311025420
+  version_requirements: *70279829324860
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70140311024920 !ruby/object:Gem::Requirement
+  requirement: &70279829322760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70140311024920
+  version_requirements: *70279829322760
 description: Small, fast racktivesupport web framework with handy DSL and explicit
   parameter validation.
 email: