deas 0.29.0 → 0.30.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 107
+  hash: 103
   prerelease: 
   segments: 
   - 0
-  - 29
+  - 30
   - 0
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-01-08 00:00:00 Z
+date: 2015-02-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -100,20 +100,6 @@ dependencies:
   name: assert-rack-test
   version_requirements: *id005
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  name: haml
-  version_requirements: *id006
-  prerelease: false
 description: Handler-based web framework powered by Sinatra
 email: 
 - kelly@kellyredding.com
@@ -148,7 +134,6 @@ files:
 - lib/deas/show_exceptions.rb
 - lib/deas/sinatra_app.rb
 - lib/deas/sinatra_runner.rb
-- lib/deas/template.rb
 - lib/deas/template_engine.rb
 - lib/deas/template_source.rb
 - lib/deas/test_helpers.rb
@@ -168,20 +153,6 @@ files:
 - test/support/test_layout2.test
 - test/support/test_template.test
 - test/support/view_handlers.rb
-- test/support/views/_info.erb
-- test/support/views/haml_layout1.haml
-- test/support/views/haml_with_layout.haml
-- test/support/views/layout1.erb
-- test/support/views/layout2.erb
-- test/support/views/layout3.erb
-- test/support/views/show.erb
-- test/support/views/show.html.erb
-- test/support/views/show.json.erb
-- test/support/views/show_json.erb
-- test/support/views/some.html.file.other
-- test/support/views/some_file.engine
-- test/support/views/some_no_engine_extension
-- test/support/views/with_layout.erb
 - test/system/rack_tests.rb
 - test/unit/cgi_tests.rb
 - test/unit/deas_runner_tests.rb
@@ -200,7 +171,6 @@ files:
 - test/unit/sinatra_runner_tests.rb
 - test/unit/template_engine_tests.rb
 - test/unit/template_source_tests.rb
-- test/unit/template_tests.rb
 - test/unit/test_runner_tests.rb
 - test/unit/url_tests.rb
 - test/unit/view_handler_tests.rb
@@ -250,20 +220,6 @@ test_files:
 - test/support/test_layout2.test
 - test/support/test_template.test
 - test/support/view_handlers.rb
-- test/support/views/_info.erb
-- test/support/views/haml_layout1.haml
-- test/support/views/haml_with_layout.haml
-- test/support/views/layout1.erb
-- test/support/views/layout2.erb
-- test/support/views/layout3.erb
-- test/support/views/show.erb
-- test/support/views/show.html.erb
-- test/support/views/show.json.erb
-- test/support/views/show_json.erb
-- test/support/views/some.html.file.other
-- test/support/views/some_file.engine
-- test/support/views/some_no_engine_extension
-- test/support/views/with_layout.erb
 - test/system/rack_tests.rb
 - test/unit/cgi_tests.rb
 - test/unit/deas_runner_tests.rb
@@ -282,7 +238,6 @@ test_files:
 - test/unit/sinatra_runner_tests.rb
 - test/unit/template_engine_tests.rb
 - test/unit/template_source_tests.rb
-- test/unit/template_tests.rb
 - test/unit/test_runner_tests.rb
 - test/unit/url_tests.rb
 - test/unit/view_handler_tests.rb

data/lib/deas/template.rb

@@ -1,86 +0,0 @@
-require 'rack'
-
-module Deas
-
-  class Template
-
-    attr_reader :name, :options
-
-    def initialize(sinatra_call, name, options = nil)
-      @sinatra_call, @name, @options = sinatra_call, name.to_sym, (options || {})
-      @options[:scope] = @sinatra_call.settings.deas_template_scope.new(@sinatra_call)
-
-      (@options.delete(:layout) || @options.delete(:layouts) || []).tap do |l|
-        @layouts = l.compact.map(&:to_sym)
-      end
-    end
-
-    def engine(template_name)
-      return 'erb' if @sinatra_call.settings.views.nil?
-
-      views_path = Pathname.new(@options[:views] || @sinatra_call.settings.views)
-      template = Dir.glob("#{views_path.join(template_name.to_s)}.*").first.to_s
-      File.extname(template)[1..-1] || 'erb'
-    end
-
-    # builds render-blocks like:
-    #
-    #   erb :main_layout do
-    #     erb :second_layout do
-    #       erb :user_index
-    #     end
-    #   end
-
-    def render(&block)
-      template_names = [ @layouts, @name ].flatten.reverse
-      top_render_proc = template_names.inject(block) do |render_proc, name|
-        proc{ @sinatra_call.send(engine(name), name, @options.dup, &render_proc) }
-      end
-      top_render_proc.call
-    end
-
-    class Scope
-
-      attr_reader :sinatra_call
-
-      def initialize(sinatra_call)
-        @sinatra_call = sinatra_call
-      end
-
-      def render(name, options = nil, &block)
-        Template.new(@sinatra_call, name, options || {}).render(&block)
-      end
-
-      def partial(name, locals = nil, &block)
-        Partial.new(@sinatra_call, name, locals || {}).render(&block)
-      end
-
-      def escape_html(html)
-        Rack::Utils.escape_html(html)
-      end
-      alias :h :escape_html
-
-      def escape_url(path)
-        Rack::Utils.escape_path(path)
-      end
-      alias :u :escape_url
-
-      def ==(other_scope)
-        self.sinatra_call == other_scope.sinatra_call
-        self.class.included_modules == other_scope.class.included_modules
-      end
-
-    end
-
-    class Partial < Template
-
-      def initialize(sinatra_call, name, locals = nil)
-        options = { :locals => (locals || {}) }
-        super sinatra_call, name, options
-      end
-
-    end
-
-  end
-
-end

data/test/support/views/_info.erb

@@ -1 +0,0 @@
-Stuff: <%= info %>

data/test/support/views/haml_layout1.haml

@@ -1,2 +0,0 @@
-Layout 1
-=yield

data/test/support/views/haml_with_layout.haml

@@ -1 +0,0 @@
-%span= view.class.inspect

data/test/support/views/layout1.erb

@@ -1,2 +0,0 @@
-Layout 1
-<%= yield %>

data/test/support/views/layout2.erb

@@ -1,2 +0,0 @@
-Layout 2
-<%= yield %>

data/test/support/views/layout3.erb

@@ -1,2 +0,0 @@
-Layout 3
-<%= yield %>

data/test/support/views/show.erb

@@ -1,2 +0,0 @@
-show page: <%= view.message %>
-<%= partial "_info", :info => 'Show Info' %>

data/test/support/views/with_layout.erb

@@ -1 +0,0 @@
-With Layouts View: <%= view.class.inspect %>

data/test/unit/template_tests.rb

@@ -1,150 +0,0 @@
-require 'assert'
-require 'deas/template'
-
-require 'test/support/fake_sinatra_call'
-
-class Deas::Template
-
-  class UnitTests < Assert::Context
-    desc "Deas::Template"
-    setup do
-      @fake_sinatra_call = FakeSinatraCall.new
-      @template = Deas::Template.new(@fake_sinatra_call, 'users/index')
-    end
-    subject{ @template }
-
-    should have_instance_methods :name, :options, :render, :engine
-
-    should "symbolize it's name" do
-      assert_equal :"users/index", subject.name
-    end
-
-    should "set it's scope option" do
-      assert_instance_of Deas::Template::Scope, subject.options[:scope]
-    end
-
-    should "know a named template's render engine" do
-      fake_sinatra_call = FakeSinatraCall.new(:views => TEST_SUPPORT_ROOT.join('views'))
-
-      views_exist = Deas::Template.new(fake_sinatra_call, 'whatever')
-      assert_equal 'erb',    views_exist.engine('layout1')
-      assert_equal 'haml',   views_exist.engine('haml_layout1')
-      assert_equal 'other',  views_exist.engine('some.html.file')
-      assert_equal 'engine', views_exist.engine('some_file')
-      assert_equal 'erb',    views_exist.engine('some_no_engine_extension')
-      assert_equal 'erb',    views_exist.engine('does_not_exist')
-
-      views_no_exist = Deas::Template.new(fake_sinatra_call, 'whatever', {
-        :views => '/does/not/exist'
-      })
-      assert_equal 'erb', views_no_exist.engine('layout1')
-      assert_equal 'erb', views_no_exist.engine('haml_layout1')
-      assert_equal 'erb', views_no_exist.engine('some.html.file')
-      assert_equal 'erb', views_no_exist.engine('some_file')
-      assert_equal 'erb', views_no_exist.engine('some_no_engine_extension')
-      assert_equal 'erb', views_no_exist.engine('does_not_exist')
-
-    end
-
-    should "call the sinatra_call's `erb` method with #render" do
-      return_value = subject.render
-
-      assert_equal subject.name,    return_value[0]
-      assert_equal subject.options, return_value[1]
-    end
-
-  end
-
-  class WithLayoutsTests < UnitTests
-    desc "with layouts"
-    setup do
-      @template = Deas::Template.new(@fake_sinatra_call, 'users/index', {
-        :layout => [ 'layouts/web', 'layouts/search' ]
-      })
-    end
-
-    should "call the engine's `erb` method for each layout" do
-      web_lay_render_args     = subject.render
-      search_lay_render_args  = web_lay_render_args.block_call_result
-      users_index_render_args = search_lay_render_args.block_call_result
-
-      assert_equal :"layouts/web",    web_lay_render_args.template_name
-      assert_equal :"layouts/search", search_lay_render_args.template_name
-      assert_equal :"users/index",    users_index_render_args.template_name
-    end
-
-  end
-
-  class ScopeTests < UnitTests
-    desc "Deas::Template::RenderScope"
-    setup do
-      @scope = Deas::Template::Scope.new(@fake_sinatra_call)
-    end
-    subject{ @scope }
-
-    should have_reader :sinatra_call
-    should have_imeths :render, :partial, :escape_html, :h, :escape_url, :u
-
-    should "call the sinatra_call's erb method with #render" do
-      render_args = subject.render('my_template', {
-        :views  => '/path/to/templates',
-        :locals => { :something => true }
-      }, &Proc.new{ '#render called this proc' })
-
-      assert_equal :my_template, render_args.template_name
-      assert_instance_of Deas::Template::Scope, render_args.opts[:scope]
-
-      exp_locals = { :something => true }
-      assert_equal exp_locals, render_args.opts[:locals]
-
-      assert_equal '#render called this proc', render_args.block_call_result
-    end
-
-    should "call the sinatra_call's erb method with #partial" do
-      render_args = subject.partial('_part', {
-        :something => true
-      }, &Proc.new{ '#partial called this proc' })
-
-      assert_equal :_part, render_args.template_name
-      assert_instance_of Deas::Template::Scope, render_args.opts[:scope]
-
-      exp_locals = { :something => true }
-      assert_equal exp_locals, render_args.opts[:locals]
-
-      assert_equal '#partial called this proc', render_args.block_call_result
-    end
-
-    should "escape html with #h or #escape_html" do
-      exp_val = "&lt;strong&gt;&lt;&#x2F;strong&gt;"
-      assert_equal exp_val, subject.escape_html("<strong></strong>")
-      assert_equal exp_val, subject.h("<strong></strong>")
-    end
-
-    should "escape urls with #u or #escape_url" do
-      exp_val = "%2Fpath%2Fto%2Fsomewhere"
-      assert_equal exp_val, subject.escape_url("/path/to/somewhere")
-      assert_equal exp_val, subject.u("/path/to/somewhere")
-    end
-
-  end
-
-  class PartialTests < UnitTests
-    desc "Partial"
-    setup do
-      @partial = Deas::Template::Partial.new(@fake_sinatra_call, 'users/index/_listing', {
-        :user => 'Joe Test'
-      })
-    end
-    subject{ @partial }
-
-    should "be a kind of Deas::Template" do
-      assert_kind_of Deas::Template, subject
-    end
-
-    should "set it's locals option" do
-      assert_equal({ :user => 'Joe Test' }, subject.options[:locals])
-    end
-
-  end
-
-end