hanami-view 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fa2f0c09d6500c146316de763a71a98afefdf03
-  data.tar.gz: 7d96ea6c912cdd30fc2945c786c6a5d057cffc98
+  metadata.gz: 2814a76015d67720fc54b6aab3acb54cce7f65a4
+  data.tar.gz: db8a5cb5b152d93e837d7a3bddd7e755d85db277
 SHA512:
-  metadata.gz: f818e7eb0e57bf05852b7f8a1b6fe1971ca87d9d20404815d179aa7202eb07c3627bc996e29136babff7d1b2072f531748b6401361e7d7e5a179ed2b7f25979a
-  data.tar.gz: 675e51826977c6e4bf1872aa4350e95d68deb225833a8a821b66ac686062f5b3418f9a19918572c850f5d9746bbc10a9e401382da4c27df9fab5d587bb1a9592
+  metadata.gz: 2132c9ae9e477ee2f99bdd71e7596946bb4fa69d1d6dde525b325df11e2859bfe0186f5b972a0942c21acb5f4e1d7e64b2c7d84ca761600f2af29e78db7490d1
+  data.tar.gz: b9de16d5e18f760165b367b042b69a0a21a079d61d9b894512295f9fd5192cd65a5df9c4d243242a59352267fa818f04005d52f76c5cf918200c943740fde20c

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Hanami::View
 View layer for Hanami
 
+## v0.6.1 - 2016-02-05
+### Changed
+- [Steve Hook] Preload partial templates in order to boost performances for partials rendering (2x faster)
+
+### Fixed
+- [Luca Guidi] Disable Slim autoescape to use `Hanami::View`'s feature
+
 ## v0.6.0 - 2016-01-22
 ### Changed
 - [Luca Guidi] Renamed the project

data/hanami-view.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   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 'tilt',         '~> 2.0', '>= 2.0.1'
   spec.add_runtime_dependency 'hanami-utils', '~> 0.7'
 
   spec.add_development_dependency 'bundler',  '~> 1.5'

data/lib/hanami/view/configuration.rb

@@ -4,6 +4,7 @@ require 'hanami/utils/kernel'
 require 'hanami/utils/string'
 require 'hanami/utils/load_paths'
 require 'hanami/view/rendering/layout_finder'
+require 'hanami/view/rendering/partial_templates_finder'
 
 module Hanami
   module View
@@ -39,6 +40,7 @@ module Hanami
       attr_reader :views
       attr_reader :layouts
       attr_reader :modules
+      attr_reader :partials
 
       # Return the original configuration of the framework instance associated
       # with the given class.
@@ -418,9 +420,39 @@ module Hanami
       def load!
         views.each   { |v| v.__send__(:load!) }
         layouts.each { |l| l.__send__(:load!) }
+        load_partials!
         freeze
       end
 
+      # Load partials for each partial template file found under the
+      # given load paths
+      #
+      # @since x.x.x
+      # @api private
+      def load_partials!
+        Hanami::View::Rendering::PartialTemplatesFinder.new(self).find.each do |partial|
+          add_partial(partial)
+        end
+      end
+
+      # Load partials for each partial template file found under the
+      # given load paths
+      #
+      # @since x.x.x
+      # @api private
+      def find_partial(relative_partial_path, template_name, format)
+        partials_for_view = partials.has_key?(relative_partial_path) ?  partials[relative_partial_path] : partials[template_name]
+        partials_for_view ? partials_for_view[format.to_sym] : nil
+      end
+
+      # Add a partial to the registry
+      #
+      # @since x.x.x
+      # @api private
+      def add_partial(partial)
+        @partials[partial.key][partial.format.to_sym] = partial.template
+      end
+
       # Reset all the values to the defaults
       #
       # @since 0.2.0
@@ -429,6 +461,7 @@ module Hanami
         root             DEFAULT_ROOT
         default_encoding DEFAULT_ENCODING
 
+        @partials   = Hash.new { |h, k| h[k] = Hash.new }
         @views      = Set.new
         @layouts    = Set.new
         @load_paths = Utils::LoadPaths.new(root)

data/lib/hanami/view/rendering/partial_file.rb

@@ -0,0 +1,19 @@
+module Hanami
+  module View
+    module Rendering
+      # @since x.x.x
+      # @api private
+      class PartialFile
+        attr_reader :key, :format, :template
+
+        # @since x.x.x
+        # @api private
+        def initialize(key, format, template)
+          @key      = key
+          @format   = format
+          @template = template
+        end
+      end
+    end
+  end
+end

data/lib/hanami/view/rendering/partial_finder.rb

@@ -23,9 +23,10 @@ module Hanami
         PREFIX = '_'.freeze
 
         # Find a template for a partial. Initially it will look for the
-        # partial template under the directory of the parent directory 
-        # view template, if not found it will search recursivly from 
-        # the view root.
+        # partial template in the framework configuration where it may
+        # already be cached. Failing that it will look under the
+        # directory of the parent directory view template, if not found
+        # it will search recursively from the view root.
         #
         # @return [Hanami::View::Template] the requested template
         #
@@ -34,14 +35,18 @@ module Hanami
         # @since 0.4.3
         # @api private
         def find
-          if path = partial_template_under_view_path
-            View::Template.new(path, @view.configuration.default_encoding)
-          else
-            super
-          end
+          Hanami::View::Configuration.for(@view).
+            find_partial(relative_partial_path, template_name, format)
         end
 
         protected
+
+        # @since x.x.x
+        # @api private
+        def relative_partial_path
+          [view_template_dir, template_name].join(separator)
+        end
+
         # @since 0.4.3
         # @api private
         def partial_template_under_view_path

data/lib/hanami/view/rendering/partial_templates_finder.rb

@@ -0,0 +1,70 @@
+require 'hanami/view/template'
+require 'hanami/view/rendering/partial_file'
+
+module Hanami
+  module View
+    module Rendering
+      # Find partial templates in the file system
+      #
+      # @api private
+      # @since x.x.x
+      #
+      # @see View::Template
+      class PartialTemplatesFinder
+        # Search pattern for partial file names
+        #
+        # @api private
+        # @since x.x.x
+        PARTIAL_PATTERN = '_*'.freeze
+
+        # @api private
+        # @since x.x.x
+        PARTIAL_PARTS_SEPARATOR = '.'.freeze
+
+        attr_reader :configuration
+
+        # Initializes a new PartialTemplatesFinder
+        #
+        # @param configuration [Configuration] the configuration object
+        #
+        # @since x.x.x
+        def initialize(configuration)
+          @configuration = configuration
+        end
+
+        # Find partials under the given path
+        #
+        # @return [Array] array of PartialFinder objects
+        #
+        # @since x.x.x
+        def find
+          _find_partials(configuration.root).map do |template|
+            partial_path, partial_base_name = Pathname(template).relative_path_from(configuration.root).split
+            partial_base_parts              = partial_base_name.to_s.split(PARTIAL_PARTS_SEPARATOR)
+
+            PartialFile.new(
+              "#{partial_path}#{::File::SEPARATOR}#{partial_base_parts[0]}",
+              partial_base_parts[1],
+              View::Template.new(template, configuration.default_encoding)
+            )
+          end
+        end
+
+        private
+
+        # Find partial template file paths
+        #
+        # @param path [String] the path under which we should search for partials
+        #
+        # @return [Array] an array of strings for each matching partial template file found
+        #
+        # @since x.x.x
+        # @api private
+        def _find_partials(path)
+          Dir.glob("#{ [path, TemplatesFinder::RECURSIVE, PARTIAL_PATTERN].join(::File::SEPARATOR) }.#{TemplatesFinder::FORMAT}.#{TemplatesFinder::ENGINES}")
+        end
+      end
+    end
+  end
+end
+

data/lib/hanami/view/template.rb

@@ -7,7 +7,9 @@ module Hanami
     # @since 0.1.0
     class Template
       def initialize(template, encoding = Encoding::UTF_8)
-        @_template = Tilt.new(template, nil, default_encoding: encoding)
+        # NOTE disable_escape: true is for Slim compatibility
+        # See https://github.com/hanami/assets/issues/36
+        @_template = Tilt.new(template, nil, default_encoding: encoding, disable_escape: true)
       end
 
       # Returns the format that the template handles.

data/lib/hanami/view/version.rb

@@ -3,6 +3,6 @@ module Hanami
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.6.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-view
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -117,7 +117,9 @@ files:
 - lib/hanami/view/rendering/null_layout.rb
 - lib/hanami/view/rendering/null_template.rb
 - lib/hanami/view/rendering/partial.rb
+- lib/hanami/view/rendering/partial_file.rb
 - lib/hanami/view/rendering/partial_finder.rb
+- lib/hanami/view/rendering/partial_templates_finder.rb
 - lib/hanami/view/rendering/registry.rb
 - lib/hanami/view/rendering/scope.rb
 - lib/hanami/view/rendering/template.rb