rom-rails 0.5.0 → 0.6.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35ec6b8265da06fcd4b015be8436704b0d43284b
-  data.tar.gz: 6200f66f14ccc4baca9d22eb6f4f9988491c0b41
+  metadata.gz: 41ac1f74ab5ab20ea7e11679f5d2f5ae7a716c65
+  data.tar.gz: e7bbdb7acc8c063724d2dc276f5ac5790c00c92f
 SHA512:
-  metadata.gz: 3738bc17799224e79616237c013af6c6f801f1560cb56b04aa154ffe72f9ed77f165c3e2e150c63043f7fa13c220feac21c92873f373d46821c74062e0bc53c2
-  data.tar.gz: 0566c112c68cdc01513a088b5f8199ace435ce1900f09855b423970a65710088a43c89412473d681928491777289680e5d1718d3b3bd395efda812ef7c74c921
+  metadata.gz: 052691ccf1dd02f4c058699c1dc3ba05d405071caf8618d1305e29eb390088e5f631872ead19a438156c9c93133125e97690d8963ce8b75a9829eef628e01201
+  data.tar.gz: d384a93fce3155ef8f6bad2196add0658195eb53dd63c833c1e1494cea5a908b7a8de136805a9e5f00b3ecf9a418443d72d0a695a8efbb55e2dd54a8784ed01b

data/.travis.yml

@@ -10,7 +10,7 @@ rvm:
   - 2.1
   - 2.2
   - rbx-2
-  - jruby
+  - jruby-9000
   - ruby-head
 matrix:
   allow_failures:

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-RAILS_VERSION = '4.2.1'
+RAILS_VERSION = '4.2.4'
 
 %w(railties actionview actionpack activerecord).each do |name|
   gem name, RAILS_VERSION
@@ -19,6 +19,10 @@ group :test do
   gem 'rack-test'
   gem 'rom', github: 'rom-rb/rom', branch: 'master'
   gem 'rom-sql', github: 'rom-rb/rom-sql', branch: 'master'
+  gem 'rom-support', github: 'rom-rb/rom-support', branch: 'master'
+  gem 'rom-mapper', github: 'rom-rb/rom-mapper', branch: 'master'
+  gem 'rom-model', github: 'rom-rb/rom-model', branch: 'master'
+  gem 'transproc', github: 'solnic/transproc', branch: 'master'
   gem 'rspec-rails', '~> 3.1'
   gem 'codeclimate-test-reporter', require: nil
   gem 'database_cleaner'

data/lib/rom/rails/model/form/class_interface.rb

@@ -425,7 +425,7 @@ module ROM
         #
         # @api private
         def build_command(name, rel_name)
-          klass = Command.build_class(name, rel_name, adapter: adapter)
+          klass = ConfigurationDSL::Command.build_class(name, rel_name, adapter: adapter)
 
           klass.result :one
           klass.validator @validator
@@ -434,10 +434,11 @@ module ROM
           gateway = rom.gateways[relation.gateway]
           gateway.extend_command_class(klass, relation.dataset)
 
+          klass.send(:include, Command.relation_methods_mod(relation.class))
+
           klass.build(relation)
         end
 
-
         # Silently update a constant, replacing any existing definition without
         # warning
         #

data/lib/rom/rails/model/form.rb

@@ -1,3 +1,4 @@
+require 'dry-equalizer'
 require 'rom-model'
 
 require 'rom/rails/model/form/class_interface'
@@ -46,7 +47,7 @@ module ROM
     #
     # @api public
     class Form
-      include Equalizer.new(:params, :model, :result)
+      include Dry::Equalizer(:params, :model, :result)
 
       extend ROM::ClassMacros
       extend Form::ClassInterface

data/lib/rom/rails/railtie.rb

@@ -17,7 +17,6 @@ module ROM
       # Make `ROM::Rails::Configuration` instance available to the user via
       # `Rails.application.config` before other initializers run.
       config.before_initialize do |_app|
-        ROM.use :auto_registration
         config.rom = Configuration.new
       end
 
@@ -41,7 +40,7 @@ module ROM
 
       # Reload ROM-related application code on each request.
       config.to_prepare do |_config|
-        Railtie.finalize
+        ROM.env = Railtie.create_container
       end
 
       # Behaves like `Railtie#configure` if the given block does not take any
@@ -63,45 +62,26 @@ module ROM
         end
       end
 
-      # @api private
-      def setup(gateways)
-        raise(
-          MissingGatewayConfigError,
-          "seems like you didn't configure any gateways"
-        ) unless gateways.any?
-
-        ROM.setup(gateways)
+      def create_configuration
+        ROM::Configuration.new(gateways)
       end
 
       # @api private
-      def setup_gateways
-        gateways =
-          if env
-            env.gateways
-          else
-            prepare_gateways
-          end
-
-        setup(gateways)
+      def create_container
+        configuration = create_configuration
+        configuration.auto_registration(root.join("app"), namespace: false)
+        ROM.container(configuration)
       end
 
       # @api private
-      def finalize
-        setup_gateways
-        load_components
-        ROM.finalize
-      end
+      def gateways
+        config.rom.gateways[:default] ||= infer_default_gateway if active_record?
 
-      # TODO: Add `ROM.env.disconnect` to core.
-      #
-      # @api private
-      def disconnect
-        ROM.gateways.each_key(&:disconnect)
-      end
+        raise(
+          MissingGatewayConfigError,
+          "seems like you didn't configure any gateways"
+        ) unless config.rom.gateways.any?
 
-      # @api private
-      def prepare_gateways
-        config.rom.gateways[:default] ||= infer_default_gateway if active_record?
         config.rom.gateways
       end
 
@@ -119,15 +99,8 @@ module ROM
       end
 
       # @api private
-      def load_components
-        COMPONENT_DIRS.each { |type| load_files(type) }
-      end
-
-      # @api private
-      def load_files(type)
-        Dir[root.join("app/#{type}/**/*.rb")].each do |path|
-          require_dependency(path)
-        end
+      def disconnect
+        container.disconnect unless container.nil?
       end
 
       # @api private
@@ -135,8 +108,7 @@ module ROM
         ::Rails.root
       end
 
-      # @api private
-      def env
+      def container
         ROM.env
       end
 

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

@@ -2,6 +2,6 @@ namespace :db do
   desc 'Set up ROM gateways'
   task :setup do
     ROM::Rails::Railtie.load_initializer
-    ROM::Rails::Railtie.setup_gateways
+    ROM::Rails::Railtie.create_configuration
   end
 end

data/lib/rom/rails/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Rails
-    VERSION = '0.5.0'.freeze
+    VERSION = '0.6.0.beta1'.freeze
   end
 end

data/lib/rom-rails.rb

@@ -1,5 +1,11 @@
 require 'rom'
 
+module ROM
+  class << self
+    attr_accessor :env
+  end
+end
+
 require 'rom/rails/version'
 require 'rom/rails/railtie'
 require 'rom/rails/model/form'

data/rom-rails.gemspec

@@ -17,8 +17,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'rom', '~> 0.9', '>= 0.9.0'
+  spec.add_runtime_dependency 'rom', '~> 1.0.0.beta1'
   spec.add_runtime_dependency 'rom-model', '~> 0.1', '>= 0.1.1'
+  spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
   spec.add_runtime_dependency 'addressable', '~> 2.3'
   spec.add_runtime_dependency 'charlatan', '~> 0.1'
   spec.add_runtime_dependency 'virtus', '~> 1.0', '>= 1.0.5'

data/spec/integration/form_with_injected_commands_spec.rb

@@ -7,7 +7,7 @@ describe 'Form with injected commands' do
 
   let(:form_class) do
     Class.new(ROM::Model::Form) do
-      commands users: :create, tags: :create
+      commands users: :create, tasks: :create
 
       inject_commands_for :tasks
 

data/spec/spec_helper.rb

@@ -24,14 +24,14 @@ RSpec.configure do |config|
   config.order = "random"
 
   config.before(:suite) do
-    conn = ROM.env.gateways[:default].connection
+    conn = rom.gateways[:default].connection
 
     DatabaseCleaner[:sequel, connection: conn].strategy = :transaction
     DatabaseCleaner[:sequel, connection: conn].clean_with(:truncation)
   end
 
   config.around(:each) do |example|
-    conn = ROM.env.gateways[:default].connection
+    conn = rom.gateways[:default].connection
 
     DatabaseCleaner[:sequel, connection: conn].cleaning { example.run }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0.beta1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: rom-model
   requirement: !ruby/object:Gem::Requirement
@@ -50,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: dry-equalizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -204,8 +212,8 @@ files:
 - spec/dummy/.rspec
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
-- spec/dummy/app/commands/tasks.rb
-- spec/dummy/app/commands/users.rb
+- spec/dummy/app/commands/create_task.rb
+- spec/dummy/app/commands/delete_user.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/users_controller.rb
 - spec/dummy/app/forms/new_user_form.rb
@@ -213,8 +221,8 @@ files:
 - spec/dummy/app/forms/user_form.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
-- spec/dummy/app/mappers/tasks.rb
-- spec/dummy/app/mappers/users.rb
+- spec/dummy/app/mappers/task_mapper.rb
+- spec/dummy/app/mappers/user_mapper.rb
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/relations/dummy_relation.rb
@@ -289,9 +297,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -302,8 +310,8 @@ test_files:
 - spec/dummy/.rspec
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
-- spec/dummy/app/commands/tasks.rb
-- spec/dummy/app/commands/users.rb
+- spec/dummy/app/commands/create_task.rb
+- spec/dummy/app/commands/delete_user.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/users_controller.rb
 - spec/dummy/app/forms/new_user_form.rb
@@ -311,8 +319,8 @@ test_files:
 - spec/dummy/app/forms/user_form.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
-- spec/dummy/app/mappers/tasks.rb
-- spec/dummy/app/mappers/users.rb
+- spec/dummy/app/mappers/task_mapper.rb
+- spec/dummy/app/mappers/user_mapper.rb
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/relations/dummy_relation.rb
@@ -372,3 +380,4 @@ test_files:
 - spec/lib/generators/relation_generator_spec.rb
 - spec/spec_helper.rb
 - spec/unit/form_spec.rb
+has_rdoc: