Skip to content

Commit

Permalink
Merge pull request #70 from icelab/upgrade-rom
Browse files Browse the repository at this point in the history
Upgrade to rom v3.0.0, rom-repository 1.0.0, rom-sql 1.0.0, rom-mapper 0.5.0, bump Ruby to 2.4.0
  • Loading branch information
dylanwolff authored Feb 3, 2017
2 parents bff2091 + 11d65f4 commit 995dec7
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 56 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.1
2.4.0
13 changes: 6 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "https://rubygems.org"

ruby "2.3.1"
ruby "2.4.0"

gem "rake"

Expand All @@ -13,11 +13,10 @@ gem "shotgun"

# Database persistence
gem "pg"
gem "rom"
gem "rom-mapper"
gem "rom-repository"
gem "rom-sql"
gem "rom-support"
gem "rom", "~> 3.0.0"
gem "rom-mapper", "~> 0.5.0"
gem "rom-repository", "~> 1.0.0"
gem "rom-sql", "~> 1.0.0"

# Background jobs
gem "que"
Expand All @@ -32,7 +31,7 @@ gem "dry-validation"
gem "dry-view"
gem "i18n"
gem "slim"
gem "transproc", git: "https://github.com/solnic/transproc"
gem "transproc"

# 3rd party services
gem "bugsnag"
Expand Down
95 changes: 47 additions & 48 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
GIT
remote: https://github.com/solnic/transproc
revision: ffe27d1d807bac6a9a47c0778eef4b3344284fb1
specs:
transproc (0.4.0)

GEM
remote: https://rubygems.org/
specs:
Expand All @@ -22,24 +16,33 @@ GEM
launchy
cliver (0.3.2)
coderay (1.1.1)
concurrent-ruby (1.0.2)
concurrent-ruby (1.0.4)
database_cleaner (1.5.3)
diff-lcs (1.2.5)
dry-auto_inject (0.4.1)
dry-container (>= 0.3.4)
dry-configurable (0.1.7)
dry-configurable (0.5.0)
concurrent-ruby (~> 1.0)
dry-container (0.5.0)
dry-container (0.6.0)
concurrent-ruby (~> 1.0)
dry-configurable (~> 0.1, >= 0.1.3)
dry-core (0.2.4)
concurrent-ruby (~> 1.0)
dry-equalizer (0.2.0)
dry-logic (0.3.0)
dry-initializer (0.11.0)
dry-logic (0.4.1)
dry-container (~> 0.2, >= 0.2.6)
dry-core (~> 0.2)
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-struct (0.1.1)
dry-configurable (~> 0.1)
dry-equalizer (~> 0.2)
dry-types (~> 0.9, >= 0.9.0)
ice_nine (~> 0.11)
dry-system (0.5.1)
concurrent-ruby (~> 1.0)
dry-auto_inject (>= 0.4.0)
Expand All @@ -52,22 +55,21 @@ GEM
dry-matcher (>= 0.5.0)
dry-monads (>= 0.0.1)
wisper (>= 1.6.0)
dry-types (0.8.1)
dry-types (0.9.4)
concurrent-ruby (~> 1.0)
dry-configurable (~> 0.1)
dry-container (~> 0.3)
dry-core (~> 0.2, >= 0.2.1)
dry-equalizer (~> 0.2)
dry-logic (~> 0.3, >= 0.3.0)
dry-monads (>= 0.0.1)
ice_nine (~> 0.11)
dry-logic (~> 0.4, >= 0.4.0)
inflecto (~> 0.0.0, >= 0.0.2)
dry-validation (0.9.5)
dry-validation (0.10.5)
concurrent-ruby (~> 1.0)
dry-configurable (~> 0.1, >= 0.1.3)
dry-container (~> 0.2, >= 0.2.8)
dry-core (~> 0.2, >= 0.2.1)
dry-equalizer (~> 0.2)
dry-logic (~> 0.3, >= 0.3.0)
dry-types (~> 0.8, >= 0.8.1)
dry-logic (~> 0.4, >= 0.4.0)
dry-types (~> 0.9, >= 0.9.0)
dry-view (0.1.1)
dry-configurable (~> 0.1)
dry-equalizer (~> 0.2)
Expand Down Expand Up @@ -151,31 +153,28 @@ GEM
roda (2.18.0)
rack
roda-flow (0.3.0)
rom (2.0.0)
rom (3.0.1)
concurrent-ruby (~> 1.0)
dry-core (~> 0.2, >= 0.2.3)
dry-equalizer (~> 0.2)
dry-types (~> 0.8)
rom-mapper (~> 0.4.0)
rom-support (~> 2.0)
rom-mapper (0.4.0)
dry-initializer (~> 0.10, >= 0.10.2)
dry-types (~> 0.9, >= 0.9.4)
rom-mapper (~> 0.5)
rom-mapper (0.5.0)
dry-core (~> 0.2.3)
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)
transproc (~> 1.0)
rom-repository (1.0.1)
dry-core (~> 0.2, >= 0.2.1)
dry-struct (~> 0.1)
rom (~> 3.0)
rom-mapper (~> 0.5)
rom-sql (1.0.0)
dry-core (~> 0.2, >= 0.2.3)
dry-equalizer (~> 0.2)
transproc (~> 0.4.0)
wisper (~> 1.6, >= 1.6.0)
dry-types (~> 0.9, >= 0.9.4)
rom (~> 3.0)
sequel (~> 4.42)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
Expand All @@ -190,7 +189,7 @@ GEM
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
ruby_dep (1.4.0)
sequel (4.38.0)
sequel (4.43.0)
shellany (0.0.1)
shotgun (0.9.2)
rack (>= 1.0)
Expand All @@ -204,6 +203,7 @@ GEM
temple (0.7.7)
thor (0.19.1)
tilt (2.0.5)
transproc (1.0.0)
websocket-driver (0.6.4)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
Expand Down Expand Up @@ -239,19 +239,18 @@ DEPENDENCIES
que
rack_csrf
rake
rom
rom-mapper
rom-repository
rom-sql
rom-support
rom (~> 3.0.0)
rom-mapper (~> 0.5.0)
rom-repository (~> 1.0.0)
rom-sql (~> 1.0.0)
rspec
shotgun
site_prism
slim
transproc!
transproc

RUBY VERSION
ruby 2.3.1p112
ruby 2.4.0p0

BUNDLED WITH
1.12.5
1.14.3
8 changes: 8 additions & 0 deletions lib/functions.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
require "transproc/all"

module Functions
extend Transproc::Registry

import Transproc::HashTransformations
import Transproc::ArrayTransformations
end
1 change: 1 addition & 0 deletions lib/types.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require "dry-types"
require "dry-struct"

module Types
include Dry::Types.module
Expand Down

0 comments on commit 995dec7

Please sign in to comment.