Merge pull request #56 from andrewcroome/dry-web-update

Bump dry web, ruby and related configuration
icelab · Sep 26, 2016 · fda3db8 · fda3db8
2 parents 3f24969 + 7982360
commit fda3db8
Show file tree

Hide file tree

Showing 26 changed files with 152 additions and 155 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.3.0
+2.3.1
diff --git a/Gemfile b/Gemfile
@@ -1,23 +1,23 @@
 source "https://rubygems.org"
 
-ruby "2.3.0"
+ruby "2.3.1"
 
 gem "rake"
 
 # Web framework
 gem "puma"
-gem "dry-web", "~> 0.2"
-gem "dry-web-roda", "~> 0.1"
+gem "dry-web", "~> 0.5"
+gem "dry-web-roda", "~> 0.4"
 gem "rack_csrf"
 gem "shotgun"
 
 # Database persistence
 gem "pg"
-gem "rom", git: "https://github.com/rom-rb/rom"
-gem "rom-mapper", git: "https://github.com/rom-rb/rom-mapper"
-gem "rom-repository", git: "https://github.com/rom-rb/rom-repository"
-gem "rom-sql", git: "https://github.com/rom-rb/rom-sql"
-gem "rom-support", git: "https://github.com/rom-rb/rom-support"
+gem "rom"
+gem "rom-mapper"
+gem "rom-repository"
+gem "rom-sql"
+gem "rom-support"
 
 # Background jobs
 gem "que"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,131 +1,88 @@
-GIT
-  remote: https://github.com/rom-rb/rom
-  revision: cc6df90a5ce18ddc41059d0f75aeb9e8b0549951
-  specs:
-    rom (2.0.0)
-      concurrent-ruby (~> 1.0)
-      dry-equalizer (~> 0.2)
-      dry-types (~> 0.7)
-      rom-mapper (~> 0.3.0)
-      rom-support (~> 1.0.0)
-
-GIT
-  remote: https://github.com/rom-rb/rom-mapper
-  revision: 5cc3714c9c7a7e9bc676f5d0760f3e3de2e8bff9
-  specs:
-    rom-mapper (0.3.0)
-      dry-equalizer (~> 0.2)
-      rom-support (~> 1.0.0)
-      transproc (~> 0.4.0)
-
-GIT
-  remote: https://github.com/rom-rb/rom-repository
-  revision: 9a702eb5de93d730cb6fb102e6d1aa9a63fd1c5f
-  specs:
-    rom-repository (0.3.0)
-      concurrent-ruby (~> 1.0)
-      rom (~> 2.0)
-      rom-mapper (~> 0.3.0)
-      rom-support (~> 1.0.0)
-
-GIT
-  remote: https://github.com/rom-rb/rom-sql
-  revision: 98e20842939b482c2103536703aeaa64383078e9
-  specs:
-    rom-sql (0.8.0)
-      dry-equalizer (~> 0.2)
-      dry-types (~> 0.7)
-      rom (~> 2.0)
-      sequel (~> 4.18)
-
-GIT
-  remote: https://github.com/rom-rb/rom-support
-  revision: 31085bb9a02a68455f2a66dce1fa08fcfd937430
-  specs:
-    rom-support (1.0.0)
-      dry-equalizer (~> 0.2)
-      transproc (~> 0.4.0)
-      wisper (~> 1.6, >= 1.6.0)
-
 GIT
   remote: https://github.com/solnic/transproc
-  revision: ef7cbef5d22fffd53beadf5c28abdb4975a02c45
+  revision: ffe27d1d807bac6a9a47c0778eef4b3344284fb1
   specs:
     transproc (0.4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
-    bugsnag (4.2.1)
+    bugsnag (5.0.1)
     byebug (9.0.5)
-    capybara (2.7.1)
+    capybara (2.9.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-screenshot (1.0.13)
+    capybara-screenshot (1.0.14)
       capybara (>= 1.0, < 3)
       launchy
     cliver (0.3.2)
     coderay (1.1.1)
     concurrent-ruby (1.0.2)
     database_cleaner (1.5.3)
     diff-lcs (1.2.5)
-    dry-auto_inject (0.3.0)
-      dry-container (~> 0.3.4)
-    dry-component (0.3.0)
-      dry-auto_inject (~> 0.3)
-      dry-configurable (~> 0.1)
-      dry-container (~> 0.3, >= 0.3.4)
-      inflecto (>= 0.0.2)
-    dry-configurable (0.1.6)
+    dry-auto_inject (0.4.1)
+      dry-container (>= 0.3.4)
+    dry-configurable (0.1.7)
       concurrent-ruby (~> 1.0)
-    dry-container (0.3.4)
+    dry-container (0.5.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
     dry-equalizer (0.2.0)
-    dry-logic (0.2.3)
+    dry-logic (0.3.0)
       dry-container (~> 0.2, >= 0.2.6)
       dry-equalizer (~> 0.2)
+    dry-matcher (0.5.0)
     dry-monads (0.0.2)
     dry-result_matcher (0.4.0)
       dry-monads (~> 0.0.0)
-    dry-transaction (0.7.0)
+    dry-system (0.5.1)
+      concurrent-ruby (~> 1.0)
+      dry-auto_inject (>= 0.4.0)
+      dry-configurable (~> 0.1)
+      dry-container (~> 0.4)
+      dry-equalizer (~> 0.2)
+      inflecto (>= 0.0.2)
+    dry-transaction (0.8.0)
       dry-container (>= 0.2.8)
-      dry-monads (~> 0.0.1)
+      dry-matcher (>= 0.5.0)
+      dry-monads (>= 0.0.1)
       wisper (>= 1.6.0)
-    dry-types (0.7.2)
+    dry-types (0.8.1)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1)
       dry-container (~> 0.3)
       dry-equalizer (~> 0.2)
-      dry-logic (~> 0.2, >= 0.2.3)
+      dry-logic (~> 0.3, >= 0.3.0)
       dry-monads (>= 0.0.1)
+      ice_nine (~> 0.11)
       inflecto (~> 0.0.0, >= 0.0.2)
-    dry-validation (0.7.4)
+    dry-validation (0.9.5)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
       dry-container (~> 0.2, >= 0.2.8)
       dry-equalizer (~> 0.2)
-      dry-logic (~> 0.2, >= 0.2.2)
-      dry-types (~> 0.6, >= 0.6.0)
-    dry-view (0.1.0)
+      dry-logic (~> 0.3, >= 0.3.0)
+      dry-types (~> 0.8, >= 0.8.1)
+    dry-view (0.1.1)
       dry-configurable (~> 0.1)
       dry-equalizer (~> 0.2)
       inflecto (~> 0)
       tilt (~> 2.0)
-    dry-web (0.3.1)
-      dry-component (~> 0.3.0)
-    dry-web-roda (0.2.1)
+    dry-web (0.5.0)
+      dry-system (~> 0.5)
+    dry-web-roda (0.4.0)
       dry-configurable (~> 0.1)
+      dry-web (~> 0.5)
       inflecto (~> 0.0)
       roda (~> 2.14)
       roda-flow (~> 0.3)
       thor (~> 0.19)
-    ffi (1.9.10)
+    ffi (1.9.14)
     formatador (0.2.5)
     guard (2.14.0)
       formatador (>= 0.2.4)
@@ -137,13 +94,14 @@ GEM
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-rspec (4.7.2)
+    guard-rspec (4.7.3)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     i18n (0.7.0)
+    ice_nine (0.11.2)
     inflecto (0.0.2)
-    json (1.8.3)
+    json (2.0.2)
     launchy (2.4.3)
       addressable (~> 2.3)
     listen (3.1.5)
@@ -160,7 +118,7 @@ GEM
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
-    notiffany (0.1.0)
+    notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
     pg (0.18.4)
@@ -169,19 +127,19 @@ GEM
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
-    postmark (1.7.1)
+    postmark (1.8.1)
       json
       rake
-    pry (0.10.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     pry-byebug (3.4.0)
       byebug (~> 9.0)
       pry (~> 0.10)
-    puma (3.4.0)
-    que (0.11.5)
-    rack (1.6.4)
+    puma (3.6.0)
+    que (0.12.0)
+    rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
     rack_csrf (2.5.0)
@@ -190,26 +148,51 @@ GEM
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    roda (2.15.0)
+    roda (2.18.0)
       rack
     roda-flow (0.3.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rom (2.0.0)
+      concurrent-ruby (~> 1.0)
+      dry-equalizer (~> 0.2)
+      dry-types (~> 0.8)
+      rom-mapper (~> 0.4.0)
+      rom-support (~> 2.0)
+    rom-mapper (0.4.0)
+      dry-equalizer (~> 0.2)
+      rom-support (~> 2.0.0)
+      transproc (~> 0.4.0)
+    rom-repository (0.3.1)
+      rom (~> 2.0)
+      rom-mapper (~> 0.4)
+      rom-support (~> 2.0)
+    rom-sql (0.8.0)
+      dry-equalizer (~> 0.2)
+      dry-types (~> 0.8)
+      rom (~> 2.0)
+      rom-support (~> 2.0)
+      sequel (~> 4.25)
+    rom-support (2.0.0)
+      concurrent-ruby (~> 1.0)
+      dry-equalizer (~> 0.2)
+      transproc (~> 0.4.0)
+      wisper (~> 1.6, >= 1.6.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.3)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    ruby_dep (1.3.1)
-    sequel (4.35.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    ruby_dep (1.4.0)
+    sequel (4.38.0)
     shellany (0.0.1)
-    shotgun (0.9.1)
+    shotgun (0.9.2)
       rack (>= 1.0)
     site_prism (2.9)
       addressable (>= 2.3.3, < 3.0)
@@ -243,8 +226,8 @@ DEPENDENCIES
   dry-types
   dry-validation
   dry-view
-  dry-web (~> 0.2)
-  dry-web-roda (~> 0.1)
+  dry-web (~> 0.5)
+  dry-web-roda (~> 0.4)
   guard-rspec
   i18n
   inflecto
@@ -256,16 +239,19 @@ DEPENDENCIES
   que
   rack_csrf
   rake
-  rom!
-  rom-mapper!
-  rom-repository!
-  rom-sql!
-  rom-support!
+  rom
+  rom-mapper
+  rom-repository
+  rom-sql
+  rom-support
   rspec
   shotgun
   site_prism
   slim
   transproc!
 
+RUBY VERSION
+   ruby 2.3.1p112
+
 BUNDLED WITH
    1.12.5
diff --git a/Rakefile b/Rakefile
@@ -10,7 +10,7 @@ begin
 rescue LoadError
 end
 
-require_relative "component/app_prototype/container"
+require_relative "system/app_prototype/container"
 
 AppPrototype::Container.boot! :bugsnag
 require "bugsnag/rake"

diff --git a/apps/main/component/main/container.rb b/apps/main/component/main/container.rb
@@ -1,6 +1,6 @@
 module Main
   class Container < Dry::Web::Container
-    require root.join("component/app_prototype/container")
+    require root.join("system/app_prototype/container")
     import AppPrototype::Container
 
     configure do |config|
@@ -13,6 +13,6 @@ class Container < Dry::Web::Container
       ]
     end
 
-    load_paths! "lib", "core"
+    load_paths! "lib", "component"
   end
 end
diff --git a/apps/main/component/main/import.rb b/apps/main/component/main/import.rb
@@ -1,7 +1,7 @@
 require_relative "container"
 
 module Main
-  Import = Main::Container::Inject.args
+  Import = Main::Container.injector
 
   def self.Import(*args)
     Import[*args]

diff --git a/bin/console b/bin/console
@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+require "bundler/setup"
 
 require "dry/web/console"
-require_relative "../component/boot"
+require_relative "../system/boot"
 
 Dry::Web::Console.start