rack-app-front_end 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5983723b1ed5893aa432c049e76c58734f9113b
-  data.tar.gz: 3ddce6ab78b7939cf2e5fe9c55b99887926918ec
+  metadata.gz: 137ded4eba081d289c0b302d4355381e82bc3bf8
+  data.tar.gz: 3068644d9ca4fce3ff1ed155a04db4c353724bff
 SHA512:
-  metadata.gz: 69ee00d52045b883dbea6d5cb38af91b2ce1c6134b97da4d2d526c73cfd63af75f15662a3949b89cc839a8789ed21a0a80668c5fe37e6a11623b193ae32c7f9b
-  data.tar.gz: 0b868ba5876ef8c515b2f5d1525d4225b1b274e1599e9a58f0ad3b9a7a2ceec5fcfa46927946780b96641c2c4db0a4a155fa7b4a51dcc750a2b9837dd634e0ee
+  metadata.gz: f768c263b5f33445cc22eafe83a90d1c45074442f8afeb852a95235f8dd6a652ee42be31b72da33d2c0deb0248131dbe19dae55d7537feb1c43bd5d01b73d877
+  data.tar.gz: 7cfe28419ead7aef1fb9a7c08e6214d98c22dbdc62d3646c66d41427cac6b102801307432871b129a4577537c48cff868fa0c144bced8c0a028cd325e973e232

data/VERSION

@@ -1 +1 @@
-0.13.0
+0.14.0

data/lib/rack/app/front_end/instance_methods.rb

@@ -1,13 +1,11 @@
 module Rack::App::FrontEnd::InstanceMethods
 
   def render(template_path, *args, &block)
+
     full_path = Rack::App::Utils.expand_path(template_path)
-    template = Rack::App::FrontEnd::Template.new(full_path, __runtime_properties__[:layout], self.class)
+    template = Rack::App::FrontEnd::Template.new(full_path, self.class)
     return template.render(self, *args, &block)
-  end
 
-  def __runtime_properties__
-    @__runtime_properties__ ||= {}
   end
 
 end

data/lib/rack/app/front_end/singleton_methods.rb

@@ -11,12 +11,10 @@ module Rack::App::FrontEnd::SingletonMethods
     @layout
   end
 
-  def precache_templates(*template_paths)
-    full_paths = template_paths.map { |path| Rack::App::Utils.expand_path(path) }
-    full_paths.each do |full_path|
-      Rack::App::FrontEnd::Template.cache.fetch(full_path) { Tilt.new(full_path) }
-    end
-    nil
+  def template_options(hash=nil)
+    @template_options ||= {:default_encoding => "utf-8"}
+    @template_options.merge!(hash) if hash.is_a?(Hash)
+    @template_options
   end
 
   def helpers(&block)

data/lib/rack/app/front_end/template.rb

@@ -3,56 +3,56 @@ class Rack::App::FrontEnd::Template
   NO_LAYOUT_KEYWORD = :none
 
   require 'rack/app/front_end/template/default_layout'
+  require 'rack/app/front_end/template/default_template'
 
   def self.cache
     @cache ||= Tilt::Cache.new
   end
 
   def render(scope, *args, &block)
-    return render_result(scope, *args, &block)
+    extend_with_helpers(scope)
+
+    layout(scope).render(scope, *args) { template.render(scope, *args, &block) }
   end
 
   protected
 
-  def initialize(template_path, layout, klass)
+  def initialize(template_path, klass)
     @file_path = template_path
-    @layout = layout
     @class = klass
   end
 
-  def render_result(scope, *args, &block)
-    return Rack::App::File::Streamer.new(@file_path) unless it_is_a_template?
-    extend_with_helpers(scope)
-    block_layouts_for(scope)
-    layout.render(scope, *args) { template.render(scope, *args, &block) }
-  end
-
-  def it_is_a_template?
+  def is_a_template?
     not Tilt.templates_for(@file_path).empty?
   end
 
   def template
-    get_template(@file_path)
+    if is_a_template?
+      get_template(@file_path)
+    else
+      DefaultTemplate.new(@file_path)
+    end
   end
 
-  def layout
-    return DefaultLayout if use_default_layout?
-
-    get_template(layout_path)
+  def layout(scope)
+    return DefaultLayout if use_default_layout?(scope)
+    block_layouts_for(scope)
+    get_template(@class.layout)
   end
 
-  def layout_path
-    return @class.layout
-  end
 
-  def use_default_layout?
-    (@layout == NO_LAYOUT_KEYWORD) or
+  def use_default_layout?(scope)
+    (scope.instance_variable_get(:@layout) == NO_LAYOUT_KEYWORD) or
         (@class.respond_to?(:layout) and @class.layout.nil?) or
-        (@file_path =~ /^#{Regexp.escape(Rack::App::Utils.namespace_folder(layout_path))}/)
+        (@file_path =~ /^#{Regexp.escape(Rack::App::Utils.namespace_folder(@class.layout))}/)
   end
 
   def get_template(file_path)
-    self.class.cache.fetch(file_path) { Tilt.new(file_path) }
+    self.class.cache.fetch(file_path) { Tilt.new(file_path, template_options) }
+  end
+
+  def template_options
+    @class.template_options
   end
 
   def extend_with_helpers(scope)
@@ -60,7 +60,7 @@ class Rack::App::FrontEnd::Template
   end
 
   def block_layouts_for(scope)
-    scope.__runtime_properties__[:layout]= NO_LAYOUT_KEYWORD
+    scope.instance_variable_set(:@layout, NO_LAYOUT_KEYWORD)
   end
 
 end

data/lib/rack/app/front_end/template/default_layout.rb

@@ -1,4 +1,5 @@
 module Rack::App::FrontEnd::Template::DefaultLayout
+
   extend self
 
   def render(*args, &block)

data/lib/rack/app/front_end/template/default_template.rb

@@ -0,0 +1,11 @@
+class Rack::App::FrontEnd::Template::DefaultTemplate
+
+  def initialize(file_path)
+    @file_path = file_path
+  end
+
+  def render(*args)
+    File.read(@file_path)
+  end
+
+end

data/rack-app-front_end.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 
-  spec.add_dependency 'rack-app','>= 1.2.2'
+  spec.add_dependency 'rack-app','>= 2.0.0'
   spec.add_dependency 'tilt'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app-front_end
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,7 @@ files:
 - lib/rack/app/front_end/singleton_methods.rb
 - lib/rack/app/front_end/template.rb
 - lib/rack/app/front_end/template/default_layout.rb
+- lib/rack/app/front_end/template/default_template.rb
 - lib/rack/app/front_end/version.rb
 - rack-app-front_end.gemspec
 homepage: http://www.rack-app.com/