dry-web-roda 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6be6ea6b8d9623e8af79c8f0592ba036523bff362e5d0ab278f273949d38654
-  data.tar.gz: d02c91f5ce75cb4c8737540d0d6433ad41db9719081a9772920a3f2b8fc0e167
+  metadata.gz: de59ba21d0b5c59a9a8292a73bb94b2101d135bb95d906bd560ef9dd625b613e
+  data.tar.gz: f8f437a3077df4f3b4dc13e69fe47ca0d3338bdad3283b217b883d3fb8e5e96d
 SHA512:
-  metadata.gz: 143aed614b62127210c9338d97adfc5cb96aea5e6eaae4117f05bf9c58a096ac4c65530527643a888237b594c2e40a35854f9264f40716d3107d27050589b46e
-  data.tar.gz: b68d11fd027f77f61e041d598a65fbf5852ed48ec18c425255a3d51de9c4bfe177cf5332edbff766b8dc1802df5c4572128a3f878209d999684386bc9aa95cba
+  metadata.gz: f49bcbf08f9b51f870a1919029251eed84309f2b19e2db9868d784f576ed0b4dd151b6956a8b3bd0ee6a8b47e7803497623b3f6e3d5f644b0380415e3e748c2a
+  data.tar.gz: b7a78d5ea09833ef49ffebcf409b0514ef96abee6b56e8548931cc3b2819ac181e5805319036bd26b4d913bf31658375404397ae953a8bbb51334592dc93467b

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 dist: trusty
-sudo: false
 services:
   - postgresql
 cache: bundler
@@ -12,16 +11,17 @@ before_script:
 script:
   - ./script/ci
 rvm:
-  - 2.5.0
-  - 2.4.3
-  - 2.3.6
-  - jruby-9.1.9.0
+  - 2.6.2
+  - 2.5.5
+  - 2.4.5
+  - 2.3.8
+  - jruby-9.2.6.0
 env:
   global:
     - JRUBY_OPTS='--dev -J-Xmx1024M'
 matrix:
   allow_failures:
-    - rvm: jruby-9.1.9.0
+    - rvm: jruby-9.2.6.0
 notifications:
   email: false
   webhooks:

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.12.0 - 2019-04-16
+
+### Changed
+
+- Update generated app to work with latest releases of dry-rb gems, including dry-view 0.7.0 and dry-monitor 0.3.0 (parndt in [#94][pr94])
+- [BREAKING] `view` roda helper now expects the dry-view context object to be registered in the container as `"view_context"` (instead of previous `"view.context"`) (parndt in [#94][pr94])
+
+[pr94]: https://github.com/dry-rb/dry-web-roda/pull/94/files
+
+[Compare v0.11.0...v0.12.0](https://github.com/dry-rb/dry-web-roda/compare/v0.11.0...v0.12.0)
+
 # 0.11.0 - 2018-02-21
 
 ### Changed

data/Gemfile

@@ -15,14 +15,14 @@ gem "pg"
 gem "rom", "~> 4.0"
 gem "rom-factory", "~> 0.5"
 gem "rom-sql", "~> 2.1"
-gem "dry-matcher", "~> 0.6.0"
-gem "dry-monads", "~> 0.3"
+gem "dry-matcher", "~> 0.7"
+gem "dry-monads", "~> 1.2"
 gem "dry-struct", "~> 0.3"
 gem "dry-system", "~> 0.9"
-gem "dry-transaction", "~> 0.10"
+gem "dry-transaction", "~> 0.13"
 gem "dry-types", "~> 0.12"
 gem "dry-validation", "~> 0.11"
-gem "dry-view", "~> 0.3"
+gem "dry-view", "~> 0.7"
 gem "dry-web", "~> 0.8"
 gem "slim"
 gem "pry-byebug", platform: :mri

data/dry-web-roda.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "thor", "~> 0.19"
 
   spec.add_development_dependency "aruba"
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", ">= 1.7"
   spec.add_development_dependency "rake", "~> 11.0"
   spec.add_development_dependency "rspec", "~> 3.4"
   spec.add_development_dependency "capybara", "~> 2.5"

data/lib/dry/web/roda/generators/abstract_project.rb

@@ -53,8 +53,8 @@ module Dry
             add_template('repository.rb.tt', "lib/#{underscored_project_name}/repository.rb")
             add_template('.keep', 'lib/persistence/relations/.keep')
             add_template('.keep', 'lib/persistence/commands/.keep')
-            add_template('view__context.rb.tt', "lib/#{underscored_project_name}/view/context.rb")
-            add_template('view__controller.rb.tt', "lib/#{underscored_project_name}/view/controller.rb")
+            add_template('view_context.rb.tt', "lib/#{underscored_project_name}/view_context.rb")
+            add_template('view.rb.tt', "lib/#{underscored_project_name}/view.rb")
           end
 
           def add_log

data/lib/dry/web/roda/generators/sub_app.rb

@@ -34,8 +34,8 @@ module Dry
           end
 
           def add_lib
-            add_template('subapp/view__context.rb.tt', "#{lib_path}/view/context.rb")
-            add_template('subapp/view__controller.rb.tt', "#{lib_path}/view/controller.rb")
+            add_template('subapp/view_context.rb.tt', "#{lib_path}/view_context.rb")
+            add_template('subapp/view.rb.tt', "#{lib_path}/view.rb")
             add_template('subapp/welcome.rb.tt', "#{lib_path}/views/welcome.rb")
           end
 

data/lib/dry/web/roda/templates/Gemfile

@@ -10,7 +10,6 @@ gem "puma"
 gem "rack_csrf"
 
 gem "rack", ">= 2.0"
-gem "rerun"
 
 # Database persistence
 gem "pg"
@@ -18,19 +17,23 @@ gem "rom", "~> 4.0"
 gem "rom-sql", "~> 2.1"
 
 # Application dependencies
-gem "dry-matcher", "~> 0.6.0"
-gem "dry-monads", "~> 0.3"
+gem "dry-matcher", "~> 0.7"
+gem "dry-monads", "~> 1.2"
 gem "dry-struct", "~> 0.3"
-gem "dry-transaction", "~> 0.10"
+gem "dry-transaction", "~> 0.13"
 gem "dry-types", "~> 0.12"
 gem "dry-validation", "~> 0.11"
-gem "dry-view", "~> 0.4"
+gem "dry-view", "~> 0.7"
 gem "slim"
 
 group :development, :test do
   gem "pry-byebug", platform: :mri
 end
 
+group :development do
+  gem "rerun"
+end
+
 group :test do
   gem "capybara"
   gem "capybara-screenshot"

data/lib/dry/web/roda/templates/container.rb.tt

@@ -1,5 +1,7 @@
 require "dry/web/container"
 require "dry/system/components"
+require 'dry-monitor'
+Dry::Monitor.load_extensions(:rack)
 
 module <%= config[:camel_cased_app_name] %>
   class Container < Dry::Web::Container

data/lib/dry/web/roda/templates/flat_project/web.rb.tt

@@ -11,19 +11,21 @@ module <%= config[:camel_cased_app_name] %>
     opts[:root] = Pathname(__FILE__).join("../..").realpath.dirname
 
     use Rack::Session::Cookie, key: "<%= config[:underscored_project_name] %>.session", secret: self["settings"].session_secret
+    use Rack::MethodOverride
 
     plugin :csrf, raise: true
     plugin :dry_view
     plugin :error_handler
     plugin :flash
     plugin :multi_route
+    plugin :all_verbs
 
     route do |r|
       # Enable this after writing your first web/routes/ file
       # r.multi_route
 
       r.root do
-        r.view "welcome"
+        r.view :welcome
       end
     end
 

data/lib/dry/web/roda/templates/monitor.rb.tt

@@ -1,6 +1,7 @@
 <%= config[:camel_cased_app_name] %>::Container.boot :monitor do
   init do
     require "dry/monitor"
+    Dry::Monitor.load_extensions(:sql)
   end
 
   start do

data/lib/dry/web/roda/templates/subapp/view.rb.tt

@@ -0,0 +1,17 @@
+# auto_register: false
+
+require "slim"
+require "dry/view"
+require "<%= config[:underscored_umbrella_name] %>/<%= config[:underscored_project_name] %>/container"
+
+module <%= config[:camel_cased_umbrella_name] %>
+  module <%= config[:camel_cased_app_name] %>
+    class View < Dry::View
+      configure do |config|
+        config.paths = [Container.root.join("web/templates")]
+        config.default_context = Container["view_context"]
+        config.layout = "application"
+      end
+    end
+  end
+end

data/lib/dry/web/roda/templates/subapp/view_context.rb.tt

@@ -0,0 +1,8 @@
+require "<%= config[:underscored_umbrella_name] %>/view_context"
+
+module <%= config[:camel_cased_umbrella_name] %>
+  module <%= config[:camel_cased_app_name] %>
+    class ViewContext < <%= config[:camel_cased_umbrella_name] %>::ViewContext
+    end
+  end
+end

data/lib/dry/web/roda/templates/subapp/web.rb.tt

@@ -12,19 +12,21 @@ module <%= config[:camel_cased_umbrella_name] %>
       opts[:root] = Pathname(__FILE__).join("../../..").realpath.dirname
 
       use Rack::Session::Cookie, key: "<%= config[:underscored_umbrella_name] %>.<%= config[:underscored_project_name] %>.session", secret: self["core.settings"].session_secret
+      use Rack::MethodOverride
 
       plugin :csrf, raise: true
       plugin :dry_view
       plugin :error_handler
       plugin :flash
       plugin :multi_route
+      plugin :all_verbs
 
       route do |r|
         # Enable this after writing your first web/routes/ file
         # r.multi_route
 
         r.root do
-          r.view "welcome"
+          r.view :welcome
         end
       end
 

data/lib/dry/web/roda/templates/subapp/welcome.rb.tt

@@ -1,9 +1,9 @@
-require "<%= config[:underscored_umbrella_name] %>/<%= config[:underscored_project_name] %>/view/controller"
+require "<%= config[:underscored_umbrella_name] %>/<%= config[:underscored_project_name] %>/view"
 
 module <%= config[:camel_cased_umbrella_name] %>
   module <%= config[:camel_cased_app_name] %>
     module Views
-      class Welcome < View::Controller
+      class Welcome < View
         configure do |config|
           config.template = "welcome"
         end

data/lib/dry/web/roda/templates/view.rb.tt

@@ -0,0 +1,15 @@
+# auto_register: false
+
+require "slim"
+require "dry/view"
+require "<%= config[:underscored_project_name] %>/container"
+
+module <%= config[:camel_cased_app_name] %>
+  class View < Dry::View
+    configure do |config|
+      config.paths = [Container.root.join("web/templates")]
+      config.default_context = Container["view_context"]
+      config.layout = "application"
+    end
+  end
+end

data/lib/dry/web/roda/templates/view_context.rb.tt

@@ -0,0 +1,31 @@
+require "dry/view/context"
+
+module <%= config[:camel_cased_app_name] %>
+  class ViewContext < Dry::View::Context
+    def csrf_token
+      self[:csrf_token]
+    end
+
+    def csrf_metatag
+      self[:csrf_metatag]
+    end
+
+    def csrf_tag
+      self[:csrf_tag]
+    end
+
+    def flash
+      self[:flash]
+    end
+
+    def flash?
+      %i[notice alert].any? { |type| flash[type] }
+    end
+
+    private
+
+    def [](name)
+      _options.fetch(name)
+    end
+  end
+end

data/lib/dry/web/roda/templates/welcome.rb.tt

@@ -1,8 +1,8 @@
-require "<%= config[:underscored_project_name] %>/view/controller"
+require "<%= config[:underscored_project_name] %>/view"
 
 module <%= config[:camel_cased_app_name] %>
   module Views
-    class Welcome < <%= config[:camel_cased_app_name] %>::View::Controller
+    class Welcome < <%= config[:camel_cased_app_name] %>::View
       configure do |config|
         config.template = "welcome"
       end

data/lib/dry/web/roda/version.rb

@@ -1,7 +1,7 @@
 module Dry
   module Web
     module Roda
-      VERSION = "0.11.0".freeze
+      VERSION = "0.12.0".freeze
     end
   end
 end

data/lib/roda/plugins/dry_view.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Roda
   module RodaPlugins
     module DryView
@@ -7,7 +9,7 @@ class Roda
 
       module InstanceMethods
         def view_context
-          self.class["view.context"].with(view_context_options)
+          self.class["view_context"].with(view_context_options)
         end
 
         def view_context_options
@@ -21,8 +23,9 @@ class Roda
 
       module RequestMethods
         def view(name, options = {})
-          options = {context: scope.view_context}.merge(options)
-          on to: scope.view_key(name), call_with: [options]
+          resolve(scope.view_key(name)) do |renderer|
+            renderer.call({ context: scope.view_context }.merge(options)).to_s
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-web-roda
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2019-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -98,14 +98,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
@@ -229,15 +229,15 @@ files:
 - lib/dry/web/roda/templates/subapp/container.rb.tt
 - lib/dry/web/roda/templates/subapp/example_routes.rb.tt
 - lib/dry/web/roda/templates/subapp/import.rb.tt
-- lib/dry/web/roda/templates/subapp/view__context.rb.tt
-- lib/dry/web/roda/templates/subapp/view__controller.rb.tt
+- lib/dry/web/roda/templates/subapp/view.rb.tt
+- lib/dry/web/roda/templates/subapp/view_context.rb.tt
 - lib/dry/web/roda/templates/subapp/web.rb.tt
 - lib/dry/web/roda/templates/subapp/welcome.rb.tt
 - lib/dry/web/roda/templates/types.rb
 - lib/dry/web/roda/templates/umbrella_project/boot.rb.tt
 - lib/dry/web/roda/templates/umbrella_project/web.rb.tt
-- lib/dry/web/roda/templates/view__context.rb.tt
-- lib/dry/web/roda/templates/view__controller.rb.tt
+- lib/dry/web/roda/templates/view.rb.tt
+- lib/dry/web/roda/templates/view_context.rb.tt
 - lib/dry/web/roda/templates/welcome.html.slim
 - lib/dry/web/roda/templates/welcome.rb.tt
 - lib/dry/web/roda/version.rb
@@ -276,8 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Roda integration for dry-web apps

data/lib/dry/web/roda/templates/subapp/view__context.rb.tt

@@ -1,10 +0,0 @@
-require "<%= config[:underscored_umbrella_name] %>/view/context"
-
-module <%= config[:camel_cased_umbrella_name] %>
-  module <%= config[:camel_cased_app_name] %>
-    module View
-      class Context < <%= config[:camel_cased_umbrella_name] %>::View::Context
-      end
-    end
-  end
-end

data/lib/dry/web/roda/templates/subapp/view__controller.rb.tt

@@ -1,19 +0,0 @@
-# auto_register: false
-
-require "slim"
-require "dry/view/controller"
-require "<%= config[:underscored_umbrella_name] %>/<%= config[:underscored_project_name] %>/container"
-
-module <%= config[:camel_cased_umbrella_name] %>
-  module <%= config[:camel_cased_app_name] %>
-    module View
-      class Controller < Dry::View::Controller
-        configure do |config|
-          config.paths = [Container.root.join("web/templates")]
-          config.context = Container["view.context"]
-          config.layout = "application"
-        end
-      end
-    end
-  end
-end

data/lib/dry/web/roda/templates/view__context.rb.tt

@@ -1,41 +0,0 @@
-module <%= config[:camel_cased_app_name] %>
-  module View
-    class Context
-      attr_reader :attrs
-
-      def initialize(attrs = {})
-        @attrs = attrs
-      end
-
-      def csrf_token
-        self[:csrf_token]
-      end
-
-      def csrf_metatag
-        self[:csrf_metatag]
-      end
-
-      def csrf_tag
-        self[:csrf_tag]
-      end
-
-      def flash
-        self[:flash]
-      end
-
-      def flash?
-        %i[notice alert].any? { |type| flash[type] }
-      end
-
-      def with(new_attrs)
-        self.class.new(attrs.merge(new_attrs))
-      end
-
-      private
-
-      def [](name)
-        attrs.fetch(name)
-      end
-    end
-  end
-end

data/lib/dry/web/roda/templates/view__controller.rb.tt

@@ -1,17 +0,0 @@
-# auto_register: false
-
-require "slim"
-require "dry/view/controller"
-require "<%= config[:underscored_project_name] %>/container"
-
-module <%= config[:camel_cased_app_name] %>
-  module View
-    class Controller < Dry::View::Controller
-      configure do |config|
-        config.paths = [Container.root.join("web/templates")]
-        config.context = Container["view.context"]
-        config.layout = "application"
-      end
-    end
-  end
-end