lotus-view 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b321d4151a1e0e2117595364a5ced056dd1e392f
-  data.tar.gz: 3632ba288305a3e5c872bab66bef57be6bf24dd0
+  metadata.gz: 157e33c3501d504b0f477800b0edf1dfda0ed005
+  data.tar.gz: d435e901372ec5f8eef01e16a7efa94a9d7fbcf6
 SHA512:
-  metadata.gz: 9f28b9f392d7a31f577fdd5cc8a9ee3afaedf3aef95db0525768aad3d4dd3505d4719a5ed46ba9483e267c7c57ab9f0730956c6a98ec95c7c8946c6f98d5773d
-  data.tar.gz: 5c82053e74076b8ab8e159efdd5ee51702a23f6fb37fd422ca29f7c0bb2ec4f23620af53279ea7d1cfbbb9b9b0312686286501fe7e2e2954828db35abd58b1e0
+  metadata.gz: b2b69e70efddf07ce8ac3b034a24a4e2d126db2512b79df640e5aa5c9c6bf5d708e8f5d972777ee235ed47b8a28c2122ccc39a2afe2c5d4aef1da8b6a6c5d542
+  data.tar.gz: 4229477e5b5d137e5b83c6aeac8083acf1e1e79f5ba11f9d334adefc9d3d2a58d6cb7d55d67e5137c9b5642ed5b29c2ffe3ffbc968cf9a6a1bca712ddc23c6ff

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Lotus::View
 View layer for Lotus
 
+## v0.4.2 - 2015-06-23
+### Fixed
+- [Tom Kadwill] Ensure views to use methods defined by the associated layout.
+
 ## v0.4.1 - 2015-05-22
 ### Added
 - [Luca Guidi] Introduced `#content` to render optional contents in a different context (eg. a view sets a page specific javascript in the application template footer).

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

@@ -203,8 +203,8 @@ module Lotus
         def method_missing(m, *args, &blk)
           if @scope.respond_to?(m)
             @scope.__send__(m, *args, &blk)
-          elsif @layout.respond_to?(m)
-            @layout.__send__(m, *args, &blk)
+          elsif layout.respond_to?(m)
+            layout.__send__(m, *args, &blk)
           else
             super
           end
@@ -228,6 +228,12 @@ module Lotus
             opts[:locals].merge!(options.fetch(:locals){ ::Hash.new })
           end
         end
+
+        # @since 0.4.2
+        # @api private
+        def layout
+          @layout || @layout.class.layout.new(@scope, "")
+        end
       end
     end
   end

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

@@ -21,7 +21,7 @@ module Lotus
         # @api private
         # @since 0.1.0
         def initialize(view, locals = {})
-          @view, @locals = view, locals
+          @view, @locals, @layout = view, locals, layout
         end
 
         # Returns an inspect String
@@ -70,6 +70,18 @@ module Lotus
             end
           )
         end
+
+        private
+
+        # @since 0.4.2
+        # @api private
+        def layout
+          if @view.class.respond_to?(:layout)
+            @view.class.layout.new(self, "")
+          else
+            nil
+          end
+        end
       end
     end
   end

data/lib/lotus/view/version.rb

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

data/lotus-view.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_runtime_dependency 'tilt',        '~> 2.0', '>= 2.0.1'
-  spec.add_runtime_dependency 'lotus-utils', '~> 0.4'
+  spec.add_runtime_dependency 'lotus-utils', '~> 0.5'
 
   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.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: View layer for Lotus, with a separation between views and templates