dry-view 0.5.3 → 0.6.0

data/lib/dry/view/scope_builder.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require "dry/core/cache"
+require "dry/equalizer"
+require_relative "scope"
+
+module Dry
+  class View
+    # Builds scope objects via matching classes
+    #
+    # @api private
+    class ScopeBuilder
+      extend Dry::Core::Cache
+      include Dry::Equalizer(:namespace)
+
+      # The view's configured `scope_namespace`
+      #
+      # @api private
+      attr_reader :namespace
+
+      # @return [RenderEnvironment]
+      #
+      # @api private
+      attr_reader :render_env
+
+      # Returns a new instance of ScopeBuilder
+      #
+      # @api private
+      def initialize(namespace: nil, render_env: nil)
+        @namespace = namespace
+        @render_env = render_env
+      end
+
+      # @api private
+      def for_render_env(render_env)
+        return self if render_env == self.render_env
+
+        self.class.new(namespace: namespace, render_env: render_env)
+      end
+
+      # Returns a new scope using a class matching the name
+      #
+      # @param name [Symbol, Class] scope name
+      # @param locals [Hash<Symbol, Object>] locals hash
+      #
+      # @return [Dry::View::Scope]
+      #
+      # @api private
+      def call(name = nil, locals)
+        scope_class(name).new(
+          name: name,
+          locals: locals,
+          render_env: render_env,
+        )
+      end
+
+      private
+
+      DEFAULT_SCOPE_CLASS = Scope
+
+      def scope_class(name = nil)
+        if name.nil?
+          DEFAULT_SCOPE_CLASS
+        elsif name.is_a?(Class)
+          name
+        else
+          fetch_or_store(namespace, name) do
+            resolve_scope_class(name: name)
+          end
+        end
+      end
+
+      def resolve_scope_class(name:)
+        name = inflector.camelize(name.to_s)
+
+        # Give autoloaders a chance to act
+        begin
+          klass = namespace.const_get(name)
+        rescue NameError
+        end
+
+        if !klass && namespace.const_defined?(name, false)
+          klass = namespace.const_get(name)
+        end
+
+        if klass && klass < Scope
+          klass
+        else
+          DEFAULT_SCOPE_CLASS
+        end
+      end
+
+      def inflector
+        render_env.inflector
+      end
+    end
+  end
+end

data/lib/dry/view/tilt.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require "dry/core/cache"
+require "tilt"
+
+module Dry
+  class View
+    # @api private
+    module Tilt
+      extend Dry::Core::Cache
+
+      class << self
+        def [](path, mapping, **options)
+          ext = File.extname(path).sub(%r{^.}, "").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/dry/view/tilt/erb.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Dry
+  class View
+    module Tilt
+      module ERB
+        def self.requirements
+          ["dry/view/tilt/erbse", <<~ERROR]
+            dry-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:
+
+            Dry::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/dry/view/tilt/erbse.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "tilt/template"
+require "erbse"
+
+module Dry
+  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/dry/view/tilt/haml.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Dry
+  class View
+    module Tilt
+      module Haml
+        def self.requirements
+          ["hamlit/block", <<~ERROR]
+            dry-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:
+
+            Dry::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/dry/view/version.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 module Dry
-  module View
-    VERSION = '0.5.3'.freeze
+  class View
+    # @api private
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dry-view
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
-- Piotr Solnica
 - Tim Riley
+- Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-21 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -18,6 +18,9 @@ dependencies:
     - - "~>"
       - !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
@@ -25,6 +28,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
@@ -68,19 +74,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
+        version: '0.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,75 +129,51 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-description: Functional view rendering system
+description: A complete, standalone view rendering system that gives you everything
+  you need to write well-factored view code
 email:
-- piotr.solnica@gmail.com
 - tim@icelab.com.au
+- piotr.solnica@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
-- benchmarks/templates/button.html.erb
-- benchmarks/view.rb
 - bin/console
+- bin/setup
+- bin/setup_helpers.rb
 - dry-view.gemspec
 - lib/dry-view.rb
 - lib/dry/view.rb
-- lib/dry/view/controller.rb
-- lib/dry/view/decorator.rb
+- lib/dry/view/context.rb
+- lib/dry/view/decorated_attributes.rb
 - lib/dry/view/exposure.rb
 - lib/dry/view/exposures.rb
-- lib/dry/view/missing_renderer.rb
 - lib/dry/view/part.rb
+- lib/dry/view/part_builder.rb
 - lib/dry/view/path.rb
+- lib/dry/view/render_environment.rb
+- lib/dry/view/render_environment_missing.rb
+- lib/dry/view/rendered.rb
 - lib/dry/view/renderer.rb
 - lib/dry/view/scope.rb
+- lib/dry/view/scope_builder.rb
+- lib/dry/view/tilt.rb
+- lib/dry/view/tilt/erb.rb
+- lib/dry/view/tilt/erbse.rb
+- lib/dry/view/tilt/haml.rb
 - lib/dry/view/version.rb
-- spec/fixtures/templates/_hello.html.slim
-- spec/fixtures/templates/controller_renderer_options.html.erb
-- spec/fixtures/templates/decorated_parts.html.slim
-- spec/fixtures/templates/edit.html.slim
-- spec/fixtures/templates/empty.html.slim
-- spec/fixtures/templates/greeting.html.slim
-- spec/fixtures/templates/hello.html.slim
-- spec/fixtures/templates/layouts/app.html.slim
-- spec/fixtures/templates/layouts/app.txt.erb
-- spec/fixtures/templates/parts_with_args.html.slim
-- spec/fixtures/templates/parts_with_args/_box.html.slim
-- spec/fixtures/templates/shared/_index_table.html.slim
-- spec/fixtures/templates/shared/_shared_hello.html.slim
-- spec/fixtures/templates/tasks.html.slim
-- spec/fixtures/templates/user.html.slim
-- spec/fixtures/templates/users.html.slim
-- spec/fixtures/templates/users.txt.erb
-- spec/fixtures/templates/users/_row.html.slim
-- spec/fixtures/templates/users/_tbody.html.slim
-- spec/fixtures/templates/users_with_count.html.slim
-- spec/fixtures/templates/users_with_count_inherit.html.slim
-- spec/fixtures/templates_override/_hello.html.slim
-- spec/fixtures/templates_override/users.html.slim
-- spec/integration/decorator_spec.rb
-- spec/integration/exposures_spec.rb
-- spec/integration/part/decorated_attributes_spec.rb
-- spec/integration/view_spec.rb
-- spec/spec_helper.rb
-- spec/unit/controller_spec.rb
-- spec/unit/decorator_spec.rb
-- spec/unit/exposure_spec.rb
-- spec/unit/exposures_spec.rb
-- spec/unit/part_spec.rb
-- spec/unit/renderer_spec.rb
-- spec/unit/scope_spec.rb
-homepage: https://github.com/dry-rb/dry-view
+homepage: https://dry-rb.org/gems/dry-view
 licenses:
 - MIT
 metadata: {}
@@ -197,43 +193,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
-summary: Functional view rendering system
-test_files:
-- spec/fixtures/templates/_hello.html.slim
-- spec/fixtures/templates/controller_renderer_options.html.erb
-- spec/fixtures/templates/decorated_parts.html.slim
-- spec/fixtures/templates/edit.html.slim
-- spec/fixtures/templates/empty.html.slim
-- spec/fixtures/templates/greeting.html.slim
-- spec/fixtures/templates/hello.html.slim
-- spec/fixtures/templates/layouts/app.html.slim
-- spec/fixtures/templates/layouts/app.txt.erb
-- spec/fixtures/templates/parts_with_args.html.slim
-- spec/fixtures/templates/parts_with_args/_box.html.slim
-- spec/fixtures/templates/shared/_index_table.html.slim
-- spec/fixtures/templates/shared/_shared_hello.html.slim
-- spec/fixtures/templates/tasks.html.slim
-- spec/fixtures/templates/user.html.slim
-- spec/fixtures/templates/users.html.slim
-- spec/fixtures/templates/users.txt.erb
-- spec/fixtures/templates/users/_row.html.slim
-- spec/fixtures/templates/users/_tbody.html.slim
-- spec/fixtures/templates/users_with_count.html.slim
-- spec/fixtures/templates/users_with_count_inherit.html.slim
-- spec/fixtures/templates_override/_hello.html.slim
-- spec/fixtures/templates_override/users.html.slim
-- spec/integration/decorator_spec.rb
-- spec/integration/exposures_spec.rb
-- spec/integration/part/decorated_attributes_spec.rb
-- spec/integration/view_spec.rb
-- spec/spec_helper.rb
-- spec/unit/controller_spec.rb
-- spec/unit/decorator_spec.rb
-- spec/unit/exposure_spec.rb
-- spec/unit/exposures_spec.rb
-- spec/unit/part_spec.rb
-- spec/unit/renderer_spec.rb
-- spec/unit/scope_spec.rb
+summary: A complete, standalone view rendering system that gives you everything you
+  need to write well-factored view code
+test_files: []