hanami-view 2.0.0.alpha2 → 2.0.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0a9e22a0413e4519d8cec81b9561779ee0834e7db1786468459d0d8e96aa4d1
-  data.tar.gz: 186b6b5fb8e24c60b65dc3cda95f66aac760e364bd33bbb4aecd9abca5c5ed1f
+  metadata.gz: b6b6dc01adb32ad3baabc7a15012119e8814de8ec999c4b5da2009204c3b047c
+  data.tar.gz: 8ef681f6101b085dec6e03f6de0815dfa55d8cbd91e960bf0144e4a46da5cce9
 SHA512:
-  metadata.gz: 246f383f6ca472687a0bd5bad8c138af7775388ec7c0a53465b3aecff934afd10c8a083dcdf3f60393292499f90e48caef9bf9f6c8b814ea9e712389e5460e0d
-  data.tar.gz: 660af0f10eef9892ae224a6383732984b76169690df59cbab8a660626d54c7fa0de027d2e18a4aae75d41111a7baadd0736548a75f87778874d574c64510f2f7
+  metadata.gz: b5704c147558d2a0e3e86d59f3b665ee65265a9398584b1d3478970551d9a022551ea04420444622c2c4967ab3406d29ea9dab7c13462207364ea985aa4af723
+  data.tar.gz: 5909511de76e1daf91a375c5947103040c2ec40208ea52882771204249cc2d4aef23d2ceaa8dac24cc960dbba978f3e4c6c08fac52118673b9c22580571f10fb

data/CHANGELOG.md

@@ -1,10 +1,15 @@
 # Hanami::View
 View layer for Hanami
 
-## v2.0.0.alpha2 - 2021-05-04
+## v2.0.0.alpha3 - 2021-11-09
+### Added
+- [Pablo Vicente] Raise `LayoutNotFoundError` exception with friendlier, more specific error message when layouts cannot be found
 
 ### Changed
+- [Tim Riley] (Internal) Updated settings to use updated dry-configurable `setting` 0.13.0 API
 
+## v2.0.0.alpha2 - 2021-05-04
+### Changed
 - [Tim Riley] Replaced entire gem with dry-view (now renamed to hanami-view). See [dry-view's documentation](https://dry-rb.org/gems/dry-view/) for its capabilities and [the dry-view changelog](CHANGELOG.dry-view.md) for its history.
 
 ## v1.3.1 - 2019-01-18

data/README.md

@@ -1,28 +1,52 @@
-[gem]: https://rubygems.org/gems/hanami-view
-[actions]: https://github.com/hanami/view/actions
-[codacy]: https://www.codacy.com/gh/hanami/view
-[chat]: https://dry-rb.zulipchat.com
-[inchpages]: http://inch-ci.org/github/hanami/view
+# Hanami::View
 
-# hanami-view [![Join the chat at https://dry-rb.zulipchat.com](https://img.shields.io/badge/dry--rb-join%20chat-%23346b7a.svg)][chat]
+A view layer for [Hanami](http://hanamirb.org)
 
-[![Gem Version](https://badge.fury.io/rb/hanami-view.svg)][gem]
-[![CI Status](https://github.com/hanami/view/workflows/ci/badge.svg)][actions]
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/fe8a45d76d8b45f6a680a29c48b43a99)][codacy]
-[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/fe8a45d76d8b45f6a680a29c48b43a99)][codacy]
-[![Inline docs](http://inch-ci.org/github/hanami/view.svg?branch=master)][inchpages]
+## Version
 
-## Links
+**This branch contains the code for `hanami-view` 2.x.**
 
-* [User documentation](http://dry-rb.org/gems/hanami-view)
-* [API documentation](http://rubydoc.info/gems/hanami-view)
+## Status
 
-## Supported Ruby versions
+[![Gem Version](https://badge.fury.io/rb/hanami-view.svg)](https://badge.fury.io/rb/hanami-view)
+[![CI](https://github.com/hanami/view/workflows/ci/badge.svg?branch=main)](https://github.com/hanami/view/actions?query=workflow%3Aci+branch%3Amain)
+[![Test Coverage](https://codecov.io/gh/hanami/view/branch/main/graph/badge.svg)](https://codecov.io/gh/hanami/view)
+[![Depfu](https://badges.depfu.com/badges/7cd17419fba78b726be1353118fb01de/overview.svg)](https://depfu.com/github/hanami/view?project=Bundler)
+[![Inline Docs](http://inch-ci.org/github/hanami/view.svg)](http://inch-ci.org/github/hanami/view)
 
-This library officially supports the following Ruby versions:
+## Contact
 
-* MRI >= `2.4`
-* jruby >= `9.2`
+* Home page: http://hanamirb.org
+* Community: http://hanamirb.org/community
+* Guides: https://guides.hanamirb.org
+* Mailing List: http://hanamirb.org/mailing-list
+* API Doc: http://rdoc.info/gems/hanami-view
+* Bugs/Issues: https://github.com/hanami/view/issues
+* Chat: http://chat.hanamirb.org
+
+## Rubies
+
+__Hanami::view__ supports Ruby (MRI) 2.6+
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem "hanami/view"
+```
+
+And then execute:
+
+```shell
+$ bundle
+```
+
+Or install it yourself as:
+
+```shell
+$ gem install hanami-view
+```
 
 ## License
 

data/hanami-view.gemspec

@@ -20,14 +20,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
-  spec.metadata['changelog_uri']     = 'https://github.com/hanami/view/blob/master/CHANGELOG.md'
+  spec.metadata['changelog_uri']     = 'https://github.com/hanami/view/blob/main/CHANGELOG.md'
   spec.metadata['source_code_uri']   = 'https://github.com/hanami/view'
   spec.metadata['bug_tracker_uri']   = 'https://github.com/hanami/view/issues'
 
   spec.required_ruby_version = ">= 2.4.0"
 
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
-  spec.add_runtime_dependency "dry-configurable", "~> 0.1"
+  spec.add_runtime_dependency "dry-configurable", "~> 0.13", ">= 0.13.0"
   spec.add_runtime_dependency "dry-core", "~> 0.5", ">= 0.5"
   spec.add_runtime_dependency "dry-inflector", "~> 0.1"
   spec.add_runtime_dependency "tilt", "~> 2.0", ">= 2.0.6"

data/lib/hanami/view/application_configuration.rb

@@ -8,7 +8,7 @@ module Hanami
     class ApplicationConfiguration
       include Dry::Configurable
 
-      setting :parts_path, "views/parts"
+      setting :parts_path, default: "views/parts"
 
       def initialize(*)
         super

data/lib/hanami/view/errors.rb

@@ -25,5 +25,20 @@ module Hanami
         super(msg)
       end
     end
+
+    # Error raised when layout could not be found within a view's configured
+    # paths
+    #
+    # @api private
+    class LayoutNotFoundError < StandardError
+      def initialize(layout_name, lookup_paths)
+        msg = [
+          "Layout +#{layout_name}+ could not be found in paths:",
+          lookup_paths.map { |path| " - #{path}" }
+        ].join("\n\n")
+
+        super(msg)
+      end
+    end
   end
 end

data/lib/hanami/view/standalone_view.rb

@@ -351,10 +351,14 @@ module Hanami
 
           if layout?
             layout_env = self.class.layout_env(format: format, context: context)
-            output = env.template(
-              self.class.layout_path,
-              layout_env.scope(config.scope, layout_locals(locals))
-            ) { output }
+            begin
+              output = env.template(
+                self.class.layout_path,
+                layout_env.scope(config.scope, layout_locals(locals))
+              ) { output }
+            rescue TemplateNotFoundError
+              raise LayoutNotFoundError.new(config.layout, config.paths)
+            end
           end
 
           Rendered.new(output: output, locals: locals)

data/lib/hanami/view/version.rb

@@ -3,6 +3,6 @@
 module Hanami
   class View
     # @api private
-    VERSION = "2.0.0.alpha2"
+    VERSION = "2.0.0.alpha3"
   end
 end

data/lib/hanami/view.rb

@@ -56,9 +56,9 @@ module Hanami
     #
     #   @api public
     # @!scope class
-    setting :paths do |paths|
+    setting :paths, constructor: -> paths {
       Array(paths).map { |path| Path[path] }
-    end
+    }
 
     # @overload config.template=(name)
     #   Set the name of the template for rendering this view. Template name
@@ -96,7 +96,7 @@ module Hanami
     #   @param name [String, FalseClass, nil] layout name, or false to indicate no layout
     #   @api public
     # @!scope class
-    setting :layout, false
+    setting :layout, default: false
 
     # @overload config.layouts_dir=(dir)
     #   Set the name of the directory (within the configured `paths`) holding
@@ -105,7 +105,7 @@ module Hanami
     #   @param dir [String] directory name
     #   @api public
     # @!scope class
-    setting :layouts_dir, "layouts"
+    setting :layouts_dir, default: "layouts"
 
     # @overload config.scope=(scope_class)
     #   Set the scope class to use when rendering the view's template.
@@ -131,7 +131,7 @@ module Hanami
     #   @param context [Hanami::View::Context] context object
     #   @api public
     # @!scope class
-    setting :default_context, Context.new.freeze
+    setting :default_context, default: Context.new.freeze
 
     # @overload config.default_format=(format)
     #   Set the default format to use when rendering.
@@ -141,7 +141,7 @@ module Hanami
     #   @param format [Symbol]
     #   @api public
     # @!scope class
-    setting :default_format, :html
+    setting :default_format, default: :html
 
     # @overload config.scope_namespace=(namespace)
     #   Set a namespace that will be searched when building scope classes.
@@ -162,7 +162,7 @@ module Hanami
     #   @param part_builder [Class]
     #   @api public
     # @!scope class
-    setting :part_builder, PartBuilder
+    setting :part_builder, default: PartBuilder
 
     # @overload config.scope_namespace=(namespace)
     #   Set a namespace that will be searched when building scope classes.
@@ -183,7 +183,7 @@ module Hanami
     #   @param scope_builder [Class]
     #   @api public
     # @!scope class
-    setting :scope_builder, ScopeBuilder
+    setting :scope_builder, default: ScopeBuilder
 
     # @overload config.inflector=(inflector)
     #   Set an inflector to provide to the part_builder and scope_builder.
@@ -193,7 +193,7 @@ module Hanami
     #   @param inflector
     #   @api public
     # @!scope class
-    setting :inflector, Dry::Inflector.new
+    setting :inflector, default: Dry::Inflector.new
 
     # @overload config.renderer_options=(options)
     #   A hash of options to pass to the template engine. Template engines are
@@ -208,9 +208,9 @@ module Hanami
     #   @param options [Hash] renderer options
     #   @api public
     # @!scope class
-    setting :renderer_options, DEFAULT_RENDERER_OPTIONS do |options|
+    setting :renderer_options, default: DEFAULT_RENDERER_OPTIONS, constructor: -> options {
       DEFAULT_RENDERER_OPTIONS.merge(options.to_h).freeze
-    end
+    }
 
     # @overload config.renderer_engine_mapping=(mapping)
     #   A hash specifying the (Tilt-compatible) template engine class to use

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-view
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha2
+  version: 2.0.0.alpha3
 platform: ruby
 authors:
 - Tim Riley
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -31,14 +31,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +185,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/hanami/view/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/hanami/view/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/hanami/view
   bug_tracker_uri: https://github.com/hanami/view/issues
 post_install_message:
@@ -197,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A complete, standalone view rendering system that gives you everything you