deas 0.38.0 → 0.39.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 135
+  hash: 131
   prerelease: 
   segments: 
   - 0
-  - 38
+  - 39
   - 0
-  version: 0.38.0
+  version: 0.39.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,10 +16,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-10-21 00:00:00 Z
+date: 2015-11-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
+  type: :runtime
+  name: much-plugin
+  version_requirements: *id001
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -39,10 +54,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   name: ns-options
-  version_requirements: *id001
+  version_requirements: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -54,10 +69,10 @@ dependencies:
         version: "1.5"
   type: :runtime
   name: rack
-  version_requirements: *id002
+  version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -69,10 +84,10 @@ dependencies:
         version: "1.4"
   type: :runtime
   name: sinatra
-  version_requirements: *id003
+  version_requirements: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -84,10 +99,10 @@ dependencies:
         version: "2.15"
   type: :development
   name: assert
-  version_requirements: *id004
+  version_requirements: *id005
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -98,7 +113,7 @@ dependencies:
         version: "0"
   type: :development
   name: assert-rack-test
-  version_requirements: *id005
+  version_requirements: *id006
   prerelease: false
 description: Handler-based web framework powered by Sinatra
 email: 
@@ -113,7 +128,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - deas.gemspec
@@ -135,27 +150,30 @@ files:
 - lib/deas/server_data.rb
 - lib/deas/show_exceptions.rb
 - lib/deas/sinatra_app.rb
-- lib/deas/sinatra_runner.rb
 - lib/deas/template_engine.rb
 - lib/deas/template_source.rb
-- lib/deas/test_helpers.rb
 - lib/deas/test_runner.rb
 - lib/deas/url.rb
 - lib/deas/version.rb
 - lib/deas/view_handler.rb
 - log/.gitkeep
 - test/helper.rb
+- test/support/empty_view_handler.rb
 - test/support/factory.rb
+- test/support/fake_request.rb
 - test/support/fake_sinatra_call.rb
+- test/support/file1.txt
+- test/support/file2.txt
 - test/support/normalized_params_spy.rb
 - test/support/routes.rb
+- test/support/show.html
+- test/support/show.json
 - test/support/template.erb
 - test/support/template.json
 - test/support/test_layout1.test
 - test/support/test_layout2.test
 - test/support/test_template.test
-- test/support/view_handlers.rb
-- test/system/rack_tests.rb
+- test/system/deas_tests.rb
 - test/unit/deas_runner_tests.rb
 - test/unit/error_handler_tests.rb
 - test/unit/exceptions_tests.rb
@@ -171,10 +189,8 @@ files:
 - test/unit/server_tests.rb
 - test/unit/show_exceptions_tests.rb
 - test/unit/sinatra_app_tests.rb
-- test/unit/sinatra_runner_tests.rb
 - test/unit/template_engine_tests.rb
 - test/unit/template_source_tests.rb
-- test/unit/test_helpers_tests.rb
 - test/unit/test_runner_tests.rb
 - test/unit/url_tests.rb
 - test/unit/view_handler_tests.rb
@@ -214,17 +230,22 @@ specification_version: 3
 summary: Handler-based web framework powered by Sinatra
 test_files: 
 - test/helper.rb
+- test/support/empty_view_handler.rb
 - test/support/factory.rb
+- test/support/fake_request.rb
 - test/support/fake_sinatra_call.rb
+- test/support/file1.txt
+- test/support/file2.txt
 - test/support/normalized_params_spy.rb
 - test/support/routes.rb
+- test/support/show.html
+- test/support/show.json
 - test/support/template.erb
 - test/support/template.json
 - test/support/test_layout1.test
 - test/support/test_layout2.test
 - test/support/test_template.test
-- test/support/view_handlers.rb
-- test/system/rack_tests.rb
+- test/system/deas_tests.rb
 - test/unit/deas_runner_tests.rb
 - test/unit/error_handler_tests.rb
 - test/unit/exceptions_tests.rb
@@ -240,10 +261,8 @@ test_files:
 - test/unit/server_tests.rb
 - test/unit/show_exceptions_tests.rb
 - test/unit/sinatra_app_tests.rb
-- test/unit/sinatra_runner_tests.rb
 - test/unit/template_engine_tests.rb
 - test/unit/template_source_tests.rb
-- test/unit/test_helpers_tests.rb
 - test/unit/test_runner_tests.rb
 - test/unit/url_tests.rb
 - test/unit/view_handler_tests.rb

data/lib/deas/sinatra_runner.rb

@@ -1,55 +0,0 @@
-require 'deas/deas_runner'
-
-module Deas
-
-  class SinatraRunner < DeasRunner
-
-    def initialize(handler_class, args = nil)
-      @sinatra_call = (args || {})[:sinatra_call]
-      super(handler_class, args)
-    end
-
-    # Helpers
-
-    def halt(*args)
-      @sinatra_call.halt(*args)
-    end
-
-    def redirect(*args)
-      @sinatra_call.redirect(*args)
-    end
-
-    def content_type(*args)
-      @sinatra_call.content_type(*args)
-    end
-
-    def status(*args)
-      @sinatra_call.status(*args)
-    end
-
-    def headers(*args)
-      @sinatra_call.headers(*args)
-    end
-
-    def source_render(source, template_name, locals = nil)
-      if self.content_type.nil?
-        self.content_type(get_content_type_ext(template_name) || 'html')
-      end
-      super
-    end
-
-    def send_file(file_path, opts = nil, &block)
-      if self.content_type.nil?
-        self.content_type(get_content_type_ext(file_path))
-      end
-      @sinatra_call.send_file(file_path, opts || {}, &block)
-    end
-
-    private
-
-    def get_content_type_ext(file_path)
-      File.extname(file_path)[1..-1]
-    end
-
-  end
-end

data/lib/deas/test_helpers.rb

@@ -1,23 +0,0 @@
-require 'rack/request'
-require 'rack/response'
-require 'deas/test_runner'
-
-module Deas
-
-  module TestHelpers
-
-    def test_runner(handler_class, args = nil)
-      args ||= {}
-      args[:request]  ||= Rack::Request.new({})
-      args[:response] ||= Rack::Response.new
-      args[:session]  ||= args[:request].session
-      TestRunner.new(handler_class, args)
-    end
-
-    def test_handler(handler_class, args = nil)
-      test_runner(handler_class, args).handler
-    end
-
-  end
-
-end

data/test/support/view_handlers.rb

@@ -1,83 +0,0 @@
-require 'deas/template_source'
-require 'deas/view_handler'
-
-class EmptyViewHandler
-  include Deas::ViewHandler
-
-end
-
-class TestRunnerViewHandler
-  include Deas::ViewHandler
-
-  attr_reader :before_called, :init_called
-  attr_accessor :custom_value
-
-  before{ @before_called = true }
-
-  def init!; @init_called = true; end
-  def run!;  'run has run';       end
-
-end
-
-class DeasRunnerViewHandler
-  include Deas::ViewHandler
-
-  attr_reader :before_called, :after_called
-  attr_reader :init_bang_called, :run_bang_called
-
-  layout 'web'
-
-  before{ @before_called = true }
-  after{  @after_called  = true }
-
-  def init!; @init_bang_called = true; end
-  def run!;  @run_bang_called  = true; end
-
-end
-
-class SendFileViewHandler
-  include Deas::ViewHandler
-
-  def run!
-    send_file "my_file.txt", :some => :option
-  end
-end
-
-class HaltViewHandler
-  include Deas::ViewHandler
-
-  def run!
-    halt_args = [ params['code'].to_i, params['headers'], params['body'] ].compact
-    halt(*halt_args)
-  end
-
-end
-
-class ContentTypeViewHandler
-  include Deas::ViewHandler
-
-  def run!
-    content_type 'text/plain', :charset => 'latin1'
-  end
-
-end
-
-class StatusViewHandler
-  include Deas::ViewHandler
-
-  def run!
-    status 422
-  end
-
-end
-
-class HeadersViewHandler
-  include Deas::ViewHandler
-
-  def run!
-    headers \
-      'other' => "other",
-      'a-header' => 'some value'
-  end
-
-end

data/test/unit/sinatra_runner_tests.rb

@@ -1,79 +0,0 @@
-require 'assert'
-require 'deas/sinatra_runner'
-
-require 'deas/deas_runner'
-require 'test/support/view_handlers'
-
-class Deas::SinatraRunner
-
-  class UnitTests < Assert::Context
-    desc "Deas::SinatraRunner"
-    setup do
-      @runner_class = Deas::SinatraRunner
-    end
-    subject{ @runner_class }
-
-    should "be a `DeasRunner`" do
-      assert subject < Deas::Runner
-    end
-
-  end
-
-  class InitTests < UnitTests
-    desc "when init"
-    setup do
-      @fake_sinatra_call = Factory.sinatra_call
-      @runner = @runner_class.new(DeasRunnerViewHandler, {
-        :sinatra_call => @fake_sinatra_call
-      })
-    end
-    subject{ @runner }
-
-    should have_imeths :run
-
-    should "call the sinatra_call's halt with" do
-      response_value = catch(:halt){ subject.halt('test') }
-      assert_equal [ 'test' ], response_value
-    end
-
-    should "call the sinatra_call's redirect method with" do
-      response_value = catch(:halt){ subject.redirect('http://google.com') }
-      exp = [ 302, { 'Location' => 'http://google.com' } ]
-
-      assert_equal exp, response_value
-    end
-
-    should "call the sinatra_call's content_type to set the response content type" do
-      args = ['txt', { :charset => 'latin1' }]
-      exp = @fake_sinatra_call.content_type(*args)
-      subject.content_type(*args)
-      assert_equal exp, subject.content_type
-    end
-
-    should "call the sinatra_call's status to set the response status" do
-      subject.status(422)
-      assert_equal 422, subject.status
-    end
-
-    should "call the sinatra_call's headers to set the response headers" do
-      exp_headers = {
-        'a-header' => 'some value',
-        'other'    => 'other'
-      }
-      subject.headers(exp_headers)
-      assert_equal exp_headers, subject.headers
-    end
-
-    should "call the sinatra_call's send_file to set the send files" do
-      block_called = false
-      args = subject.send_file('a/file.txt', {:some => 'opts'}, &proc{ block_called = true })
-      assert_equal 'a/file.txt', args.file_path
-      assert_equal({:some => 'opts'}, args.options)
-      assert_true block_called
-
-      assert_equal 'txt', subject.content_type
-    end
-
-  end
-
-end

data/test/unit/test_helpers_tests.rb

@@ -1,53 +0,0 @@
-require 'assert'
-require 'deas/test_helpers'
-
-require 'rack/request'
-require 'rack/response'
-require 'deas/view_handler'
-
-module Deas::TestHelpers
-
-  class UnitTests < Assert::Context
-    desc "Deas::TestHelpers"
-    setup do
-      @test_helpers = Deas::TestHelpers
-    end
-    subject{ @test_helpers }
-
-  end
-
-  class MixinTests < UnitTests
-    desc "as a mixin"
-    setup do
-      context_class = Class.new{ include Deas::TestHelpers }
-      @context = context_class.new
-    end
-    subject{ @context }
-
-    should have_imeths :test_runner, :test_handler
-
-  end
-
-  class HandlerTestRunnerTests < MixinTests
-    desc "for handler testing"
-    setup do
-      @handler_class = Class.new{ include Deas::ViewHandler }
-      @runner  = @context.test_runner(@handler_class)
-      @handler = @context.test_handler(@handler_class)
-    end
-
-    should "build a test runner for a given handler" do
-      assert_kind_of ::Deas::TestRunner, @runner
-      assert_kind_of Rack::Request,  @runner.request
-      assert_kind_of Rack::Response, @runner.response
-      assert_equal @runner.request.session, @runner.session
-    end
-
-    should "return an initialized handler instance" do
-      assert_kind_of @handler_class, @handler
-      assert_equal @runner.handler, @handler
-    end
-
-  end
-
-end