rom-rails 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68fc37fe8b9ca646395ffd02e68f29b774d7330e9513bf1de8a27771d5393896
-  data.tar.gz: 90159fa988c5fbe590516e2d4112483ab35752264c771352bdfc0a63f14168d2
+  metadata.gz: 2aa950bd64c7498d660f81d2b6f0f6206d88b81249b6c72103a598ccc4abdeb0
+  data.tar.gz: '04184007c2c8ec6f3adf047ccb4ab7856c9fdb0bfcf84ca4f59efc91a2cce625'
 SHA512:
-  metadata.gz: fb112f2f9c27a973262ed39133ae9befe1adbaf91aed42470d28a46776c73d02f17f22318863d9d2623e0f30caf65fafac40168ed050785a94261006a2c64fd4
-  data.tar.gz: e7e53cbb6139f0df6d748c3ead2c1e153ceba72f9dcb3bf69df11cb2d8b50b7cc7a99824d2d13ad75884270ae07711c7eb10e54ad1aedaeb63223ae55f0ed4fa
+  metadata.gz: 19289d877377affe80deede5ec1a195252354a6ab2ade3a2ce80b3c0c543295e57ba409e333c4199b38fdec08bea59b027f2eff47cc55af54e18dc5d7ad26884
+  data.tar.gz: 20199e51ec01cb205650c000bb6f79980c764ce1797634130bf73808e2038cc346aea47d6ef3aadd35ec42a8a9b14103769ac3a558bb084aa2a5f56e95a0388a

data/.rubocop.yml

@@ -31,10 +31,14 @@ AllCops:
     - tmp/**/*
     - vendor/**/*
 
+Layout/AlignArguments:
+  EnforcedStyle: with_fixed_indentation
+
 # The enforced style doesn’t match Vim’s defaults
 Layout/AlignParameters:
   Enabled: false
 
+
 # UTF-8 is perfectly fine in comments
 Style/AsciiComments:
   Enabled: false

data/.travis.yml

@@ -9,6 +9,7 @@ rvm:
   - 2.6.3
   - jruby-9.2.7.0
 env:
+  - RAILS_VERSION=6.0
   - RAILS_VERSION=5.2
   - RAILS_VERSION=5.1
   - RAILS_VERSION=5.0
@@ -20,3 +21,7 @@ notifications:
     on_success: change
     on_failure: always
     on_start: false
+matrix:
+  exclude:
+    - rvm: 2.4.6
+      env: RAILS_VERSION=6.0

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## v2.2.0 2019-09-12
+
+### Changed
+
+* Read new-style Rails6 configuration, inferring all defined databases (cflipse)
+
+### Fixed
+
+* Updated generator to produce files that are actually compatible with ROM 5.0 (cflipse)
+
+[Compare v2.1.0...v2.2.0](https://github.com/rom-rb/rom-rails/compare/v2.1.0...v2.2.0)
+
+## v2.1.0 2019-09-09
+
+### Changed
+
+* Allow rails6 (cflipse)
+
+[Compare v2.0.0...v2.1.0](https://github.com/rom-rb/rom-rails/compare/v2.0.0...v2.1.0)
+
 ## v2.0.0 2019-04-27
 
 ### Changed

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-RAILS_VERSION = ENV.fetch("RAILS_VERSION", '5.1.0').freeze
+RAILS_VERSION = ENV.fetch("RAILS_VERSION", '6.0.0').freeze
 
 %w(railties actionview actionpack activerecord).each do |name|
   gem name, "~> #{RAILS_VERSION}"

data/lib/generators/rom/install/templates/application_model.rb

@@ -4,7 +4,7 @@ class ApplicationModel < ROM::Struct
   def self.inherited(base)
     super
 
-    base.constructor_type :schema
+    base.transform_types(&:omittable)
 
     base.extend ActiveModel::Naming
     base.include ActiveModel::Conversion

data/lib/generators/rom/install/templates/types.rb

@@ -1,9 +1,9 @@
 require "dry/types"
 
 module Types
-  include Dry::Types.module
+  include Dry.Types
 
-  ID = Coercible::Int.optional.meta(primary_key: true)
+  ID = Coercible::Integer.optional.meta(primary_key: true)
 
   # Include your own type definitions and coersions here.
   # See http://dry-rb.org/gems/dry-types

data/lib/rom/rails/active_record/configuration.rb

@@ -1,4 +1,4 @@
-require 'addressable/uri'
+require_relative 'uri_builder'
 
 module ROM
   module Rails
@@ -17,15 +17,43 @@ module ROM
           :host
         ].freeze
 
+        attr_reader :configurations
+        attr_reader :env
+        attr_reader :root
+        attr_reader :uri_builder
+
+        def initialize(env: ::Rails.env, root: ::Rails.root, configurations: ::ActiveRecord::Base.configurations)
+          @configurations = configurations
+          @env  = env
+          @root = root
+
+          @uri_builder = ROM::Rails::ActiveRecord::UriBuilder.new
+        end
+
         # Returns gateway configuration for the current environment.
         #
         # @note This relies on ActiveRecord being initialized already.
         # @param [Rails::Application]
         #
         # @api private
-        def self.call
-          configuration = ::ActiveRecord::Base.configurations.fetch(::Rails.env)
-          build(configuration.symbolize_keys.update(root: ::Rails.root))
+        def call
+          specs = { default: build(default_configuration.symbolize_keys) }
+
+          if rails6?
+            configurations.configs_for(env_name: env).each do |config|
+              specs[config.spec_name.to_sym] = build(config.config.symbolize_keys)
+            end
+          end
+
+          specs
+        end
+
+        def default_configuration
+          if rails6?
+            configurations.default_hash(env)
+          else
+            configurations.fetch(env)
+          end
         end
 
         # Builds a configuration hash from a flat database config hash.
@@ -38,68 +66,22 @@ module ROM
         # @return [Hash]
         #
         # @api private
-        def self.build(config)
+        def build(config)
           adapter = config.fetch(:adapter)
-          uri_options = config.except(:adapter).merge(scheme: adapter)
+          uri_options = config.except(:adapter).merge(
+            root: root,
+            scheme: adapter
+          )
           other_options = config.except(*BASE_OPTIONS)
 
-          builder_method = :"#{adapter}_uri"
-          uri = if respond_to?(builder_method)
-                  send(builder_method, uri_options)
-                else
-                  generic_uri(uri_options)
-                end
-
-          # JRuby connection strings require special care.
-          if RUBY_ENGINE == 'jruby' && adapter != 'postgresql'
-            uri = "jdbc:#{uri}"
-          end
-
+          uri = uri_builder.build(adapter, uri_options)
           { uri: uri, options: other_options }
         end
 
-        def self.sqlite3_uri(config)
-          path = Pathname.new(config.fetch(:root)).join(config.fetch(:database))
-
-          build_uri(
-            scheme: 'sqlite',
-            host: '',
-            path: path.to_s
-          )
-        end
-
-        def self.postgresql_uri(config)
-          generic_uri(config.merge(
-                        host: config.fetch(:host) { '' },
-                        scheme: 'postgres'
-                      ))
-        end
-
-        def self.mysql_uri(config)
-          if config.key?(:username) && !config.key?(:password)
-            config.update(password: '')
-          end
-
-          generic_uri(config)
-        end
-
-        def self.generic_uri(config)
-          build_uri(
-            scheme: config.fetch(:scheme),
-            user: escape_option(config[:username]),
-            password: escape_option(config[:password]),
-            host: config[:host],
-            port: config[:port],
-            path: config[:database]
-          )
-        end
-
-        def self.build_uri(attrs)
-          Addressable::URI.new(attrs).to_s
-        end
+        private
 
-        def self.escape_option(option)
-          option.nil? ? option : CGI.escape(option)
+        def rails6?
+          ::ActiveRecord::VERSION::MAJOR >= 6
         end
       end
     end

data/lib/rom/rails/active_record/uri_builder.rb

@@ -0,0 +1,70 @@
+require 'addressable/uri'
+
+module ROM
+  module Rails
+    module ActiveRecord
+      class UriBuilder
+        def build(adapter, uri_options)
+          builder_method = :"#{adapter}_uri"
+
+          uri = if respond_to?(builder_method)
+                  send(builder_method, uri_options)
+                else
+                  generic_uri(uri_options)
+                end
+
+          # JRuby connection strings require special care.
+          if RUBY_ENGINE == 'jruby' && adapter != 'postgresql'
+            uri = "jdbc:#{uri}"
+          end
+
+          uri
+        end
+
+        def sqlite3_uri(config)
+          path = Pathname.new(config.fetch(:root)).join(config.fetch(:database))
+
+          build_uri(
+            scheme: 'sqlite',
+            host: '',
+            path: path.to_s
+          )
+        end
+
+        def postgresql_uri(config)
+          generic_uri(config.merge(
+                        host: config.fetch(:host) { '' },
+                        scheme: 'postgres'
+                      ))
+        end
+
+        def mysql_uri(config)
+          if config.key?(:username) && !config.key?(:password)
+            config.update(password: '')
+          end
+
+          generic_uri(config)
+        end
+
+        def generic_uri(config)
+          build_uri(
+            scheme: config.fetch(:scheme),
+            user: escape_option(config[:username]),
+            password: escape_option(config[:password]),
+            host: config[:host],
+            port: config[:port],
+            path: config[:database]
+          )
+        end
+
+        def build_uri(attrs)
+          Addressable::URI.new(attrs).to_s
+        end
+
+        def escape_option(option)
+          option.nil? ? option : CGI.escape(option)
+        end
+      end
+    end
+  end
+end

data/lib/rom/rails/railtie.rb

@@ -86,7 +86,11 @@ module ROM
 
       # @api private
       def gateways
-        config.rom.gateways[:default] ||= infer_default_gateway if active_record?
+        if active_record?
+          load_active_record_config.each do |name, spec|
+            config.rom.gateways[name] ||= [:sql, spec[:uri], spec[:options]]
+          end
+        end
 
         if config.rom.gateways.empty?
           ::Rails.logger.warn "It seems that you have not configured any gateways"
@@ -97,13 +101,9 @@ module ROM
         config.rom.gateways
       end
 
-      # If there's no default gateway configured, try to infer it from
-      # other sources, e.g. ActiveRecord.
-      #
-      # @api private
-      def infer_default_gateway
-        spec = ROM::Rails::ActiveRecord::Configuration.call
-        [:sql, spec[:uri], spec[:options]]
+      # Attempt to infer all configured gateways from activerecord
+      def load_active_record_config
+        ROM::Rails::ActiveRecord::Configuration.new.call
       end
 
       def load_initializer

data/lib/rom/rails/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Rails
-    VERSION = '2.0.0'.freeze
+    VERSION = '2.2.0'.freeze
   end
 end

data/rom-rails.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'addressable', '~> 2.3'
   spec.add_runtime_dependency 'dry-core', '~> 0.3'
   spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
-  spec.add_runtime_dependency 'railties', '>= 3.0', '< 6.0'
+  spec.add_runtime_dependency 'railties', '>= 3.0', '< 6.1'
   spec.add_runtime_dependency 'rom', '~> 5.0'
 
   spec.add_development_dependency "bundler"

data/spec/lib/active_record/configuration_spec.rb

@@ -1,15 +1,19 @@
 require 'rom/rails/active_record/configuration'
+require 'active_record'
+require 'active_record/database_configurations' if Rails::VERSION::MAJOR >= 6
 
 RSpec.describe ROM::Rails::ActiveRecord::Configuration do
   let(:root) { Pathname.new('/path/to/app') }
 
+  subject(:configuration) { described_class.new(root: root) }
+
   def uri_for(config)
     result = read(config)
     result.is_a?(Hash) ? result[:uri] : result
   end
 
   def read(config)
-    described_class.build(config.merge(root: root))
+    configuration.build(config)
   end
 
   def parse(uri)
@@ -130,4 +134,70 @@ RSpec.describe ROM::Rails::ActiveRecord::Configuration do
       end
     end
   end
+
+  if Rails::VERSION::MAJOR >= 6
+    context "with an activerecord 6 configuration" do
+      subject(:configuration) { described_class.new(root: root, configurations: railsconfig, env: "test") }
+      let(:railsconfig) { ActiveRecord::DatabaseConfigurations.new(config_file) }
+
+      context "with only a single database" do
+        let(:config_file) {
+          {
+            test: {
+              adapter: 'mysql',
+              host: 'example.com',
+              database: 'test',
+              username: 'user',
+              encoding: 'utf8'
+            }
+          }
+        }
+
+        it "returns the default hash" do
+          expected_uri = uri_for(config_file[:test])
+          expect(configuration.call[:default]).to match(uri: expected_uri, options: { encoding: 'utf8' })
+        end
+      end
+
+      context "with multiple configured databases" do
+        let(:config_file) {
+          {
+            test: {
+              reader: {
+                adapter: 'mysql',
+                host: 'example.com',
+                database: 'test_reader',
+                username: 'user',
+                encoding: 'utf8'
+              },
+              writer: {
+                adapter: 'mysql',
+                host: 'write.example.com',
+                database: 'test_writer',
+                username: 'user',
+                encoding: 'utf8'
+              }
+            }
+          }
+        }
+
+        it "configures the first database as the default" do
+          expected_uri = uri_for(config_file[:test][:reader])
+          expect(configuration.call[:default]).to match(uri: expected_uri, options: {encoding: 'utf8'})
+        end
+
+        it "returns each configured database" do
+          options = { encoding: 'utf8' }
+          expected_reader_uri = uri_for(config_file[:test][:reader])
+          expected_writer_uri = uri_for(config_file[:test][:writer])
+
+          expect(configuration.call).to include(
+            reader: { uri: expected_reader_uri, options: options },
+            writer: { uri: expected_writer_uri, options: options }
+          )
+        end
+      end
+    end
+
+  end
 end

data/spec/lib/generators/install_generator_spec.rb

@@ -42,9 +42,9 @@ RSpec.describe ROM::Generators::InstallGenerator, type: :generator do
             require "dry/types"
 
             module Types
-              include Dry::Types.module
+              include Dry.Types
 
-              ID = Coercible::Int.optional.meta(primary_key: true)
+              ID = Coercible::Integer.optional.meta(primary_key: true)
 
               # Include your own type definitions and coersions here.
               # See http://dry-rb.org/gems/dry-types
@@ -69,7 +69,7 @@ RSpec.describe ROM::Generators::InstallGenerator, type: :generator do
                 def self.inherited(base)
                   super
 
-                  base.constructor_type :schema
+                  base.transform_types(&:omittable)
 
                   base.extend ActiveModel::Naming
                   base.include ActiveModel::Conversion

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rom-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Chris Flipse
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -62,7 +62,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rom
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +179,7 @@ files:
 - lib/generators/rom/repository_generator.rb
 - lib/rom-rails.rb
 - lib/rom/rails/active_record/configuration.rb
+- lib/rom/rails/active_record/uri_builder.rb
 - lib/rom/rails/configuration.rb
 - lib/rom/rails/controller_extension.rb
 - lib/rom/rails/inflections.rb
@@ -279,8 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Integrate Ruby Object Mapper with Rails