dzl 1.0.0.rc12 → 1.0.0

data/lib/dzl/examples/multi_file/first.rb

@@ -0,0 +1,15 @@
+require 'dzl/examples/base'
+
+module Dzl::Examples::MultiFile
+  class App < Dzl::Examples::Base
+    get '/one' do
+      handle do
+        'one'
+      end
+    end
+
+    pblock :import do
+      required :foo
+    end
+  end
+end

data/lib/dzl/examples/multi_file/second.rb

@@ -0,0 +1,11 @@
+Dzl::Examples::MultiFile::App.router do
+  get '/two' do
+    handle do
+      'two'
+    end
+  end
+
+  get '/import' do
+    import_pblock :import
+  end
+end

data/lib/dzl/version.rb

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

data/lib/dzl.rb

@@ -63,6 +63,11 @@ module Dzl
         end
       end
 
+      def router
+        raise ArgumentError unless block_given?
+        __router.dsl_proxy.instance_exec(&Proc.new)
+      end
+
       def respond_to?(m)
         orig_respond_to?(m) || (__router && __router.dsl_proxy.respond_to?(m))
       end

data/spec/multi_file_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'rack/test'
+require 'dzl/examples/multi_file/first'
+require 'dzl/examples/multi_file/second'
+
+describe 'multi file apps' do
+  include Rack::Test::Methods
+  def app; Dzl::Examples::MultiFile::App; end
+
+  specify 'apps can be declared in multiple files' do
+    get('/one').body.should == 'one'
+    get('/two').body.should == 'two'
+  end
+
+  specify 'pblock importing still works' do
+    get('/import') do |response|
+      response.status.should == 404
+      JSON.parse(response.body)['errors']['/import']['foo'].should == 'missing_required_param'
+    end
+  end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: dzl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc12
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Kyle Brett
@@ -14,7 +14,7 @@ date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70160812208580 !ruby/object:Gem::Requirement
+  requirement: &70266315864100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70160812208580
+  version_requirements: *70266315864100
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70160812208080 !ruby/object:Gem::Requirement
+  requirement: &70266315862300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70160812208080
+  version_requirements: *70266315862300
 description: Small, fast racktivesupport web framework with handy DSL and explicit
   parameter validation.
 email:
@@ -85,6 +85,8 @@ files:
 - lib/dzl/examples/fun_with_pblocks.rb
 - lib/dzl/examples/fun_with_requests.rb
 - lib/dzl/examples/fun_with_scopes.rb
+- lib/dzl/examples/multi_file/first.rb
+- lib/dzl/examples/multi_file/second.rb
 - lib/dzl/examples/route_profile.rb
 - lib/dzl/examples/scribe.rb
 - lib/dzl/examples/trey.rb
@@ -112,6 +114,7 @@ files:
 - spec/fun_with_scopes_spec.rb
 - spec/hash_validator_spec.rb
 - spec/logger_spec.rb
+- spec/multi_file_spec.rb
 - spec/route_params_spec.rb
 - spec/router_doc_spec.rb
 - spec/scribe_spec.rb
@@ -133,9 +136,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15
@@ -154,6 +157,7 @@ test_files:
 - spec/fun_with_scopes_spec.rb
 - spec/hash_validator_spec.rb
 - spec/logger_spec.rb
+- spec/multi_file_spec.rb
 - spec/route_params_spec.rb
 - spec/router_doc_spec.rb
 - spec/scribe_spec.rb