deas 0.35.0 → 0.36.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c4676b93d32b63bba485b4137c0983725b08ad0b
+  data.tar.gz: 4047d05f7b72713a7a999b19d50d808366180bfb
+SHA512:
+  metadata.gz: a3eb2b3a29678f4de02bfe510b4801669740130773c74e377770e3f9cd8df08b3a088aca928eda3555a37c34a1fa232a2b5b01dafff2d6038f1addcf29e80c34
+  data.tar.gz: 7ae9da0d7f9a45110001b374fd9a23fd10b18232f3da04a90462ac0f406cac335eb5cd9746e9cf9fd444596c5278d69b20b4f895389a1046a0295d0e7cfe8889

data/deas.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency("rack",       ["~> 1.5"])
   gem.add_dependency("sinatra",    ["~> 1.4"])
 
-  gem.add_development_dependency("assert", ["~> 2.12"])
+  gem.add_development_dependency("assert", ["~> 2.15"])
   gem.add_development_dependency("assert-rack-test")
 
 end

data/lib/deas/redirect_proxy.rb

@@ -8,10 +8,15 @@ module Deas
 
     attr_reader :handler_class_name, :handler_class
 
-    def initialize(path = nil, &block)
+    def initialize(router, path = nil, &block)
       @handler_class = Class.new do
         include Deas::ViewHandler
 
+        def self.router; @router; end
+        def self.router=(value)
+          @router = value
+        end
+
         def self.redirect_path; @redirect_path; end
         def self.redirect_path=(value)
           @redirect_path = value
@@ -22,7 +27,9 @@ module Deas
         attr_reader :redirect_path
 
         def init!
-          @redirect_path = self.instance_eval(&self.class.redirect_path)
+          @redirect_path = self.class.router.prepend_base_url(
+            self.instance_eval(&self.class.redirect_path)
+          )
         end
 
         def run!
@@ -31,6 +38,7 @@ module Deas
 
       end
 
+      @handler_class.router = router
       @handler_class.redirect_path = if path.nil?
         block
       elsif path.kind_of?(Deas::Url)

data/lib/deas/router.rb

@@ -30,10 +30,14 @@ module Deas
     end
 
     def base_url(value = nil)
-      @base_url = value if !value.nil?
+      set_base_url(value) if !value.nil?
       @base_url
     end
 
+    def set_base_url(value)
+      @base_url = value
+    end
+
     def prepend_base_url(url_path)
       "#{base_url}#{url_path}"
     end
@@ -98,7 +102,7 @@ module Deas
       end
 
       require 'deas/redirect_proxy'
-      proxy = Deas::RedirectProxy.new(to_url || to_path, &block)
+      proxy = Deas::RedirectProxy.new(self, to_url || to_path, &block)
       proxies = { self.default_request_type_name => proxy }
 
       from_url = self.urls[from_path]

data/lib/deas/test_runner.rb

@@ -32,13 +32,6 @@ module Deas
       @response_value = catch(:halt){ self.handler.init; nil }
     end
 
-    # TODO: remove eventually
-    def return_value
-      warn "calling `return_value` on a test runner is deprecated - " \
-           "switch to `response_value` instead"
-      self.response_value
-    end
-
     def run
       @response_value ||= catch(:halt){ self.handler.run }
     end

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.35.0"
+  VERSION = "0.36.0"
 end

data/test/unit/redirect_proxy_tests.rb

@@ -11,7 +11,9 @@ class Deas::RedirectProxy
   class UnitTests < Assert::Context
     desc "Deas::RedirectProxy"
     setup do
-      @proxy = Deas::RedirectProxy.new('/somewhere')
+      @base_url = Factory.url
+      @router   = Deas::Router.new
+      @proxy    = Deas::RedirectProxy.new(@router, '/somewhere')
     end
     subject{ @proxy }
 
@@ -30,7 +32,7 @@ class Deas::RedirectProxy
     end
     subject{ @handler_class }
 
-    should have_accessor :redirect_path
+    should have_accessor :router, :redirect_path
     should have_imeth :name
 
     should "be a view handler" do
@@ -39,22 +41,26 @@ class Deas::RedirectProxy
       end
     end
 
-    should "know its name" do
-      assert_equal 'Deas::RedirectHandler', subject.name
+    should "store the given router" do
+      assert_equal @router, subject.router
     end
 
     should "store its redirect path as a proc" do
       assert_kind_of Proc, subject.redirect_path
 
       url = Deas::Url.new(:some_thing, '/:some/:thing')
-      handler_class = Deas::RedirectProxy.new(url).handler_class
+      handler_class = Deas::RedirectProxy.new(@router, url).handler_class
       assert_kind_of Proc, handler_class.redirect_path
 
       path_proc = proc{ '/somewhere' }
-      handler_class = Deas::RedirectProxy.new(&path_proc).handler_class
+      handler_class = Deas::RedirectProxy.new(@router, &path_proc).handler_class
       assert_kind_of Proc, handler_class.redirect_path
     end
 
+    should "know its name" do
+      assert_equal 'Deas::RedirectHandler', subject.name
+    end
+
   end
 
   class HandlerTests < HandlerClassTests
@@ -67,24 +73,45 @@ class Deas::RedirectProxy
     should have_reader :redirect_path
 
     should "know its redir path if from a path string" do
-      assert_equal '/somewhere', subject.redirect_path
+      exp_path = '/somewhere'
+      assert_equal exp_path, subject.redirect_path
+
+      @router.base_url(@base_url)
+      handler = test_handler(@handler_class)
+      exp = @router.prepend_base_url(exp_path)
+      assert_equal exp, handler.redirect_path
     end
 
     should "know its redir path if from Url" do
       url = Deas::Url.new(:some_thing, '/:some/:thing')
-      handler_class = Deas::RedirectProxy.new(url).handler_class
+      handler_class = Deas::RedirectProxy.new(@router, url).handler_class
       handler = test_handler(handler_class, {
         :params => { 'some' => 'a', 'thing' => 'goose' }
       })
 
-      assert_equal '/a/goose', handler.redirect_path
+      exp_path = '/a/goose'
+      assert_equal exp_path, handler.redirect_path
+
+      @router.base_url(@base_url)
+      handler = test_handler(handler_class, {
+        :params => { 'some' => 'a', 'thing' => 'goose' }
+      })
+      exp = @router.prepend_base_url(exp_path)
+      assert_equal exp, handler.redirect_path
     end
 
     should "know its redir path if from a block" do
-      handler_class = Deas::RedirectProxy.new(&proc{'/from-block-arg'}).handler_class
+      path_proc = proc{ '/from-block-arg' }
+      handler_class = Deas::RedirectProxy.new(@router, &path_proc).handler_class
       handler = test_handler(handler_class)
 
-      assert_equal '/from-block-arg', handler.redirect_path
+      exp_path = '/from-block-arg'
+      assert_equal exp_path , handler.redirect_path
+
+      @router.base_url(@base_url)
+      handler = test_handler(handler_class)
+      exp = @router.prepend_base_url(exp_path)
+      assert_equal exp, handler.redirect_path
     end
 
   end

data/test/unit/router_tests.rb

@@ -3,6 +3,7 @@ require 'deas/router'
 
 require 'deas/exceptions'
 require 'deas/route'
+require 'deas/test_helpers'
 require 'test/support/view_handlers'
 
 class Deas::Router
@@ -21,9 +22,12 @@ class Deas::Router
   end
 
   class InitTests < UnitTests
+    include Deas::TestHelpers
+
     desc "when init"
     setup do
-      @router = @router_class.new
+      @base_url = a_base_url = [Factory.url, nil].choice
+      @router = @router_class.new{ base_url a_base_url }
     end
     subject{ @router }
 
@@ -31,7 +35,7 @@ class Deas::Router
     should have_readers :escape_query_value_proc
 
     should have_imeths :view_handler_ns, :escape_query_value
-    should have_imeths :base_url, :prepend_base_url
+    should have_imeths :base_url, :set_base_url, :prepend_base_url
     should have_imeths :url, :url_for
     should have_imeths :default_request_type_name, :add_request_type
     should have_imeths :request_type_name
@@ -39,18 +43,19 @@ class Deas::Router
     should have_imeths :route, :redirect
 
     should "default its settings" do
-      assert_nil subject.view_handler_ns
-      assert_nil subject.base_url
-      assert_empty subject.request_types
-      assert_empty subject.urls
-      assert_empty subject.routes
+      router = @router_class.new
+      assert_nil router.view_handler_ns
+      assert_nil router.base_url
+      assert_empty router.request_types
+      assert_empty router.urls
+      assert_empty router.routes
 
       exp = @router_class::DEFAULT_REQUEST_TYPE_NAME
-      assert_equal exp, subject.default_request_type_name
+      assert_equal exp, router.default_request_type_name
 
       value = "#%&?"
       exp = Rack::Utils.escape(value)
-      assert_equal exp, subject.escape_query_value_proc.call(value)
+      assert_equal exp, router.escape_query_value_proc.call(value)
     end
 
     should "set a view handler namespace" do
@@ -69,9 +74,16 @@ class Deas::Router
     should "set a base url" do
       subject.base_url(exp = Factory.url)
       assert_equal exp, subject.base_url
+
+      subject.base_url(nil)
+      assert_not_nil subject.base_url
+
+      subject.set_base_url(nil)
+      assert_nil subject.base_url
     end
 
     should "prepend the base url to any url path" do
+      subject.set_base_url(nil)
       url_path = Factory.path
       base_url = Factory.url
 
@@ -94,11 +106,17 @@ class Deas::Router
     should "prepend the base url when adding redirects" do
       url = Factory.url
       subject.base_url url
-      path = Factory.path
-      redirect = subject.redirect(path, Factory.path)
+      path1 = Factory.path
+      path2 = Factory.path
+      redirect = subject.redirect(path1, path2)
 
-      exp_path = subject.prepend_base_url(path)
-      assert_equal exp_path, redirect.path
+      exp = subject.prepend_base_url(path1)
+      assert_equal exp, redirect.path
+
+      proxy = redirect.handler_proxies[subject.default_request_type_name]
+      handler = test_handler(proxy.handler_class)
+      exp = subject.prepend_base_url(path2)
+      assert_equal exp, handler.redirect_path
     end
 
     should "set a default request type name" do
@@ -174,7 +192,7 @@ class Deas::Router
       route = subject.routes.last
       assert_instance_of Deas::Route, route
       assert_equal @method, route.method
-      assert_equal @path1,  route.path
+      assert_equal subject.prepend_base_url(@path1), route.path
 
       proxies = route.handler_proxies
       assert_kind_of HandlerProxies, proxies
@@ -220,12 +238,16 @@ class Deas::Router
 
       route = subject.routes.last
       assert_instance_of Deas::Route, route
-      assert_equal :get,   route.method
-      assert_equal @path1, route.path
+      assert_equal :get, route.method
+      assert_equal subject.prepend_base_url(@path1), route.path
 
       proxy = route.handler_proxies[subject.default_request_type_name]
       assert_kind_of Deas::RedirectProxy, proxy
       assert_equal 'Deas::RedirectHandler', proxy.handler_class_name
+
+      handler = test_handler(proxy.handler_class)
+      exp = subject.prepend_base_url(@path2)
+      assert_equal exp, handler.redirect_path
     end
 
   end
@@ -261,13 +283,13 @@ class Deas::Router
     end
 
     should "build a path for a url given params" do
-      exp_path = "/info/now"
+      exp_path = subject.prepend_base_url("/info/now")
       assert_equal exp_path, subject.url_for(:get_info, :for => 'now')
       assert_equal exp_path, subject.url_for(:get_info, 'now')
     end
 
     should "'squash' duplicate forward-slashes when building urls" do
-      exp_path = "/info/now"
+      exp_path = subject.prepend_base_url("/info/now")
       assert_equal exp_path, subject.url_for(:get_info, :for => '/now')
       assert_equal exp_path, subject.url_for(:get_info, '/now')
     end
@@ -289,7 +311,8 @@ class Deas::Router
       url   = subject.urls[:get_info]
       route = subject.routes.last
 
-      assert_equal url.path, route.path
+      exp = subject.prepend_base_url(url.path)
+      assert_equal exp, route.path
     end
 
     should "route using a url name instead of a path" do
@@ -297,7 +320,8 @@ class Deas::Router
       url   = subject.urls[:get_info]
       route = subject.routes.last
 
-      assert_equal url.path, route.path
+      exp = subject.prepend_base_url(url.path)
+      assert_equal exp, route.path
     end
 
     should "prepend the base url when building named urls" do

data/test/unit/test_runner_tests.rb

@@ -46,7 +46,6 @@ class Deas::TestRunner
 
     should have_readers :response_value
     should have_imeths :run
-    should have_imeths :return_value # TODO: deprecated
 
     should "raise an invalid error when not passed a view handler" do
       assert_raises(Deas::InvalidServiceHandlerError) do
@@ -92,13 +91,6 @@ class Deas::TestRunner
       assert_equal subject.handler.run!, subject.response_value
     end
 
-    # TODO: deprecated
-    should "alias its response value at `return_value`" do
-      assert_equal subject.response_value, subject.return_value
-      subject.run
-      assert_equal subject.response_value, subject.return_value
-    end
-
     should "build halt args if halt is called" do
       value = catch(:halt){ subject.halt }
       assert_kind_of HaltArgs, value

metadata

@@ -1,117 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: deas
-version: !ruby/object:Gem::Version 
-  hash: 147
-  prerelease: 
-  segments: 
-  - 0
-  - 35
-  - 0
-  version: 0.35.0
+version: !ruby/object:Gem::Version
+  version: 0.36.0
 platform: ruby
-authors: 
+authors:
 - Kelly Redding
 - Collin Redding
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-06-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+date: 2015-08-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ns-options
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 1
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.1.4
   type: :runtime
-  name: ns-options
-  version_requirements: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
-  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+- !ruby/object:Gem::Dependency
   name: rack
-  version_requirements: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
   name: sinatra
-  version_requirements: *id003
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 12
-        version: "2.12"
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
   name: assert
-  version_requirements: *id004
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
+  type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
+- !ruby/object:Gem::Dependency
+  name: assert-rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: assert-rack-test
-  version_requirements: *id005
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Handler-based web framework powered by Sinatra
-email: 
+email:
 - kelly@kellyredding.com
 - collin.redding@me.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -177,39 +161,30 @@ files:
 - test/unit/view_handler_tests.rb
 - tmp/.gitkeep
 homepage: http://github.com/redding/deas
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Handler-based web framework powered by Sinatra
-test_files: 
+test_files:
 - test/helper.rb
 - test/support/factory.rb
 - test/support/fake_sinatra_call.rb