dry-web-roda 0.6.3 → 0.7.0

data/lib/dry/web/roda/{skeletons/sub_app/system/__underscored_app_name__ → templates/subapp}/application.rb.tt

@@ -10,7 +10,7 @@ module <%= config[:camel_cased_app_name] %>
 
     opts[:root] = Pathname(__FILE__).join("../..").realpath.dirname
 
-    use Rack::Session::Cookie, key: "<%= config[:underscored_app_name] %>.session", secret: <%= config[:camel_cased_umbrella_name] %>::Container.settings.session_secret
+    use Rack::Session::Cookie, key: "<%= config[:underscored_project_name] %>.session", secret: self["core.settings"].session_secret
 
     plugin :csrf, raise: true
     plugin :flash
@@ -24,6 +24,11 @@ module <%= config[:camel_cased_app_name] %>
       end
     end
 
+    error do |e|
+      self.class[:rack_monitor].instrument(:error, exception: e)
+      raise e
+    end
+
     load_routes!
   end
 end

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

@@ -0,0 +1,5 @@
+require_relative "<%= config[:underscored_project_name] %>/container"
+
+<%= config[:camel_cased_app_name] %>::Container.finalize!
+
+require "<%= config[:underscored_project_name] %>/application"

data/lib/dry/web/roda/{skeletons/sub_app/system/__underscored_app_name__ → templates/subapp}/container.rb.tt

@@ -4,20 +4,17 @@ require "dry/web/container"
 module <%= config[:camel_cased_app_name] %>
   class Container < Dry::Web::Container
     require root.join("system/<%= config[:underscored_umbrella_name] %>/container")
-    import <%= config[:camel_cased_umbrella_name] %>::Container
+    import core: <%= config[:camel_cased_umbrella_name] %>::Container
+
+    register :rack_monitor, <%= config[:camel_cased_umbrella_name] %>::Container[:rack_monitor]
 
     configure do |config|
       config.root = Pathname(__FILE__).join("../..").realpath.dirname.freeze
-
       config.logger = <%= config[:camel_cased_umbrella_name] %>::Container[:logger]
-
-      config.default_namespace = "<%= config[:underscored_app_name] %>"
-
-      config.auto_register = %w[
-        lib/<%= config[:underscored_app_name] %>
-      ]
+      config.default_namespace = "<%= config[:underscored_project_name] %>"
+      config.auto_register = %w[lib/<%= config[:underscored_project_name] %>]
     end
 
-    load_paths! "lib", "system"
+    load_paths! "lib"
   end
 end

data/lib/dry/web/roda/{skeletons/sub_app/system/__underscored_app_name__ → templates/subapp}/transactions.rb.tt

@@ -1,7 +1,6 @@
 require "dry-transaction"
-require "<%= config[:underscored_umbrella_name] %>/transactions"
-require "<%= config[:underscored_app_name] %>/container"
-require "<%= config[:underscored_app_name] %>/import"
+require "<%= config[:underscored_project_name] %>/container"
+require "<%= config[:underscored_project_name] %>/import"
 
 module <%= config[:camel_cased_app_name] %>
   class Transactions < <%= config[:camel_cased_umbrella_name] %>::Transactions

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_app_name] %>
+  module View
+    class Context < <%= config[:camel_cased_umbrella_name] %>::View::Context
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# auto_register: false
+
+require "slim"
+require "dry-view"
+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

data/lib/dry/web/roda/{skeletons/umbrella_project/system/__underscored_app_name__ → templates/umbrella_project}/application.rb.tt

@@ -8,7 +8,12 @@ module <%= config[:camel_cased_app_name] %>
     end
 
     route do |r|
-      r.run Main::Application.freeze.app
+      r.run ::Main::Application.freeze.app
+    end
+
+    error do |e|
+      self.class[:rack_monitor].instrument(:error, exception: e)
+      raise e
     end
   end
 end

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

@@ -0,0 +1,16 @@
+begin
+  require "pry-byebug"
+rescue LoadError
+end
+
+require_relative "<%= config[:underscored_project_name] %>/container"
+
+<%= config[:camel_cased_app_name] %>::Container.finalize!
+
+# Load sub-apps
+app_paths = Pathname(__FILE__).dirname.join("../apps").realpath.join("*")
+Dir[app_paths].each do |f|
+  require "#{f}/system/boot"
+end
+
+require "<%= config[:underscored_project_name] %>/application"

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

@@ -0,0 +1,43 @@
+# auto_register: false
+
+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

@@ -0,0 +1,17 @@
+# auto_register: false
+
+require "slim"
+require "dry-view"
+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

data/lib/dry/web/roda/{skeletons/flat_project/lib/__underscored_app_name__/views → templates}/welcome.rb.tt

@@ -1,8 +1,8 @@
-require "<%= config[:underscored_app_name] %>/view_controller"
+require "<%= config[:underscored_project_name] %>/view/controller"
 
 module <%= config[:camel_cased_app_name] %>
   module Views
-    class Welcome < <%= config[:camel_cased_app_name] %>::ViewController
+    class Welcome < <%= config[:camel_cased_app_name] %>::View::Controller
       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.6.3".freeze
+      VERSION = "0.7.0".freeze
     end
   end
 end

data/lib/roda/plugins/dry_view.rb

@@ -9,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

data/spec/support/project.rb

@@ -16,7 +16,7 @@ module RSpec
           create_project name, args
 
           within_project_directory(name) do
-            setup_gemfile
+            setup_gemfile gems: ["'dry-web-roda', path: '#{root}'"], exclude_gems: ['dry-web-roda']
             bundle_install
             yield
           end

metadata

@@ -1,49 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dry-web-roda
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: dry-web
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: dry-monitor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
@@ -210,6 +176,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -221,89 +188,57 @@ files:
 - lib/dry/web/roda/cli.rb
 - lib/dry/web/roda/cli/generate.rb
 - lib/dry/web/roda/generate.rb
+- lib/dry/web/roda/generators/abstract_generator.rb
+- lib/dry/web/roda/generators/abstract_project.rb
 - lib/dry/web/roda/generators/flat_project.rb
 - lib/dry/web/roda/generators/inflections.rb
 - lib/dry/web/roda/generators/sub_app.rb
 - lib/dry/web/roda/generators/umbrella_project.rb
-- lib/dry/web/roda/skeletons/flat_project/Gemfile
-- lib/dry/web/roda/skeletons/flat_project/README.md.tt
-- lib/dry/web/roda/skeletons/flat_project/Rakefile.tt
-- lib/dry/web/roda/skeletons/flat_project/bin/console.tt
-- lib/dry/web/roda/skeletons/flat_project/bin/setup
-- lib/dry/web/roda/skeletons/flat_project/config.ru.tt
-- lib/dry/web/roda/skeletons/flat_project/config/settings.yml.tt
-- lib/dry/web/roda/skeletons/flat_project/db/sample_data.rb
-- lib/dry/web/roda/skeletons/flat_project/db/seed.rb
-- lib/dry/web/roda/skeletons/flat_project/lib/__underscored_app_name__/.keep
-- lib/dry/web/roda/skeletons/flat_project/lib/__underscored_app_name__/views/welcome.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/lib/persistence/commands/.keep
-- lib/dry/web/roda/skeletons/flat_project/lib/persistence/relations/.keep
-- lib/dry/web/roda/skeletons/flat_project/lib/types.rb
-- lib/dry/web/roda/skeletons/flat_project/log/.keep
-- lib/dry/web/roda/skeletons/flat_project/spec/app_helper.rb
-- lib/dry/web/roda/skeletons/flat_project/spec/db_helper.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/spec/spec_helper.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/spec/support/db/test_factories.rb
-- lib/dry/web/roda/skeletons/flat_project/spec/support/test_helpers.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/system/__underscored_app_name__/application.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/system/__underscored_app_name__/container.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/system/__underscored_app_name__/import.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/system/__underscored_app_name__/repository.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/system/__underscored_app_name__/settings.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/system/__underscored_app_name__/transactions.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/system/__underscored_app_name__/view_context.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/system/__underscored_app_name__/view_controller.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/system/boot.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/system/boot/monitor.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/system/boot/rom.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/system/boot/view.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/transactions/example.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/web/routes/example.rb.tt
-- lib/dry/web/roda/skeletons/flat_project/web/templates/layouts/application.html.slim
-- lib/dry/web/roda/skeletons/flat_project/web/templates/welcome.html.slim
-- lib/dry/web/roda/skeletons/sub_app/lib/__underscored_app_name__/.keep
-- lib/dry/web/roda/skeletons/sub_app/lib/__underscored_app_name__/views/welcome.rb.tt
-- lib/dry/web/roda/skeletons/sub_app/system/__underscored_app_name__/application.rb.tt
-- lib/dry/web/roda/skeletons/sub_app/system/__underscored_app_name__/container.rb.tt
-- lib/dry/web/roda/skeletons/sub_app/system/__underscored_app_name__/import.rb.tt
-- lib/dry/web/roda/skeletons/sub_app/system/__underscored_app_name__/transactions.rb.tt
-- lib/dry/web/roda/skeletons/sub_app/system/__underscored_app_name__/view_context.rb.tt
-- lib/dry/web/roda/skeletons/sub_app/system/__underscored_app_name__/view_controller.rb.tt
-- lib/dry/web/roda/skeletons/sub_app/system/boot.rb.tt
-- lib/dry/web/roda/skeletons/sub_app/system/boot/view.rb.tt
-- lib/dry/web/roda/skeletons/sub_app/transactions/example.rb.tt
-- lib/dry/web/roda/skeletons/sub_app/web/routes/example.rb.tt
-- lib/dry/web/roda/skeletons/sub_app/web/templates/layouts/application.html.slim
-- lib/dry/web/roda/skeletons/sub_app/web/templates/welcome.html.slim
-- lib/dry/web/roda/skeletons/umbrella_project/.gitignore
-- lib/dry/web/roda/skeletons/umbrella_project/Gemfile
-- lib/dry/web/roda/skeletons/umbrella_project/README.md.tt
-- lib/dry/web/roda/skeletons/umbrella_project/Rakefile.tt
-- lib/dry/web/roda/skeletons/umbrella_project/bin/console.tt
-- lib/dry/web/roda/skeletons/umbrella_project/bin/setup
-- lib/dry/web/roda/skeletons/umbrella_project/config.ru.tt
-- lib/dry/web/roda/skeletons/umbrella_project/config/settings.yml.tt
-- lib/dry/web/roda/skeletons/umbrella_project/db/sample_data.rb
-- lib/dry/web/roda/skeletons/umbrella_project/db/seed.rb
-- lib/dry/web/roda/skeletons/umbrella_project/lib/__underscored_app_name__/repository.rb.tt
-- lib/dry/web/roda/skeletons/umbrella_project/lib/__underscored_app_name__/transactions.rb.tt
-- lib/dry/web/roda/skeletons/umbrella_project/lib/__underscored_app_name__/view_context.rb.tt
-- lib/dry/web/roda/skeletons/umbrella_project/lib/persistence/commands/.keep
-- lib/dry/web/roda/skeletons/umbrella_project/lib/persistence/relations/.keep
-- lib/dry/web/roda/skeletons/umbrella_project/lib/types.rb
-- lib/dry/web/roda/skeletons/umbrella_project/log/.keep
-- lib/dry/web/roda/skeletons/umbrella_project/spec/app_helper.rb
-- lib/dry/web/roda/skeletons/umbrella_project/spec/db_helper.rb.tt
-- lib/dry/web/roda/skeletons/umbrella_project/spec/spec_helper.rb.tt
-- lib/dry/web/roda/skeletons/umbrella_project/spec/support/db/test_factories.rb
-- lib/dry/web/roda/skeletons/umbrella_project/spec/support/test_helpers.rb.tt
-- lib/dry/web/roda/skeletons/umbrella_project/system/__underscored_app_name__/application.rb.tt
-- lib/dry/web/roda/skeletons/umbrella_project/system/__underscored_app_name__/container.rb.tt
-- lib/dry/web/roda/skeletons/umbrella_project/system/__underscored_app_name__/import.rb.tt
-- lib/dry/web/roda/skeletons/umbrella_project/system/__underscored_app_name__/settings.rb.tt
-- lib/dry/web/roda/skeletons/umbrella_project/system/boot.rb.tt
-- lib/dry/web/roda/skeletons/umbrella_project/system/boot/monitor.rb.tt
-- lib/dry/web/roda/skeletons/umbrella_project/system/boot/rom.rb.tt
+- lib/dry/web/roda/templates/.env.test.tt
+- lib/dry/web/roda/templates/.env.tt
+- lib/dry/web/roda/templates/.gitignore
+- lib/dry/web/roda/templates/.keep
+- lib/dry/web/roda/templates/.rspec
+- lib/dry/web/roda/templates/Gemfile
+- lib/dry/web/roda/templates/README.md.tt
+- lib/dry/web/roda/templates/Rakefile.tt
+- lib/dry/web/roda/templates/application.html.slim
+- lib/dry/web/roda/templates/boot__settings.rb.tt
+- lib/dry/web/roda/templates/config.ru.tt
+- lib/dry/web/roda/templates/console.tt
+- lib/dry/web/roda/templates/container.rb.tt
+- lib/dry/web/roda/templates/example_routes.rb.tt
+- lib/dry/web/roda/templates/flat_project/application.rb.tt
+- lib/dry/web/roda/templates/flat_project/boot.rb.tt
+- lib/dry/web/roda/templates/import.rb.tt
+- lib/dry/web/roda/templates/monitor.rb.tt
+- lib/dry/web/roda/templates/operation.rb.tt
+- lib/dry/web/roda/templates/repository.rb.tt
+- lib/dry/web/roda/templates/rom.rb.tt
+- lib/dry/web/roda/templates/sample_data.rb
+- lib/dry/web/roda/templates/seed.rb
+- lib/dry/web/roda/templates/settings.rb.tt
+- lib/dry/web/roda/templates/setup
+- lib/dry/web/roda/templates/spec/db_spec_helper.rb.tt
+- lib/dry/web/roda/templates/spec/factories/example.rb
+- lib/dry/web/roda/templates/spec/spec_helper.rb.tt
+- lib/dry/web/roda/templates/spec/support/db/factory.rb
+- lib/dry/web/roda/templates/spec/support/db/helpers.rb.tt
+- lib/dry/web/roda/templates/spec/support/web/helpers.rb.tt
+- lib/dry/web/roda/templates/spec/web_spec_helper.rb
+- lib/dry/web/roda/templates/subapp/application.rb.tt
+- lib/dry/web/roda/templates/subapp/boot.rb.tt
+- lib/dry/web/roda/templates/subapp/container.rb.tt
+- lib/dry/web/roda/templates/subapp/transactions.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/types.rb
+- lib/dry/web/roda/templates/umbrella_project/application.rb.tt
+- lib/dry/web/roda/templates/umbrella_project/boot.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/welcome.html.slim
+- lib/dry/web/roda/templates/welcome.rb.tt
 - lib/dry/web/roda/version.rb
 - lib/roda/plugins/dry_view.rb
 - script/ci
@@ -341,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Roda integration for dry-web apps

data/lib/dry/web/roda/skeletons/flat_project/README.md.tt

@@ -1,12 +0,0 @@
-# <%= config[:camel_cased_app_name] %>
-
-Welcome! You’ve generated an app using dry-web-roda.
-
-## First steps
-
-1. Run `bundle`
-1. Review `config/settings.yml` (and make a copy at `config/settings.example.yml` if you want to keep example settings checked in)
-1. Create a `<%= config[:underscored_app_name] %>_development` database
-1. Add your own steps to `bin/setup`
-1. Run the app with `bundle exec shotgun -p 3000 -o 0.0.0.0 config.ru`
-1. Initialize git with `git init` and make your initial commit