hanami-view 1.3.3 → 2.0.0.alpha2

data/lib/hanami/view/tilt.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require "dry/core/cache"
+require "tilt"
+
+module Hanami
+  class View
+    # @api private
+    module Tilt
+      extend Dry::Core::Cache
+
+      class << self
+        def [](path, mapping, **options)
+          ext = File.extname(path).sub(/^./, "").to_sym
+          activate_adapter ext
+
+          with_mapping(mapping).new(path, **options)
+        end
+
+        def default_mapping
+          ::Tilt.default_mapping
+        end
+
+        def register_adapter(ext, adapter)
+          adapters[ext] = adapter
+        end
+
+        def deregister_adapter(ext)
+          adapters.delete(ext)
+        end
+
+        private
+
+        def adapters
+          @adapters ||= {}
+        end
+
+        def activate_adapter(ext)
+          fetch_or_store(:adapter, ext) {
+            adapter = adapters[ext]
+            return unless adapter
+
+            *requires, error_message = adapter.requirements
+
+            begin
+              requires.each(&method(:require))
+            rescue LoadError => e
+              raise e, "#{e.message}\n\n#{error_message}"
+            end
+
+            adapter.activate
+          }
+        end
+
+        def with_mapping(mapping)
+          fetch_or_store(:mapping, mapping) {
+            if mapping.any?
+              build_mapping(mapping)
+            else
+              default_mapping
+            end
+          }
+        end
+
+        def build_mapping(mapping)
+          default_mapping.dup.tap do |new_mapping|
+            mapping.each do |extension, template_class|
+              new_mapping.register template_class, extension
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+require_relative "tilt/erb"
+require_relative "tilt/haml"

data/lib/hanami/view/tilt/erb.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Hanami
+  class View
+    module Tilt
+      module ERB
+        def self.requirements
+          ["hanami/view/tilt/erbse", <<~ERROR]
+            hanami-view requires erbse for full compatibility when rendering .erb templates (e.g. implicitly capturing block content when yielding)
+
+            To ignore this and use another engine for .erb templates, deregister this adapter before calling your views:
+
+            Hanami::View::Tilt.deregister_adapter(:erb)
+          ERROR
+        end
+
+        def self.activate
+          Tilt.default_mapping.register ErbseTemplate, "erb"
+          self
+        end
+      end
+
+      register_adapter :erb, ERB
+    end
+  end
+end

data/lib/hanami/view/tilt/erbse.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "tilt/template"
+require "erbse"
+
+module Hanami
+  class View
+    module Tilt
+      # Tilt template class copied from cells-erb gem
+      class ErbseTemplate < ::Tilt::Template
+        def prepare
+          @template = ::Erbse::Engine.new
+        end
+
+        def precompiled_template(_locals)
+          @template.call(data)
+        end
+      end
+    end
+  end
+end

data/lib/hanami/view/tilt/haml.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Hanami
+  class View
+    module Tilt
+      module Haml
+        def self.requirements
+          ["hamlit/block", <<~ERROR]
+            hanami-view requires hamlit-block for full compatibility when rendering .haml templates (e.g. implicitly capturing block content when yielding)
+
+            To ignore this and use another engine for .haml templates, dereigster this adapter before calling your views:
+
+            Hanami::View::Tilt.deregister_adatper(:haml)
+          ERROR
+        end
+
+        def self.activate
+          # Requiring hamlit/block will register the engine with Tilt
+          self
+        end
+      end
+
+      register_adapter :haml, Haml
+    end
+  end
+end

data/lib/hanami/view/version.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 module Hanami
-  module View
-    # Defines the version
-    #
-    # @since 0.1.0
-    VERSION = '1.3.3'.freeze
+  class View
+    # @api private
+    VERSION = "2.0.0.alpha2"
   end
 end

metadata

@@ -1,145 +1,188 @@
 --- !ruby/object:Gem::Specification
 name: hanami-view
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 2.0.0.alpha2
 platform: ruby
 authors:
-- Luca Guidi
-autorequire: 
+- Tim Riley
+- Piotr Solnica
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: dry-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: hanami-utils
+  name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - "<"
+        version: 2.0.6
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13'
-description: View layer for Hanami
+        version: '0'
+description: A complete, standalone view rendering system that gives you everything
+  you need to write well-factored view code
 email:
-- me@lucaguidi.com
+- tim@icelab.com.au
+- piotr.solnica@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- LICENSE.md
+- LICENSE
 - README.md
 - hanami-view.gemspec
 - lib/hanami-view.rb
-- lib/hanami/layout.rb
-- lib/hanami/presenter.rb
 - lib/hanami/view.rb
-- lib/hanami/view/configuration.rb
-- lib/hanami/view/dsl.rb
+- lib/hanami/view/application_configuration.rb
+- lib/hanami/view/application_context.rb
+- lib/hanami/view/application_view.rb
+- lib/hanami/view/context.rb
+- lib/hanami/view/context_helpers/content_helpers.rb
+- lib/hanami/view/decorated_attributes.rb
 - lib/hanami/view/errors.rb
-- lib/hanami/view/escape.rb
-- lib/hanami/view/inheritable.rb
-- lib/hanami/view/rendering.rb
-- lib/hanami/view/rendering/layout_finder.rb
-- lib/hanami/view/rendering/layout_registry.rb
-- lib/hanami/view/rendering/layout_scope.rb
-- lib/hanami/view/rendering/null_layout.rb
-- lib/hanami/view/rendering/null_local.rb
-- lib/hanami/view/rendering/null_template.rb
-- lib/hanami/view/rendering/null_view.rb
-- lib/hanami/view/rendering/options.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/subscope.rb
-- lib/hanami/view/rendering/template.rb
-- lib/hanami/view/rendering/template_finder.rb
-- lib/hanami/view/rendering/template_name.rb
-- lib/hanami/view/rendering/templates_finder.rb
-- lib/hanami/view/rendering/view_finder.rb
-- lib/hanami/view/template.rb
+- lib/hanami/view/exposure.rb
+- lib/hanami/view/exposures.rb
+- lib/hanami/view/part.rb
+- lib/hanami/view/part_builder.rb
+- lib/hanami/view/path.rb
+- lib/hanami/view/render_environment.rb
+- lib/hanami/view/render_environment_missing.rb
+- lib/hanami/view/rendered.rb
+- lib/hanami/view/renderer.rb
+- lib/hanami/view/scope.rb
+- lib/hanami/view/scope_builder.rb
+- lib/hanami/view/standalone_view.rb
+- lib/hanami/view/tilt.rb
+- lib/hanami/view/tilt/erb.rb
+- lib/hanami/view/tilt/erbse.rb
+- lib/hanami/view/tilt/haml.rb
 - lib/hanami/view/version.rb
-homepage: http://hanamirb.org
+homepage: https://dry-rb.org/gems/hanami-view
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/hanami/view/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/hanami/view
+  bug_tracker_uri: https://github.com/hanami/view/issues
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,15 +190,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.4
+signing_key:
 specification_version: 4
-summary: View layer for Hanami, with a separation between views and templates
+summary: A complete, standalone view rendering system that gives you everything you
+  need to write well-factored view code
 test_files: []

data/LICENSE.md

@@ -1,22 +0,0 @@
-Copyright (c) 2014-2017 Luca Guidi
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.