dzl 1.0.0.rc8 → 1.0.0.rc9

data/lib/dzl/dsl_proxies/parameter.rb

@@ -48,6 +48,10 @@ class Dzl::DSLProxies::Parameter < Dzl::DSLProxy
     end
 
     if type == Hash
+      unless @subject.router.subject(2).is_a?(Dzl::DSLSubjects::Endpoint)
+        raise Dzl::NYI.new("Hash parameters may only be specified in endpoints, for now")
+      end
+
       raise Dzl::RetryBlockPlease.new(
         subject: HashValidator.new(
           @subject.opts.except(:type_opts).reverse_merge(format: :json)

data/lib/dzl/dsl_subjects/router.rb

@@ -29,8 +29,8 @@ class Dzl::DSLSubjects::Router < Dzl::DSLSubject
     @stack.pop
   end
 
-  def subject
-    @stack.last
+  def subject(n = 1)
+    @stack[-1 * n]
   end
 
   def call_with_scope(proc, scope)

data/lib/dzl/version.rb

@@ -1,3 +1,3 @@
 module Dzl
-  VERSION = "1.0.0.rc8"
+  VERSION = "1.0.0.rc9"
 end

data/spec/fun_with_hashes_spec.rb

@@ -29,6 +29,16 @@ describe 'hash parameters' do
       }.to raise_exception(Dzl::Deprecated)
     end
 
+    specify 'NYI: hash parameters are currently only allowed in anonymous pblocks' do
+      expect {
+        class T1 < Dzl::Examples::Base
+          pblock :broken do
+            required(:foo) { type Hash }
+          end
+        end
+      }.to raise_error(Dzl::NYI)
+    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

metadata

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