deas 0.3.0 → 0.4.0

data/lib/deas/server.rb

@@ -29,7 +29,7 @@ module Deas
 
       # server handling options
       option :error_procs,     Array, :default => []
-      option :init_proc,       Proc,  :default => proc{ }
+      option :init_procs,      Array, :default => []
       option :logger,                 :default => proc{ Deas::NullLogger.new }
       option :middlewares,     Array, :default => []
       option :verbose_logging,        :default => true
@@ -105,7 +105,7 @@ module Deas
     end
 
     def init(&block)
-      self.configuration.init_proc = block
+      self.configuration.init_procs << block
     end
 
     def logger(*args)

data/lib/deas/sinatra_app.rb

@@ -7,7 +7,10 @@ module Deas
   module SinatraApp
 
     def self.new(server_config)
-      server_config.init_proc.call
+      # the reason this is done here is b/c the below sinatra configuration is
+      # not considered valid until the init procs have been run and the routes
+      # have been constantized.
+      server_config.init_procs.each{ |p| p.call }
       server_config.routes.each(&:constantize!)
 
       Sinatra.new do

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/test/unit/server_tests.rb

@@ -76,9 +76,11 @@ class Deas::Server
       subject.logger stdout_logger
       assert_equal stdout_logger, config.logger
 
+      assert_equal 0, config.init_procs.size
       init_proc = proc{ }
       subject.init(&init_proc)
-      assert_equal init_proc, config.init_proc
+      assert_equal 1, config.init_procs.size
+      assert_equal init_proc, config.init_procs.first
     end
 
     should "add a GET route using #get" do
@@ -172,7 +174,7 @@ class Deas::Server
     should have_imeths :static_files, :reload_templates
 
     # server handling options
-    should have_imeths :init_proc, :logger, :verbose_logging, :middlewares
+    should have_imeths :init_procs, :logger, :verbose_logging, :middlewares
     should have_imeths :routes, :view_handler_ns
 
     should "default the env to 'development'" do

data/test/unit/sinatra_app_tests.rb

@@ -32,10 +32,13 @@ module Deas::SinatraApp
 
     should "call init procs when initialized" do
       initialized = false
-      @configuration.init_proc = proc{ initialized = true }
+      other_initialized = false
+      @configuration.init_procs << proc{ initialized = true }
+      @configuration.init_procs << proc{ other_initialized = true }
       @sinatra_app = Deas::SinatraApp.new(@configuration)
 
       assert_equal true, initialized
+      assert_equal true, other_initialized
     end
 
     should "call constantize! on all routes" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -19,8 +19,9 @@ cert_chain: []
 date: 2013-05-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: ns-options
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -38,12 +39,12 @@ dependencies:
         - 1
         - 4
         version: 1.1.4
-  requirement: *id001
-  name: ns-options
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: rack
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -53,12 +54,12 @@ dependencies:
         - 1
         - 5
         version: "1.5"
-  requirement: *id002
-  name: rack
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: sinatra
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -68,12 +69,12 @@ dependencies:
         - 1
         - 4
         version: "1.4"
-  requirement: *id003
-  name: sinatra
   type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: assert
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -83,12 +84,12 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  requirement: *id004
-  name: assert
   type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: assert-mocha
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -98,12 +99,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  requirement: *id005
-  name: assert-mocha
   type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: rack-test
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -113,9 +114,8 @@ dependencies:
         - 0
         - 6
         version: "0.6"
-  requirement: *id006
-  name: rack-test
   type: :development
+  version_requirements: *id006
 description: Handler-based web framework powered by Sinatra
 email: 
 - kelly@kellyredding.com
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Handler-based web framework powered by Sinatra