rom 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9513b27090115add08f6f4f4d8e446b7e805d0d8
-  data.tar.gz: 4a33b39b54ee48c1d551138688e864a3b6052970
+  metadata.gz: fef04bd27871ee67a85b39c0cfb4a2a9c588a01f
+  data.tar.gz: 6f5e0515a4cdd8d0df9816c574bf176aa9634783
 SHA512:
-  metadata.gz: 17c5de3ec96c11fcf6d95fd06c89ef1f76af66f6468bdbb139a421f5a7125ae1aae228021303b778e8150abf4a3650753ec164eb4aa393997e3a44cd42bbfcaf
-  data.tar.gz: 5ded7613f606353f66371b9bc537c6a24c30f72e58d8a741f24133e976fa2d898609ca56bd4bf41a993827b3bda3f937b69dbc1f9c7ce9b432439ddfad0a1786
+  metadata.gz: 9ea6324c33c9c7701ab5452f291d7c397e41062ea706c2345c66d167b9cad8e7914f39af536fa065cb76e3bdca612898bc89de9e0fa6d46a1e58a4c532b88576
+  data.tar.gz: 9954ad8c0413dc7e94d4170703b47dd3a80387a22236c37a86d71ce7b6a01b8588658673a0cd10224013cf7b166c6592f800585f5c2fa4ecc691825701d3dcb0

data/.rubocop.yml

@@ -6,10 +6,6 @@ AllCops:
   Exclude:
     - tmp/**/*
 
-# It’s quite readable when we know what we are doing
-Lint/AssignmentInCondition:
-  Enabled: false
-
 Style/BlockDelimiters:
   EnforcedStyle: semantic
   FunctionalMethods:

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## v0.7.1 2015-05-22
+
+### Added
+
+* Support for passing a block for custom coercion to `attribute` (gotar)
+* `fold` mapping operation which groups keys from input tuples to array
+  of values from the first of listed keys (nepalez)
+* Adapter `Relation` and command classes can specify `adapter` identifier
+  which allows using adapter-specific plugins w/o the need to specify adapter
+  when calling `use` (solnic)
+
+### Changed
+
+* [rom/memory] `restrict` operation supports array as a value (gotar)
+* [rom/memory] `restrict` operation supports regexp as a value (gotar)
+
+[Compare v0.7.0...HEAD](https://github.com/rom-rb/rom/compare/v0.7.0...HEAD)
+
 ## v0.7.0 2015-05-17
 
 ### Added

data/lib/rom/command.rb

@@ -9,7 +9,7 @@ module ROM
 
     include Equalizer.new(:relation, :options)
 
-    defines :relation, :result, :input, :validator, :register_as
+    defines :adapter, :relation, :result, :input, :validator, :register_as
 
     input Hash
     validator proc {}
@@ -85,7 +85,6 @@ module ROM
     #
     # @api public
     def self.use(plugin, options = {})
-      adapter = options.fetch(:adapter, :default)
       ROM.plugin_registry.commands.fetch(plugin, adapter).apply_to(self)
     end
 

data/lib/rom/header/attribute.rb

@@ -47,6 +47,8 @@ module ROM
           Unwrap
         elsif type.equal?(:hash)
           meta[:wrap] ? Wrap : Hash
+        elsif meta[:fold]
+          Group
         elsif type.equal?(:array)
           meta[:group] ? Group : Array
         else

data/lib/rom/mapper/attribute_dsl.rb

@@ -30,17 +30,22 @@ module ROM
         @reject_keys = options.fetch(:reject_keys)
       end
 
-      # Define a mapping attribute with its options
+      # Define a mapping attribute with its options and/or block
       #
       # @example
       #   dsl = AttributeDSL.new([])
       #
       #   dsl.attribute(:name)
       #   dsl.attribute(:email, from: 'user_email')
+      #   dsl.attribute(:name) { 'John' }
+      #   dsl.attribute(:name) { |t| t.upcase }
       #
       # @api public
-      def attribute(name, options = EMPTY_HASH)
+      def attribute(name, options = EMPTY_HASH, &block)
         with_attr_options(name, options) do |attr_options|
+          raise ArgumentError,
+            "can't specify type and block at the same time" if options[:type] && block
+          attr_options[:coercer] = block if block
           add_attribute(name, attr_options)
         end
       end
@@ -166,6 +171,26 @@ module ROM
         end
       end
 
+      # Define an embedded hash attribute that requires "fold" transformation
+      #
+      # Typically this is used in sql context to fold single joined field
+      # to the array of values.
+      #
+      # @example
+      #   dsl = AttributeDSL.new([])
+      #
+      #   dsl.fold(tags: [:name])
+      #
+      # @see AttributeDSL#embedded
+      #
+      # @api public
+      def fold(*args)
+        with_name_or_options(*args) do |name, *|
+          fold_options = { type: :array, fold: true }
+          dsl(name, fold_options)
+        end
+      end
+
       # Define an embedded combined attribute that requires "combine" transformation
       #
       # Typically this can be used to process results of eager-loading
@@ -192,7 +217,7 @@ module ROM
           type: options.fetch(:type, :array),
           keys: options.fetch(:on),
           combine: true,
-          header: dsl.header,
+          header: dsl.header
         }
 
         add_attribute(name, attr_opts)
@@ -260,7 +285,7 @@ module ROM
         dsl = new(options, &block)
         header = dsl.header
         add_attribute(name, options.update(header: header))
-        header.each { |attr| exclude(attr.key) }
+        header.each { |attr| exclude(attr.key) unless name == attr.key }
       end
 
       # Define attributes from the `name => attributes` hash syntax
@@ -272,7 +297,7 @@ module ROM
         hash.each do |name, header|
           with_attr_options(name, options) do |attr_options|
             add_attribute(name, attr_options.update(header: header.zip))
-            header.each { |attr| exclude(attr) }
+            header.each { |attr| exclude(attr) unless name == attr }
           end
         end
       end

data/lib/rom/memory/commands.rb

@@ -10,6 +10,8 @@ module ROM
       #
       # @api public
       class Create < ROM::Commands::Create
+        adapter :memory
+
         # @see ROM::Commands::Create#execute
         def execute(tuple)
           attributes = input[tuple]
@@ -22,6 +24,8 @@ module ROM
       #
       # @api public
       class Update < ROM::Commands::Update
+        adapter :memory
+
         # @see ROM::Commands::Update#execute
         def execute(params)
           attributes = input[params]
@@ -34,6 +38,8 @@ module ROM
       #
       # @api public
       class Delete < ROM::Commands::Delete
+        adapter :memory
+
         # @see ROM::Commands::Delete#execute
         def execute
           tuples = target.to_a

data/lib/rom/memory/dataset.rb

@@ -30,10 +30,15 @@ module ROM
       #
       # @api public
       def restrict(criteria = nil)
-        if criteria
-          find_all { |tuple| criteria.all? { |k, v| tuple[k].eql?(v) } }
-        else
-          find_all { |tuple| yield(tuple) }
+        return find_all { |tuple| yield(tuple) } unless criteria
+        find_all do |tuple|
+          criteria.all? do |k, v|
+            case v
+            when Array then v.include?(tuple[k])
+            when Regexp then tuple[k].match(v)
+            else tuple[k].eql?(v)
+            end
+          end
         end
       end
 

data/lib/rom/memory/relation.rb

@@ -10,6 +10,8 @@ module ROM
     class Relation < ROM::Relation
       include Enumerable
 
+      adapter :memory
+
       forward :take, :join, :project, :restrict, :order
 
       # Insert tuples into the relation

data/lib/rom/plugin_registry.rb

@@ -129,6 +129,6 @@ module ROM
         raise(UnknownPluginError, name)
     end
 
-    alias [] fetch
+    alias_method :[], :fetch
   end
 end

data/lib/rom/processor/transproc.rb

@@ -91,13 +91,18 @@ module ROM
 
       # Visit plain attribute
       #
+      # It will call block transformation if it's used
+      #
       # If it's a typed attribute a coercion transformation is added
       #
       # @param [Header::Attribute] attribute
       #
       # @api private
       def visit_attribute(attribute)
-        if attribute.typed?
+        coercer = attribute.meta[:coercer]
+        if coercer
+          t(:map_value, attribute.name, coercer)
+        elsif attribute.typed?
           t(:map_value, attribute.name, t(:"to_#{attribute.type}"))
         end
       end
@@ -189,6 +194,7 @@ module ROM
           name = attribute.name
           header = attribute.header
           keys = attribute.tuple_keys
+          fold = attribute.meta[:fold]
 
           other = header.groups
 
@@ -196,9 +202,13 @@ module ROM
             ops << t(:group, name, keys)
             ops << t(:map_array, t(:map_value, name, FILTER_EMPTY))
 
-            ops << other.map { |attr|
-              t(:map_array, t(:map_value, name, visit_group(attr, true)))
-            }
+            if fold
+              ops << t(:map_array, t(:fold, name, keys.first))
+            else
+              ops << other.map { |attr|
+                t(:map_array, t(:map_value, name, visit_group(attr, true)))
+              }
+            end
           end
         else
           visit_array(attribute)

data/lib/rom/relation/class_interface.rb

@@ -12,11 +12,12 @@ module ROM
       def inherited(klass)
         super
 
+        klass.extend ClassMacros
+        klass.defines :adapter
+
         return if klass.superclass == ROM::Relation
 
         klass.class_eval do
-          extend ClassMacros
-
           use :registry_reader
 
           defines :repository, :dataset, :register_as, :exposed_relations
@@ -128,7 +129,6 @@ module ROM
       #
       # @api public
       def use(plugin, options = {})
-        adapter = options.fetch(:adapter, :default)
         ROM.plugin_registry.relations.fetch(plugin, adapter).apply_to(self)
       end
 

data/lib/rom/support/deprecations.rb

@@ -6,8 +6,9 @@ module ROM
         define_method(old_name) do |*args, &block|
           warn <<-MSG.gsub(/^\s+/, '')
             #{self.class}##{old_name} is deprecated and will be removed in 1.0.0.
-            Please use #{self.class}##{new_name} instead."
+            Please use #{self.class}##{new_name} instead.
             #{msg}
+            #{caller.detect { |l| !l.include?('lib/rom')}}
           MSG
           __send__(new_name, *args, &block)
         end

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.7.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.1'
+  gem.add_runtime_dependency 'transproc', '~> 0.2', '>= 0.2.2'
   gem.add_runtime_dependency 'equalizer', '~> 0.0', '>= 0.0.9'
 
   gem.add_development_dependency 'rake', '~> 10.3'

data/spec/integration/mappers/fold_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe 'Mapper definition DSL' do
+  include_context 'users and tasks'
+
+  let(:header) { mapper.header }
+
+  describe 'folded relation mapper' do
+    before do
+      setup.relation(:tasks) do
+        def with_users
+          join(users)
+        end
+      end
+
+      setup.relation(:users) do
+        def with_tasks
+          join(tasks)
+        end
+      end
+    end
+
+    let(:rom) { setup.finalize }
+    let(:actual) do
+      rom.relation(:users).with_tasks.map_with(:users).to_a
+    end
+
+    it 'groups all attributes and folds the first key' do
+      setup.mappers do
+        define(:users) do
+          fold tasks: [:title, :priority]
+        end
+      end
+
+      expect(actual).to eql [
+        { name: 'Joe', email: 'joe@doe.org', tasks: ['be nice', 'sleep well'] },
+        { name: 'Jane', email: 'jane@doe.org', tasks: ['be cool'] }
+      ]
+    end
+
+    it 'is sensitive to the order of keys' do
+      setup.mappers do
+        define(:users) do
+          fold priorities: [:priority, :title]
+        end
+      end
+
+      expect(actual).to eql [
+        { name: 'Joe', email: 'joe@doe.org', priorities: [1, 2] },
+        { name: 'Jane', email: 'jane@doe.org', priorities: [2] }
+      ]
+    end
+  end
+end

data/spec/integration/mappers/group_spec.rb

@@ -158,5 +158,27 @@ describe 'Mapper definition DSL' do
         ])
       )
     end
+
+    it 'allows defining grouped attributes with the same name as their keys' do
+      setup.mappers do
+        define(:with_tasks, parent: :users) do
+
+          attribute :name
+          attribute :email
+
+          group title: [:title, :priority]
+        end
+      end
+
+      rom = setup.finalize
+
+      jane = rom.relation(:users).with_tasks.map_with(:with_tasks).to_a.last
+
+      expect(jane).to eql(
+        name: 'Jane',
+        email: 'jane@doe.org',
+        title: [{ title: 'be cool', priority: 2 }]
+      )
+    end
   end
 end

data/spec/integration/mappers/overwrite_attributes_value_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+require 'rom/memory'
+
+describe 'Mappers / Attributes value' do
+  let(:setup) { ROM.setup(:memory) }
+
+  before do
+    setup.relation(:users)
+  end
+
+  it 'allows to manipulate attribute value' do
+    class Test::UserMapper < ROM::Mapper
+      relation :users
+
+      attribute :id
+      attribute :name, from: :first_name do
+        'John'
+      end
+      attribute :age do
+        9+9
+      end
+      attribute :weight do |t|
+        t+15
+      end
+    end
+
+    rom = setup.finalize
+
+    rom.relations.users << {
+      id: 123,
+      first_name: 'Jane',
+      weight: 75
+    }
+
+    jane = rom.relation(:users).as(:users).first
+
+    expect(jane).to eql(id: 123, name: 'John', weight: 90, age: 18)
+  end
+
+  it 'raise ArgumentError if type and block used at the same time' do
+    expect {
+      class Test::UserMapper < ROM::Mapper
+        relation :users
+
+        attribute :name, type: :string do
+          'John'
+        end
+      end
+    }.to raise_error(ArgumentError, "can't specify type and block at the same time")
+  end
+end

data/spec/support/mutant.rb

@@ -2,7 +2,7 @@ module Mutant
   class Selector
     # Expression based test selector
     class Expression < self
-      def call(subject)
+      def call(_subject)
         integration.all_tests
       end
     end # Expression

data/spec/unit/rom/memory/relation_spec.rb

@@ -49,6 +49,20 @@ describe ROM::Memory::Relation do
         { name: 'Joe', email: 'joe@doe.org', age: 12 }
       ])
     end
+
+    it 'allows to use array as a value' do
+      expect(relation.restrict(age: [10, 11])).to match_array([
+        { name: 'Jane', email: 'jane@doe.org', age: 10 },
+        { name: 'Jade', email: 'jade@doe.org', age: 11 }
+      ])
+    end
+
+    it 'allows to use regexp as a value' do
+      expect(relation.restrict(name: /\w{4}/)).to match_array([
+        { name: 'Jane', email: 'jane@doe.org', age: 10 },
+        { name: 'Jade', email: 'jade@doe.org', age: 11 }
+      ])
+    end
   end
 
   describe '#order' do

data/spec/unit/rom/plugin_spec.rb

@@ -89,7 +89,7 @@ describe "ROM::PluginRegistry" do
     end
 
     setup.relation(:users) do
-      use :lazy, adapter: :memory
+      use :lazy
     end
 
     expect(env.relation(:users)).to be_lazy
@@ -97,11 +97,16 @@ describe "ROM::PluginRegistry" do
 
   it "respects adapter restrictions" do
     Test::LazyPlugin = Module.new
+    Test::LazyMemoryPlugin = Module.new
     Test::LazySQLPlugin = Module.new
 
     ROM.plugins do
       register :lazy, Test::LazyPlugin, type: :command
 
+      adapter :memory do
+        register :lazy_command, Test::LazyMemoryPlugin, type: :command
+      end
+
       adapter :sql do
         register :lazy, Test::LazySQLPlugin, type: :command
       end
@@ -112,10 +117,17 @@ describe "ROM::PluginRegistry" do
     Class.new(ROM::Commands::Create[:memory]) do
       relation :users
       register_as :create
-      use :lazy, adapter: :memory
+      use :lazy
+    end
+
+    Class.new(ROM::Commands::Update[:memory]) do
+      relation :users
+      register_as :update
+      use :lazy_command
     end
 
     expect(env.command(:users).create).not_to be_kind_of Test::LazySQLPlugin
     expect(env.command(:users).create).to be_kind_of Test::LazyPlugin
+    expect(env.command(:users).update).to be_kind_of Test::LazyMemoryPlugin
   end
 end

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

@@ -23,7 +23,7 @@ describe ROM::Relation::Graph do
     end
 
     setup.relation(:tasks) do
-      def for_users(users)
+      def for_users(_users)
         self
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: transproc
@@ -19,7 +19,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +203,9 @@ files:
 - spec/integration/mappers/deep_embedded_spec.rb
 - spec/integration/mappers/definition_dsl_spec.rb
 - spec/integration/mappers/embedded_spec.rb
+- spec/integration/mappers/fold_spec.rb
 - spec/integration/mappers/group_spec.rb
+- spec/integration/mappers/overwrite_attributes_value_spec.rb
 - spec/integration/mappers/prefixing_attributes_spec.rb
 - spec/integration/mappers/registering_custom_mappers_spec.rb
 - spec/integration/mappers/renaming_attributes_spec.rb