rom-rails 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d81f44c9999447bf6ccdc64f6529bc1fd614d19d
-  data.tar.gz: 4114017307dfae118382f978f1433ff1869595d3
+  metadata.gz: c71af912d846495ada02031cada0f862e572ae3a
+  data.tar.gz: f4a68403dd222af657cbea87ab6531be66f27191
 SHA512:
-  metadata.gz: 9fbf68d09cc7cd8f92460fb60eac6c54badc9200763347080f879c377de8638467ae9441be6d6095cc553d9328341c8cdb0f2e1a2f5a68973623e27bf4c5bcfe
-  data.tar.gz: 8dc7266b70cc95434bcbf162b01d356c381f17cd8bda8defa3326eb397535f5aeb4be227e1d5d19ae896440dae57e2f8ed627dd675f8c51c491567c3758af3ab
+  metadata.gz: 28d19550136b0bf857f3728edfe5a374426f9612d719cb37ffbf63868f7673af93cdeb837fea2a34e70861ea532942f720a72740d0cdad680060cc475a75fff7
+  data.tar.gz: 12c820a8f0ffdb019fc53dba13f6f90f573e2cff9bc7a04b7361ee48ee906fd45b6d485611373dde921df2e48200bab14a5b1595576081a719ecb119b1bd4e67

data/.travis.yml

@@ -4,15 +4,21 @@ cache: bundler
 bundler_args: --without yard guard benchmarks
 script: "RAILS_ENV=test bundle exec rake app:db:reset app:spec"
 rvm:
-  - 2.1
-  - 2.2
+  - 2.2.2
   - 2.3.1
   - rbx-2
   - jruby-9.0.5.0
   - ruby-head
+env:
+  - RAILS_VERSION=5.0.0
+  - RAILS_VERSION=4.2.0
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: rbx-2
+  exclude:
+    - rvm: rbx-2
+      env: RAILS_VERSION=5.0.0
 notifications:
   webhooks:
     urls:

data/CHANGELOG.md

@@ -1,8 +1,31 @@
-## v0.6.0 to-be-released
+## v0.8.0 2016-08-08
+### Changed
+
+- Updated to work with Rails 5 (cflipse)
+- Form validations are now handled entirely within form (cflipse)
+- [Rails5] when applicable, parmeters are converted to unsafe hash (cflipse)
+
+### Deprecated
+- Dropping support for ruby 2.1 and below
+
+## v0.7.0 2016-07-27
+
+### Changed
+- Updated to work with rom 2.0
+- Loosen Gem dependencies for Rails 4.2
+- Allow multiple auto_registration paths (vbyno) 
 
-Updated to work with new ROM configuration API.
+[Compare v0.6.0...v0.7.0](https://github.com/rom-rb/rom-rails/compare/v0.6.0...v0.7.0)
+
+### Fixed
+- Fixed generated mapper's `register_as` (duduribeiro)
+
+## v0.6.0 2016-01-06
+
+### Changed
+- Updated to work with new ROM configuration API.
 
-[Compare v0.6.0...HEAD](https://github.com/rom-rb/rom-rails/compare/v0.6.0...HEAD)
+[Compare v0.5.0...v0.6.0](https://github.com/rom-rb/rom-rails/compare/v0.5.0...v0.6.0)
 
 ## v0.5.0 2015-08-19
 

data/Gemfile

@@ -2,15 +2,16 @@ source 'https://rubygems.org'
 
 gemspec
 
-RAILS_VERSION = '~> 4.2.4'.freeze
+RAILS_VERSION = ENV.fetch("RAILS_VERSION", '5.0.0').freeze
 
 %w(railties actionview actionpack activerecord).each do |name|
-  gem name, RAILS_VERSION
+  gem name, "~> #{RAILS_VERSION}"
 end
 
 gem 'sqlite3', platforms: [:mri, :rbx]
 gem 'byebug', platforms: :mri
 gem 'rom-sql', '~> 0.8'
+gem 'rom-model', github: 'rom-rb/rom-model', branch: 'master'
 
 platforms :jruby do
   gem 'jdbc-sqlite3'

data/README.md

@@ -35,7 +35,7 @@ To run tests:
 You can read more about ROM and Rails on the official website:
 
 * [Introduction to ROM](http://rom-rb.org/learn/)
-* [Rails setup](http://rom-rb.org/learn/setup/rails/)
+* [Rails setup](http://rom-rb.org/learn/getting-started/rails-setup/)
 
 
 ## Community

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

@@ -92,8 +92,9 @@ module ROM
 
       # @api private
       def initialize(params = {}, options = {})
-        @params = params
-        @model  = self.class.model.new(params.merge(options.slice(*self.class.key)))
+        @params = params.respond_to?(:to_unsafe_hash) ?
+          params.to_unsafe_hash : params
+        @model  = self.class.model.new(params.to_h.merge(options.slice(*self.class.key)))
         @result = nil
         @errors = ErrorProxy.new
         options.each { |key, value| instance_variable_set("@#{key}", value) }
@@ -114,9 +115,9 @@ module ROM
       #
       # @api public
       def save(*args)
-        @errors.clear
-        @result = commit!(*args)
+        validate!
 
+        @result = commit!(*args) unless @errors.present?
         @errors.set @result.error if result.respond_to? :error
 
         self
@@ -136,6 +137,7 @@ module ROM
       # @api public
       def validate!
         @errors.clear
+        return unless defined? self.class::Validator
         validator = self.class::Validator.new(attributes)
         validator.validate
 

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

@@ -428,7 +428,6 @@ module ROM
           klass = ConfigurationDSL::Command.build_class(name, rel_name, adapter: adapter)
 
           klass.result :one
-          klass.validator @validator
 
           relation = rom.relations[rel_name]
           gateway = rom.gateways[relation.gateway]

data/lib/rom/rails/version.rb

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

data/rom-rails.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'addressable', '~> 2.3'
   spec.add_runtime_dependency 'charlatan', '~> 0.1'
   spec.add_runtime_dependency 'virtus', '~> 1.0', '>= 1.0.5'
-  spec.add_runtime_dependency 'railties', ['>= 3.0', '< 5.0']
+  spec.add_runtime_dependency 'railties', '>= 3.0', '< 6.0'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/spec/dummy/app/commands/create_task_with_validations.rb

@@ -0,0 +1,11 @@
+class CreateTaskWithValidations < CreateTask
+  register_as :create_task_with_validations
+
+  class Validator
+    include ROM::Model::Validator
+
+    validates :title, presence: true
+  end
+
+  validator Validator
+end

data/spec/dummy/config/application.rb

@@ -10,8 +10,6 @@ require 'rspec-rails'
 
 module Dummy
   class Application < Rails::Application
-    config.assets.enabled = false
-
     require 'rom/test_adapter'
   end
 end

data/spec/integration/form_with_command_validation_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe 'Form with command supplied validations' do
+
+  subject(:form) { form_class.build(params) }
+
+  let(:params) {{}}
+
+  let(:form_class) do
+    Class.new(ROM::Model::Form) do
+      inject_commands_for :tasks
+
+      input do
+        set_model_name 'Task'
+
+        attribute :title
+      end
+
+      def commit!
+        tasks.try { tasks.create_task_with_validations.call(attributes) }
+      end
+    end
+  end
+
+
+  it "copies validation errors from command" do
+    form.save
+
+    errors = form.errors
+    expect(errors[:title]).to be_present
+  end
+
+end

data/spec/unit/form_spec.rb

@@ -187,12 +187,12 @@ describe 'Form' do
 
   describe '#save' do
     it 'commits the form without extra args' do
-      result = form.build({}).save.result
+      result = form.build({email: 'jdoe@example.com'}).save.result
       expect(result).to eql('it works []')
     end
 
     it 'commits the form with extra args' do
-      result = form.build({}).save(1, 2, 3).result
+      result = form.build({email: 'jdoe@example.com'}).save(1, 2, 3).result
       expect(result).to eql('it works [1, 2, 3]')
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -123,7 +123,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,6 @@ 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
@@ -217,12 +216,12 @@ 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
 - spec/dummy/Rakefile
 - spec/dummy/app/commands/create_task.rb
+- spec/dummy/app/commands/create_task_with_validations.rb
 - spec/dummy/app/commands/delete_user.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/users_controller.rb
@@ -280,6 +279,7 @@ files:
 - spec/dummy/vendor/assets/stylesheets/.keep
 - spec/features/users_spec.rb
 - spec/integration/activerecord_setup.rb
+- spec/integration/form_with_command_validation_spec.rb
 - spec/integration/form_with_injected_commands_spec.rb
 - spec/integration/initializer_spec.rb
 - spec/integration/logger_spec.rb
@@ -313,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Integrate Ruby Object Mapper with Rails
@@ -322,6 +322,7 @@ test_files:
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/commands/create_task.rb
+- spec/dummy/app/commands/create_task_with_validations.rb
 - spec/dummy/app/commands/delete_user.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/users_controller.rb
@@ -379,6 +380,7 @@ test_files:
 - spec/dummy/vendor/assets/stylesheets/.keep
 - spec/features/users_spec.rb
 - spec/integration/activerecord_setup.rb
+- spec/integration/form_with_command_validation_spec.rb
 - spec/integration/form_with_injected_commands_spec.rb
 - spec/integration/initializer_spec.rb
 - spec/integration/logger_spec.rb

data/db

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

data/log

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