dry-web-roda 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d35dfd61f8677597e209b8096632bb2c1db3866d
-  data.tar.gz: 0a97af17cf4480d1192568eb2bddc93a56ad8d30
+  metadata.gz: 162e0fb5d5d74204c4e1abe9f68962acad040064
+  data.tar.gz: ff5c3b8c76462d9b1a35aba887d93d7a923b73e0
 SHA512:
-  metadata.gz: b9828bdd25a1c1ec4c5a15cfe4d00449d11cf1a9dbd5a8a43e4d7bd83f53191c0b194c8b99c7d4aa17c51f11d6fa2c199cc7301eab5cf55a93de5bb1bf84eb58
-  data.tar.gz: 285a3e0eab770167ffab195b4dbd7786fa2af8684aba21c4f105eacac9a72d3f085e5d604940094efa1d7c29ea097270b3c64f0691aff81c0531fd0e7a4d3743
+  metadata.gz: ccfa0cf8901a6ec6dc9558d9973cff8ae647a3e7523d476c444fe2155ddede2b8b1ab0a44f2e7a0e11bcfd9c150eb5a23cddcaeda603a5ff227c5479038f3203
+  data.tar.gz: 6e3d4edf002317f4b81b63011536f1f6deb8ddd036a01d33808c6799b1a53e08d747ccccd6c3527299060d90378595b02081098d69c1d64a5b5024d52d7f5c7d

data/.travis.yml

@@ -10,15 +10,12 @@ rvm:
   - 2.3.0
   - rbx
   - jruby-9000
-  - ruby-head
-  - jruby-head
 env:
   global:
     - JRUBY_OPTS='--dev -J-Xmx1024M'
 matrix:
   allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
+    - rvm: rbx
 notifications:
   email: false
   webhooks:

data/CHANGELOG.md

@@ -1,6 +1,23 @@
+# 0.5.0 - 2016-10-21
+
+### Changed
+
+- Depend on the version of shotgun with fixes for Rack 2.0 (timriley)
+- Update to work with latest dry-web and dry-system
+  - Expect `system/` dirs instead of `component/` (gotar)
+  - Update bootable dependency files to match latest dry-system API for bootable dependencies with lifecycles (gotar)
+- Use latest released versions of rom-repository and rom-sql, instead of relying on their master branches (wafcio)
+- Replace dry-result_matcher gem with dry-matcher (gotar)
+- Add dry-monads and dry-struct gems to generated Gemfile (gotar)
+- Expect symbols for flash keys in generated `Page` class (timriley)
+
+### Fixed
+
+- Update `view` roda plugin to expect default namespace in sub-app containers (timriley)
+
 # 0.4.0 - 2016-08-15
 
-Update to dry-web with dry-system
+Update to dry-web with dry-system (solnic)
 
 # 0.3.0 - 2016-07-26
 

data/lib/dry/web/roda/skeletons/app/{component → system}/__underscored_app_name__/container.rb.tt

@@ -3,11 +3,12 @@ require "dry/web/container"
 
 module <%= config[:camel_cased_app_name] %>
   class Container < Dry::Web::Container
-    require root.join("component/<%= config[:underscored_umbrella_name] %>/container")
+    require root.join("system/<%= config[:underscored_umbrella_name] %>/container")
     import <%= config[:camel_cased_umbrella_name] %>::Container
 
     configure do |config|
       config.root = Pathname(__FILE__).join("../..").realpath.dirname.freeze
+
       config.default_namespace = "<%= config[:underscored_app_name] %>"
 
       config.auto_register = %w[
@@ -15,6 +16,6 @@ module <%= config[:camel_cased_app_name] %>
       ]
     end
 
-    load_paths! "lib", "component"
+    load_paths! "lib", "system"
   end
 end

data/lib/dry/web/roda/skeletons/umbrella/Gemfile

@@ -3,22 +3,23 @@ source "https://rubygems.org"
 gem "rake"
 
 # Web framework
-gem "dry-web", ">= 0.4.0"
-gem "dry-web-roda", ">= 0.3.0"
+gem "dry-web", ">= 0.5.0"
+gem "dry-web-roda", ">= 0.5.0"
 gem "puma"
 gem "rack_csrf"
-gem "shotgun"
+
+gem "rack", ">= 2.0"
+gem "shotgun", ">= 0.9.2"
 
 # Database persistence
 gem "pg"
-gem "rom",            github: "rom-rb/rom"
-gem "rom-mapper",     github: "rom-rb/rom-mapper"
-gem "rom-repository", github: "rom-rb/rom-repository"
-gem "rom-sql",        github: "rom-rb/rom-sql"
-gem "rom-support",    github: "rom-rb/rom-support"
+gem "rom-repository"
+gem "rom-sql"
 
 # Application dependencies
-gem "dry-result_matcher"
+gem "dry-matcher"
+gem "dry-monads"
+gem "dry-struct"
 gem "dry-transaction"
 gem "dry-types"
 gem "dry-validation"
@@ -26,7 +27,6 @@ gem "dry-view"
 gem "slim"
 
 group :development, :test do
-  gem "guard-rspec"
   gem "pry-byebug"
 end
 

data/lib/dry/web/roda/skeletons/umbrella/Rakefile.tt

@@ -9,7 +9,7 @@ begin
 rescue LoadError
 end
 
-require_relative "component/<%= config[:underscored_app_name] %>/container"
+require_relative "system/<%= config[:underscored_app_name] %>/container"
 
 require "rom/sql/rake_task"
 require "sequel"

data/lib/dry/web/roda/skeletons/umbrella/bin/console.tt

@@ -2,6 +2,6 @@
 
 require "bundler/setup"
 require "dry/web/console"
-require_relative "../component/boot"
+require_relative "../system/boot"
 
 Dry::Web::Console.start

data/lib/dry/web/roda/skeletons/umbrella/config.ru.tt

@@ -1,2 +1,2 @@
-require_relative "component/boot"
+require_relative "system/boot"
 run <%= config[:camel_cased_app_name] %>::Application.freeze.app

data/lib/dry/web/roda/skeletons/umbrella/lib/__underscored_app_name__/page.rb.tt

@@ -30,7 +30,7 @@ module <%= config[:camel_cased_app_name] %>
     end
 
     def flash?
-      %w(notice alert).any? { |type| flash[type] }
+      %i[notice alert].any? { |type| flash[type] }
     end
 
     def with_flash(flash)

data/lib/dry/web/roda/skeletons/umbrella/lib/roda_plugins.rb

@@ -23,7 +23,7 @@ class Roda
       module RequestMethods
         def view(name, overrides = {})
           options = {scope: scope.current_page}.merge(overrides)
-          is to: "#{scope.name}.views.#{name}", call_with: [options]
+          is to: "views.#{name}", call_with: [options]
         end
       end
     end

data/lib/dry/web/roda/skeletons/umbrella/lib/types.rb

@@ -1,3 +1,4 @@
+require "dry-struct"
 require "dry-types"
 
 module Types

data/lib/dry/web/roda/skeletons/umbrella/spec/app_helper.rb

@@ -8,7 +8,7 @@ require "capybara/poltergeist"
 Dir[SPEC_ROOT.join("support/app/*.rb").to_s].each(&method(:require))
 Dir[SPEC_ROOT.join("shared/app/*.rb").to_s].each(&method(:require))
 
-require SPEC_ROOT.join("../component/boot").realpath
+require SPEC_ROOT.join("../system/boot").realpath
 
 Capybara.app = TestHelpers.app
 Capybara.server_port = 3001

data/lib/dry/web/roda/skeletons/umbrella/spec/spec_helper.rb.tt

@@ -7,7 +7,7 @@ SPEC_ROOT = Pathname(__FILE__).dirname
 Dir[SPEC_ROOT.join("support/*.rb").to_s].each(&method(:require))
 Dir[SPEC_ROOT.join("shared/*.rb").to_s].each(&method(:require))
 
-require SPEC_ROOT.join("../component/<%= config[:underscored_app_name] %>/container")
+require SPEC_ROOT.join("../system/<%= config[:underscored_app_name] %>/container")
 
 RSpec.configure do |config|
   config.disable_monkey_patching!

data/lib/dry/web/roda/skeletons/umbrella/{component → system}/__underscored_app_name__/container.rb.tt

@@ -8,7 +8,7 @@ module <%= config[:camel_cased_app_name] %>
       config.settings_loader = <%= config[:camel_cased_app_name] %>::Settings
     end
 
-    load_paths! "lib", "component"
+    load_paths! "lib", "system"
 
     def self.settings
       config.settings

data/lib/dry/web/roda/skeletons/umbrella/{component → system}/boot.rb.tt

@@ -7,6 +7,6 @@ require_relative "<%= config[:underscored_app_name] %>/container"
 end
 
 app_paths = Pathname(__FILE__).dirname.join("../apps").realpath.join("*")
-Dir[app_paths].each { |f| require "#{f}/component/boot" }
+Dir[app_paths].each { |f| require "#{f}/system/boot" }
 
 require_relative "<%= config[:underscored_app_name] %>/application"

data/lib/dry/web/roda/skeletons/umbrella/system/boot/rom.rb.tt

@@ -0,0 +1,26 @@
+<%= config[:camel_cased_app_name] %>::Container.namespace "persistence" do |persistence|
+  persistence.finalize(:rom) do
+    init do
+      require "sequel"
+      require "rom"
+
+      Sequel.database_timezone = :utc
+      Sequel.application_timezone = :local
+
+      rom_config = ROM::Configuration.new(
+        :sql,
+        persistence.settings.database_url,
+        extensions: [:error_sql]
+      )
+
+      persistence.register("config", rom_config)
+    end
+
+    start do
+      config = persistence["persistence.config"]
+      config.auto_registration(persistence.root.join("lib/persistence"))
+
+      persistence.register("rom", ROM.container(config))
+    end
+  end
+end

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

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

data/spec/dummy/bin/console

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'dry/web/cli'
-# require_relative '../component/boot'
+# require_relative '../system/boot'
 
 Dry::Web::Cli.start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-web-roda
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-web
@@ -175,14 +175,14 @@ files:
 - lib/dry/web/roda/generate.rb
 - lib/dry/web/roda/generators/app.rb
 - lib/dry/web/roda/generators/umbrella.rb
-- lib/dry/web/roda/skeletons/app/component/__underscored_app_name__/application.rb.tt
-- lib/dry/web/roda/skeletons/app/component/__underscored_app_name__/container.rb.tt
-- lib/dry/web/roda/skeletons/app/component/__underscored_app_name__/import.rb.tt
-- lib/dry/web/roda/skeletons/app/component/__underscored_app_name__/page.rb.tt
-- lib/dry/web/roda/skeletons/app/component/__underscored_app_name__/transactions.rb.tt
-- lib/dry/web/roda/skeletons/app/component/__underscored_app_name__/view.rb.tt
-- lib/dry/web/roda/skeletons/app/component/boot.rb.tt
 - lib/dry/web/roda/skeletons/app/lib/__underscored_app_name__/.keep
+- lib/dry/web/roda/skeletons/app/system/__underscored_app_name__/application.rb.tt
+- lib/dry/web/roda/skeletons/app/system/__underscored_app_name__/container.rb.tt
+- lib/dry/web/roda/skeletons/app/system/__underscored_app_name__/import.rb.tt
+- lib/dry/web/roda/skeletons/app/system/__underscored_app_name__/page.rb.tt
+- lib/dry/web/roda/skeletons/app/system/__underscored_app_name__/transactions.rb.tt
+- lib/dry/web/roda/skeletons/app/system/__underscored_app_name__/view.rb.tt
+- lib/dry/web/roda/skeletons/app/system/boot.rb.tt
 - lib/dry/web/roda/skeletons/app/transactions/example.rb.tt
 - lib/dry/web/roda/skeletons/app/web/routes/example.rb.tt
 - lib/dry/web/roda/skeletons/app/web/templates/layouts/application.html.slim
@@ -192,13 +192,6 @@ files:
 - lib/dry/web/roda/skeletons/umbrella/Rakefile.tt
 - lib/dry/web/roda/skeletons/umbrella/bin/console.tt
 - lib/dry/web/roda/skeletons/umbrella/bin/setup
-- lib/dry/web/roda/skeletons/umbrella/component/__underscored_app_name__/application.rb.tt
-- lib/dry/web/roda/skeletons/umbrella/component/__underscored_app_name__/container.rb.tt
-- lib/dry/web/roda/skeletons/umbrella/component/__underscored_app_name__/import.rb.tt
-- lib/dry/web/roda/skeletons/umbrella/component/__underscored_app_name__/settings.rb.tt
-- lib/dry/web/roda/skeletons/umbrella/component/boot.rb.tt
-- lib/dry/web/roda/skeletons/umbrella/component/boot/logger.rb.tt
-- lib/dry/web/roda/skeletons/umbrella/component/boot/rom.rb.tt
 - lib/dry/web/roda/skeletons/umbrella/config.ru.tt
 - lib/dry/web/roda/skeletons/umbrella/config/settings.yml.tt
 - lib/dry/web/roda/skeletons/umbrella/db/sample_data.rb
@@ -216,6 +209,13 @@ files:
 - lib/dry/web/roda/skeletons/umbrella/spec/spec_helper.rb.tt
 - lib/dry/web/roda/skeletons/umbrella/spec/support/db/test_factories.rb
 - lib/dry/web/roda/skeletons/umbrella/spec/support/test_helpers.rb.tt
+- lib/dry/web/roda/skeletons/umbrella/system/__underscored_app_name__/application.rb.tt
+- lib/dry/web/roda/skeletons/umbrella/system/__underscored_app_name__/container.rb.tt
+- lib/dry/web/roda/skeletons/umbrella/system/__underscored_app_name__/import.rb.tt
+- lib/dry/web/roda/skeletons/umbrella/system/__underscored_app_name__/settings.rb.tt
+- lib/dry/web/roda/skeletons/umbrella/system/boot.rb.tt
+- lib/dry/web/roda/skeletons/umbrella/system/boot/logger.rb.tt
+- lib/dry/web/roda/skeletons/umbrella/system/boot/rom.rb.tt
 - lib/dry/web/roda/version.rb
 - spec/dummy/apps/main/lib/main/entities/user.rb
 - spec/dummy/apps/main/lib/main/persistence/repositories/users.rb

data/lib/dry/web/roda/skeletons/umbrella/component/boot/rom.rb.tt

@@ -1,16 +0,0 @@
-require "sequel"
-require "rom"
-
-Sequel.database_timezone = :utc
-Sequel.application_timezone = :local
-
-<%= config[:camel_cased_app_name] %>::Container.namespace "persistence" do |container|
-  config = ROM::Configuration.new(:sql, container.settings.database_url, extensions: [:error_sql])
-
-  container.register "config", config
-
-  container.finalize :rom do
-    config.auto_registration container.root.join("lib/persistence")
-    container.register "rom", ROM.container(config)
-  end
-end