deas 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e01bef9b6af4303f73139d7163cffe10e365422
-  data.tar.gz: 72a8a94d809478d18b0977d6f08db810a4801547
+  metadata.gz: adc507d7ca21b98b7f24b336b303ebe5800a5902
+  data.tar.gz: 85fc3d5b41048f51ce959d0b9fd0d630b28d477a
 SHA512:
-  metadata.gz: d911b586a2a5550d68b1213da0928c9660bded2411454543f838d5aa882652412d7bc3717c526fd9b53349c5250ce37c66c0feffb5105e8c65ea7382bb0ebf9a
-  data.tar.gz: 29061f4db02882144065819d5f86c720cf9859eb100972f88c070ce23c90257b65bf8f52a0cc6c973f3c94b2a6c7746656aa20613916d2be4a2049526ce321da
+  metadata.gz: 800d1d86aef361ab9f194f74fb83ea4951c4e45ce639c8dccf46378c3eb7daea7442045c3bbdedd6f9e238146a2a130c8b4c2b1b0234cf5d40e886eccb37ea0d
+  data.tar.gz: 8a67207f27e0fb0e993207c7c5f4cc31c0d189086c66a5dbfc5c9aa0845d58cc5b7807caaf23f08386867c83160c649a4d75b664d1e99e26a44fb02f29600a7c

data/lib/deas/router.rb

@@ -1,7 +1,4 @@
 require 'deas/exceptions'
-require 'deas/redirect_proxy'
-require 'deas/route'
-require 'deas/route_proxy'
 require 'deas/url'
 
 module Deas
@@ -74,6 +71,7 @@ module Deas
         handler_names[self.default_request_type_name] = default_handler_name
       end
 
+      require 'deas/route_proxy'
       proxies = handler_names.inject({}) do |proxies, (req_type_name, handler_name)|
         proxies[req_type_name] = Deas::RouteProxy.new(handler_name, self.view_handler_ns)
         proxies
@@ -91,6 +89,7 @@ module Deas
         raise ArgumentError, "no url named `#{to_path.inspect}`"
       end
 
+      require 'deas/redirect_proxy'
       proxy = Deas::RedirectProxy.new(to_url || to_path, &block)
       proxies = { self.default_request_type_name => proxy }
 
@@ -108,6 +107,7 @@ module Deas
 
     def add_route(http_method, path, proxies)
       proxies = HandlerProxies.new(proxies, self.default_request_type_name)
+      require 'deas/route'
       Deas::Route.new(http_method, path, proxies).tap{ |r| self.routes.push(r) }
     end
 

data/lib/deas/runner.rb

@@ -1,8 +1,3 @@
-# need to define class immediately b/c of circular requires:
-# - runner -> router -> route -> deas_runner -> runner
-module Deas; end
-class Deas::Runner; end
-
 require 'rack/utils'
 require 'deas/logger'
 require 'deas/router'

data/lib/deas/template_source.rb

@@ -46,7 +46,7 @@ module Deas
     end
 
     def render(template_name, view_handler, locals, &content)
-      [ view_handler.class.layouts,
+      [ view_handler.layouts,
         template_name
       ].flatten.reverse.inject(content) do |render_proc, name|
         proc{ get_engine(name).render(name, view_handler, locals, &render_proc) }

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.32.0"
+  VERSION = "0.33.0"
 end

data/lib/deas/view_handler.rb

@@ -37,6 +37,10 @@ module Deas
         raise NotImplementedError
       end
 
+      def layouts
+        self.class.layouts.map{ |proc| self.instance_eval(&proc) }
+      end
+
       def inspect
         reference = '0x0%x' % (self.object_id << 1)
         "#<#{self.class}:#{reference} @request=#{request.inspect}>"
@@ -62,6 +66,7 @@ module Deas
       def source_partial(*args, &block); @deas_runner.source_partial(*args, &block); end
       def send_file(*args, &block);      @deas_runner.send_file(*args, &block);      end
 
+      # TODO: make these public when built using the test helpers
       def logger;   @deas_runner.logger;   end
       def router;   @deas_runner.router;   end
       def request;  @deas_runner.request;  end
@@ -79,10 +84,14 @@ module Deas
 
     module ClassMethods
 
-      def layout(*args)
-        (@layouts ||= []).tap{ |l| l.push(*args) }
+      def layout(path = nil, &block)
+        value = !path.nil? ? Proc.new{ path } : block
+        self.layouts.push(value) if value
+      end
+
+      def layouts
+        @layouts ||= []
       end
-      alias :layouts :layout
 
       def before_callbacks; @before_callbacks ||= []; end
       def after_callbacks;  @after_callbacks  ||= []; end

data/test/unit/template_source_tests.rb

@@ -219,11 +219,11 @@ class Deas::TemplateSource
   end
 
   TestViewHandler = Class.new do
-    def self.layouts; []; end
+    def layouts; []; end
   end
 
   LayoutViewHandler = Class.new do
-    def self.layouts; ['test_layout1', 'test_layout2']; end
+    def layouts; ['test_layout1', 'test_layout2']; end
   end
 
 end

data/test/unit/view_handler_tests.rb

@@ -26,10 +26,10 @@ module Deas::ViewHandler
 
     should "specify layouts" do
       subject.layout 'layouts/app'
-      assert_equal ['layouts/app'], subject.layouts
+      assert_equal ['layouts/app'], subject.layouts.map(&:call)
 
-      subject.layouts 'layouts/web', 'layouts/search'
-      assert_equal ['layouts/app', 'layouts/web', 'layouts/search'], subject.layouts
+      subject.layout { 'layouts/web' }
+      assert_equal ['layouts/app', 'layouts/web'], subject.layouts.map(&:call)
     end
 
   end
@@ -37,12 +37,13 @@ module Deas::ViewHandler
   class InitTests < UnitTests
     desc "when init"
     setup do
-      @runner = test_runner(@handler_class)
+      @runner  = test_runner(@handler_class)
       @handler = @runner.handler
     end
     subject{ @handler }
 
     should have_imeths :init, :init!, :run, :run!
+    should have_imeths :layouts
 
     should "have called `init!` and it's callbacks" do
       assert_equal true, subject.before_init_called
@@ -59,6 +60,21 @@ module Deas::ViewHandler
 
   end
 
+  class LayoutsTests < InitTests
+    desc "with layouts"
+    setup do
+      @params = { 'n' => Factory.integer }
+      @runner  = test_runner(LayoutsViewHandler, :params => @params)
+      @handler = @runner.handler
+    end
+
+    should "build its layouts by instance eval'ing its class layout procs" do
+      exp = subject.class.layouts.map{ |proc| @handler.instance_eval(&proc) }
+      assert_equal exp, subject.layouts
+    end
+
+  end
+
   class RunTests < InitTests
     desc "and run"
 
@@ -279,4 +295,13 @@ module Deas::ViewHandler
 
   end
 
+  class LayoutsViewHandler
+    include Deas::ViewHandler
+
+    layout '1.html'
+    layout { '2.html' }
+    layout { "#{params['n']}.html" }
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deas
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Kelly Redding
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ns-options