rom 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f71a2cbfa094787fbd2ca709cd2c229aca10799
-  data.tar.gz: 73f461e9a6e50aec0d632f4332137fc389d57a70
+  metadata.gz: d5a38d2264b1f215a3dbcccadc91a7031358ab0d
+  data.tar.gz: 69054a1fdda6257167af21e190e6574f89d192ad
 SHA512:
-  metadata.gz: a74fec1aaf8c1d5f0feb8b2128fa4db3c0ec31cf7018f8905ef396e3a614d071f17d7f60f2bd3411ca887efdbb9959faa3e73f0082fa3cbedcf43a95efd93286
-  data.tar.gz: 1ad96805142be1ac15bb329109e251c8c4170ce2c42f6fc409b7351899bb8ae283686241b414a7f1ff1bb08dc4b1b10f0ff59da2ad4e0d46f2e3c8e90f1dbf62
+  metadata.gz: 66241774ced83118c07f10e9266e1094f6e7211f7d194983a43779deca602ca734ee2ee79461af90b190b033057cd2aad3a296fc12b1804aae0851cbbb48fc33
+  data.tar.gz: 394fdb0895e9d020540b73ff39ae7fe8cf3051294f03d6c0f17584dafba6110130dc5c5ed26324ad6fbda311000027696a127531e00ef644ddfbfb226e01c098

data/CHANGELOG.md

@@ -1,7 +1,20 @@
+## v0.8.1 2015-07-12
+
+### Fixed
+
+* `ROM::CommandError` properly sets original error and backtrace (solnic)
+
+### Changed
+
+* Internal transproc processor has been updated to the new API (solnic)
+
+[Compare v0.8.0...v0.8.1](https://github.com/rom-rb/rom/compare/v0.8.0...v0.8.1)
+
 ## v0.8.0 2015-06-22
 
 ### Added
 
+* Commands can be combined into a single command that can work with a nested input (solnic)
 * New `step` mapper operation that allows multistep transformations inside a single mapper (dekz)
 * New `ungroup` and `unfold` mapper operations inverse `group` and `fold` (nepalez)
 * Support deep nesting of `unwrap` mapper operations (nepalez)

data/README.md

@@ -14,26 +14,28 @@
 [![Test Coverage](https://codeclimate.com/github/rom-rb/rom/badges/coverage.svg)][codeclimate]
 [![Inline docs](http://inch-ci.org/github/rom-rb/rom.svg?branch=master&style=flat)][inchpages]
 
-Ruby Object Mapper (ROM) is an experimental Ruby library with the goal to
-provide powerful object mapping capabilities without limiting the full power of
-your datastore.
+Ruby Object Mapper (ROM) is a data mapping and persistence toolkit for Ruby
+with the goal to provide powerful object mapping capabilities without limiting the
+full power of your datastore.
 
 Learn more:
 
 * [Introduction](http://rom-rb.org/introduction/)
-* [Rails tutorial](http://rom-rb.org/tutorials/todo-app-with-rails/)
+* [Guides](http://rom-rb.org/introduction/)
+* [Tutorials](http://rom-rb.org/tutorials/)
 
 ## Adapters
 
   * [rom-sql](https://github.com/rom-rb/rom-sql)
   * [rom-yesql](https://github.com/rom-rb/rom-yesql)
+  * [rom-couchdb](https://github.com/rom-rb/rom-couchdb)
   * [rom-mongo](https://github.com/rom-rb/rom-mongo)
-  * [rom-yaml](https://github.com/rom-rb/rom-yaml)
-  * [rom-csv](https://github.com/rom-rb/rom-csv)
   * [rom-neo4j](https://github.com/rom-rb/rom-neo4j)
   * [rom-event_store](https://github.com/rom-rb/rom-event_store)
   * [rom-influxdb](https://github.com/rom-rb/rom-influxdb)
   * [rom-rethinkdb](https://github.com/rom-rb/rom-rethinkdb)
+  * [rom-yaml](https://github.com/rom-rb/rom-yaml)
+  * [rom-csv](https://github.com/rom-rb/rom-csv)
 
 See [issues](https://github.com/rom-rb/rom/issues?q=is%3Aopen+is%3Aissue+label%3Aadapter+label%3Afeature)
 for a list of adapters that are planned to be added soon.
@@ -44,64 +46,6 @@ for a list of adapters that are planned to be added soon.
 * [rom-rails](https://github.com/rom-rb/rom-rails)
 * [rom-roda](https://github.com/rom-rb/rom-roda)
 
-## Synopsis
-
-``` ruby
-ROM.setup(:memory)
-
-# This is our domain-specific class
-class User
-  attr_reader :name, :age
-
-  def initialize(attributes)
-    @name, @age = attributes.values_at(:name, :age)
-  end
-end
-
-# Here we define user relation which encapsulates accessing user data that
-# we can map to domain objects
-class Users < ROM::Relation[:memory]
-  def by_name(name)
-    restrict(name: name)
-  end
-
-  def adults
-    restrict { |user| user[:age] >= 18 }
-  end
-end
-
-# Even though mappers can be derived from model definitions here's how you
-# could define it explicitly
-class UserMapper < ROM::Mapper
-  relation :users
-  register_as :entity
-
-  model User
-
-  attribute :name
-  attribute :age
-end
-
-# You can define specialized commands that handle creating, updating and deleting
-# data, those classes can use external input param handlers and validators too
-class CreateUser < ROM::Commands::Create[:memory]
-  register_as :create
-  relation :users
-  result :one
-end
-
-# finalize the setup and retrieve object registry (aka ROM env)
-rom = ROM.finalize.env
-
-# accessing defined commands
-rom.command(:users).create.call(name: "Joe", age: 17)
-rom.command(:users).create.call(name: "Jane", age: 18)
-
-# reading relations using defined mappers
-puts rom.relation(:users) { |r| r.by_name("Jane").adults }.as(:entity).to_a.inspect
-# => [#<User:0x007fdba161cc48 @id=2, @name="Jane", @age=18>]
-```
-
 ## ROADMAP
 
 ROM is on its way towards 1.0.0. You can see an overview of tasks scheduled for 1.0.0 on our [waffle board](https://waffle.io/rom-rb/rom?label=1.0.0). Please notice that most of the 1.0.0 features/changes will become part of minor (0.x) upgrades before 1.0.0 final gets released.

data/lib/rom/constants.rb

@@ -33,7 +33,8 @@ module ROM
     def initialize(command, err)
       super("command: #{command.inspect}; original message: #{err.message}")
       @command = command
-      @original_error = original_error
+      @original_error = err
+      set_backtrace(err.backtrace)
     end
   end
 

data/lib/rom/processor/transproc.rb

@@ -14,6 +14,23 @@ module ROM
     class Transproc < Processor
       include ::Transproc::Composer
 
+      module Functions
+        extend ::Transproc::Registry
+
+        import ::Transproc::Coercions
+        import ::Transproc::ArrayTransformations
+        import ::Transproc::HashTransformations
+        import ::Transproc::ClassTransformations
+
+        def self.identity(tuple)
+          tuple
+        end
+
+        def self.filter_empty(arr)
+          arr.reject { |row| row.values.all?(&:nil?) }
+        end
+      end
+
       # @return [Header] header from a mapper
       #
       # @api private
@@ -34,14 +51,6 @@ module ROM
       # @api private
       attr_reader :row_proc
 
-      # Default no-op row_proc
-      EMPTY_FN = -> tuple { tuple }.freeze
-
-      # Filter out empty tuples from an array
-      FILTER_EMPTY = Transproc(
-        -> arr { arr.reject { |row| row.values.all?(&:nil?) } }
-      )
-
       # Build a transproc function from the header
       #
       # @param [ROM::Header] header
@@ -67,7 +76,7 @@ module ROM
       #
       # @api private
       def to_transproc
-        compose(EMPTY_FN) do |ops|
+        compose(t(:identity)) do |ops|
           combined = header.combined
           ops << t(:combine, combined.map(&method(:combined_args))) if combined.any?
           ops << header.preprocessed.map { |attr| visit(attr, true) }
@@ -207,7 +216,7 @@ module ROM
 
           compose do |ops|
             ops << t(:group, name, keys)
-            ops << t(:map_array, t(:map_value, name, FILTER_EMPTY))
+            ops << t(:map_array, t(:map_value, name, t(:filter_empty)))
             ops << others.map { |attr|
               t(:map_array, t(:map_value, name, visit(attr, true)))
             }
@@ -262,7 +271,7 @@ module ROM
 
           compose do |ops|
             ops << t(:group, name, keys)
-            ops << t(:map_array, t(:map_value, name, FILTER_EMPTY))
+            ops << t(:map_array, t(:map_value, name, t(:filter_empty)))
             ops << t(:map_array, t(:fold, name, keys.first))
           end
         end
@@ -369,6 +378,11 @@ module ROM
       def new(*args)
         self.class.new(*args)
       end
+
+      # @api private
+      def t(*args)
+        Functions[*args]
+      end
     end
   end
 end

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.8.1'.freeze
 end

data/rom.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {spec}/*`.split("\n")
   gem.license       = 'MIT'
 
-  gem.add_runtime_dependency 'transproc', '~> 0.2', '>= 0.2.4'
+  gem.add_runtime_dependency 'transproc', '~> 0.3', '>= 0.3.0'
   gem.add_runtime_dependency 'equalizer', '~> 0.0', '>= 0.0.9'
 
   gem.add_development_dependency 'rake', '~> 10.3'

data/spec/integration/commands/graph_spec.rb

@@ -12,14 +12,14 @@ describe 'Building up a command graph for nested input' do
 
     setup.commands(:users) do
       define(:create) do
-        input Transproc(:accept_keys, [:name])
+        input T(:accept_keys, [:name])
         result :one
       end
     end
 
     setup.commands(:books) do
       define(:create) do
-        input Transproc(:accept_keys, [:title, :user])
+        input T(:accept_keys, [:title, :user])
 
         def execute(tuples, user)
           super(tuples.map { |t| t.merge(user: user.fetch(:name)) })
@@ -29,7 +29,7 @@ describe 'Building up a command graph for nested input' do
 
     setup.commands(:tags) do
       define(:create) do
-        input Transproc(:accept_keys, [:name, :task])
+        input T(:accept_keys, [:name, :task])
 
         def execute(tuples, task)
           super(tuples.map { |t| t.merge(task: task.fetch(:title)) })
@@ -41,7 +41,7 @@ describe 'Building up a command graph for nested input' do
   it 'creates a command graph for nested input :one result as root' do
     setup.commands(:tasks) do
       define(:create) do
-        input Transproc(:accept_keys, [:title, :user])
+        input T(:accept_keys, [:title, :user])
         result :one
 
         def execute(tuple, user)
@@ -102,7 +102,7 @@ describe 'Building up a command graph for nested input' do
   it 'creates a command graph for nested input with :many results as root' do
     setup.commands(:tasks) do
       define(:create) do
-        input Transproc(:accept_keys, [:title, :user])
+        input T(:accept_keys, [:title, :user])
 
         def execute(tuples, user)
           super(tuples.map { |t| t.merge(user: user.fetch(:name)) })
@@ -178,7 +178,7 @@ describe 'Building up a command graph for nested input' do
 
     setup.commands(:tasks) do
       define(:create) do
-        input Transproc(:accept_keys, [:title, :user])
+        input T(:accept_keys, [:title, :user])
 
         def execute(tuples, user)
           super(tuples.map { |t| t.merge(user: user.fetch(:name)) })

data/spec/spec_helper.rb

@@ -33,6 +33,10 @@ module Test
   end
 end
 
+def T(*args)
+  ROM::Processor::Transproc::Functions[*args]
+end
+
 RSpec.configure do |config|
   config.after do
     Test.remove_constants

data/spec/unit/rom/commands/graph_spec.rb

@@ -141,6 +141,14 @@ describe ROM::Commands::Graph do
         allow(command.nodes[0]).to receive(:call).and_raise(StandardError, 'ooops')
 
         expect { command.call }.to raise_error(ROM::CommandFailure, /oops/)
+
+        begin
+          command.call
+        rescue ROM::CommandFailure => e
+          expect(e.original_error).to be_a(ROM::CommandFailure)
+          expect(e.original_error.message).to include('ooops')
+          expect(e.backtrace).to eql(e.original_error.backtrace)
+        end
       end
     end
   end

data/spec/unit/rom/memory/commands/create_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 require 'rom/memory'
 
-describe ROM::Memory::Commands::Delete do
+describe ROM::Memory::Commands::Create do
   include_context 'users and tasks'
 
-  subject(:command) { ROM::Memory::Commands::Delete.build(users) }
+  subject(:command) { ROM::Memory::Commands::Create.build(users) }
 
   let(:users) { rom.relations[:users] }
 

data/spec/unit/rom/memory/commands/delete_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 require 'rom/memory'
 
-describe ROM::Memory::Commands::Create do
+describe ROM::Memory::Commands::Delete do
   include_context 'users and tasks'
 
-  subject(:command) { ROM::Memory::Commands::Create.build(users) }
+  subject(:command) { ROM::Memory::Commands::Delete.build(users) }
 
   let(:users) { rom.relations[:users] }
 

data/spec/unit/rom/relation/graph_spec.rb

@@ -7,7 +7,7 @@ describe ROM::Relation::Graph do
 
   it_behaves_like 'materializable relation' do
     let(:mapper) do
-      Transproc(:combine, [[:tasks, name: :name]])
+      T(:combine, [[:tasks, name: :name]])
     end
 
     let(:relation) do

data/spec/unit/rom/support/array_dataset_spec.rb

@@ -8,7 +8,7 @@ describe ROM::ArrayDataset do
       include ROM::ArrayDataset
 
       def self.row_proc
-        Transproc(:symbolize_keys)
+        T(:symbolize_keys)
       end
     end
   end

data/spec/unit/rom/support/enumerable_dataset_spec.rb

@@ -8,7 +8,7 @@ describe ROM::EnumerableDataset do
       include ROM::EnumerableDataset
 
       def self.row_proc
-        Transproc(:symbolize_keys)
+        T(:symbolize_keys)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: transproc
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement