rom-rails 1.1.0 → 2.3.0

data/spec/lib/generators/commands_generator_spec.rb

@@ -1,7 +1,7 @@
 require 'generators/rom/commands_generator'
 
 RSpec.describe ROM::Generators::CommandsGenerator do
-  destination File.expand_path('../../../../tmp', __FILE__)
+  destination File.expand_path('../../../tmp', __dir__)
 
   before(:each) do
     prepare_destination
@@ -10,7 +10,7 @@ RSpec.describe ROM::Generators::CommandsGenerator do
   specify do
     run_generator ['users']
 
-    default_adapter = ROM.adapters.keys.first
+    default_adapter = ROM.env.gateways[:default].adapter
 
     expect(destination_root).to have_structure {
       directory 'app' do
@@ -49,7 +49,6 @@ RSpec.describe ROM::Generators::CommandsGenerator do
                     relation :users
                     register_as :delete
                     result :one
-
                   end
             CONTENT
           end

data/spec/lib/generators/install_generator_spec.rb

@@ -1,7 +1,7 @@
 require 'generators/rom/install_generator'
 
 RSpec.describe ROM::Generators::InstallGenerator, type: :generator do
-  destination File.expand_path('../../../../tmp', __FILE__)
+  destination File.expand_path('../../../tmp', __dir__)
 
   before(:each) do
     prepare_destination
@@ -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,12 +39,12 @@ 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
+              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
@@ -63,13 +63,13 @@ 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)
                   super
 
-                  base.constructor_type :schema
+                  base.transform_types(&:omittable)
 
                   base.extend ActiveModel::Naming
                   base.include ActiveModel::Conversion
@@ -85,11 +85,8 @@ RSpec.describe ROM::Generators::InstallGenerator, type: :generator do
               end
             CONTENT
           end
-
         end
       end
     }
   end
-
-
 end

data/spec/lib/generators/mapper_generator_spec.rb

@@ -1,7 +1,7 @@
 require 'generators/rom/mapper_generator'
 
 RSpec.describe ROM::Generators::MapperGenerator do
-  destination File.expand_path('../../../../tmp', __FILE__)
+  destination File.expand_path('../../../tmp', __dir__)
 
   before(:all) do
     prepare_destination

data/spec/lib/generators/relation_generator_spec.rb

@@ -1,7 +1,7 @@
 require 'generators/rom/relation_generator'
 
 RSpec.describe ROM::Generators::RelationGenerator, type: :generator do
-  destination File.expand_path('../../../../tmp', __FILE__)
+  destination File.expand_path('../../../tmp', __dir__)
 
   before(:each) do
     prepare_destination
@@ -9,7 +9,7 @@ RSpec.describe ROM::Generators::RelationGenerator, type: :generator do
 
   specify do
     run_generator ['users']
-    default_adapter = ROM.adapters.keys.first
+    default_adapter = ROM.env.gateways[:default].adapter
 
     expect(destination_root).to have_structure {
       directory 'app' do
@@ -54,4 +54,7 @@ RSpec.describe ROM::Generators::RelationGenerator, type: :generator do
     relation = File.read(File.join(destination_root, 'app', 'relations', 'users_relation.rb'))
     expect(relation).to match(/schema.*as: :profiles/)
   end
+
+  specify "with multiple generators" do
+  end
 end

data/spec/lib/generators/repository_generator_spec.rb

@@ -2,7 +2,7 @@ require 'rom-repository'
 require 'generators/rom/repository_generator'
 
 RSpec.describe ROM::Generators::RepositoryGenerator, type: :generator do
-  destination File.expand_path('../../../../tmp', __FILE__)
+  destination File.expand_path('../../../tmp', __dir__)
 
   before(:each) do
     prepare_destination
@@ -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,71 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: rom-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.3.0
 platform: ruby
 authors:
+- Chris Flipse
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2021-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rom
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: dry-equalizer
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +62,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,9 +72,23 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
-  name: rom-repository
+  name: rom
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +102,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,7 +116,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rom-repository
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -144,21 +145,29 @@ dependencies:
         version: '0.50'
 description: 
 email:
+- cflipse@gmail.com
 - piotr.solnica@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE/----please-don-t-ask-for-support-via-issues.md"
+- ".github/ISSUE_TEMPLATE/---bug-report.md"
+- ".github/ISSUE_TEMPLATE/---feature-request.md"
+- ".github/workflows/ci.yml"
+- ".github/workflows/docsite.yml"
+- ".github/workflows/sync_configs.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - db
+- docsite/source/index.html.md
 - lib/generators/rom.rb
 - lib/generators/rom/commands/templates/create.rb.erb
 - lib/generators/rom/commands/templates/delete.rb.erb
@@ -176,6 +185,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
@@ -231,7 +241,7 @@ files:
 - spec/dummy/db/migrate/20141110205016_add_users.rb
 - spec/dummy/db/migrate/20150202194440_create_tasks.rb
 - spec/dummy/db/migrate/20150403194906_create_tags.rb
-- spec/dummy/lib/additional_app/app/commands/create_additional_task.rb
+- spec/dummy/lib/additional_app/persistence/commands/create_additional_task.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/lib/rom/test_adapter.rb
 - spec/dummy/lib/tasks/.keep
@@ -245,6 +255,7 @@ files:
 - spec/dummy/vendor/assets/stylesheets/.keep
 - spec/features/users_spec.rb
 - spec/integration/activerecord_setup.rb
+- spec/integration/controller_extensions_spec.rb
 - spec/integration/initializer_spec.rb
 - spec/integration/logger_spec.rb
 - spec/integration/user_commands_spec.rb
@@ -275,8 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Integrate Ruby Object Mapper with Rails
@@ -328,7 +338,7 @@ test_files:
 - spec/dummy/db/migrate/20141110205016_add_users.rb
 - spec/dummy/db/migrate/20150202194440_create_tasks.rb
 - spec/dummy/db/migrate/20150403194906_create_tags.rb
-- spec/dummy/lib/additional_app/app/commands/create_additional_task.rb
+- spec/dummy/lib/additional_app/persistence/commands/create_additional_task.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/lib/rom/test_adapter.rb
 - spec/dummy/lib/tasks/.keep
@@ -342,6 +352,7 @@ test_files:
 - spec/dummy/vendor/assets/stylesheets/.keep
 - spec/features/users_spec.rb
 - spec/integration/activerecord_setup.rb
+- spec/integration/controller_extensions_spec.rb
 - spec/integration/initializer_spec.rb
 - spec/integration/logger_spec.rb
 - spec/integration/user_commands_spec.rb

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-sudo: false
-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
-env:
-  - RAILS_VERSION=5.1.0
-  - RAILS_VERSION=5.0.0
-  - RAILS_VERSION=4.2.0
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/39e1225f489f38b0bd09
-    on_success: change
-    on_failure: always
-    on_start: false