deas 0.1.0 → 0.2.0

data/lib/deas/rack_request_fix.rb

@@ -0,0 +1,23 @@
+require 'rack'
+
+class Rack::Request
+
+  # Pulled from rack master on 2013-05-01. This modifies the rack port lookup
+  # to look at HTTP_X_FORWARDED_PROTO and make a decision. This lookup is
+  # missing from v1.5.2 and causes our Production setup (stunnel and haproxy)
+  # to not work correctly.
+  def port
+    if port = host_with_port.split(/:/)[1]
+      port.to_i
+    elsif port = @env['HTTP_X_FORWARDED_PORT']
+      port.to_i
+    elsif @env.has_key?("HTTP_X_FORWARDED_HOST")
+      DEFAULT_PORTS[scheme]
+    elsif @env.has_key?("HTTP_X_FORWARDED_PROTO")
+      DEFAULT_PORTS[@env['HTTP_X_FORWARDED_PROTO']]
+    else
+      @env["SERVER_PORT"].to_i
+    end
+  end
+
+end

data/lib/deas/server.rb

@@ -29,9 +29,10 @@ module Deas
       option :static_files,    NsOptions::Boolean, :default => true
 
       # Deas specific options
-      option :init_proc, Proc,   :default => proc{ }
-      option :logger,            :default => proc{ Deas::NullLogger.new }
-      option :verbose_logging,   :default => true
+      option :init_proc,       Proc,  :default => proc{ }
+      option :logger,                 :default => proc{ Deas::NullLogger.new }
+      option :middlewares,     Array, :default => []
+      option :verbose_logging,        :default => true
 
       option :routes,          Array, :default => []
       option :view_handler_ns, String
@@ -102,6 +103,10 @@ module Deas
       self.configuration.logger *args
     end
 
+    def use(*args)
+      self.configuration.middlewares << args
+    end
+
     def verbose_logging(*args)
       self.configuration.verbose_logging *args
     end

data/lib/deas/sinatra_app.rb

@@ -8,26 +8,30 @@ module Deas
       server_config.init_proc.call
       server_config.routes.each(&:constantize!)
 
-      Class.new(Sinatra::Base).tap do |app|
+      Sinatra.new do
 
         # built-in settings
-        app.set :environment, server_config.env
-        app.set :root,        server_config.root
+        set :environment, server_config.env
+        set :root,        server_config.root
 
-        app.set :app_file,      server_config.app_file
-        app.set :public_folder, server_config.public_folder
-        app.set :views,         server_config.views_folder
+        set :app_file,      server_config.app_file
+        set :public_folder, server_config.public_folder
+        set :views,         server_config.views_folder
 
-        app.set :dump_errors,     server_config.dump_errors
-        app.set :logging,         false
-        app.set :method_override, server_config.method_override
-        app.set :sessions,        server_config.sessions
-        app.set :show_exceptions, server_config.show_exceptions
-        app.set :static,          server_config.static_files
+        set :dump_errors,     server_config.dump_errors
+        set :logging,         false
+        set :method_override, server_config.method_override
+        set :sessions,        server_config.sessions
+        set :show_exceptions, server_config.show_exceptions
+        set :static,          server_config.static_files
 
         # custom settings
-        app.set :logger,        server_config.logger
-        app.set :runner_logger, server_config.runner_logger
+        set :logger,        server_config.logger
+        set :runner_logger, server_config.runner_logger
+
+        server_config.middlewares.each do |middleware_args|
+          use *middleware_args
+        end
 
         # routes
         server_config.routes.each do |route|
@@ -35,13 +39,13 @@ module Deas
           #   before('/'){ ... }
           #   get('/'){ ... }
           #   after('/'){ ... }
-          app.before(route.path) do
+          before(route.path) do
             @runner = route.runner(self).setup
           end
-          app.send(route.method, route.path) do
+          send(route.method, route.path) do
             @runner.run
           end
-          app.after(route.path) do
+          after(route.path) do
             @runner.teardown
           end
         end

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/deas.rb

@@ -6,6 +6,9 @@ require 'deas/server'
 require 'deas/sinatra_app'
 require 'deas/view_handler'
 
+# TODO - remove with future version of Rack (> v1.5.2)
+require 'deas/rack_request_fix'
+
 ENV['DEAS_ROUTES_FILE'] ||= 'config/routes'
 
 module Deas

data/test/unit/server_tests.rb

@@ -23,7 +23,7 @@ class Deas::Server
     subject{ Deas::Server }
 
     should have_instance_methods :configuration, :init, :view_handler_ns,
-      :get, :post, :put, :patch, :delete, :route
+      :get, :post, :put, :patch, :delete, :route, :use
 
     should "be a singleton" do
       assert_includes Singleton, subject.included_modules
@@ -59,6 +59,9 @@ class Deas::Server
       subject.static_files false
       assert_equal false, config.static_files
 
+      subject.use 'MyMiddleware'
+      assert_equal [ ['MyMiddleware'] ], config.middlewares
+
       stdout_logger = Logger.new(STDOUT)
       subject.logger stdout_logger
       assert_equal stdout_logger, config.logger
@@ -155,7 +158,8 @@ class Deas::Server
 
     should have_instance_methods :env, :root, :app_file, :public_folder,
       :views_folder, :dump_errors, :method_override, :sessions, :static_files,
-      :init_proc, :logger, :routes, :view_handler_ns, :show_exceptions
+      :init_proc, :logger, :routes, :view_handler_ns, :show_exceptions,
+      :middlewares
 
     should "default the env to 'development'" do
       assert_equal 'development', subject.env
@@ -198,6 +202,10 @@ class Deas::Server
       assert_equal [], subject.routes
     end
 
+    should "default middlewares to an empty array" do
+      assert_equal [], subject.middlewares
+    end
+
   end
 
 end

data/test/unit/sinatra_app_tests.rb

@@ -42,19 +42,20 @@ module Deas::SinatraApp
     end
 
     should "have it's configuration set based on the server configuration" do
-      subject.settings do |settings|
-        assert_equal 'staging',                  settings.env
-        assert_equal 'path/to/somewhere',        settings.root
+      subject.settings.tap do |settings|
+        assert_equal 'staging',                  settings.environment
+        assert_equal 'path/to/somewhere',        settings.root.to_s
         assert_equal @configuration.app_file,    settings.app_file
-        assert_equal 'path/to/somewhere/public', settings.public_folder
-        assert_equal 'path/to/somewhere/views',  settings.views
+        assert_equal 'path/to/somewhere/public', settings.public_folder.to_s
+        assert_equal 'path/to/somewhere/views',  settings.views.to_s
         assert_equal true,                       settings.dump_errors
         assert_equal false,                      settings.logging
         assert_equal false,                      settings.method_override
         assert_equal false,                      settings.sessions
         assert_equal true,                       settings.show_exceptions
-        assert_equal true,                       settings.static_files
-        assert_equal @configuration.logger,      settings.deas_logger
+        assert_equal true,                       settings.static
+        assert_instance_of Deas::RunnerLogger,   settings.runner_logger
+        assert_instance_of Deas::NullLogger,     settings.logger
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-01 00:00:00 Z
+date: 2013-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -127,6 +127,7 @@ files:
 - deas.gemspec
 - lib/deas.rb
 - lib/deas/logger.rb
+- lib/deas/rack_request_fix.rb
 - lib/deas/route.rb
 - lib/deas/runner.rb
 - lib/deas/server.rb