rom-rails 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8841ce1317e0b85ca6e9df4bfcdbc30b0a3a545f
-  data.tar.gz: 2f9a18f403fcaf8bda465616937ebfcda0464ec7
+  metadata.gz: 9d21be75bbb9e3c79f408a7543e948cbbe5a2d48
+  data.tar.gz: 0c7bf6a32c50ceca32d4575f4840725f8b2d2ca6
 SHA512:
-  metadata.gz: bac7c987bad0abc06d290b68ebb7078330febd35ff76571cd0e4f240c89c4a494e67dcc519e860b2bae7552f6876691eecb641186b99c08178745da43e881293
-  data.tar.gz: 2d57f131b6515a8176c05fc7574b82aee3e8129385b026c8fa0accf296637427d5ae3e882336867eca2f84d379643e4661afb3d4ff94358e03a85b9a7d946d73
+  metadata.gz: e16b255e12b8b290652b9d9e19b8dcf585486f65544ee00ec91b537b969d485e035f64b6f8f38ac24c5b913913466dcba4d19221570274144cb2be08f359984e
+  data.tar.gz: f890b82c6a0b8c4b237db7a638ec31731f0e291c2a1ca800d80bc846a333adbcace7fd3b9e99f39af9085932f99dfb986d06a85bba79aa8c7480b278f1aeccae

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.ruby-version
 Gemfile.lock
 InstalledFiles
 _yardoc

data/.travis.yml

@@ -1,8 +1,10 @@
 language: ruby
+sudo: false
+cache: bundler
 bundler_args: --without yard guard benchmarks
 env:
   - CODECLIMATE_REPO_TOKEN=87c9080bda25bce8e63a294f99312345c144c0f6d5eedf400fd753356fbf7dcf
-script: "RAILS_ENV=test rake app:db:schema:load app:spec"
+script: "RAILS_ENV=test bundle exec rake app:db:schema:load app:spec"
 rvm:
   - 2.0
   - 2.1

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v0.2.1 2015-01-07
+
+### Changed
+
+* input params uses virtus' `:strict` mode by default (stevehodgkiss)
+
+### Fixed
+
+* `rom` extension is now mixed into ActionController::Base which addresses #12 (solnic)
+
 ## v0.2.0 2014-12-31
 
 ### Added

data/README.md

@@ -14,66 +14,22 @@
 [![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]
 
-Rails integration for [Ruby Object Mapper](https://github.com/rom-rb/rom).
+Rails integration for [Ruby Object Mapper](https://github.com/rom-rb/rom) which
+ships with:
 
-## Installation and setup
+* Params sanitizer/coercer extension
+* Validation extension based on `ActiveModel`
+* Relation generators
+* Mapper generators
+* Command generators
 
-In your Gemfile:
+## Resources
 
-```
-gem 'rom'
-gem 'rom-rails'
-```
+You can read more about ROM and Rails on the official website:
 
-## Schema
+* [Introduction to ROM](http://rom-rb.org/introduction)
+* [Rails tutorial](http://rom-rb.org/tutorials/rails)
 
-Defining schema is only required for adapters that don't support inferring schema
-automatically. This means if you're using `rom-sql` you don't have to define the schema.
-In other cases the railtie expects the schema to be in `db/rom/schema.rb` which
-is loaded before relations and mappers.
-
-## Relations and mappers
-
-The railtie automatically loads relations and mappers from `app/relations` and
-`app/mappers` and finalizes the environment afterwards. During the booting process
-rom's setup object is available via `Rails.application.config.rom.setup`.
-
-## Relations in controllers
-
-The recommended way of using relations in controllers is to specify which relations
-are needed for particular actions using a DSL provided by the railtie:
-
-``` ruby
-class UsersController < ApplicationController
-  relation 'users.index', only: :index
-  relation 'users.by_name', only: :search, requires: :name
-
-  def index
-    render
-  end
-
-  def search
-    render :index
-  end
-end
-```
-
-By doing this actions will have access to `users` which is also set as a helper
-method making it available in the views.
-
-This means **no database interaction will take place in the views or helpers**
-as ROM materializes relations when "injecting" them into controller actions.
-
-## Status
-
-This project is still in beta state. For examples of usage please take a look
-at `spec/dummy` app.
-
-Proper documentation will be added once the interface is stable.
-
-## Roadmap
-
-Please refer to [issues](https://github.com/rom-rb/rom-rails/issues).
 
 ## Community
 

data/lib/rom/model.rb

@@ -35,9 +35,11 @@ module ROM
     #
     # @api public
     module Params
+      VirtusModel = Virtus.model(strict: true, required: false)
+
       def self.included(base)
         base.class_eval do
-          include Virtus.model
+          include VirtusModel
           include ActiveModel::Validations
           include ActiveModel::Conversion
         end

data/lib/rom/rails/controller_extension.rb

@@ -8,7 +8,7 @@ module ROM
       end
 
       def rom
-        ::Rails.application.config.rom.env
+        ROM.env
       end
 
       module ClassExtensions

data/lib/rom/rails/railtie.rb

@@ -45,7 +45,7 @@ module ROM
           app.config.rom.setup!
           app.config.rom.load!
           app.config.rom.finalize!
-          ApplicationController.send(:include, ControllerExtension)
+          ActionController::Base.send(:include, ControllerExtension)
         end
       end
 

data/lib/rom/rails/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Rails
-    VERSION = "0.2.0".freeze
+    VERSION = "0.2.1".freeze
   end
 end

data/rom-rails.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'rom', '~> 0.5', '>= 0.5.0'
-  spec.add_runtime_dependency 'virtus', '~> 1.0'
+  spec.add_runtime_dependency 'virtus', '~> 1.0', '>= 1.0.4'
   spec.add_runtime_dependency 'railties', ['>= 3.0', '< 5.0']
 
   spec.add_development_dependency "bundler"

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

@@ -4,4 +4,8 @@ ROM.commands(:users) do
     validator UserValidator
     result :one
   end
+
+  define(:delete) do
+    result :one
+  end
 end

data/spec/dummy/spec/integration/user_commands_spec.rb

@@ -7,7 +7,7 @@ describe 'User commands' do
     it 'inserts user with valid params' do
       result = users.try { create(name: 'Jade') }
 
-      expect(result.value).to eql(id: 1, name: 'Jade')
+      expect(result.value).to eql(id: result.value[:id], name: 'Jade')
     end
 
     it 'returns error if params are not valid' do
@@ -18,4 +18,13 @@ describe 'User commands' do
       expect(result.error.messages[:name]).to include("can't be blank")
     end
   end
+
+  describe 'delete' do
+    it 'deletes record' do
+      users.create.call(name: 'Piotr')
+      result = users.try { delete(:by_name, 'Piotr') }
+
+      expect(result.error).to be(nil)
+    end
+  end
 end

data/spec/dummy/spec/integration/user_model_mapping_spec.rb

@@ -6,7 +6,7 @@ describe 'User model mapping' do
   let(:users) { rom.read(:users) }
 
   before do
-    rom.command(:users).create.call(name: 'Piotr')
+    rom.command(:users).try { create(name: 'Piotr') }
   end
 
   it 'works' do

data/spec/unit/model_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe ROM::Model::Params do
+  let(:klass) {
+    Class.new do
+      include ROM::Model::Params
+
+      attribute :name, String
+    end
+  }
+
+  it 'fails loudly when given an incorrect type' do
+    expect {
+      klass.new(name: [])
+    }.to raise_error(Virtus::CoercionError, /name/)
+  end
+
+  it 'does not fail on nil or missing attributes' do
+    expect {
+      klass.new
+    }.not_to raise_error
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -37,6 +37,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,6 +47,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -116,12 +122,10 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
-- LICENSE.txt
 - README.md
 - Rakefile
 - lib/generators/rom.rb
@@ -199,6 +203,7 @@ files:
 - spec/lib/generators/mapper_generator_spec.rb
 - spec/lib/generators/relation_generator_spec.rb
 - spec/spec_helper.rb
+- spec/unit/model_spec.rb
 homepage: http://rom-rb.org
 licenses:
 - MIT
@@ -219,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Integrate Ruby Object Mapper with Rails
@@ -284,4 +289,4 @@ test_files:
 - spec/lib/generators/mapper_generator_spec.rb
 - spec/lib/generators/relation_generator_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 
+- spec/unit/model_spec.rb

data/.ruby-version

@@ -1 +0,0 @@
-2.1

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2014 Piotr Solnica
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.