dry-web-roda 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0b52ca289fcd050c9e5b498b086623693121890
-  data.tar.gz: ecc6be6cf23f114ae9b1609e1d7a6a3fbfcdf404
+  metadata.gz: e348dfce9fa4b251b883b90b61878d6ceee1af35
+  data.tar.gz: 2cea77e0744f93b64bee61faae24f6369b213328
 SHA512:
-  metadata.gz: 461355ca58d5e379276d622408c7d781cec9fedd28eacc15b678bdb701204c7ed196f5442a100bae6ba188e28e38c7dcbf3830754806d792e15503c04b9150cf
-  data.tar.gz: d977fe040b436a017212dab9191401af617d14dd11471ae4b26422dd8a1fbcfceeb1667ff2f612a4a2fc978ca5c316772448ade18ca00fe447acedddfbf9881e
+  metadata.gz: 5cf1e0afb685e830f0a60a8516188939d744c3ba79c93da3983fe40229eebeb2e2c473880cd4cdc66d99d1394d37e46cb01cfc75e41c8914ca725c8c39078ec1
+  data.tar.gz: 4c01ed9ce85496b9daca4a8dfab49b377490017aec8ad4c8cf9020aca368a2fb25abe7c2df5671591ab3d78787a2e05cb2b88f0bcfa418ec6c58d2dfdc215746

data/.travis.yml

@@ -14,7 +14,6 @@ script:
 rvm:
   - 2.4.0
   - 2.3.3
-  - 2.2.6
   - jruby-9.1.6.0
 env:
   global:

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.8.0 - 2017-10-26
+
+### Changed
+
+In generated projects:
+
+- Work with dry-system 0.8 (timriley)
+- Use dry-systems own settings component in `boot/settings.rb` for project configuration (timriley)
+- Rename `:rom` bootable component to `:persistence` so it can be automatically resolved and lazily loaded (timriley)
+- Use rom-rb 4.0 (timriley)
+
 # 0.7.5 - 2017-07-25
 
 ### Added

data/Gemfile

@@ -7,23 +7,23 @@ gem 'byebug', platform: :mri
 gem 'codeclimate-test-reporter', platform: :rbx
 
 # Generated application dependencies
-gem "dry-system", ">= 0.7.1"
-gem "dry-web", ">= 0.7.0"
+gem "dry-system", "~> 0.8"
+gem "dry-web", "~> 0.7"
 gem "puma"
 gem "rack_csrf"
 gem "rack", ">= 2.0"
 gem "shotgun", ">= 0.9.2"
 gem "pg"
-gem "rom-factory"
-gem "rom-repository"
-gem "rom-sql"
-gem "dry-matcher"
-gem "dry-monads"
-gem "dry-struct"
-gem "dry-transaction", ">= 0.10.0"
-gem "dry-types"
-gem "dry-validation"
-gem "dry-view", ">= 0.3.0"
+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-struct", "~> 0.3"
+gem "dry-transaction", "~> 0.10"
+gem "dry-types", "~> 0.12"
+gem "dry-validation", "~> 0.11"
+gem "dry-view", "~> 0.3"
 gem "slim"
 gem "pry-byebug", platform: :mri
 gem "capybara"

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.2.0'
+  spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_runtime_dependency "dry-configurable", "~> 0.2"
   spec.add_runtime_dependency "inflecto", "~> 0.0"

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

@@ -94,13 +94,12 @@ module Dry
           def add_system_lib
             add_template("container.rb.tt", "system/#{underscored_project_name}/container.rb")
             add_template("import.rb.tt", "system/#{underscored_project_name}/import.rb")
-            add_template("settings.rb.tt", "system/#{underscored_project_name}/settings.rb")
           end
 
           def add_system_boot
             add_template("monitor.rb.tt", "system/boot/monitor.rb")
-            add_template("rom.rb.tt", "system/boot/rom.rb")
-            add_template("boot__settings.rb.tt", "system/boot/settings.rb")
+            add_template("persistence.rb.tt", "system/boot/persistence.rb")
+            add_template("settings.rb.tt", "system/boot/settings.rb")
           end
 
           def add_config_files

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

@@ -3,9 +3,9 @@ source "https://rubygems.org"
 gem "rake"
 
 # Web framework
-gem "dry-system", ">= 0.7.1"
-gem "dry-web", ">= 0.7.0"
-gem "dry-web-roda", ">= 0.6.0"
+gem "dry-system", "~> 0.8"
+gem "dry-web", "~> 0.7"
+gem "dry-web-roda", "~> 0.7"
 gem "puma"
 gem "rack_csrf"
 
@@ -14,18 +14,17 @@ gem "shotgun", ">= 0.9.2"
 
 # Database persistence
 gem "pg"
-gem "rom", ">= 3.1.0"
-gem "rom-repository"
-gem "rom-sql", ">= 1.1.0"
+gem "rom", "~> 4.0"
+gem "rom-sql", "~> 2.1"
 
 # Application dependencies
-gem "dry-matcher"
-gem "dry-monads"
-gem "dry-struct"
-gem "dry-transaction", ">= 0.10.0"
-gem "dry-types"
-gem "dry-validation"
-gem "dry-view", ">= 0.3.0"
+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.3"
 gem "slim"
 
 group :development, :test do
@@ -38,5 +37,5 @@ group :test do
   gem "database_cleaner"
   gem "poltergeist"
   gem "rspec"
-  gem "rom-factory"
+  gem "rom-factory", "~> 0.5"
 end

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

@@ -6,7 +6,7 @@ Welcome! You’ve generated an app using dry-web-roda.
 
 1. Run `bundle`
 1. Review `.env` & `.env.test` (and make a copy to e.g. `.example.env` if you want example settings checked in)
-1. Create a `blog_development` database
+1. Run `bundle exec rake db:create`
 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

data/lib/dry/web/roda/templates/Rakefile.tt

@@ -1,5 +1,5 @@
 require "bundler/setup"
-require "byebug" unless ENV["RACK_ENV"] == "production"
+require "pry-byebug" unless ENV["RACK_ENV"] == "production"
 require "rom/sql/rake_task"
 require "shellwords"
 require_relative "system/<%= config[:underscored_project_name] %>/container"
@@ -35,11 +35,7 @@ end
 
 namespace :db do
   task :setup do
-    <%= config[:camel_cased_app_name] %>::Container.boot :rom
-  end
-
-  task :settings do
-    <%= config[:camel_cased_app_name] %>::Container.boot :settings
+    <%= config[:camel_cased_app_name] %>::Container.init :persistence
   end
 
   desc "Print current database schema version"
@@ -55,7 +51,7 @@ namespace :db do
   end
 
   desc "Create database"
-  task create: :settings do
+  task :create do
     if system("which createdb", out: File::NULL)
       uri = database_uri
       system(postgres_env_vars(uri), "createdb #{Shellwords.escape(uri.path[1..-1])}")
@@ -66,7 +62,7 @@ namespace :db do
   end
 
   desc "Drop database"
-  task drop: :settings do
+  task :drop do
     if system("which dropdb", out: File::NULL)
       uri = database_uri
       system(postgres_env_vars(uri), "dropdb #{Shellwords.escape(uri.path[1..-1])}")

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

@@ -1,4 +1,5 @@
 require "dry/web/container"
+require "dry/system/components"
 
 module <%= config[:camel_cased_app_name] %>
   class Container < Dry::Web::Container

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

@@ -1,4 +1,4 @@
-<%= config[:camel_cased_app_name] %>::Container.finalize :monitor do |_container|
+<%= config[:camel_cased_app_name] %>::Container.boot :monitor do
   init do
     require "dry/monitor"
   end

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

@@ -0,0 +1,36 @@
+<%= config[:camel_cased_app_name] %>::Container.boot :persistence, namespace: true do |system|
+  init do
+    require "sequel"
+    require "rom"
+    require "rom/sql"
+
+    use :monitor, :settings
+
+    ROM::SQL.load_extensions :postgres
+
+    Sequel.database_timezone = :utc
+    Sequel.application_timezone = :local
+
+    rom_config = ROM::Configuration.new(
+      :sql,
+      system[:settings].database_url,
+      extensions: %i[error_sql pg_array pg_json],
+    )
+
+    rom_config.plugin :sql, relations: :instrumentation do |plugin_config|
+      plugin_config.notifications = notifications
+    end
+
+    rom_config.plugin :sql, relations: :auto_restrictions
+
+    register "config", rom_config
+    register "db", rom_config.gateways[:default].connection
+  end
+
+  start do
+    config = container["persistence.config"]
+    config.auto_registration system.root.join("lib/persistence")
+
+    register "rom", ROM.container(config)
+  end
+end

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

@@ -4,8 +4,6 @@ require "rom-repository"
 require "<%= config[:underscored_project_name] %>/container"
 require "<%= config[:underscored_project_name] %>/import"
 
-<%= config[:camel_cased_app_name] %>::Container.boot! :rom
-
 module <%= config[:camel_cased_app_name] %>
   class Repository < ROM::Repository::Root
     include <%= config[:camel_cased_app_name] %>::Import.args["persistence.rom"]

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

@@ -1,9 +1,10 @@
-require "dry/web/settings"
-require "types"
+<%= config[:camel_cased_app_name] %>::Container.boot :settings, from: :system do
+  before :init do
+    ::Kernel.require "types"
+  end
 
-module <%= config[:camel_cased_app_name] %>
-  class Settings < Dry::Web::Settings
-    setting :database_url, Types::Strict::String.constrained(filled: true)
-    setting :session_secret, Types::Strict::String.constrained(filled: true)
+  settings do
+    key :session_secret, Types::Strict::String.constrained(filled: true)
+    key :database_url, Types::Strict::String.constrained(filled: true)
   end
 end

data/lib/dry/web/roda/templates/spec/db_spec_helper.rb.tt

@@ -1,6 +1,6 @@
 require_relative "spec_helper"
 
-<%= config[:camel_cased_app_name] %>::Container.boot! :rom
+<%= config[:camel_cased_app_name] %>::Container.start :persistence
 
 Dir[SPEC_ROOT.join("support/db/*.rb").to_s].each(&method(:require))
 Dir[SPEC_ROOT.join("shared/db/*.rb").to_s].each(&method(:require))

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

@@ -1,5 +1,6 @@
 require "pathname"
 require "dry/web/container"
+require "dry/system/components"
 
 module <%= config[:camel_cased_app_name] %>
   class Container < Dry::Web::Container

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

@@ -1,5 +1,3 @@
-# auto_register: false
-
 module <%= config[:camel_cased_app_name] %>
   module View
     class Context

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-web-roda
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -203,7 +203,6 @@ files:
 - 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
@@ -213,8 +212,8 @@ files:
 - 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/persistence.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
@@ -268,7 +267,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -276,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Roda integration for dry-web apps

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

@@ -1,10 +0,0 @@
-<%= config[:camel_cased_app_name] %>::Container.finalize :settings do |container|
-  init do
-    require "<%= config[:underscored_project_name] %>/settings"
-  end
-
-  start do
-    settings = <%= config[:camel_cased_app_name] %>::Settings.load(container.config.root, container.config.env)
-    container.register "settings", settings
-  end
-end

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

@@ -1,39 +0,0 @@
-<%= config[:camel_cased_app_name] %>::Container.namespace "persistence" do |container|
-  container.finalize :rom do
-    init do
-      require "sequel"
-      require "rom"
-      require "rom/sql"
-
-      use :settings
-      use :monitor
-
-      ROM::SQL.load_extensions :postgres
-
-      Sequel.database_timezone = :utc
-      Sequel.application_timezone = :local
-
-      rom_config = ROM::Configuration.new(
-        :sql,
-        container["settings"].database_url,
-        extensions: %i[error_sql pg_array pg_json],
-      )
-
-      rom_config.plugin :sql, relations: :instrumentation do |plugin_config|
-        plugin_config.notifications = notifications
-      end
-
-      rom_config.plugin :sql, relations: :auto_restrictions
-
-      container.register "config", rom_config
-      container.register "db", rom_config.gateways[:default].connection
-    end
-
-    start do
-      config = container["persistence.config"]
-      config.auto_registration container.root.join("lib/persistence")
-
-      container.register "rom", ROM.container(config)
-    end
-  end
-end