dry-web-roda 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae7be8dfee807179e26795b99b21373e09af8136
-  data.tar.gz: b0617d0d7ead77a504ba4caa3487bb5c171814d0
+  metadata.gz: 2687d6c62fe47551a7f1d73de05dfbe8350e60a2
+  data.tar.gz: a94145d9896fa2ac5059f0aa372f3df86d0b1005
 SHA512:
-  metadata.gz: 22456e206baab37dcb943358c5a4ccf99d85b1365b4d0a56756ac0eaa87a19f82ec1cf684c75df3a20b6da5245f7a255b1369d09c7bdafd92f92c532fb631e75
-  data.tar.gz: 9b5832e568862fd71249c29f9580b0937a2157cacbdd0f25baa75a803dc73b30b550ca430baa86f3601c44ff23e0de3dff963a847464ed805ec223fbb6c4001e
+  metadata.gz: f32d05abe77ab8d0b687e091cfa0f4c0384bc5558ae76d909eaf4f6a6e2eeb0431f5b8c3af4b487537a71ad097ca68cdbfaa9a076e3cc7bd4aebcb00b90514a7
+  data.tar.gz: c8547744187747d7c505f8cb3f9ac294d52edd305ae428428683fff964b13e35adc8665865c7028feb7035fe0de56a9923bfee9b8a5f21cce50e5ad50589575c

data/.gitignore

@@ -4,11 +4,14 @@
 /coverage/
 /InstalledFiles
 /pkg/
-/spec/reports/
 /test/tmp/
 /test/version_tmp/
 /tmp/
 
+## Testing
+/spec/reports/
+/spec/examples.txt
+
 ## Documentation cache and generated files:
 /.yardoc/
 /_yardoc/
@@ -27,3 +30,6 @@ Gemfile.lock
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+
+.byebug_history
+/vendor/cache/

data/.rspec

@@ -1,3 +1,2 @@
 --color
---order random
---require ./spec/spec_helper.rb
+--require spec_helper

data/.travis.yml

@@ -1,21 +1,27 @@
 language: ruby
+dist: trusty
 sudo: false
+services:
+  - postgresql
 cache: bundler
-bundler_args: --without tools
+install: true
+before_install:
+  - gem update --system
+before_script:
+  - psql -c 'create database sandbox_test;' -U postgres
 script:
-  - bundle exec rake spec
+  - ./script/ci
 rvm:
-  - 2.1
-  - 2.2
-  - 2.3.0
-  - rbx
-  - jruby-9000
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
+  - jruby-9.1.6.0
 env:
   global:
     - JRUBY_OPTS='--dev -J-Xmx1024M'
 matrix:
   allow_failures:
-    - rvm: rbx
+    - rvm: jruby-9.1.6.0
 notifications:
   email: false
   webhooks:

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+# 0.6.1 - 2017-02-08
+
+### Added
+
+- In generated projects, set up dry-monitor for request logging (timriley)
+- In generated projects, use dry-monitor to log SQL queries (timriley)
+- Add new flat project generator: `dry-web-roda new <your_app> --arch=flat` (timriley)
+
+### Changed
+
+- Renamed sub-app generator from `dry-web-roda generate app` to `dry-web-roda generate sub_app` (timriley)
+
+### Fixed
+
+- Ensure dry-monitor is set up in `Application` regardless of the order in which the application's configs are applied (timriley)
+
+# 0.6.1 - 2017-02-03
+
+### Added
+
+- In generated projects, integrate with dry-monitor (via dry-web) for centralized application logging and error reporting (solnic)
+
 # 0.5.1 - 2016-12-27
 
 ### Fixed

data/Gemfile

@@ -1,20 +1,31 @@
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in rodakase.gemspec
 gemspec
 
-group :test do
-  gem 'byebug', platform: :mri
-  gem 'rack', '>= 1.0.0', '<= 2.0.0'
-  gem 'rack-test'
-  gem 'dry-monads'
-  gem 'dry-transaction'
-  gem 'dry-view'
-  gem 'slim'
+gem 'pry'
+gem 'byebug', platform: :mri
+gem 'codeclimate-test-reporter', platform: :rbx
 
-  gem 'codeclimate-test-reporter', platform: :rbx
-end
-
-group :tools do
-  gem 'pry'
-end
+# Generated application dependencies
+gem "dry-web", ">= 0.6.0"
+gem "puma"
+gem "rack_csrf"
+gem "rack", ">= 2.0"
+gem "shotgun", ">= 0.9.2"
+gem "pg"
+gem "rom-repository"
+gem "rom-sql"
+gem "dry-matcher"
+gem "dry-monads"
+gem "dry-struct"
+gem "dry-transaction"
+gem "dry-types"
+gem "dry-validation"
+gem "dry-view", ">= 0.2.2"
+gem "slim"
+gem "pry-byebug", platform: :mri
+gem "capybara"
+gem "capybara-screenshot"
+gem "database_cleaner"
+gem "poltergeist"
+gem "rspec"

data/README.md

@@ -13,16 +13,28 @@
 
 Integration between dry-web and roda.
 
-dry-web-roda offers a CLI for generating new projects:
+dry-web-roda offers a CLI for generating new projects.
+
+### Umbrella projects
+
+To generate a new _umbrella project_ (functionality divided into sub-apps):
 
 ```sh
-$ dry-web-roda new <project_name>
+$ dry-web-roda new <your_project_name>
 ```
 
-And building apps within projects:
+And to generate sub-apps within your project:
 
 ```sh
-$ dry-web-roda generate app <my_sub_app_name>
+$ dry-web-roda generate sub_app <your_sub_app_name> --umbrella=<your_project_name>
+```
+
+### Flat projects
+
+To generate a new _flat project_ (a simpler architecture, with a single module for your entire app):
+
+```sh
+$ dry-web-roda new <your_project_name> --arch=flat
 ```
 
 ## LICENSE
@@ -32,3 +44,9 @@ See `LICENSE` file.
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/dry-rb/dry-web-roda.
+
+## Acknowledgements
+
+The support code for testing the CLI and generated app are derived from
+[hanami/hanami](https://github.com/hanami/hanami). Thank you to Luca and the
+Hanami team!

data/dry-web-roda.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.1.0'
+  spec.required_ruby_version = '>= 2.2.0'
 
   spec.add_runtime_dependency "dry-web", "~> 0.6", ">= 0.6.0"
   spec.add_runtime_dependency "dry-monitor"
@@ -28,8 +28,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "roda-flow", "~> 0.3"
   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"
 end

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

@@ -16,9 +16,9 @@ module Dry
         plugin :error_handler
 
         def self.configure(&block)
-          container = super
-          use(container[:rack_monitor])
-          container
+          super.tap do
+            use(config.container[:rack_monitor])
+          end
         end
 
         def self.resolve(name)

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

@@ -5,9 +5,16 @@ module Dry
     module Roda
       class CLI < Thor
         desc "new APP", "Generate a new dry-web-roda project"
+        option :arch, required: false, default: "umbrella", enum: %w[umbrella flat], banner: "ARCH", desc: "Project architecture (umbrella/flat)"
         def new(app_name)
-          require "dry/web/roda/generators/umbrella"
-          Generators::Umbrella.new.(app_name)
+          case options[:arch]
+          when "umbrella"
+            require "dry/web/roda/generators/umbrella_project"
+            Generators::UmbrellaProject.new.(app_name)
+          when "flat"
+            require "dry/web/roda/generators/flat_project"
+            Generators::FlatProject.new.(app_name)
+          end
         end
 
         desc "generate GENERATOR", "Generate a new component for an existing dry-web-roda project"

data/lib/dry/web/roda/cli/generate.rb

@@ -5,11 +5,11 @@ module Dry
     module Roda
       class CLI
         class Generate < Thor
-          desc "generate app APP", "Generate an app within a dry-web umbrella"
+          desc "generate sub_app APP", "Generate a sub-app within a dry-web umbrella app"
           option :umbrella, required: true, banner: "UMBRELLA_NAME", desc: "Provide the name of the umbrella app, e.g. my_project"
-          def app(app_name)
-            require "dry/web/roda/generators/app"
-            Dry::Web::Roda::Generators::App.new.(app_name, umbrella: options[:umbrella])
+          def sub_app(app_name)
+            require "dry/web/roda/generators/sub_app"
+            Dry::Web::Roda::Generators::SubApp.new.(app_name, umbrella: options[:umbrella])
           end
         end
       end

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

@@ -0,0 +1,31 @@
+require "inflecto"
+require "dry/web/roda/generate"
+
+module Dry
+  module Web
+    module Roda
+      module Generators
+        class FlatProject
+          attr_reader :generate
+
+          def initialize
+            @generate = Generate.new("flat_project")
+          end
+
+          def call(target_dir)
+            generate.(target_dir, prepare_scope(target_dir))
+          end
+
+          private
+
+          def prepare_scope(target_dir)
+            {
+              underscored_app_name: Inflecto.underscore(target_dir),
+              camel_cased_app_name: Inflecto.camelize(target_dir)
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dry/web/roda/generators/{app.rb → sub_app.rb}

@@ -5,11 +5,11 @@ module Dry
   module Web
     module Roda
       module Generators
-        class App
+        class SubApp
           attr_reader :generate
 
           def initialize
-            @generate = Dry::Web::Roda::Generate.new("app")
+            @generate = Dry::Web::Roda::Generate.new("sub_app")
           end
 
           def call(target_dir, options = {})

data/lib/dry/web/roda/generators/{umbrella.rb → umbrella_project.rb}

@@ -1,25 +1,25 @@
 require "inflecto"
 require "securerandom"
 require "dry/web/roda/generate"
-require "dry/web/roda/generators/app"
+require "dry/web/roda/generators/sub_app"
 
 module Dry
   module Web
     module Roda
       module Generators
-        class Umbrella
-          attr_reader :generate, :app_generator
+        class UmbrellaProject
+          attr_reader :generate, :sub_app_generator
 
           def initialize
-            @generate = Generate.new("umbrella")
-            @app_generator = Generators::App.new
+            @generate = Generate.new("umbrella_project")
+            @sub_app_generator = Generators::SubApp.new
           end
 
           def call(target_dir)
             generate.(target_dir, prepare_scope(target_dir))
 
             Dir.chdir(target_dir) do
-              app_generator.("main", umbrella: target_dir)
+              sub_app_generator.("main", umbrella: target_dir)
             end
           end
 

data/lib/dry/web/roda/skeletons/{umbrella → flat_project}/Gemfile

@@ -3,8 +3,8 @@ source "https://rubygems.org"
 gem "rake"
 
 # Web framework
-gem "dry-web", ">= 0.5.0"
-gem "dry-web-roda", ">= 0.5.0"
+gem "dry-web", ">= 0.6.0"
+gem "dry-web-roda", ">= 0.6.0"
 gem "puma"
 gem "rack_csrf"
 
@@ -27,7 +27,7 @@ gem "dry-view", ">= 0.2.2"
 gem "slim"
 
 group :development, :test do
-  gem "pry-byebug"
+  gem "pry-byebug", platform: :mri
 end
 
 group :test do

data/lib/dry/web/roda/skeletons/flat_project/lib/rom/instrumentation.rb.tt

@@ -0,0 +1,22 @@
+require "rom-sql"
+
+module ROM
+  class Relation
+    # Monkey patch ROM::SQL to support query logs until an official API is available
+    module Instrumentation
+      def self.included(klass)
+        klass.option :notifications, reader: true, optional: false, default: proc {
+          <%= config[:camel_cased_app_name] %>::Container[:notifications]
+        }
+      end
+
+      def to_a
+        notifications.instrument(:sql, name: name.relation, query: dataset.sql) do
+          super
+        end
+      end
+    end
+
+    SQL::Relation.include(Instrumentation)
+  end
+end

data/lib/dry/web/roda/skeletons/flat_project/system/__underscored_app_name__/application.rb.tt

@@ -0,0 +1,29 @@
+require "dry/web/roda/application"
+require_relative "container"
+
+module <%= config[:camel_cased_app_name] %>
+  class Application < Dry::Web::Roda::Application
+    configure do |config|
+      config.container = Container
+      config.routes = "web/routes".freeze
+    end
+
+    opts[:root] = Pathname(__FILE__).join("../..").realpath.dirname
+
+    use Rack::Session::Cookie, key: "<%= config[:underscored_app_name] %>.session", secret: <%= config[:camel_cased_app_name] %>::Container.settings.session_secret
+
+    plugin :csrf, raise: true
+    plugin :flash
+    plugin :dry_view
+
+    route do |r|
+      r.multi_route
+
+      r.root do
+        r.view "welcome"
+      end
+    end
+
+    load_routes!
+  end
+end