deas 0.23.1 → 0.23.2

data/Gemfile

@@ -6,3 +6,4 @@ gem 'rake'
 gem 'pry'
 gem 'multi_json'
 gem 'yajl-ruby'
+gem 'rack-test'

data/lib/deas/sinatra_runner.rb

@@ -13,7 +13,7 @@ module Deas
       @sinatra_call  = sinatra_call
       @app_settings  = @sinatra_call.settings
       @logger        = @sinatra_call.settings.logger
-      @params        = @sinatra_call.params
+      @params        = normalize_params(@sinatra_call.params)
       @request       = @sinatra_call.request
       @response      = @sinatra_call.response
       @session       = @sinatra_call.session
@@ -81,5 +81,21 @@ 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
+      end
+    end
+
   end
 end

data/lib/deas/test_runner.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'rack/multipart'
 require 'deas/runner'
 
 module Deas
@@ -11,7 +12,7 @@ module Deas
       args = (args || {}).dup
       @app_settings = OpenStruct.new(args.delete(:app_settings))
       @logger       = args.delete(:logger) || Deas::NullLogger.new
-      @params       = args.delete(:params) || {}
+      @params       = normalize_params(args.delete(:params) || {})
       @request      = args.delete(:request)
       @response     = args.delete(:response)
       @session      = args.delete(:session)
@@ -80,6 +81,32 @@ module Deas
 
     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)
+        value.kind_of?(::File) ||
+        value.kind_of?(::Rack::Multipart::UploadedFile) ||
+        (defined?(::Rack::Test::UploadedFile) && value.kind_of?(::Rack::Test::UploadedFile))
+      end
+    end
+
   end
 
 end

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.23.1"
+  VERSION = "0.23.2"
 end

data/test/support/view_handlers.rb

@@ -5,6 +5,17 @@ class TestViewHandler
 
 end
 
+class TestRunnerViewHandler
+  include Deas::ViewHandler
+
+  attr_accessor :custom_value
+
+  def run!
+    'run has run'
+  end
+
+end
+
 class RenderViewHandler
   include Deas::ViewHandler
 
@@ -64,7 +75,7 @@ class HaltViewHandler
   include Deas::ViewHandler
 
   def run!
-    halt_args = [ params['code'], params['headers'], params['body'] ].compact
+    halt_args = [ params['code'].to_i, params['headers'], params['body'] ].compact
     halt(*halt_args)
   end
 

data/test/unit/sinatra_runner_tests.rb

@@ -6,7 +6,7 @@ require 'deas/sinatra_runner'
 
 class Deas::SinatraRunner
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Deas::SinatraRunner"
     setup do
       @fake_sinatra_call = FakeSinatraCall.new
@@ -82,7 +82,7 @@ class Deas::SinatraRunner
 
   end
 
-  class RunTests < BaseTests
+  class RunTests < UnitTests
     desc "run"
     setup do
       @return_value = @runner.run
@@ -106,4 +106,43 @@ 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' }
+        ]
+      })
+    end
+
+    private
+
+    def runner_params(params)
+      @fake_sinatra_call.params = params
+      Deas::SinatraRunner.new(FlagViewHandler, @fake_sinatra_call).params
+    end
+
+  end
+
 end

data/test/unit/test_runner_tests.rb

@@ -0,0 +1,193 @@
+require 'assert'
+require 'deas/test_runner'
+
+require 'rack/test'
+require 'test/support/view_handlers'
+
+class Deas::TestRunner
+
+  class UnitTests < Assert::Context
+    desc "Deas::TestRunner"
+    setup do
+      @runner = Deas::TestRunner.new(TestRunnerViewHandler)
+    end
+    subject{ @runner }
+
+    should have_readers :handler, :return_value
+
+    should "build a handler instance" do
+      assert_kind_of TestRunnerViewHandler, subject.handler
+    end
+
+    should "default the handler settings" do
+      assert_kind_of OpenStruct, subject.app_settings
+      assert_kind_of Deas::NullLogger, subject.logger
+      assert_equal Hash.new, subject.params
+      assert_nil subject.request
+      assert_nil subject.response
+      assert_nil subject.session
+    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
+    end
+
+    should "not set a return value on initialize" do
+      assert_nil subject.return_value
+    end
+
+    should "set its return value to the return value of `run!` on run" do
+      assert_nil subject.return_value
+      subject.run
+      assert_equal subject.handler.run!, subject.return_value
+    end
+
+    should "build halt args if halt is called" do
+      value = catch(:halt){ subject.halt }
+      assert_kind_of HaltArgs, value
+      [:body, :headers, :status].each do |meth|
+        assert_respond_to meth, value
+      end
+    end
+
+    should "build redirect args if redirect is called" do
+      value = subject.redirect '/some/path'
+      assert_kind_of RedirectArgs, value
+      [:path, :halt_args].each do |meth|
+        assert_respond_to meth, value
+      end
+      assert_equal '/some/path', value.path
+      assert value.redirect?
+    end
+
+    should "build content type args if content type is called" do
+      value = subject.content_type 'something'
+      assert_kind_of ContentTypeArgs, value
+      [:value, :opts].each do |meth|
+        assert_respond_to meth, value
+      end
+      assert_equal 'something', value.value
+    end
+
+    should "build status args if status is called" do
+      value = subject.status(432)
+      assert_kind_of StatusArgs, value
+      assert_respond_to :value, value
+      assert_equal 432, value.value
+    end
+
+    should "build headers args if headers is called" do
+      value = subject.headers(:some => 'thing')
+      assert_kind_of HeadersArgs, value
+      assert_respond_to :value, value
+      exp_val = {:some => 'thing'}
+      assert_equal exp_val, value.value
+    end
+
+    should "build render args if render is called" do
+      value = subject.render 'some/template'
+      assert_kind_of RenderArgs, value
+      [:template_name, :options, :block].each do |meth|
+        assert_respond_to meth, value
+      end
+      assert_equal 'some/template', value.template_name
+    end
+
+    should "build send file args if send file is called" do
+      value = subject.send_file 'some/file/path'
+      assert_kind_of SendFileArgs, value
+      [:file_path, :options, :block].each do |meth|
+        assert_respond_to meth, value
+      end
+      assert_equal 'some/file/path', value.file_path
+    end
+
+  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']
+      })
+    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'
+        }
+      })
+    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' }
+      })
+    end
+
+    should "not convert File param values to strings" do
+      tempfile = File.new(TEST_SUPPORT_ROOT.join('routes.rb'))
+      params = runner_params({
+        'attachment' => { :tempfile => 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({
+        'attachment' => { :tempfile => tempfile }
+      })
+      assert_kind_of Rack::Multipart::UploadedFile, params['attachment']['tempfile']
+    end
+
+    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({
+        'attachment' => { :tempfile => tempfile }
+      })
+      assert_kind_of Rack::Test::UploadedFile, params['attachment']['tempfile']
+    end
+
+    private
+
+    def runner_params(params)
+      Deas::TestRunner.new(TestRunnerViewHandler, :params => params).params
+    end
+
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 65
+  hash: 71
   prerelease: 
   segments: 
   - 0
   - 23
-  - 1
-  version: 0.23.1
+  - 2
+  version: 0.23.2
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-11-18 00:00:00 Z
+date: 2013-11-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ns-options
@@ -201,6 +201,7 @@ files:
 - test/unit/sinatra_app_tests.rb
 - test/unit/sinatra_runner_tests.rb
 - test/unit/template_tests.rb
+- test/unit/test_runner_tests.rb
 - test/unit/url_tests.rb
 - test/unit/view_handler_tests.rb
 - tmp/.gitkeep
@@ -272,5 +273,6 @@ test_files:
 - test/unit/sinatra_app_tests.rb
 - test/unit/sinatra_runner_tests.rb
 - test/unit/template_tests.rb
+- test/unit/test_runner_tests.rb
 - test/unit/url_tests.rb
 - test/unit/view_handler_tests.rb