lotus-view 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6054b04ffdb4d4b0bc17f0de1b4d239a45fa1062
-  data.tar.gz: 3fdec77bf94ab52bf27916b979661619cc053b71
+  metadata.gz: e8fa1effeef34385f8e2500ab74842e8d196f9bf
+  data.tar.gz: 203e83425ed18d487d19cc825443fed66c53c86e
 SHA512:
-  metadata.gz: ebf1e5d0839acda038d449cb18b9c9b12f49d7de7ec8c6460f7b4c7cef84cf685364e5d3e6ccd0882536024cc47e91f18a05f7aa6afb0cdff08587761d5f2b2f
-  data.tar.gz: 73eecc96f67474d79ca0f21f4440d10aa0a510d3172966fe3939d811c1d2d623170328140097ed81f0b17f53bc3537baff7d8f9d5c8a6955cb95e8c0d0083a9c
+  metadata.gz: 6b1317306b81d7579d3a3894ba2f22584f69f28039a0161a706c3d3cb7f89cc5a2b591c09e7c57b684d53870a9b96010a8db882717cd8a6ce0d9574f59be4b81
+  data.tar.gz: bee5b8b82b89c9e561bc89bffb53ba3a01028393934fb8bfa350e7fb13c240a305061a3c9b8196abadb710c13d3654b932a4986a609b06280c49c7abc24c6af0

data/CHANGELOG.md

@@ -1,105 +1,55 @@
-## v0.2.0
-### Jun 23, 2014
-
-f053805 2014-06-20 **Luca Guidi** [breaking] Make Rendering::TemplatesFinder to look recursively for templates, starting from the root
-
-5a5ed1b 2014-06-18 **Luca Guidi** Depend on lotus-utils ~> 0.2
-
-d7858df 2014-06-18 **Luca Guidi** Ensure to handle correctly the namespace for views, when it's configured as nil
-
-8f9e876 2014-06-18 **Luca Guidi** Renamed Lotus::View methods: .duplicate => .dupe, .generate => .duplicate
-
-199c1d6 2014-06-11 **Luca Guidi** Introducing Lotus::View.generate as shortcut for .duplicate and .configure
-
-d3e65d9 2014-06-11 **Luca Guidi** Ensure lazy loading and correct namespace of the layout class when using configuration's "layout" DSL
-
-850c9b9 2014-06-11 **Luca Guidi** Specify different scenario for template name in a standalone application
-
-6199419 2014-06-06 **Luca Guidi** Ensure to return the correct template name for namespaced views
-
-71d502f 2014-06-06 **Luca Guidi** Ensure independent configurations between the framework, the views and its children. Lotus::View::Dsl.root now internally uses the configuration.
-
-dd0ec4c 2014-06-06 **Luca Guidi** Lazily load layout for Configuration. This mechanism solves eventual race conditions between the loading of the framework and the application.
-
-d2e0775 2014-06-05 **Luca Guidi** [breaking] Lotus::View can be safely duplicated. Moved views and layout registries into Configuration. Configuration is now able to duplicated and (un)load itself. Layouts can be looked up in a given Ruby namespace.
-
-a619bd2 2014-06-05 **Luca Guidi** Implemented Lotus::View::Configuration#views and #layouts
-
-e4e892e 2014-06-04 **Luca Guidi** [breaking] Removed Lotus::View's class accessor for root, in favor of the API of Lotus::View::Configuration
-
-1aa68c6 2014-06-04 **Luca Guidi** [breaking] Removed Lotus::View's class accessor for layout, in favor of the API of Lotus::View::Configuration
-
-da9bee4 2014-06-04 **Luca Guidi** Implemented Lotus::View::Configuration#layout
-
-da31e3e 2014-06-04 **Luca Guidi** Implemented Lotus::View::Configuration#load_paths
-
-1471cdd 2014-06-03 **Luca Guidi** Introduced Lotus::View::Configuration with a bare minimum behavior
-
-425c79e 2014-05-21 **Grant Ammons** Support arguments for methods inside templates
-
-d4d407b 2014-05-10 **Luca Guidi** Support Ruby 2.1.2
-
-593f1a5 2014-04-07 **Luca Guidi** Ensure outermost locals to not shadow innermost inside templates/partials. Closes #3
-
-## v0.1.0
-### Mar 23, 2014
-
-af70191 2014-03-22 **Luca Guidi** Introduced Lotus::View::MissingFormatError in order to force a rendering context to specify the requested format (mime type)
-
-320f322 2014-03-22 **Luca Guidi** Changed signature of Lotus::View.render: it now accepts only a context for the view
-
-9d5de63 2014-03-21 **Luca Guidi** Test with other engines than ERb, HAML in this case.
-
-a5ade35 2014-03-21 **Luca Guidi** Erubis is no longer a dependency.
-
-257e342 2014-03-21 **Luca Guidi** Performance: prefer `Hash#fetch(key) { default }`, over `#fetch(key, default)`.
-
-426eaf7 2014-03-21 **Luca Guidi** Allow custom rendering policies. Views can override #render and decide how to return the output.
-
-b2759f8 2014-03-18 **Luca Guidi** Lotus::View::Layout => Lotus::Layout
-
-c0c04a8 2014-03-17 **Luca Guidi** Remove private method for Presenter: #object
-
-74ca485 2014-03-13 **Luca Guidi** Introduced Lotus::Presenter
-
-0ee9c10 2014-03-13 **Luca Guidi** Render partial from a layout
-
-dc4a74f 2014-03-12 **Luca Guidi** Support for Tilt 2.0
-
-728fe70 2014-02-20 **Luca Guidi** Added Lotus::View#locals
-
-11c7e5a 2013-08-08 **Luca Guidi** Don't use global class vars.
-
-570a20c 2013-08-07 **Luca Guidi** Scope templates discovery to registered engines
-
-4b45b11 2013-08-06 **Luca Guidi** Added support for layouts.
-
-96a2c66 2013-08-02 **Luca Guidi** Allow templates to be rendered from templates.
-
-ba5acdc 2013-08-01 **Luca Guidi** Allow partials to be rendered from templates.
-
-04474d4 2013-08-01 **Luca Guidi** Render template in the Lotus::View::Rendering::Scope context
-
-d108767 2013-08-01 **Luca Guidi** Freeze at subclasses level too
-
-04a3093 2013-08-01 **Luca Guidi** Let views to specify relative template filename
-
-e7c832d 2013-08-01 **Luca Guidi** Lotus::View::Rendering::Template => Lotus::View::Template
-
-f603ea9 2013-08-01 **Luca Guidi** Rework
-
-5df49f1 2013-07-23 **Luca Guidi** Removed unnecessary indirection
-
-683741c 2013-07-22 **Luca Guidi** Views can now transparently inheriths variables from locals, in order to reuse them.
-
-3a31f63 2013-07-19 **Luca Guidi** Removed templates as class variable for views: introduced a registry for runtime resolution
-
-f27e19f 2013-07-18 **Luca Guidi** WIP rendering resolver
-
-05e1d8c 2013-07-18 **Luca Guidi** Allow views inheritance.
-
-8236523 2013-07-18 **Luca Guidi** Refactoring: Engine is not relevant, let Tilt to deal with it. View has multiple templates. Intoduced DSL for format. Introduced resolver for runtime rendering. Dependency injection. :tophat:
-
-f7f3d25 2013-07-17 **Luca Guidi** Extracted Lotus::View::Template::Finder
-
-11d3c47 2013-07-15 **Luca Guidi** Initial mess
+# Lotus::View
+View layer for Lotus
+
+## v0.3.0 - 2014-12-23
+### Added
+- [Trung Lê] When duplicate the framework, also duplicate `Presenter`
+- [Benny Klotz] Introduced `Scope#class`, `#inspect`, `LayoutScope#class` and `#inspect`
+- [Alfonso Uceda Pompa & Trung Lê] Introduced `Configuration#prepare`
+- [Luca Guidi] Implemented "respond to" logic for `Lotus::View::Scope` (`respond_to?` and `respond_to_missing?`)
+- [Luca Guidi] Implemented "respond to" logic for `Lotus::Layout` (`respond_to?` and `respond_to_missing?`)
+- [Jeremy Stephens] Allow view concrete methods that accept a block to be invoked from templates
+- [Peter Suschlik] Implemented "respond to" logic for `Lotus::Presenter` (`respond_to?` and `respond_to_missing?`)
+- [Luca Guidi] Official support for Ruby 2.2
+
+### Changed
+- [Alfonso Uceda Pompa] Raise an exception when a layout doesn't have an associated template
+
+### Fixed
+- [Luca Guidi] Ensure that concrete methods in layouts are available in templates
+- [Luca Guidi] Ensure to associate the right layout to a view in case fo duplicated framework
+- [Luca Guidi] Safe override of Ruby's top level methods in Scope. (Eg. use `select` from a view, not from `::Kernel`)
+
+## v0.2.0 - 2014-06-23
+### Added
+- [Luca Guidi] Introduced `Configuration#duplicate`
+- [Luca Guidi] Introduced `Configuration#layout` to define the layout that all the views will use
+- [Luca Guidi] Introduced `Configuration#load_paths` to define several sources where to lookup for templates
+- [Luca Guidi] Introduced `Configuration#root` to define the root path where to find templates
+- [Luca Guidi] Introduced `Lotus::View::Configuration`
+- [Grant Ammons] Allow view concrete methods with arity > 0 to be invoked from templates
+- [Luca Guidi] Official support for Ruby 2.1
+
+### Changed
+- [Luca Guidi] `Rendering::TemplatesFinder` now look recursively for templates, starting from the root.
+- [Luca Guidi] Removed `View.layout=`
+- [Luca Guidi] Removed `View.root=`
+
+### Fixed
+- [Luca Guidi] Ensure outermost locals to not shadow innermost inside templates/partials
+
+## v0.1.0 - 2014-03-23
+### Added
+- [Luca Guidi] Allow custom rendering policy via `Action#render` override. This bypasses the template lookup and rendering.
+- [Luca Guidi] Introduced `Lotus::Presenter`
+- [Luca Guidi] Introduced templates rendering from templates and layouts
+- [Luca Guidi] Introduced partials rendering from templates and layouts
+- [Luca Guidi] Introduced layouts support
+- [Luca Guidi] Introduced `Lotus::View.load!` as entry point to load views and templates
+- [Luca Guidi] Allow to setup template name via `View.template`
+- [Luca Guidi] Rendering context also considers locals passed to the constructor
+- [Luca Guidi] Introduced `View.format` as DSL to declare which format to handle
+- [Luca Guidi] Introduced view subclasses as way to handle different formats (mime types)
+- [Luca Guidi] Introduced multiple templates per each View
+- [Luca Guidi] Implemented basic rendering with templates
+- [Luca Guidi] Official support for Ruby 2.0

data/README.md

@@ -6,13 +6,13 @@ It's based on a **separation between views and templates**.
 
 A _view_ is an object that encapsulates the presentation logic of a page.
 A _template_ is a file that defines the semantic and visual elements of a page.
-In order to show a result to an user, a template must be _rendered_ by a view.
+In order to show a result to a user, a template must be _rendered_ by a view.
 
 Keeping things separated helps to declutter templates and models from presentation logic.
 Also, since views are objects, they are easily testable.
 If you ever used [Mustache](http://mustache.github.io/), you are already aware of the advantages.
 
-Like all the other Lotus compontents, it can be used as a standalone framework or within a full Lotus application.
+Like all the other Lotus components, it can be used as a standalone framework or within a full Lotus application.
 
 ## Status
 
@@ -40,7 +40,9 @@ __Lotus::View__ supports Ruby (MRI) 2+
 
 Add this line to your application's Gemfile:
 
-    gem 'lotus-view'
+```ruby
+gem 'lotus-view'
+```
 
 And then execute:
 
@@ -56,7 +58,7 @@ Or install it yourself as:
 
   * Templates are searched under `Lotus::View.configuration.root`, set this value according to your app structure (eg. `"app/templates"`).
   * A view will look for a template with a file name that is composed by its full class name (eg. `"articles/index"`).
-  * A template must have two concatenated extensions: one for the format one for the engine (eg. `".html.erb"`).
+  * A template must have two concatenated extensions: one for the format and one for the engine (eg. `".html.erb"`).
   * The framework must be loaded before rendering the first time: `Lotus::View.load!`.
 
 ### Views
@@ -145,7 +147,7 @@ module Articles
     include Lotus::View
 
     def authors
-      article.map(&:author).join ', '
+      article.authors.map(&:full_name).join ', '
     end
   end
 end
@@ -406,7 +408,7 @@ module Articles
   end
 end
 
-Articles::Index.template  # => "articles/new"
+Articles::Create.template  # => "articles/new"
 ```
 
 ### Partials
@@ -515,7 +517,7 @@ puts presenter.inspect_object # => #<Map:0x007fdeada0b2f0 @locations=["Rome", "B
 
 ### Configuration
 
-Lotus::View can be configured with a DSL that determines its behavior.
+__Lotus::View__ can be configured with a DSL that determines its behavior.
 It supports a few options:
 
 ```ruby
@@ -533,9 +535,17 @@ Lotus::View.configure do
   namespace 'MyApp::Views'
 
   # Set the global layout
-  # Argument: Symbol, defautls to nil
+  # Argument: Symbol, defaults to nil
   #
   layout :application
+
+  # Set modules that you want to include in all views
+  # Argument: Block
+  #
+  prepare do
+    include MyCustomModule
+    before { do_something }
+  end
 end
 ```
 
@@ -562,7 +572,7 @@ Show.root                      # => #<Pathname:/another/root>
 
 ### Reusability
 
-Lotus::View can be used as a singleton framework as seen in this README.
+__Lotus::View__ can be used as a singleton framework as seen in this README.
 The application code includes `Lotus::View` or `Lotus::Layout` directly
 and the configuration is unique per Ruby process.
 
@@ -597,7 +607,7 @@ configuration.
 
 ### Thread safety
 
-**Lotus::View**'s is thread safe during the runtime, but it isn't during the loading process.
+__Lotus::View__ is thread safe during the runtime, but it isn't during the loading process.
 Please load the framework as the last thing before your application starts.
 Also, be sure that your app provides a thread safe context while it's loaded.
 

data/lib/lotus/layout.rb

@@ -98,7 +98,8 @@ module Lotus
       #
       # @see Lotus::View.load!
       def load!
-        # registry.freeze
+        registry.freeze
+        configuration.freeze
       end
     end
 

data/lib/lotus/presenter.rb

@@ -59,6 +59,10 @@ module Lotus
     end
 
     protected
+    # Override Ruby's method_missing
+    #
+    # @api private
+    # @since 0.1.0
     def method_missing(m, *args, &blk)
       if @object.respond_to?(m)
         @object.__send__ m, *args, &blk
@@ -66,5 +70,13 @@ module Lotus
         super
       end
     end
+
+    # Override Ruby's respond_to_missing? in order to support proper delegation
+    #
+    # @api private
+    # @since 0.3.0
+    def respond_to_missing?(m, include_private = false)
+      @object.respond_to?(m, include_private)
+    end
   end
 end

data/lib/lotus/view.rb

@@ -148,8 +148,9 @@ module Lotus
     #   #
     #   # 1. Generate MyApp::View
     #   # 2. Generate MyApp::Layout
-    #   # 3. Generate MyApp::Views
-    #   # 4. Configure MyApp::Views as the default namespace for views
+    #   # 3. Generate MyApp::Presenter
+    #   # 4. Generate MyApp::Views
+    #   # 5. Configure MyApp::Views as the default namespace for views
     #
     #  module MyApp::Views::Dashboard
     #    class Index
@@ -227,7 +228,10 @@ module Lotus
     def self.duplicate(mod, views = 'Views', &blk)
       dupe.tap do |duplicated|
         mod.module_eval %{ module #{ views }; end } if views
-        mod.module_eval %{ Layout = Lotus::Layout.dup }
+        mod.module_eval %{
+          Layout = Lotus::Layout.dup
+          Presenter = Lotus::Presenter.dup
+        }
 
         duplicated.configure do
           namespace [mod, views].compact.join '::'
@@ -272,6 +276,8 @@ module Lotus
 
         self.configuration = conf.duplicate
       end
+
+      conf.copy!(base)
     end
 
     # Load the framework
@@ -281,13 +287,5 @@ module Lotus
     def self.load!
       configuration.load!
     end
-
-    # Unload the framework
-    #
-    # @since 0.1.0
-    # @api private
-    def self.unload!
-      configuration.unload!
-    end
   end
 end

data/lib/lotus/view/configuration.rb

@@ -32,6 +32,7 @@ module Lotus
       attr_reader :load_paths
       attr_reader :views
       attr_reader :layouts
+      attr_reader :modules
 
       # Return the original configuration of the framework instance associated
       # with the given class.
@@ -83,7 +84,7 @@ module Lotus
       def self.for(base)
         # TODO this implementation is similar to Lotus::Controller::Configuration consider to extract it into Lotus::Utils
         namespace = Utils::String.new(base).namespace
-        framework = Utils::Class.load!("(#{namespace}|Lotus)::View")
+        framework = Utils::Class.load_from_pattern!("(#{namespace}|Lotus)::View")
         framework.configuration
       end
 
@@ -229,10 +230,96 @@ module Lotus
       #
       #   MyApp::View.configuration.layout # => MyApp::ApplicationLayout
       def layout(value = nil)
-        if value
+        if value.nil?
+          Rendering::LayoutFinder.find(@layout, @namespace)
+        else
           @layout = value
+        end
+      end
+
+      # Prepare the views.
+      #
+      # The given block will be yielded when `Lotus::View` will be included by
+      # a view.
+      #
+      # This method can be called multiple times.
+      #
+      # @param blk [Proc] the code block
+      #
+      # @return [void]
+      #
+      # @raise [ArgumentError] if called without passing a block
+      #
+      # @since 0.3.0
+      #
+      # @see Lotus::View.configure
+      # @see Lotus::View.duplicate
+      #
+      # @example Including shared utilities
+      #   require 'lotus/view'
+      #
+      #   module UrlHelpers
+      #     def comments_path
+      #       '/'
+      #     end
+      #   end
+      #
+      #   Lotus::View.configure do
+      #     prepare do
+      #       include UrlHelpers
+      #     end
+      #   end
+      #
+      #   Lotus::View.load!
+      #
+      #   module Comments
+      #     class New
+      #       # The following include will cause UrlHelpers to be included too.
+      #       # This makes `comments_path` available in the view context
+      #       include Lotus::View
+      #
+      #       def form
+      #         %(<form action="#{ comments_path }" method="POST"></form>)
+      #       end
+      #     end
+      #   end
+      #
+      # @example Preparing multiple times
+      #   require 'lotus/view'
+      #
+      #   Lotus::View.configure do
+      #     prepare do
+      #       include UrlHelpers
+      #     end
+      #
+      #     prepare do
+      #       format :json
+      #     end
+      #   end
+      #
+      #   Lotus::View.configure do
+      #     prepare do
+      #       include FormattingHelpers
+      #     end
+      #   end
+      #
+      #   Lotus::View.load!
+      #
+      #   module Articles
+      #     class Index
+      #       # The following include will cause the inclusion of:
+      #       #   * UrlHelpers
+      #       #   * FormattingHelpers
+      #       #
+      #       # It also sets the view to render only JSON
+      #       include Lotus::View
+      #     end
+      #   end
+      def prepare(&blk)
+        if block_given?
+          @modules.push(blk)
         else
-          Rendering::LayoutFinder.find(@layout, @namespace)
+          raise ArgumentError.new('Please provide a block')
         end
       end
 
@@ -264,6 +351,7 @@ module Lotus
           c.root       = root
           c.layout     = @layout # lazy loading of the class
           c.load_paths = load_paths.dup
+          c.modules    = modules.dup
         end
       end
 
@@ -272,8 +360,9 @@ module Lotus
       # @since 0.2.0
       # @api private
       def load!
-        views.each   {|v| v.__send__(:load!) }
-        layouts.each {|l| l.__send__(:load!) }
+        views.each   { |v| v.__send__(:load!) }
+        layouts.each { |l| l.__send__(:load!) }
+        freeze
       end
 
       # Reset all the values to the defaults
@@ -287,12 +376,31 @@ module Lotus
         @layouts    = Set.new
         @load_paths = Utils::LoadPaths.new(root)
         @layout     = nil
+        @modules    = []
+      end
+
+      # Copy the configuration for the given action
+      #
+      # @param base [Class] the target action
+      #
+      # @return void
+      #
+      # @since 0.3.0
+      # @api private
+      def copy!(base)
+        modules.each do |mod|
+          base.class_eval(&mod)
+        end
       end
 
       alias_method :unload!, :reset!
 
       protected
-      attr_writer :namespace, :root, :load_paths, :layout
+      attr_writer :namespace
+      attr_writer :root
+      attr_writer :load_paths
+      attr_writer :layout
+      attr_writer :modules
     end
   end
 end

data/lib/lotus/view/dsl.rb

@@ -43,10 +43,10 @@ module Lotus
       #   Lotus::View.configuration.root # => 'app/templates'
       #   Articles::Show.root            # => 'path/to/articles/templates'
       def root(value = nil)
-        if value
-          configuration.root(value)
-        else
+        if value.nil?
           configuration.root
+        else
+          configuration.root(value)
         end
       end
 
@@ -75,10 +75,10 @@ module Lotus
       #   Articles::Show.format     # => nil
       #   Articles::JsonShow.format # => :json
       def format(value = nil)
-        if value
-          @format = value
-        else
+        if value.nil?
           @format
+        else
+          @format = value
         end
       end
 
@@ -204,10 +204,10 @@ module Lotus
       #   Bookshelf::Web::Views::Books::Index.template # => 'books/index'
       #   Bookshelf::Api::Views::Books::Index.template # => 'books/index'
       def template(value = nil)
-        if value
-          @@template = value
-        else
+        if value.nil?
           @@template ||= Rendering::TemplateName.new(name, configuration.namespace).to_s
+        else
+          @@template = value
         end
       end
 
@@ -295,10 +295,10 @@ module Lotus
       #   Lotus::View.load!
       #   Articles::Show.layout # => :articles
       def layout(value = nil)
-        if value
-          @layout = value
+        if value.nil?
+          @_layout ||= Rendering::LayoutFinder.find(@layout || configuration.layout, configuration.namespace)
         else
-          @layout ||= configuration.layout
+          @layout = value
         end
       end
 
@@ -317,8 +317,8 @@ module Lotus
           v.root.freeze
           v.format.freeze
           v.template.freeze
-          v.layout(Rendering::LayoutFinder.new(v).find)
           v.layout#.freeze
+          v.configuration.freeze
         end
       end
     end

data/lib/lotus/view/rendering/layout_finder.rb

@@ -66,7 +66,7 @@ module Lotus
           when Symbol, String
             # TODO Move this low level logic into a Lotus::Utils solution
             class_name = "#{ Utils::String.new(layout).classify }#{ SUFFIX }"
-            namespace  = Utils::Class.load!(namespace)
+            namespace  = Utils::Class.load_from_pattern!(namespace)
             namespace.const_get(class_name)
           when Class
             layout

data/lib/lotus/view/rendering/layout_registry.rb

@@ -4,6 +4,16 @@ require 'lotus/view/rendering/templates_finder'
 module Lotus
   module View
     module Rendering
+      # Missing template layout error
+      #
+      # This is raised at the runtime when Lotus::Layout cannot find it's template.
+      #
+      # @since 0.3.0
+      class MissingTemplateLayoutError < ::StandardError
+        def initialize(template)
+          super("Can't find layout template '#{ template }'")
+        end
+      end
       # Holds the references of all the registered layouts.
       # As now the registry is unique at the level of the framework.
       #
@@ -48,6 +58,7 @@ module Lotus
           templates.each do |template|
             merge! template.format => template
           end
+          self.any? or raise MissingTemplateLayoutError.new(@view)
         end
 
         def templates

data/lib/lotus/view/rendering/layout_scope.rb

@@ -4,7 +4,7 @@ module Lotus
       # Scope for layout rendering
       #
       # @since 0.1.0
-      class LayoutScope
+      class LayoutScope < BasicObject
         # Initialize the scope
         #
         # @param layout [Lotus::Layout] the layout to render
@@ -17,6 +17,27 @@ module Lotus
           @layout, @scope = layout, scope
         end
 
+        # Returns the classname as string
+        #
+        # @return classname
+        #
+        # @since 0.3.0
+        def class
+          (class << self; self end).superclass
+        end
+
+        # Returns an inspect String
+        #
+        # @return [String] inspect String (contains classname, objectid in hex, available ivars)
+        #
+        # @since 0.3.0
+        def inspect
+          base = "#<#{ self.class }:#{'%x' % (self.object_id << 1)}"
+          base << " @layout=\"#{@layout}\"" if @layout
+          base << " @scope=\"#{@scope}\"" if @scope
+          base << ">"
+        end
+
         # Render a partial or a template within a layout template.
         #
         # @param options [Hash]
@@ -90,6 +111,30 @@ module Lotus
           @locals || @scope.locals
         end
 
+        # Implements "respond to" logic
+        #
+        # @return [TrueClass,FalseClass]
+        #
+        # @since 0.3.0
+        #
+        # @see http://ruby-doc.org/core/Object.html#method-i-respond_to-3F
+        def respond_to?(m, include_all = false)
+          respond_to_missing?(m, include_all)
+        end
+
+        # Implements "respond to" logic
+        #
+        # @return [TrueClass,FalseClass]
+        #
+        # @since 0.3.0
+        # @api private
+        #
+        # @see http://ruby-doc.org/core/Object.html#method-i-respond_to_missing-3F
+        def respond_to_missing?(m, include_all)
+          @layout.respond_to?(m, include_all) ||
+            @scope.respond_to?(m, include_all)
+        end
+
         protected
         # Forward all the missing methods to the view scope or to the layout.
         #
@@ -108,11 +153,11 @@ module Lotus
         #
         #   # `article` will be looked up in the view scope first.
         #   # If not found, it will be searched within the layout.
-        def method_missing(m)
+        def method_missing(m, *args, &blk)
           begin
-            @scope.__send__ m
+            @scope.__send__(m, *args, &blk)
           rescue
-            @layout.__send__ m
+            @layout.__send__(m, *args, &blk)
           end
         end
 
@@ -129,7 +174,7 @@ module Lotus
           options.dup.tap do |opts|
             opts.merge!(format: format)
             opts[:locals] = locals
-            opts[:locals].merge!(options.fetch(:locals){ Hash[] })
+            opts[:locals].merge!(options.fetch(:locals){ ::Hash.new })
           end
         end
       end

data/lib/lotus/view/rendering/null_template.rb

@@ -63,6 +63,10 @@ module Lotus
       class NullTemplate
         # Render the layout template
         #
+        # @param scope [Lotus::View::Scope] the rendering scope
+        # @param locals [Hash] a set of objects available during the rendering
+        # @yield [Proc] yields the given block
+        #
         # @return [String] the output of the rendering process
         #
         # @api private
@@ -70,8 +74,8 @@ module Lotus
         #
         # @see Lotus::Layout#render
         # @see Lotus::View::Rendering#render
-        def render(scope, locals = {}, &blk)
-          blk.call
+        def render(scope, locals = {})
+          yield
         end
       end
     end

data/lib/lotus/view/rendering/scope.rb

@@ -23,6 +23,18 @@ module Lotus
           @view, @locals = view, locals
         end
 
+        # Returns an inspect String
+        #
+        # @return [String] inspect String (contains classname, objectid in hex, available ivars)
+        #
+        # @since 0.3.0
+        def inspect
+          base = "#<#{ self.class }: #{'%x' % (self.object_id << 1)}"
+          base << " @view=\"#{@view}\"" if @view
+          base << " @locals=\"#{@locals}\"" if @locals
+          base << ">"
+        end
+
         # Returns the requested format.
         #
         # @return [Symbol] the requested format (eg. :html, :json, :xml, etc..)
@@ -32,10 +44,23 @@ module Lotus
           locals[:format]
         end
 
+        # Implements "respond to" logic
+        #
+        # @return [TrueClass,FalseClass]
+        #
+        # @since 0.3.0
+        # @api private
+        #
+        # @see http://ruby-doc.org/core/Object.html#method-i-respond_to_missing-3F
+        def respond_to_missing?(m, include_all)
+          @view.respond_to?(m) ||
+            @locals.key?(m)
+        end
+
         protected
-        def method_missing(m, *args)
+        def method_missing(m, *args, &block)
           if @view.respond_to?(m)
-            @view.__send__ m, *args
+            @view.__send__ m, *args, &block
           elsif @locals.key?(m)
             @locals[m]
           else

data/lib/lotus/view/template.rb

@@ -12,7 +12,7 @@ module Lotus
 
       # Returns the format that the template handles.
       #
-      # @return [String] the format name
+      # @return [Symbol] the format name
       #
       # @since 0.1.0
       #
@@ -20,11 +20,9 @@ module Lotus
       #   require 'lotus/view'
       #
       #   template = Lotus::View::Template.new('index.html.erb')
-      #   template.format # => 'html'
+      #   template.format # => :html
       def format
-        @_template.basename.match(/(\.[^.]+)/).to_s.
-          gsub('.', ''). # TODO shame on me, this should be part of the regex above
-          to_sym
+        @_template.basename.match(/\.([^.]+)/).captures.first.to_sym
       end
 
       # Render the template within the context of the given scope.

data/lib/lotus/view/version.rb

@@ -3,6 +3,6 @@ module Lotus
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/lotus-view.gemspec

@@ -17,9 +17,10 @@ Gem::Specification.new do |spec|
   spec.executables   = []
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_runtime_dependency 'tilt',        '~> 2.0', '>= 2.0.1'
-  spec.add_runtime_dependency 'lotus-utils', '~> 0.2'
+  spec.add_runtime_dependency 'lotus-utils', '~> 0.3', '>= 0.3.2'
 
   spec.add_development_dependency 'bundler',  '~> 1.5'
   spec.add_development_dependency 'minitest', '~> 5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lotus-view
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -36,14 +36,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="