rom-rails 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86f0549c067203ec89e8f4abb2ea37b2562e0973
-  data.tar.gz: f18045fb036c3c1a1686e71a5a1bfa0ee1b338fd
+  metadata.gz: d81f44c9999447bf6ccdc64f6529bc1fd614d19d
+  data.tar.gz: 4114017307dfae118382f978f1433ff1869595d3
 SHA512:
-  metadata.gz: f7c52be36381a02975bb9a86e9a487abfc8019fad010060d54bab705196ace41290c6ae374367bff04cdc438096ce7178004aff4e78625265dd6cd40857e4904
-  data.tar.gz: 5a156f91d425270831119cd93742ff470e1228dfbd34ff025a3302c497b39ec434ee3a5c2344553fd6a2e0c7ffc018bd4e2380e4dd4210096ebd2ece49c49832
+  metadata.gz: 9fbf68d09cc7cd8f92460fb60eac6c54badc9200763347080f879c377de8638467ae9441be6d6095cc553d9328341c8cdb0f2e1a2f5a68973623e27bf4c5bcfe
+  data.tar.gz: 8dc7266b70cc95434bcbf162b01d356c381f17cd8bda8defa3326eb397535f5aeb4be227e1d5d19ae896440dae57e2f8ed627dd675f8c51c491567c3758af3ab

data/.rubocop.yml

@@ -38,14 +38,24 @@ Style/AlignParameters:
 Style/AsciiComments:
   Enabled: false
 
-# Allow using braces for value-returning blocks
-Style/Blocks:
-  Enabled: false
+Style/BlockDelimiters:
+  EnforcedStyle: semantic
+  FunctionalMethods:
+    - let
+    - let!
+    - subject
+    - watch
+    - before
 
 Style/BracesAroundHashParameters:
   Enabled: true
   EnforcedStyle: context_dependent
 
+# Allow compact style for specs
+Style/ClassAndModuleChildren:
+  Exclude:
+    - spec/**/*_spec.rb
+
 # Documentation checked by Inch CI
 Style/Documentation:
   Enabled: false
@@ -59,27 +69,48 @@ Style/FileName:
 Style/GuardClause:
   Enabled: false
 
+# Need to be skipped for >-> usage
+Style/Lambda:
+  Enabled: false
+
 # Multiline block chains are ok
 Style/MultilineBlockChain:
   Enabled: false
 
+# Multiline operation chains are indented
+Style/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
 # Model::Validator uses Model::ValidationError for this
 Style/RaiseArgs:
   Exclude:
     - lib/rom/model.rb
 
-# Even a single escaped slash can be confusing
-Style/RegexpLiteral:
-  MaxSlashes: 0
-
 # Don’t introduce semantic fail/raise distinction
 Style/SignalException:
   EnforcedStyle: only_raise
 
+# Need to be skipped for >-> usage
+Style/SpaceAroundOperators:
+  Enabled: false
+
 # Accept both single and double quotes
 Style/StringLiterals:
   Enabled: false
 
+# Allow def self.foo; @foo; end
+Style/TrivialAccessors:
+  Enabled: false
+
 Style/AccessorMethodName:
   Exclude:
     - lib/rom/rails/model/params.rb
+
+# Allow logical `or`/`and` in conditionals
+Style/AndOr:
+  EnforcedStyle: conditionals
+
+# Fails to register points where we otherwise _use_ the block
+Performance/RedundantBlockCall:
+  Enabled: false
+

data/.travis.yml

@@ -2,16 +2,13 @@ language: ruby
 sudo: false
 cache: bundler
 bundler_args: --without yard guard benchmarks
-env:
-  - CODECLIMATE_REPO_TOKEN=87c9080bda25bce8e63a294f99312345c144c0f6d5eedf400fd753356fbf7dcf
 script: "RAILS_ENV=test bundle exec rake app:db:reset app:spec"
 rvm:
-  - 2.0
   - 2.1
   - 2.2
-  - 2.3.0
+  - 2.3.1
   - rbx-2
-  - jruby-9000
+  - jruby-9.0.5.0
   - ruby-head
 matrix:
   allow_failures:

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-RAILS_VERSION = '4.2.4'
+RAILS_VERSION = '~> 4.2.4'.freeze
 
 %w(railties actionview actionpack activerecord).each do |name|
   gem name, RAILS_VERSION
@@ -10,6 +10,7 @@ end
 
 gem 'sqlite3', platforms: [:mri, :rbx]
 gem 'byebug', platforms: :mri
+gem 'rom-sql', '~> 0.8'
 
 platforms :jruby do
   gem 'jdbc-sqlite3'
@@ -17,7 +18,6 @@ end
 
 group :test do
   gem 'rack-test'
-  gem 'rom-sql'
   gem 'rspec-rails', '~> 3.1'
   gem 'codeclimate-test-reporter', require: nil
   gem 'database_cleaner'

data/README.md

@@ -9,7 +9,7 @@
 
 [![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.png)][gemnasium]
+[![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]
@@ -34,8 +34,8 @@ To run tests:
 
 You can read more about ROM and Rails on the official website:
 
-* [Introduction to ROM](http://rom-rb.org/introduction/)
-* [Rails tutorial](http://rom-rb.org/tutorials/todo-app-with-rails/)
+* [Introduction to ROM](http://rom-rb.org/learn/)
+* [Rails setup](http://rom-rb.org/learn/setup/rails/)
 
 
 ## Community

data/db

@@ -0,0 +1 @@
+spec/dummy/db

data/lib/generators/rom/form_generator.rb

@@ -42,7 +42,6 @@ module ROM
       def relation
         class_name.pluralize.underscore
       end
-
     end
   end
 end

data/lib/generators/rom/mapper_generator.rb

@@ -21,9 +21,8 @@ module ROM
       end
 
       def register_as
-        model_name.singularize.downcase
+        model_name.singularize.underscore.downcase
       end
-
     end
   end
 end

data/lib/generators/rom/relation_generator.rb

@@ -18,7 +18,6 @@ module ROM
         desc: "specify the registration identifier",
         required: false
 
-
       def create_relation_file
         template(
           'relation.rb.erb',
@@ -43,7 +42,6 @@ module ROM
       def gateway
         options[:gateway]
       end
-
     end
   end
 end

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

@@ -70,8 +70,8 @@ module ROM
 
         def self.postgresql_uri(config)
           generic_uri(config.merge(
-            host: config.fetch(:host) { '' },
-            scheme: 'postgres'
+                        host: config.fetch(:host) { '' },
+                        scheme: 'postgres'
           ))
         end
 

data/lib/rom/rails/configuration.rb

@@ -9,6 +9,7 @@ module ROM
       include Virtus.model(strict: true)
 
       attribute :gateways, Hash, default: {}
+      attribute :auto_registration_paths, Array, default: []
 
       deprecate :repositories, :gateways
     end

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

@@ -84,7 +84,7 @@ module ROM
       attr_reader :errors
 
       delegate :model_name, :persisted?, :to_key, to: :model
-      alias_method :to_model, :model
+      alias to_model model
 
       class << self
         delegate :model_name, to: :attributes
@@ -152,7 +152,6 @@ module ROM
       def attributes
         self.class.attributes[params]
       end
-
     end
   end
 end

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

@@ -76,8 +76,8 @@ module ROM
         def inherited(klass)
           klass.inject_commands_for(*injectible_commands) if injectible_commands
           klass.commands(*self_commands) if self_commands
-          input_blocks.each{|block| klass.input(readers: false, &block) }
-          validation_blocks.each{|block| klass.validations(&block) }
+          input_blocks.each { |block| klass.input(readers: false, &block) }
+          validation_blocks.each { |block| klass.validations(&block) }
           super
         end
 
@@ -359,7 +359,7 @@ module ROM
           @validator = ClassBuilder.new(name: "#{name}::Validator", parent: Object).call { |klass|
             klass.send(:include, ROM::Model::Validator)
           }
-          validation_blocks.each{|validation| @validator.class_eval(&validation) }
+          validation_blocks.each { |validation| @validator.class_eval(&validation) }
           update_const(:Validator, @validator)
         end
 
@@ -403,7 +403,7 @@ module ROM
                   {}
                 end
 
-              commands[rel_name] = CommandRegistry.new(elements, options)
+              commands[rel_name] = CommandRegistry.new(rel_name, elements, options)
             end
           end
 

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

@@ -8,7 +8,6 @@ module ROM
       #
       # @api private
       class ErrorProxy < SimpleDelegator
-
         # @api private
         def initialize
           super ActiveModel::Errors.new([])
@@ -48,9 +47,7 @@ module ROM
         def success?
           !present?
         end
-
       end
-
     end
   end
 end

data/lib/rom/rails/railtie.rb

@@ -27,9 +27,10 @@ module ROM
       end
 
       initializer 'rom.adjust_eager_load_paths' do |app|
-        paths = COMPONENT_DIRS.map do |directory|
-          root.join('app', directory).to_s
-        end
+        paths =
+          auto_registration_paths.inject([]) do |result, root_path|
+            result.concat(COMPONENT_DIRS.map { |dir| root_path.join('app', dir).to_s })
+          end
 
         app.config.eager_load_paths -= paths
       end
@@ -49,6 +50,7 @@ module ROM
       # @example
       #   ROM::Rails::Railtie.configure do |config|
       #     config.gateways[:default] = [:yaml, 'yaml:///data']
+      #     config.auto_registration_paths += [MyEngine.root]
       #   end
       #
       # @api public
@@ -69,7 +71,11 @@ module ROM
       # @api private
       def create_container
         configuration = create_configuration
-        configuration.auto_registration(root.join("app"), namespace: false)
+
+        auto_registration_paths.each do |root_path|
+          configuration.auto_registration(root_path.join('app'), namespace: false)
+        end
+
         ROM.container(configuration)
       end
 
@@ -95,7 +101,9 @@ module ROM
       end
 
       def load_initializer
-        load "#{root}/config/initializers/rom.rb" rescue LoadError
+        load "#{root}/config/initializers/rom.rb"
+      rescue LoadError
+        # do nothing
       end
 
       # @api private
@@ -112,6 +120,10 @@ module ROM
         ROM.env
       end
 
+      def auto_registration_paths
+        config.rom.auto_registration_paths + [root]
+      end
+
       # @api private
       def active_record?
         defined?(::ActiveRecord)

data/lib/rom/rails/version.rb

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

data/log

@@ -0,0 +1 @@
+spec/dummy/log

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', '~> 1.0.0'
-  spec.add_runtime_dependency 'rom-model', '~> 0.2.0'
+  spec.add_runtime_dependency 'rom', '~> 2.0'
+  spec.add_runtime_dependency 'rom-support', '~> 2.0'
+  spec.add_runtime_dependency 'rom-model', '~> 0.3'
   spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
   spec.add_runtime_dependency 'addressable', '~> 2.3'
   spec.add_runtime_dependency 'charlatan', '~> 0.1'
@@ -27,5 +28,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rubocop", "~> 0.28.0"
+  spec.add_development_dependency "rubocop", "~> 0.28"
 end

data/spec/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'

data/spec/dummy/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Rails.application

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

@@ -2,4 +2,5 @@ ROM::Rails::Railtie.configure do |config|
   scheme = RUBY_ENGINE == 'jruby' ? 'jdbc:sqlite' : 'sqlite'
   config.gateways[:default] = [:sql, "#{scheme}://#{Rails.root}/db/#{Rails.env}.sqlite3"]
   config.gateways[:test] = [:test_adapter, foo: :bar]
+  config.auto_registration_paths += [Rails.root.join('lib', 'additional_app')]
 end

data/spec/dummy/db/migrate/20141110205016_add_users.rb

@@ -1,6 +1,6 @@
 ROM::SQL.migration do
   change do
-    create_table(:users) do |t|
+    create_table(:users) do
       primary_key :id
       String :name
       String :email

data/spec/dummy/db/migrate/20150202194440_create_tasks.rb

@@ -1,6 +1,6 @@
 ROM::SQL.migration do
   change do
-    create_table(:tasks) do |t|
+    create_table(:tasks) do
       primary_key :id
       String :title
     end

data/spec/dummy/db/migrate/20150403194906_create_tags.rb

@@ -1,6 +1,6 @@
 ROM::SQL.migration do
   change do
-    create_table(:tags) do |t|
+    create_table(:tags) do
       primary_key :id
       String :name
     end

data/spec/dummy/lib/additional_app/app/commands/create_additional_task.rb

@@ -0,0 +1,5 @@
+class CreateAdditionalTask < ROM::Commands::Create[:sql]
+  relation :tasks
+  register_as :create_additional
+  result :one
+end

data/spec/integration/initializer_spec.rb

@@ -8,4 +8,8 @@ describe 'ROM initializer' do
     expect(rom.gateways[:test]).to eql(gateway)
     expect(rom.relations.dummy).to eql(relation)
   end
+
+  it 'loads commands from additionall auto_registration_paths' do
+    expect(rom.commands.tasks.create_additional).to be_a(CreateAdditionalTask)
+  end
 end

data/spec/lib/active_record/configuration_spec.rb

@@ -105,13 +105,13 @@ describe ROM::Rails::ActiveRecord::Configuration do
           username: 'root',
           password: 'password',
           database: 'database',
-          host: 'example.com',
+          host: 'example.com'
         }
 
         expected_uri = 'mysql2://root:password@example.com/database'
         expected_uri = "jdbc:#{expected_uri}" if RUBY_ENGINE == 'jruby'
 
-        expect(read(config)).to eq uri: expected_uri, options: {pool: 5}
+        expect(read(config)).to eq uri: expected_uri, options: { pool: 5 }
       end
     end
   end

data/spec/lib/generators/form_generator_spec.rb

@@ -77,7 +77,6 @@ describe ROM::Generators::FormGenerator do
   end
 
   shared_examples_for "generates an edit user form" do
-
     it "populates a edit form file" do
       expect(destination_root).to have_structure {
         directory 'app' do
@@ -138,6 +137,4 @@ describe ROM::Generators::FormGenerator do
     it_should_behave_like "generates a base user form"
     it_should_behave_like "generates an edit user form"
   end
-
-
 end

data/spec/lib/generators/mapper_generator_spec.rb

@@ -8,6 +8,7 @@ describe ROM::Generators::MapperGenerator do
   before(:all) do
     prepare_destination
     run_generator ['users']
+    run_generator ['app_user']
   end
 
   specify do
@@ -30,6 +31,23 @@ describe ROM::Generators::MapperGenerator do
               end
             CONTENT
           end
+
+          file 'app_user_mapper.rb' do
+            contains <<-CONTENT.strip_heredoc
+              class AppUserMapper < ROM::Mapper
+                relation :app_users
+
+                register_as :app_user
+
+                # specify model and attributes ie
+                #
+                # model AppUser
+                #
+                # attribute :name
+                # attribute :email
+              end
+            CONTENT
+          end
         end
       end
     }

data/spec/lib/generators/relation_generator_spec.rb

@@ -58,5 +58,4 @@ describe ROM::Generators::RelationGenerator, type: :generator do
     relation = File.read(File.join(destination_root, 'app', 'relations', 'users_relation.rb'))
     expect(relation).to include("register_as :profiles")
   end
-
 end

data/spec/spec_helper.rb

@@ -22,6 +22,7 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
   config.order = "random"
+  config.example_status_persistence_file_path = "tmp/examples.txt"
 
   config.before(:suite) do
     conn = rom.gateways[:default].connection

data/spec/unit/form_spec.rb

@@ -199,7 +199,7 @@ describe 'Form' do
 
   describe "#errors" do
     context "with a new model" do
-      it "exposes an activemodel compatible error"  do
+      it "exposes an activemodel compatible error" do
         errors = form.build({}).errors
 
         expect(errors).to respond_to(:[])
@@ -220,9 +220,9 @@ describe 'Form' do
           attribute :email, String
         end
 
-        def commit!(*args)
+        def commit!(*)
           users.try {
-            raise ROM::SQL::ConstraintError.new(RuntimeError.new("duplicate key"))
+            raise ROM::SQL::ConstraintError, RuntimeError.new("duplicate key")
           }
         end
       end
@@ -362,7 +362,5 @@ describe 'Form' do
 
       expect(child_form.validator).to_not be(form.validator)
     end
-
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rom-support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rom-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -154,14 +168,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: '0.28'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: '0.28'
 description: 
 email:
 - piotr.solnica@gmail.com
@@ -178,6 +192,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- db
 - lib/generators/rom.rb
 - lib/generators/rom/commands/templates/create.rb.erb
 - lib/generators/rom/commands/templates/delete.rb.erb
@@ -202,6 +217,7 @@ files:
 - lib/rom/rails/railtie.rb
 - lib/rom/rails/tasks/db.rake
 - lib/rom/rails/version.rb
+- log
 - rom-rails.gemspec
 - spec/dummy/.rspec
 - spec/dummy/README.rdoc
@@ -250,6 +266,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/assets/.keep
 - spec/dummy/lib/rom/test_adapter.rb
 - spec/dummy/lib/tasks/.keep
@@ -296,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Integrate Ruby Object Mapper with Rails
@@ -348,6 +365,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/assets/.keep
 - spec/dummy/lib/rom/test_adapter.rb
 - spec/dummy/lib/tasks/.keep