rack-app-front_end 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 137ded4eba081d289c0b302d4355381e82bc3bf8
-  data.tar.gz: 3068644d9ca4fce3ff1ed155a04db4c353724bff
+  metadata.gz: 426e13bd34c9a41ac2e81eacc66a0a9d0ac07fc7
+  data.tar.gz: f4ca5b23f2db738e4894aa6e2ed371682a40a55b
 SHA512:
-  metadata.gz: f768c263b5f33445cc22eafe83a90d1c45074442f8afeb852a95235f8dd6a652ee42be31b72da33d2c0deb0248131dbe19dae55d7537feb1c43bd5d01b73d877
-  data.tar.gz: 7cfe28419ead7aef1fb9a7c08e6214d98c22dbdc62d3646c66d41427cac6b102801307432871b129a4577537c48cff868fa0c144bced8c0a028cd325e973e232
+  metadata.gz: db70eebf6181f66e04c5411c1823dc7cdfce045b043edc1d8739d89907b92af620f73d86b9bc854a3727ff797e3a44c6a2e75b077a6ba72080d1fd7b2a87b601
+  data.tar.gz: c93a71ddc8188d2d1e01231de1c779fb42c1e98a9e303d7f49bda983ce68d1f7f57826bd7c37625e45ff994ac85270b668ef520637ff3d55268695aeb5173fa7

data/VERSION

@@ -1 +1 @@
-0.14.0
+0.15.0

data/lib/rack/app/front_end.rb

@@ -5,9 +5,10 @@ module Rack::App::FrontEnd
   require 'tilt/plain'
 
   require 'rack/app/front_end/version'
+  require 'rack/app/front_end/helpers'
   require 'rack/app/front_end/template'
   require 'rack/app/front_end/folder_mounter'
-  require 'rack/app/front_end/instance_methods'
+  require 'rack/app/front_end/endpoint_methods'
   require 'rack/app/front_end/singleton_methods'
 
   class << self
@@ -15,7 +16,7 @@ module Rack::App::FrontEnd
     [:extended, :included].each do |method|
       define_method(method) do |klass|
 
-        klass.__send__(:include, self::InstanceMethods)
+        klass.__send__(:include, self::EndpointMethods)
         klass.__send__(:extend, self::SingletonMethods)
 
         klass.on_inheritance do |parent, child|

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

@@ -0,0 +1,16 @@
+module Rack::App::FrontEnd::EndpointMethods
+
+  def render(template_path, variables={}, options={}, &block)
+    options = {:layout_path => self.class.layout}.merge(options)
+
+    scope = Rack::App::FrontEnd::Template::Scope.new
+    scope.extend(self.class.helpers)
+    scope.inherit_instance_variables!(self)
+
+    full_path = Rack::App::Utils.expand_path(template_path)
+    template = Rack::App::FrontEnd::Template.new(full_path, options)
+
+    return template.render(scope, variables, &block)
+  end
+
+end

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

@@ -0,0 +1,9 @@
+module Rack::App::FrontEnd::Helpers
+
+  def render(template_path, variables={}, options={}, &block)
+    full_path = Rack::App::Utils.expand_path(template_path)
+    template = Rack::App::FrontEnd::Template.new(full_path,options)
+    return template.render(self, variables, &block)
+  end
+
+end

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

@@ -11,16 +11,16 @@ module Rack::App::FrontEnd::SingletonMethods
     @layout
   end
 
-  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)
-    @helpers ||= Module.new
+
+    @helpers ||= lambda {
+      helpers_module = Module.new
+      helpers_module.__send__(:include, Rack::App::FrontEnd::Helpers)
+    }.call
+
     @helpers.class_eval(&block) unless block.nil?
-    @helpers
+
+    return @helpers
   end
 
 end

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

@@ -1,7 +1,7 @@
 require 'tilt'
 class Rack::App::FrontEnd::Template
-  NO_LAYOUT_KEYWORD = :none
 
+  require 'rack/app/front_end/template/scope'
   require 'rack/app/front_end/template/default_layout'
   require 'rack/app/front_end/template/default_template'
 
@@ -9,58 +9,55 @@ class Rack::App::FrontEnd::Template
     @cache ||= Tilt::Cache.new
   end
 
-  def render(scope, *args, &block)
-    extend_with_helpers(scope)
+  def self.template?(file_path)
+    not Tilt.templates_for(file_path).empty?
+  end
+
+  def render(current_scope, variables={}, &block)
+    scope = create_scope(current_scope)
 
-    layout(scope).render(scope, *args) { template.render(scope, *args, &block) }
+    layout.render(scope, variables) { template.render(scope, variables, &block) }
   end
 
   protected
 
-  def initialize(template_path, klass)
-    @file_path = template_path
-    @class = klass
-  end
+  DEFAULT_TEMPLATE_OPTIONS = {:default_encoding => "utf-8"}
 
-  def is_a_template?
-    not Tilt.templates_for(@file_path).empty?
+  def initialize(template_path, options={})
+    @file_path = template_path
+    @layout_path = options.delete(:layout_path)
+    @template_options = DEFAULT_TEMPLATE_OPTIONS.merge(options)
   end
 
   def template
-    if is_a_template?
+    if self.class.template?(@file_path)
       get_template(@file_path)
     else
       DefaultTemplate.new(@file_path)
     end
   end
 
-  def layout(scope)
-    return DefaultLayout if use_default_layout?(scope)
-    block_layouts_for(scope)
-    get_template(@class.layout)
-  end
+  def layout
+    return DefaultLayout if use_default_layout?
 
-
-  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(@class.layout))}/)
+    get_template(@layout_path)
   end
 
-  def get_template(file_path)
-    self.class.cache.fetch(file_path) { Tilt.new(file_path, template_options) }
+  def use_default_layout?
+    @layout_path.nil? or
+        not File.exist?(@layout_path) or
+        (@file_path =~ /^#{Regexp.escape(Rack::App::Utils.namespace_folder(@layout_path))}/)
   end
 
-  def template_options
-    @class.template_options
-  end
-
-  def extend_with_helpers(scope)
-    scope.extend(@class.helpers) if @class.respond_to?(:helpers)
+  def get_template(file_path)
+    self.class.cache.fetch(file_path) { Tilt.new(file_path, @template_options) }
   end
 
-  def block_layouts_for(scope)
-    scope.instance_variable_set(:@layout, NO_LAYOUT_KEYWORD)
+  def create_scope(current_scope)
+    new_scope = Scope.new
+    new_scope.inherit_instance_variables!(current_scope)
+    new_scope.inherit_modules!(current_scope)
+    new_scope
   end
 
 end

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

@@ -0,0 +1,24 @@
+class Rack::App::FrontEnd::Template::Scope
+
+  def extended_modules
+    class << self
+      self
+    end.included_modules
+  end
+
+  def inherit_modules!(object)
+    class << object
+      self
+    end.included_modules.each do |module_constant|
+      extend(module_constant)
+    end
+  end
+  
+  def inherit_instance_variables!(object)
+    object.__send__(:instance_variables).each do |instance_variable|
+      value = object.__send__(:instance_variable_get, instance_variable)
+      instance_variable_set(instance_variable, value)
+    end
+  end
+
+end

data/rack-app-front_end.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app-front_end
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,12 +99,14 @@ files:
 - bin/console
 - bin/setup
 - lib/rack/app/front_end.rb
+- lib/rack/app/front_end/endpoint_methods.rb
 - lib/rack/app/front_end/folder_mounter.rb
-- lib/rack/app/front_end/instance_methods.rb
+- lib/rack/app/front_end/helpers.rb
 - 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/template/scope.rb
 - lib/rack/app/front_end/version.rb
 - rack-app-front_end.gemspec
 homepage: http://www.rack-app.com/

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

@@ -1,11 +0,0 @@
-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, self.class)
-    return template.render(self, *args, &block)
-
-  end
-
-end