dzl 1.0.0.rc0 → 1.0.0.rc1

data/config.ru

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

data/lib/dzl/dsl_subjects/parameter.rb

@@ -29,6 +29,11 @@ class Dzl::DSLSubjects::Parameter < Dzl::DSLSubject
   def dup_data
     @opts = @opts.clone
     @validations = @validations.clone
+    @validations.each do |k, v|
+      if v.kind_of?(Dzl::Validator)
+        @validations[k] = v.clone
+      end
+    end
     @dsl_proxy = Dzl::DSLProxies::Parameter.new(self)
   end
 

data/lib/dzl/examples/fun_with_pblocks.rb

@@ -0,0 +1,26 @@
+require 'dzl/examples/base'
+
+class Dzl::Examples::FunWithPblocks < Dzl::Examples::Base
+  pblock :foo do
+    required :ary do
+      type Array
+      size == 2
+    end
+  end
+
+  pblock :bar do
+    import_pblock :foo
+
+    required :ary do
+      size == 4
+    end
+  end
+
+  get '/foo' do
+    import_pblock :foo
+  end
+
+  get '/bar' do
+    import_pblock :bar
+  end
+end

data/lib/dzl/validators/size.rb

@@ -1,8 +1,8 @@
 module Dzl::Validators
   class Size < Dzl::Validator
     attr_reader :conditions
-    def initialize
-      @conditions = []
+    def initialize(conditions = {})
+      @conditions = conditions
     end
 
     def validate(input)
@@ -25,8 +25,13 @@ module Dzl::Validators
 
     [:==, :<=, :>=, :<, :>].each do |op|
       define_method(op) do |n|
-        @conditions << [op, n]
+        @conditions[op] = n
       end
     end
+
+    def clone
+      dup_conditions = @conditions.clone
+      self.class.new(dup_conditions)
+    end
   end
 end

data/lib/dzl/version.rb

@@ -1,3 +1,3 @@
 module Dzl
-  VERSION = "1.0.0.rc0"
+  VERSION = "1.0.0.rc1"
 end

data/spec/fun_with_pblocks_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'rack/test'
+require 'dzl/examples/fun_with_pblocks'
+
+describe Dzl::Examples::FunWithPblocks do
+  def app; Dzl::Examples::FunWithPblocks; end
+  include Rack::Test::Methods
+
+  specify '/foo required :ary size == 2' do
+    get('/foo?ary=one%20two').status.should == 200
+    get('/foo?ary=one%20two%20three%20four').status.should == 404
+  end
+
+  specify '/bar required :ary size == 4' do
+    get('/bar?ary=one%20two%20three%20four').status.should == 200
+    get('/bar?ary=one%20two').status.should == 404
+  end
+end

data/spec/hash_validator_spec.rb

@@ -241,4 +241,38 @@ describe HashValidator do
       ary: [1, 2, 3]
     }).should == true
   end
+
+  context 'allows re-opening of keys for redefinition' do
+    specify 'for a simple type change' do
+      v = HashValidator.new do
+        required(:foo)
+      end
+
+      v.valid?({foo: 'hello'}).should == true
+
+      v.required(:foo) do
+        type Fixnum
+      end
+
+      v.valid?({foo: 'hello'}).should == false
+      v.valid?({foo: 4}).should == true
+    end
+
+    specify 'for new allowed_values' do
+      v = HashValidator.new do
+        required(:foo) do
+          allowed_values ['two', 'four', 'six']
+        end
+      end
+
+      v.valid?({foo: 'two'}).should == true
+
+      v.required(:foo) do
+        allowed_values ['one', 'three', 'five']
+      end
+
+      v.valid?({foo: 'two'}).should == false
+      v.valid?({foo: 'three'}).should == true
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dzl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc0
+  version: 1.0.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000 Z
+date: 2012-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70190801357240 !ruby/object:Gem::Requirement
+  requirement: &70217913767620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70190801357240
+  version_requirements: *70217913767620
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70190801356740 !ruby/object:Gem::Requirement
+  requirement: &70217913766740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70190801356740
+  version_requirements: *70217913766740
 description: Small, fast racktivesupport web framework with handy DSL and explicit
   parameter validation.
 email:
@@ -82,6 +82,7 @@ files:
 - lib/dzl/examples/fun_with_hashes.rb
 - lib/dzl/examples/fun_with_hooks.rb
 - lib/dzl/examples/fun_with_params.rb
+- lib/dzl/examples/fun_with_pblocks.rb
 - lib/dzl/examples/fun_with_requests.rb
 - lib/dzl/examples/fun_with_scopes.rb
 - lib/dzl/examples/route_profile.rb
@@ -105,6 +106,7 @@ files:
 - spec/fun_with_hashes_spec.rb
 - spec/fun_with_hooks_spec.rb
 - spec/fun_with_params_spec.rb
+- spec/fun_with_pblocks_spec.rb
 - spec/fun_with_requests_spec.rb
 - spec/fun_with_scopes_spec.rb
 - spec/hash_validator_spec.rb
@@ -145,6 +147,7 @@ test_files:
 - spec/fun_with_hashes_spec.rb
 - spec/fun_with_hooks_spec.rb
 - spec/fun_with_params_spec.rb
+- spec/fun_with_pblocks_spec.rb
 - spec/fun_with_requests_spec.rb
 - spec/fun_with_scopes_spec.rb
 - spec/hash_validator_spec.rb