hanami-view 2.1.0.beta1 → 2.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 547759271a98bf19bed148a823827ddb668f8034ce9673a0db01a989f10d8b4a
-  data.tar.gz: 5fbab49653a3efd335a8b67ce8910a6a077023b57466b0f84f61a71ffc8cc328
+  metadata.gz: d15d51188db92065fac65432748c393654adc894fb1fbb41547eb3226af3736d
+  data.tar.gz: b4af5a77b310e6a32fd33f61359429c5dfe4ef269638f7aa0623db4171797784
 SHA512:
-  metadata.gz: 2f218ce967455774e6b00340a791b17e30accdee496c88f79c2b12721a97e2008d40341b8981f3144caba2a7bacb0eff9aa0e0c51b8f0c25b1406b55c0a68d18
-  data.tar.gz: 83cf8481266c6f0c8e4c76ec3c87b36b60e2e3035fc61db1ee9497675030008efde35fd5890e625a3560b9c6fc0b182956f55c9358e7752f5c6457ea5e4fb5a8
+  metadata.gz: 3792f9a42a835e7e3441d9cc5544689543f33d7575d8e1e872ba26bcae1b5c59a441499c4c1b334a4f40abc049aceb1c8725753f9e71185d788804281579069d
+  data.tar.gz: 280eb1a5752838d0ffab053ff7dac261ed5529a481caceda9a8dda54784009c49592caa7ec463087932d325cbcd98c8f15d942c7e0bff81dd13ee9ebed6223b1

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 View layer for Hanami
 
+## v2.1.0.beta2 - 2023-10-04
+
+### Added
+- [Luca Guidi] Add `Hanami::View::Rendered#match?`, `#match`, and `#include?` to make it more specs friendly.
+- [Philip Arndt] Make `Hanami::View#call` to accept `layout:` keyword argument to specify the layout to use during the rendering.
+
 ## v2.1.0.beta1 - 2023-06-29
 
 ### Added

data/lib/hanami/view/rendered.rb

@@ -7,6 +7,7 @@ module Hanami
     # Output of a View rendering
     #
     # @api public
+    # @since 2.1.0
     class Rendered
       include Dry::Equalizer(:output, :locals)
 
@@ -15,6 +16,7 @@ module Hanami
       # @return [String]
       #
       # @api public
+      # @since 2.1.0
       attr_reader :output
 
       # Returns the hash of locals used to render the view
@@ -22,9 +24,11 @@ module Hanami
       # @return [Hash[<Symbol, Hanami::View::Part>] locals hash
       #
       # @api public
+      # @since 2.1.0
       attr_reader :locals
 
       # @api private
+      # @since 2.1.0
       def initialize(output:, locals:)
         @output = output
         @locals = locals
@@ -37,6 +41,7 @@ module Hanami
       # @return [Hanami::View::Part]
       #
       # @api public
+      # @since 2.1.0
       def [](name)
         locals[name]
       end
@@ -46,10 +51,36 @@ module Hanami
       # @return [String]
       #
       # @api public
+      # @since 2.1.0
       def to_s
         output
       end
       alias_method :to_str, :to_s
+
+      # Matches given input with the rendered view
+      #
+      # @param matcher [String, Regexp] matcher
+      #
+      # @return [TrueClass,FalseClass]
+      #
+      # @api public
+      # @since 2.1.0
+      def match?(matcher)
+        output.match?(matcher)
+      end
+      alias_method :match, :match?
+
+      # Checks if given string is included in the rendered view
+      #
+      # @param string [String] string
+      #
+      # @return [TrueClass,FalseClass]
+      #
+      # @api public
+      # @since 2.1.0
+      def include?(string)
+        output.include?(string)
+      end
     end
   end
 end

data/lib/hanami/view/version.rb

@@ -3,6 +3,6 @@
 module Hanami
   class View
     # @api private
-    VERSION = "2.1.0.beta1"
+    VERSION = "2.1.0.beta2"
   end
 end

data/lib/hanami/view.rb

@@ -477,8 +477,8 @@ module Hanami
     # @!endgroup
 
     # @api private
-    def self.layout_path
-      File.join(*[config.layouts_dir, config.layout].compact)
+    def self.layout_path(layout)
+      File.join(*[config.layouts_dir, layout].compact)
     end
 
     # @api private
@@ -520,24 +520,25 @@ module Hanami
     #
     # @param format [Symbol] template format to use
     # @param context [Context] context object to use
+    # @param layout [String, FalseClass, nil] layout name, or false to indicate no layout
     # @param input input data for preparing exposure values
     #
     # @return [Rendered] rendered view object
     # @api public
-    def call(format: config.default_format, context: config.default_context, **input)
+    def call(format: config.default_format, context: config.default_context, layout: config.layout, **input)
       rendering = self.rendering(format: format, context: context)
 
       locals = locals(rendering, input)
       output = rendering.template(config.template, rendering.scope(config.scope, locals))
 
-      if layout?
+      if layout
         begin
           output = rendering.template(
-            self.class.layout_path,
+            self.class.layout_path(layout),
             rendering.scope(config.scope, layout_locals(locals))
           ) { output }
         rescue TemplateNotFoundError
-          raise LayoutNotFoundError.new(config.layout, config.paths)
+          raise LayoutNotFoundError.new(layout, config.paths)
         end
       end
 
@@ -570,9 +571,5 @@ module Hanami
         layout_locals[key] = value if exposures[key].for_layout?
       end
     end
-
-    def layout?
-      !!config.layout # rubocop:disable Style/DoubleNegation
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-view
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta1
+  version: 2.1.0.beta2
 platform: ruby
 authors:
 - Tim Riley
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby