rom-rails 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5acc8ec1307f8d3d91dc9918bff1e25d359685d57525ec3ddfbed5296ce38b2
-  data.tar.gz: 688d949fe6d60bebb5e48162370a62694a6aa8f6f965696952252c9e044a008f
+  metadata.gz: 68fc37fe8b9ca646395ffd02e68f29b774d7330e9513bf1de8a27771d5393896
+  data.tar.gz: 90159fa988c5fbe590516e2d4112483ab35752264c771352bdfc0a63f14168d2
 SHA512:
-  metadata.gz: 47bdcf5a66ae1f5dbcf683cdf7d8a8873a23a12bd9cd0029bd2881ee1c68e9b26aeffb271c80e132a7587a07e10db767d9bd5dd63e097979a4be3e89b5d5b688
-  data.tar.gz: 7ac28d31ef0a9c86b3a49104cce96c9b46c2302e3a063c7e9d7fd53ed3ac39483dc1fa1f893fcff826a4123d55a073af57c9d0e61e3f78d8874651febd361e82
+  metadata.gz: fb112f2f9c27a973262ed39133ae9befe1adbaf91aed42470d28a46776c73d02f17f22318863d9d2623e0f30caf65fafac40168ed050785a94261006a2c64fd4
+  data.tar.gz: e7e53cbb6139f0df6d748c3ead2c1e153ceba72f9dcb3bf69df11cb2d8b50b7cc7a99824d2d13ad75884270ae07711c7eb10e54ad1aedaeb63223ae55f0ed4fa

data/.travis.yml

@@ -4,17 +4,19 @@ cache: bundler
 bundler_args: --without yard guard benchmarks
 script: "RAILS_ENV=test bundle exec rake app:db:reset app:spec"
 rvm:
-  - 2.3.1
-  - 2.4.1
-  - jruby-9.1.13.0
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
+  - jruby-9.2.7.0
 env:
-  - RAILS_VERSION=5.1.0
-  - RAILS_VERSION=5.0.0
-  - RAILS_VERSION=4.2.0
+  - RAILS_VERSION=5.2
+  - RAILS_VERSION=5.1
+  - RAILS_VERSION=5.0
+  - RAILS_VERSION=4.2
 notifications:
   webhooks:
     urls:
-      - https://webhooks.gitter.im/e/39e1225f489f38b0bd09
+      - https://rom-rb.zulipchat.com/api/v1/external/travis?api_key=S1S2GRkXHlzlaCGyUwm7o4lg50IZrwCH&stream=notifications&topic=ci
     on_success: change
     on_failure: always
     on_start: false

data/CHANGELOG.md

@@ -1,6 +1,29 @@
+## v2.0.0 2019-04-27
+
+### Changed
+
+* Updated to depend on rom-* 5.0
+* Repository generator creates a `by_id` method (cflipse)
+
+[Compare v1.3.0...v2.0.0](https://github.com/rom-rb/rom-rails/compare/v1.3.0...v2.0.0)
+
+## v1.3.0 2018-11-26
+
+### Changed
+
+* Rake task automatically attempts to include `rom-sql`'s tasks (cflipse)
+* Escape special characters in username & password from parsed database.yml (Cervajz)
+
+### Fixed
+
+* do not double log when ActiveRecord is present (Cervajz)
+* running the install generator no longer results in a broken app if `DATABASE_URL` is not set (cflipse)
+
+[Compare v1.2.0...v1.3.0](https://github.com/rom-rb/rom-rails/compare/v1.2.0...v1.3.0)
+
 ## v1.2.0 2018-10-20
 
-## Changed
+### Changed
 
 * ROM output is broadcast to STDOUT during rails console (radar)
 * Generators default to same adapter as the default gateway (cflipse)
@@ -11,7 +34,7 @@
 
 ## v1.1.1 2018-04-17
 
-### Changed
+### Fixedd
 
 * Fix Rails.logger lookup bug (cflipse)
 

data/Gemfile

@@ -17,7 +17,6 @@ gem 'rom', git: 'https://github.com/rom-rb/rom', branch: 'master' do
   gem 'rom-repository', group: :tools
 end
 
-gem 'rom-http'
 gem 'rom-sql', github: 'rom-rb/rom-sql', branch: 'master'
 
 platforms :jruby do

data/README.md

@@ -1,6 +1,5 @@
 [gem]: https://rubygems.org/gems/rom-rails
 [travis]: https://travis-ci.org/rom-rb/rom-rails
-[gemnasium]: https://gemnasium.com/rom-rb/rom-rails
 [codeclimate]: https://codeclimate.com/github/rom-rb/rom-rails
 [coveralls]: https://coveralls.io/r/rom-rb/rom-rails
 [inchpages]: http://inch-ci.org/github/rom-rb/rom-rails
@@ -9,7 +8,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/rom-rails.svg)][gem]
 [![Build Status](https://travis-ci.org/rom-rb/rom-rails.svg?branch=master)][travis]
-[![Dependency Status](https://gemnasium.com/rom-rb/rom-rails.svg)][gemnasium]
 [![Code Climate](https://codeclimate.com/github/rom-rb/rom-rails/badges/gpa.svg)][codeclimate]
 [![Test Coverage](https://codeclimate.com/github/rom-rb/rom-rails/badges/coverage.svg)][codeclimate]
 [![Inline docs](http://inch-ci.org/github/rom-rb/rom-rails.svg?branch=master)][inchpages]

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

@@ -1,4 +1,4 @@
-require 'types'
+require "types"
 
 class ApplicationModel < ROM::Struct
   def self.inherited(base)

data/lib/generators/rom/install/templates/initializer.rb.erb

@@ -1,3 +1,3 @@
 ROM::Rails::Railtie.configure do |config|
-  config.gateways[:default] = [:<%= adapter %>, ENV.fetch('DATABASE_URL')]
+  # config.gateways[:default] = [:<%= adapter %>, ENV.fetch('DATABASE_URL')]
 end

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

@@ -1,4 +1,4 @@
-require 'dry/types'
+require "dry/types"
 
 module Types
   include Dry::Types.module

data/lib/generators/rom/repository/templates/repository.rb.erb

@@ -4,4 +4,12 @@ class <%= model_name %>Repository < ROM::Repository::Root
   commands :create, update: :by_pk, delete: :by_pk
 
   struct_namespace <%= struct_namespace %>
+
+  def by_id(id)
+    root.by_pk(id).one
+  end
+
+  def all
+    root.to_a
+  end
 end

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

@@ -86,8 +86,8 @@ module ROM
         def self.generic_uri(config)
           build_uri(
             scheme: config.fetch(:scheme),
-            user: config[:username],
-            password: config[:password],
+            user: escape_option(config[:username]),
+            password: escape_option(config[:password]),
             host: config[:host],
             port: config[:port],
             path: config[:database]
@@ -97,6 +97,10 @@ module ROM
         def self.build_uri(attrs)
           Addressable::URI.new(attrs).to_s
         end
+
+        def self.escape_option(option)
+          option.nil? ? option : CGI.escape(option)
+        end
       end
     end
   end

data/lib/rom/rails/railtie.rb

@@ -46,10 +46,7 @@ module ROM
       end
 
       console do |_app|
-        unless ActiveSupport::Logger.logger_outputs_to?(::Rails.logger, STDERR, STDOUT)
-          console = ActiveSupport::Logger.new(STDERR)
-          ::Rails.logger.extend ActiveSupport::Logger.broadcast console
-        end
+        Railtie.configure_console_logger
       end
 
       # Behaves like `Railtie#configure` if the given block does not take any
@@ -137,6 +134,19 @@ module ROM
       def active_record?
         defined?(::ActiveRecord)
       end
+
+      # @api private
+      def std_err_out_logger?
+        ActiveSupport::Logger.logger_outputs_to?(::Rails.logger, STDERR, STDOUT)
+      end
+
+      # @api private
+      def configure_console_logger
+        return if active_record? || std_err_out_logger?
+
+        console = ActiveSupport::Logger.new(STDERR)
+        ::Rails.logger.extend ActiveSupport::Logger.broadcast console
+      end
     end
   end
 end

data/lib/rom/rails/tasks/db.rake

@@ -1,3 +1,9 @@
+begin
+  require "rom/sql/rake_task"
+rescue LoadError
+  # rom-sql is optional
+end
+
 namespace :db do
   desc 'Set up ROM gateways'
   task :setup do

data/lib/rom/rails/version.rb

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

data/rom-rails.gemspec

@@ -5,8 +5,8 @@ require 'rom/rails/version'
 Gem::Specification.new do |spec|
   spec.name          = "rom-rails"
   spec.version       = ROM::Rails::VERSION.dup
-  spec.authors       = ["Piotr Solnica"]
-  spec.email         = ["piotr.solnica@gmail.com"]
+  spec.authors       = ["Chris Flipse", "Piotr Solnica"]
+  spec.email         = ["cflipse@gmail.com", "piotr.solnica@gmail.com"]
   spec.summary       = 'Integrate Ruby Object Mapper with Rails'
   spec.homepage      = "http://rom-rb.org"
   spec.license       = "MIT"
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   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 'rom', '~> 4.0'
+  spec.add_runtime_dependency 'rom', '~> 5.0'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/spec/dummy/config/initializers/rom.rb

@@ -1,6 +1,6 @@
 ROM::Rails::Railtie.configure do |config|
   scheme = RUBY_ENGINE == 'jruby' ? 'jdbc:sqlite' : 'sqlite'
-  config.gateways[:arro] = [:http, uri: 'http://example.org' ]
+  config.gateways[:arro] = [:test_adapter, uri: 'http://example.org' ]
   config.gateways[:sql] = [:sql, "#{scheme}://#{Rails.root}/db/#{Rails.env}.sqlite3"]
   config.gateways[:default] = [:test_adapter, foo: :bar]
   config.auto_registration_paths += [Rails.root.join('lib', 'additional_app', 'persistence')]

data/spec/lib/active_record/configuration_spec.rb

@@ -112,6 +112,22 @@ RSpec.describe ROM::Rails::ActiveRecord::Configuration do
 
         expect(read(config)).to eq uri: expected_uri, options: { pool: 5 }
       end
+
+      it 'handles special characters in username and password' do
+        config = {
+          pool: 5,
+          adapter: 'mysql2',
+          username: 'r@o%ot',
+          password: 'p@ssw0rd#',
+          database: 'database',
+          host: 'example.com'
+        }
+
+        expected_uri = 'mysql2://r%40o%25ot:p%40ssw0rd%23@example.com/database'
+        expected_uri = "jdbc:#{expected_uri}" if RUBY_ENGINE == 'jruby'
+
+        expect(read(config)).to eq uri: expected_uri, options: { pool: 5 }
+      end
     end
   end
 end

data/spec/lib/generators/install_generator_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe ROM::Generators::InstallGenerator, type: :generator do
           file 'rom.rb' do
             contains <<-CONTENT.strip_heredoc
               ROM::Rails::Railtie.configure do |config|
-                config.gateways[:default] = [:sql, ENV.fetch('DATABASE_URL')]
+                # config.gateways[:default] = [:sql, ENV.fetch('DATABASE_URL')]
               end
             CONTENT
           end
@@ -39,7 +39,7 @@ RSpec.describe ROM::Generators::InstallGenerator, type: :generator do
       directory "lib" do
         file "types.rb" do
           contains <<-CONTENT.strip_heredoc
-            require 'dry/types'
+            require "dry/types"
 
             module Types
               include Dry::Types.module
@@ -63,7 +63,7 @@ RSpec.describe ROM::Generators::InstallGenerator, type: :generator do
         directory "models" do
           file "application_model.rb" do
             contains <<-CONTENT.strip_heredoc
-              require 'types'
+              require "types"
 
               class ApplicationModel < ROM::Struct
                 def self.inherited(base)

data/spec/lib/generators/repository_generator_spec.rb

@@ -22,6 +22,14 @@ RSpec.describe ROM::Generators::RepositoryGenerator, type: :generator do
                 commands :create, update: :by_pk, delete: :by_pk
 
                 struct_namespace Dummy
+
+                def by_id(id)
+                  root.by_pk(id).one
+                end
+
+                def all
+                  root.to_a
+                end
               end
             CONTENT
           end
@@ -44,6 +52,14 @@ RSpec.describe ROM::Generators::RepositoryGenerator, type: :generator do
                 commands :create, update: :by_pk, delete: :by_pk
 
                 struct_namespace Dummy
+
+                def by_id(id)
+                  root.by_pk(id).one
+                end
+
+                def all
+                  root.to_a
+                end
               end
             CONTENT
           end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rom-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
+- Chris Flipse
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-20 00:00:00.000000000 Z
+date: 2019-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -78,14 +79,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +145,7 @@ dependencies:
         version: '0.50'
 description: 
 email:
+- cflipse@gmail.com
 - piotr.solnica@gmail.com
 executables: []
 extensions: []