lotus-view 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 157e33c3501d504b0f477800b0edf1dfda0ed005
-  data.tar.gz: d435e901372ec5f8eef01e16a7efa94a9d7fbcf6
+  metadata.gz: 649aad9b2c89338664e94077b6cf76852ca7a7d7
+  data.tar.gz: dfd9c547cd5ff6448905ae97ca4bfe5a7df6388e
 SHA512:
-  metadata.gz: b2b69e70efddf07ce8ac3b034a24a4e2d126db2512b79df640e5aa5c9c6bf5d708e8f5d972777ee235ed47b8a28c2122ccc39a2afe2c5d4aef1da8b6a6c5d542
-  data.tar.gz: 4229477e5b5d137e5b83c6aeac8083acf1e1e79f5ba11f9d334adefc9d3d2a58d6cb7d55d67e5137c9b5642ed5b29c2ffe3ffbc968cf9a6a1bca712ddc23c6ff
+  metadata.gz: d7a6401cd9a910d97eb56b52d028b5941273b78bf4fa4950cea0534daf70af68233d7626c6cd00b5f6537a7d052e0fd400762c686c52c815097343cf125477d9
+  data.tar.gz: 63435a70f8067de9eff27ee955b3916c073e155405b79be4e8ff2c6bcfbbd5c7a31def284477ce1bcdd6078ae293820448127eeb2447b652befc8013e6759ead

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Lotus::View
 View layer for Lotus
 
+## v0.4.3 - 2015-07-10
+### Fixed
+- [Farrel Lifson] Force partial finder to be explicit when to templates have the same name.
+
 ## v0.4.2 - 2015-06-23
 ### Fixed
 - [Tom Kadwill] Ensure views to use methods defined by the associated layout.

data/README.md

@@ -460,7 +460,7 @@ module Articles
 
   class RssIndex < Index
     format :rss
-    layout nil
+    layout false
   end
 end
 

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

@@ -13,7 +13,7 @@ module Lotus
       #   module Articles
       #     class Show
       #       include Lotus::View
-      #       layout nil
+      #       layout false
       #     end
       #   end
       #

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

@@ -22,7 +22,39 @@ module Lotus
         #   "_sidebar.html.erb"
         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.
+        #
+        # @return [Lotus::View::Template] the requested template
+        #
+        # @see Lotus::View::Rendering::TemplateFinder#find
+        #
+        # @since 0.4.3
+        # @api private
+        def find
+          if path = partial_template_under_view_path
+            View::Template.new path
+          else
+            super
+          end
+        end
+
         protected
+        # @since 0.4.3
+        # @api private
+        def partial_template_under_view_path
+          _find(view_template_dir).first
+        end
+
+        # @since 0.4.3
+        # @api private
+        def view_template_dir
+          *all, _ = @view.template.split(separator)
+          all.join(separator)
+        end
+
         def template_name
           *all, last = partial_name.split(separator)
           all.push( last.prepend(prefix) ).join(separator)

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

@@ -69,12 +69,19 @@ module Lotus
         #   Lotus::View::Rendering::TemplatesFinder.new(Articles::Show).find
         #     # => [#<Lotus::View::Template:0x007f8a0a86a970 ... @file="/path/to/templates/articles/show.html.erb">]
         def find
-          Dir.glob( "#{ [root, recursive, template_name].join(separator) }.#{ format }.#{ engines }" ).map do |template|
-            View::Template.new template
+          _find.map do |template|
+            View::Template.new(template)
           end
         end
 
         protected
+
+        # @api private
+        # @since 0.4.3
+        def _find(lookup = search_path)
+          Dir.glob( "#{ [root, lookup, template_name].join(separator) }.#{ format }.#{ engines }" )
+        end
+
         # @api private
         # @since 0.1.0
         def template_name
@@ -87,6 +94,12 @@ module Lotus
           @view.root
         end
 
+        # @api private
+        # @since 0.4.3
+        def search_path
+          recursive
+        end
+
         # @api private
         # @since 0.2.0
         def recursive

data/lib/lotus/view/version.rb

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

data/lotus-view.gemspec

@@ -6,8 +6,8 @@ require 'lotus/view/version'
 Gem::Specification.new do |spec|
   spec.name          = 'lotus-view'
   spec.version       = Lotus::View::VERSION
-  spec.authors       = ['Luca Guidi']
-  spec.email         = ['me@lucaguidi.com']
+  spec.authors       = ['Luca Guidi', 'Trung Lê', 'Alfonso Uceda Pompa']
+  spec.email         = ['me@lucaguidi.com', 'trung.le@ruby-journal.com', 'uceda73@gmail.com']
   spec.description   = %q{View layer for Lotus}
   spec.summary       = %q{View layer for Lotus, with a separation between views and templates}
   spec.homepage      = 'http://lotusrb.org'

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: lotus-view
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Luca Guidi
+- Trung Lê
+- Alfonso Uceda Pompa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -89,6 +91,8 @@ dependencies:
 description: View layer for Lotus
 email:
 - me@lucaguidi.com
+- trung.le@ruby-journal.com
+- uceda73@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []