dry-web-roda 0.10.0 → 0.14.0

data/dry-web-roda.gemspec

@@ -1,35 +1,36 @@
-lib = File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+# this file is managed by dry-rb/devtools project
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "dry/web/roda/version"
+require 'dry/web/roda/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "dry-web-roda"
-  spec.version       = Dry::Web::Roda::VERSION
+  spec.name          = 'dry-web-roda'
   spec.authors       = ["Piotr Solnica"]
   spec.email         = ["piotr.solnica@gmail.com"]
+  spec.license       = 'MIT'
+  spec.version       = Dry::Web::Roda::VERSION.dup
+
   spec.summary       = "Roda integration for dry-web apps"
   spec.description   = spec.summary
-  spec.homepage      = "https://github.com/dry-rb/dry-web-roda"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://dry-rb.org/gems/dry-web-roda'
+  spec.files         = Dir["CHANGELOG.md", "LICENSE", "README.md", "dry-web-roda.gemspec", "lib/**/*"]
+  spec.bindir        = 'bin'
+  spec.executables   = ["dry-web-roda"]
+  spec.require_paths = ['lib']
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+  spec.metadata['changelog_uri']     = 'https://github.com/dry-rb/dry-web-roda/blob/master/CHANGELOG.md'
+  spec.metadata['source_code_uri']   = 'https://github.com/dry-rb/dry-web-roda'
+  spec.metadata['bug_tracker_uri']   = 'https://github.com/dry-rb/dry-web-roda/issues'
 
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = ">= 2.4.0"
 
+  # to update dependencies edit project.yml
   spec.add_runtime_dependency "dry-configurable", "~> 0.2"
-  spec.add_runtime_dependency "inflecto", "~> 0.0"
-  spec.add_runtime_dependency "roda", "~> 2.14"
-  spec.add_runtime_dependency "roda-flow", "~> 0.3.1"
-  spec.add_runtime_dependency "thor", "~> 0.19"
-
-  spec.add_development_dependency "aruba"
-  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"
-  spec.add_development_dependency "waitutil"
+  spec.add_runtime_dependency "dry-inflector", "~> 0.2"
+  spec.add_runtime_dependency "roda", "~> 3.0"
+  spec.add_runtime_dependency "roda-flow", "~> 0.4"
+  spec.add_runtime_dependency "thor", "~> 1.0"
 end

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/inflections.rb

@@ -1,4 +1,4 @@
-require "inflecto"
+require 'dry/web/roda/inflector'
 
 module Dry
   module Web
@@ -8,11 +8,11 @@ module Dry
           module_function
 
           def underscored_name(name)
-            Inflecto.underscore(name)
+            Inflector.underscore(name)
           end
 
           def camel_cased_name(name)
-            Inflecto.camelize(underscored_name(name))
+            Inflector.camelize(underscored_name(name))
           end
         end
       end

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/inflector.rb

@@ -0,0 +1,9 @@
+require 'dry/inflector'
+
+module Dry
+  module Web
+    module Roda
+      Inflector = Dry::Inflector.new
+    end
+  end
+end

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

@@ -1,41 +1,46 @@
 source "https://rubygems.org"
 
+# TODO: The original content of this Gemfile was generated by dry-web-roda.
+#       It is recommended to review the dependencies and define their version
+#       requirements for gems that miss them.
 gem "rake"
 
 # Web framework
-gem "dry-system", "~> 0.9"
-gem "dry-web", "~> 0.7"
-gem "dry-web-roda", "~> 0.7"
+gem "dry-web-roda"
+gem "dry-system"
+gem "dry-web"
 gem "puma"
 gem "rack_csrf"
 
 gem "rack", ">= 2.0"
-gem "rerun"
 
 # Database persistence
 gem "pg"
-gem "rom", "~> 4.0"
-gem "rom-sql", "~> 2.1"
+gem "rom", "~> 5.1"
+gem "rom-sql", "~> 3.1"
 
 # Application dependencies
-gem "dry-matcher", "~> 0.6.0"
-gem "dry-monads", "~> 0.3"
-gem "dry-struct", "~> 0.3"
-gem "dry-transaction", "~> 0.10"
-gem "dry-types", "~> 0.12"
-gem "dry-validation", "~> 0.11"
-gem "dry-view", "~> 0.4"
+gem "dry-matcher"
+gem "dry-monads"
+gem "dry-struct"
+gem "dry-types"
+gem "dry-validation"
+gem "dry-view"
 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"
   gem "database_cleaner"
   gem "poltergeist"
   gem "rspec"
-  gem "rom-factory", "~> 0.5"
+  gem "rom-factory", "~> 0.10"
 end

data/lib/dry/web/roda/templates/README.md.tt

@@ -5,8 +5,11 @@ Welcome! You’ve generated an app using dry-web-roda.
 ## First steps
 
 1. Run `bundle`
-2. Review `.env` & `.env.test` (and make a copy to e.g. `.example.env` if you want example settings checked in)
-3. Run `bundle exec rake db:create`
-4. Add your own steps to `bin/setup`
-5. Run the app with `bundle exec rerun -- rackup --port 4000 config.ru`
-6. Initialize git with `git init` and make your initial commit
+2. Review `.env` & `.env.test` (and make a copy to e.g. `.example.env` if you want example settings checked in). In
+particular, ensure that your PostgreSQL username and password are specified in the `DATABASE_URL` variable as follows:
+`postgres://username:password@your_host/...`.
+3. Run `bundle exec rake db:create` to create the development database.
+4. Run `RACK_ENV=test bundle exec rake db:create` to create the test database.
+5. Add your own steps to `bin/setup`
+6. Run the app with `bundle exec rerun -- rackup --port 4000 config.ru`
+7. Initialize git with `git init` and make your initial commit

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/boot.rb.tt

@@ -1,3 +1,5 @@
+require "bundler/setup"
+
 begin
   require "pry-byebug"
 rescue LoadError

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,9 +1,10 @@
 <%= config[:camel_cased_app_name] %>::Container.boot :monitor do
   init do
-    require "dry/monitor"
+    require "dry/monitor/sql/logger"
   end
 
   start do
+    notifications.register_event(:sql)
     Dry::Monitor::SQL::Logger.new(logger).subscribe(notifications)
   end
 end

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

@@ -5,9 +5,6 @@ require "dry/system/components"
 module <%= config[:camel_cased_umbrella_name] %>
   module <%= config[:camel_cased_app_name] %>
     class Container < Dry::Web::Container
-      require root.join("system/<%= config[:underscored_umbrella_name] %>/container")
-      import core: <%= config[:camel_cased_umbrella_name] %>::Container
-
       configure do |config|
         config.root = Pathname(__FILE__).join("../../..").realpath.dirname.freeze
         config.logger = <%= config[:camel_cased_umbrella_name] %>::Container[:logger]
@@ -15,6 +12,9 @@ module <%= config[:camel_cased_umbrella_name] %>
         config.auto_register = %w[lib/<%= config[:underscored_umbrella_name] %>/<%= config[:underscored_project_name] %>]
       end
 
+      require root.join("../../system/<%= config[:underscored_umbrella_name] %>/container").to_s
+      import core: <%= config[:camel_cased_umbrella_name] %>::Container
+
       load_paths! "lib"
     end
   end

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/types.rb

@@ -1,6 +1,6 @@
-require "dry-struct"
-require "dry-types"
+require "dry/struct"
+require "dry/types"
 
 module Types
-  include Dry::Types.module
+  include Dry.Types()
 end

data/lib/dry/web/roda/templates/umbrella_project/boot.rb.tt

@@ -1,3 +1,5 @@
+require "bundler/setup"
+
 begin
   require "pry-byebug"
 rescue LoadError

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.10.0".freeze
+      VERSION = "0.14.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)
-          is 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