deas 0.24.0 → 0.24.1

data/lib/deas/logging.rb

@@ -102,7 +102,7 @@ module Deas
         'method'  => request.request_method,
         'path'    => request.path,
         'handler' => env['deas.handler_class_name'],
-        'params'  => env['sinatra.params'],
+        'params'  => env['deas.params'],
         'time'    => env['deas.time_taken'],
         'status'  => status
       }

data/lib/deas/route.rb

@@ -1,6 +1,7 @@
 require 'deas/sinatra_runner'
 
 module Deas
+
   class Route
 
     attr_reader :method, :path, :handler_proxy, :handler_class
@@ -15,14 +16,16 @@ module Deas
 
     # TODO: unit test this??
     def run(sinatra_call)
+      runner = Deas::SinatraRunner.new(self.handler_class, sinatra_call)
       sinatra_call.request.env.tap do |env|
-        env['sinatra.params']          = sinatra_call.params
+        env['deas.params'] = runner.params
         env['deas.handler_class_name'] = self.handler_class.name
         env['deas.logging'].call "  Handler: #{env['deas.handler_class_name']}"
-        env['deas.logging'].call "  Params:  #{env['sinatra.params'].inspect}"
+        env['deas.logging'].call "  Params:  #{env['deas.params'].inspect}"
       end
-      Deas::SinatraRunner.run(self.handler_class, sinatra_call)
+      runner.run
     end
 
   end
+
 end

data/lib/deas/runner.rb

@@ -1,3 +1,5 @@
+require 'rack/utils'
+
 module Deas
 
   class Runner
@@ -19,6 +21,28 @@ module Deas
     def partial(*args);      raise NotImplementedError; end
     def send_file(*args);    raise NotImplementedError; end
 
+    class NormalizedParams
+
+      attr_reader :value
+
+      def initialize(value)
+        @value = if value.is_a?(::Array)
+          value.map{ |i| self.class.new(i).value }
+        elsif Rack::Utils.params_hash_type?(value)
+          value.inject({}){ |h, (k, v)| h[k.to_s] = self.class.new(v).value; h }
+        elsif self.file_type?(value)
+          value
+        else
+          value.to_s
+        end
+      end
+
+      def file_type?(value)
+        raise NotImplementedError
+      end
+
+    end
+
   end
 
 end

data/lib/deas/sinatra_runner.rb

@@ -5,21 +5,17 @@ module Deas
 
   class SinatraRunner < Runner
 
-    def self.run(*args)
-      self.new(*args).run
-    end
-
     attr_reader :app_settings
 
     def initialize(handler_class, sinatra_call)
       @sinatra_call  = sinatra_call
       @app_settings  = @sinatra_call.settings
 
-      @request       = @sinatra_call.request
-      @response      = @sinatra_call.response
-      @params        = normalize_params(@sinatra_call.params)
-      @logger        = @sinatra_call.settings.logger
-      @session       = @sinatra_call.session
+      @request  = @sinatra_call.request
+      @response = @sinatra_call.response
+      @params   = NormalizedParams.new(@sinatra_call.params).value
+      @logger   = @sinatra_call.settings.logger
+      @session  = @sinatra_call.session
 
       super(handler_class)
     end
@@ -89,19 +85,9 @@ module Deas
       File.extname(template_name)[1..-1] || 'html'
     end
 
-    def normalize_params(params)
-      StringifiedKeys.new(params)
-    end
-
-    module StringifiedKeys
-      def self.new(value)
-        if value.is_a?(::Array)
-          value.map{ |i| StringifiedKeys.new(i) }
-        elsif Rack::Utils.params_hash_type?(value)
-          value.inject({}){ |h, (k, v)| h[k.to_s] = StringifiedKeys.new(v); h }
-        else
-          value
-        end
+    class NormalizedParams < Deas::Runner::NormalizedParams
+      def file_type?(value)
+        value.kind_of?(::Tempfile)
       end
     end
 

data/lib/deas/test_runner.rb

@@ -12,11 +12,11 @@ module Deas
       args = (args || {}).dup
       @app_settings = OpenStruct.new(args.delete(:app_settings))
 
-      @request      = args.delete(:request)
-      @response     = args.delete(:response)
-      @params       = normalize_params(args.delete(:params) || {})
-      @logger       = args.delete(:logger) || Deas::NullLogger.new
-      @session      = args.delete(:session)
+      @request  = args.delete(:request)
+      @response = args.delete(:response)
+      @params   = NormalizedParams.new(args.delete(:params) || {}).value
+      @logger   = args.delete(:logger) || Deas::NullLogger.new
+      @session  = args.delete(:session)
 
       super(handler_class)
       args.each{|key, value| @handler.send("#{key}=", value) }
@@ -82,26 +82,9 @@ module Deas
     end
     SendFileArgs = Struct.new(:file_path, :options, :block)
 
-    private
-
-    def normalize_params(params)
-      Stringify.new(params)
-    end
-
-    module Stringify
-      def self.new(value)
-        if value.is_a?(::Array)
-          value.map{ |i| Stringify.new(i) }
-        elsif Rack::Utils.params_hash_type?(value)
-          value.inject({}){ |h, (k, v)| h[k.to_s] = Stringify.new(v); h }
-        elsif self.file_type?(value)
-          value
-        else
-          value.to_s
-        end
-      end
-
-      def self.file_type?(value)
+    class NormalizedParams < Deas::Runner::NormalizedParams
+      def file_type?(value)
+        value.kind_of?(::Tempfile) ||
         value.kind_of?(::File) ||
         value.kind_of?(::Rack::Multipart::UploadedFile) ||
         (defined?(::Rack::Test::UploadedFile) && value.kind_of?(::Rack::Test::UploadedFile))

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.24.0"
+  VERSION = "0.24.1"
 end

data/test/support/normalized_params_spy.rb

@@ -0,0 +1,24 @@
+module Deas; end
+class Deas::Runner
+
+  class NormalizedParamsSpy
+    attr_reader :params, :value_called
+
+    def initialize
+      @params = nil
+      @value_called = false
+    end
+
+    def new(params)
+      @params = params
+      self
+    end
+
+    def value
+      @value_called = true
+      @params
+    end
+
+  end
+
+end

data/test/unit/route_tests.rb

@@ -5,7 +5,7 @@ require 'deas/route'
 
 class Deas::Route
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Deas::Route"
     setup do
       @handler_proxy = Deas::RouteProxy.new('TestViewHandler')

data/test/unit/runner_tests.rb

@@ -5,7 +5,7 @@ require 'test/support/view_handlers'
 
 class Deas::Runner
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Deas::Runner"
     setup do
       @runner = Deas::Runner.new(TestViewHandler)
@@ -43,4 +43,69 @@ class Deas::Runner
 
   end
 
+  class NormalizedParamsTests < UnitTests
+    desc "NormalizedParams"
+
+    should "convert any non-Array or non-Hash values to strings" do
+      exp_params = {
+        'nil' => '',
+        'int' => '42',
+        'str' => 'string'
+      }
+      assert_equal exp_params, normalized({
+        'nil' => nil,
+        'int' => 42,
+        'str' => 'string'
+      })
+    end
+
+    should "recursively convert array values to strings" do
+      exp_params = {
+        'array' => ['', '42', 'string']
+      }
+      assert_equal exp_params, normalized({
+        'array' => [nil, 42, 'string']
+      })
+    end
+
+    should "recursively convert hash values to strings" do
+      exp_params = {
+        'values' => {
+          'nil' => '',
+          'int' => '42',
+          'str' => 'string'
+        }
+      }
+      assert_equal exp_params, normalized({
+        'values' => {
+          'nil' => nil,
+          'int' => 42,
+          'str' => 'string'
+        }
+      })
+    end
+
+    should "convert any non-string hash keys to string keys" do
+      exp_params = {
+        'nil' => '',
+        'vals' => { '42' => 'int', 'str' => 'string' }
+      }
+      assert_equal exp_params, normalized({
+        'nil' => '',
+        :vals => { 42 => :int, 'str' => 'string' }
+      })
+    end
+
+    private
+
+    def normalized(params)
+      TestNormalizedParams.new(params).value
+    end
+
+    class TestNormalizedParams < Deas::Runner::NormalizedParams
+      def file_type?(value); false; end
+    end
+
+  end
+
 end

data/test/unit/sinatra_runner_tests.rb

@@ -1,17 +1,35 @@
 require 'assert'
 require 'deas/sinatra_runner'
 
+require 'deas/runner'
+require 'deas/template'
 require 'test/support/fake_sinatra_call'
 require 'test/support/view_handlers'
-require 'deas/template'
 
 class Deas::SinatraRunner
 
   class UnitTests < Assert::Context
     desc "Deas::SinatraRunner"
     setup do
+      @runner_class = Deas::SinatraRunner
+    end
+    subject{ @runner_class }
+
+    should "be a Runner" do
+      assert subject < Deas::Runner
+    end
+
+  end
+
+  class InitTests < UnitTests
+    desc "when init"
+    setup do
+      @params = { 'value' => '1' }
+      @norm_params_spy = Deas::Runner::NormalizedParamsSpy.new
+      Assert.stub(NormalizedParams, :new){ |p| @norm_params_spy.new(p) }
+
       @fake_sinatra_call = FakeSinatraCall.new
-      @runner = Deas::SinatraRunner.new(FlagViewHandler, @fake_sinatra_call)
+      @runner = @runner_class.new(FlagViewHandler, @fake_sinatra_call)
     end
     subject{ @runner }
 
@@ -26,6 +44,11 @@ class Deas::SinatraRunner
       assert_equal @fake_sinatra_call.session, subject.session
     end
 
+    should "call to normalize its params" do
+      assert_equal @fake_sinatra_call.params, @norm_params_spy.params
+      assert_true @norm_params_spy.value_called
+    end
+
     should "call the sinatra_call's halt with" do
       return_value = catch(:halt){ subject.halt('test') }
       assert_equal [ 'test' ], return_value
@@ -87,8 +110,8 @@ class Deas::SinatraRunner
 
   end
 
-  class RunTests < UnitTests
-    desc "run"
+  class RunTests < InitTests
+    desc "and run"
     setup do
       @return_value = @runner.run
       @handler = @runner.instance_variable_get("@handler")
@@ -111,41 +134,28 @@ class Deas::SinatraRunner
 
   end
 
-  class ParamsTests < UnitTests
-    desc "normalizing params"
-
-    should "convert any non-string hash keys to string keys" do
-      exp_params = {
-        'a' => 'aye',
-        'b' => 'bee',
-        'attachment' => {
-          'tempfile' => 'a-file',
-          'content_type' => 'whatever'
-        },
-        'attachments' => [
-          { 'tempfile' => 'a-file' },
-          { 'tempfile' => 'b-file' }
-        ]
-      }
-      assert_equal exp_params, runner_params({
-        :a  => 'aye',
-        'b' => 'bee',
-        'attachment' => {
-          :tempfile => 'a-file',
-          :content_type => 'whatever'
-        },
-        'attachments' => [
-          { :tempfile  => 'a-file' },
-          { 'tempfile' => 'b-file' }
-        ]
+  class NormalizedParamsTests < UnitTests
+    desc "NormalizedParams"
+    setup do
+      @norm_params_class = Deas::SinatraRunner::NormalizedParams
+    end
+
+    should "be a normalized params subclass" do
+      assert @norm_params_class < Deas::Runner::NormalizedParams
+    end
+
+    should "not convert Tempfile param values to strings" do
+      tempfile = Class.new(::Tempfile){ def initialize; end }.new
+      params = normalized({
+        'attachment' => { :tempfile => tempfile }
       })
+      assert_kind_of ::Tempfile, params['attachment']['tempfile']
     end
 
     private
 
-    def runner_params(params)
-      @fake_sinatra_call.params = params
-      Deas::SinatraRunner.new(FlagViewHandler, @fake_sinatra_call).params
+    def normalized(params)
+      @norm_params_class.new(params).value
     end
 
   end

data/test/unit/test_runner_tests.rb

@@ -3,6 +3,7 @@ require 'deas/test_runner'
 
 require 'rack/test'
 require 'deas/runner'
+require 'test/support/normalized_params_spy'
 require 'test/support/view_handlers'
 
 class Deas::TestRunner
@@ -10,17 +11,29 @@ class Deas::TestRunner
   class UnitTests < Assert::Context
     desc "Deas::TestRunner"
     setup do
-      @runner = Deas::TestRunner.new(TestRunnerViewHandler)
+      @runner_class = Deas::TestRunner
+    end
+    subject{ @runner_class }
+
+    should "be a Runner" do
+      assert subject < Deas::Runner
+    end
+
+  end
+
+  class InitTests < UnitTests
+    desc "when init"
+    setup do
+      @params = { 'value' => '1' }
+      @norm_params_spy = Deas::Runner::NormalizedParamsSpy.new
+      Assert.stub(NormalizedParams, :new){ |p| @norm_params_spy.new(p) }
+      @runner = @runner_class.new(TestRunnerViewHandler, :params => @params)
     end
     subject{ @runner }
 
     should have_readers :app_settings, :return_value
     should have_imeths :run
 
-    should "be a Runner" do
-      assert subject.class < Deas::Runner
-    end
-
     should "know its app_settings" do
       assert_kind_of OpenStruct, subject.app_settings
     end
@@ -28,11 +41,21 @@ class Deas::TestRunner
     should "default its settings" do
       assert_nil subject.request
       assert_nil subject.response
-      assert_equal Hash.new, subject.params
+      assert_kind_of ::Hash, subject.params
       assert_kind_of Deas::NullLogger, subject.logger
       assert_nil subject.session
     end
 
+    should "default its params" do
+      runner = @runner_class.new(TestRunnerViewHandler)
+      assert_equal ::Hash.new, runner.params
+    end
+
+    should "call to normalize its params" do
+      assert_equal @params, @norm_params_spy.params
+      assert_true @norm_params_spy.value_called
+    end
+
     should "write any non-standard settings on the handler" do
       runner = Deas::TestRunner.new(TestRunnerViewHandler, :custom_value => 42)
       assert_equal 42, runner.handler.custom_value
@@ -120,70 +143,35 @@ class Deas::TestRunner
 
   end
 
-  class ParamsTests < UnitTests
-    desc "normalizing params"
-
-    should "convert any non-Array or non-Hash values to strings" do
-      exp_params = {
-        'nil' => '',
-        'int' => '42',
-        'str' => 'string'
-      }
-      assert_equal exp_params, runner_params({
-        'nil' => nil,
-        'int' => 42,
-        'str' => 'string'
-      })
-    end
-
-    should "recursively convert array values to strings" do
-      exp_params = {
-        'array' => ['', '42', 'string']
-      }
-      assert_equal exp_params, runner_params({
-        'array' => [nil, 42, 'string']
-      })
+  class NormalizedParamsTests < UnitTests
+    desc "NormalizedParams"
+    setup do
+      @norm_params_class = Deas::TestRunner::NormalizedParams
     end
 
-    should "recursively convert hash values to strings" do
-      exp_params = {
-        'values' => {
-          'nil' => '',
-          'int' => '42',
-          'str' => 'string'
-        }
-      }
-      assert_equal exp_params, runner_params({
-        'values' => {
-          'nil' => nil,
-          'int' => 42,
-          'str' => 'string'
-        }
-      })
+    should "be a normalized params subclass" do
+      assert @norm_params_class < Deas::Runner::NormalizedParams
     end
 
-    should "convert any non-string hash keys to string keys" do
-      exp_params = {
-        'nil' => '',
-        'vals' => { '42' => 'int', 'str' => 'string' }
-      }
-      assert_equal exp_params, runner_params({
-        'nil' => '',
-        :vals => { 42 => :int, 'str' => 'string' }
+    should "not convert Tempfile param values to strings" do
+      tempfile = Class.new(::Tempfile){ def initialize; end }.new
+      params = normalized({
+        'attachment' => { :tempfile => tempfile }
       })
+      assert_kind_of ::Tempfile, params['attachment']['tempfile']
     end
 
     should "not convert File param values to strings" do
       tempfile = File.new(TEST_SUPPORT_ROOT.join('routes.rb'))
-      params = runner_params({
+      params = normalized({
         'attachment' => { :tempfile => tempfile }
       })
-      assert_kind_of File, params['attachment']['tempfile']
+      assert_kind_of ::File, params['attachment']['tempfile']
     end
 
     should "not convert Rack::Multipart::UploadedFile param values to strings" do
       tempfile = Rack::Multipart::UploadedFile.new(TEST_SUPPORT_ROOT.join('routes.rb'))
-      params = runner_params({
+      params = normalized({
         'attachment' => { :tempfile => tempfile }
       })
       assert_kind_of Rack::Multipart::UploadedFile, params['attachment']['tempfile']
@@ -191,7 +179,7 @@ class Deas::TestRunner
 
     should "not convert Rack::Test::UploadedFile param values to strings" do
       tempfile = Rack::Test::UploadedFile.new(TEST_SUPPORT_ROOT.join('routes.rb'))
-      params = runner_params({
+      params = normalized({
         'attachment' => { :tempfile => tempfile }
       })
       assert_kind_of Rack::Test::UploadedFile, params['attachment']['tempfile']
@@ -199,8 +187,8 @@ class Deas::TestRunner
 
     private
 
-    def runner_params(params)
-      Deas::TestRunner.new(TestRunnerViewHandler, :params => params).params
+    def normalized(params)
+      @norm_params_class.new(params).value
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 127
+  hash: 125
   prerelease: 
   segments: 
   - 0
   - 24
-  - 0
-  version: 0.24.0
+  - 1
+  version: 0.24.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-24 00:00:00 Z
+date: 2014-06-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -169,6 +169,7 @@ files:
 - log/.gitkeep
 - test/helper.rb
 - test/support/fake_sinatra_call.rb
+- test/support/normalized_params_spy.rb
 - test/support/routes.rb
 - test/support/view_handlers.rb
 - test/support/views/_info.erb
@@ -241,6 +242,7 @@ summary: Handler-based web framework powered by Sinatra
 test_files: 
 - test/helper.rb
 - test/support/fake_sinatra_call.rb
+- test/support/normalized_params_spy.rb
 - test/support/routes.rb
 - test/support/view_handlers.rb
 - test/support/views/_info.erb