rom-mapper 0.2.0 → 0.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1305458b68360474e3be88eb5418ce057e7a5dc3
-  data.tar.gz: 69e816fabf9130eaf6daf3300f56b9efce63161f
+  metadata.gz: e261943dc4114a157a1f142045a0f5ee033dd5c5
+  data.tar.gz: 06c40a576ebf206f9719c161f332f43a5dbf075c
 SHA512:
-  metadata.gz: 1184db0c8ce2fd3bea1d7bb7cdec72a8f1a7f298f0be35482a2357081c9841896aeea87e0a648f5deab1af1cad8a5160ac888ebc9840cadf960952421143e4f5
-  data.tar.gz: fa2c178cdcf7ce602c4390a633fd255c2a04f15b5fe3425d90445ca6a6fa30bcb5ed1ed320adedee55e581e7f0c30530cbe7deb8fd618ff426f1947c866bfa4b
+  metadata.gz: 5f3dd818d7f91c3c73828bd8ed93354e41183bd86d3a3a30c1f8a26bad02994a37ed86c22befc4fa473d11b788595805a015d41792226ba12947fd6af71a984f
+  data.tar.gz: d53d9d99ad4be33c2faf1eca94eff0cf05bd75966e2cf6267afda48c605d7551772f141d3cb1c0b4f370d9a6bf3d9344838b456f9abde81cd303f3774d994115

data/.travis.yml

@@ -8,7 +8,7 @@ rvm:
   - 2.1
   - 2.2
   - rbx-2
-  - jruby
+  - jruby-9000
   - ruby-head
   - jruby-head
 env:

data/Gemfile

@@ -2,8 +2,11 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'transproc', github: 'solnic/transproc', branch: 'master'
+gem 'rom-support', github: 'rom-rb/rom-support', branch: 'master'
+
 group :test do
-  gem 'anima'
+  gem 'anima', '~> 0.2.0'
   gem 'virtus'
   gem 'inflecto', '~> 0.0', '>= 0.0.2'
 
@@ -13,7 +16,7 @@ group :test do
 end
 
 group :benchmarks do
-  gem 'benchmark-ips', '~> 2.2.0'
+  gem 'benchmark-ips', '~> 2.2'
 end
 
 group :tools do
@@ -26,7 +29,7 @@ group :tools do
   gem 'byebug'
 
   platform :mri do
-    gem 'mutant', '>= 0.8.0', github: 'mbj/mutant', branch: 'master'
+    gem 'mutant', '~> 0.8.0'
     gem 'mutant-rspec'
   end
 end

data/lib/rom-mapper.rb

@@ -1,3 +1,4 @@
+require 'dry-equalizer'
 require 'rom-support'
 
 require 'rom/mapper'

data/lib/rom/header.rb

@@ -1,5 +1,3 @@
-require 'equalizer'
-
 require 'rom/header/attribute'
 
 module ROM
@@ -11,7 +9,7 @@ module ROM
   # @private
   class Header
     include Enumerable
-    include Equalizer.new(:attributes, :model)
+    include Dry::Equalizer(:attributes, :model)
 
     # @return [Class] optional model associated with a header
     #
@@ -182,7 +180,7 @@ module ROM
     #
     # @api private
     def initialize_tuple_keys
-      @tuple_keys = mapping.keys + non_primitives.flat_map(&:tuple_keys)
+      @tuple_keys = mapping.keys.flatten + non_primitives.flat_map(&:tuple_keys)
     end
 
     # Set all tuple keys from all attributes popping from Unwrap and Ungroup

data/lib/rom/header/attribute.rb

@@ -9,7 +9,7 @@ module ROM
     #
     # @private
     class Attribute
-      include Equalizer.new(:name, :key, :type)
+      include Dry::Equalizer(:name, :key, :type)
 
       # @return [Symbol] name of an attribute
       #
@@ -93,6 +93,10 @@ module ROM
       def mapping
         { key => name }
       end
+
+      def union?
+        key.is_a? ::Array
+      end
     end
 
     # Embedded attribute is a special attribute type that has a header
@@ -101,7 +105,7 @@ module ROM
     #
     # @private
     class Embedded < Attribute
-      include Equalizer.new(:name, :key, :type, :header)
+      include Dry::Equalizer(:name, :key, :type, :header)
 
       # return [Header] header of an attribute
       #

data/lib/rom/mapper.rb

@@ -1,15 +1,12 @@
 require 'rom/mapper/dsl'
 
-require 'rom/support/inheritance_hook'
-
 module ROM
   # Mapper is a simple object that uses transformers to load relations
   #
   # @private
   class Mapper
-    extend ROM::Support::InheritanceHook
     include DSL
-    include Equalizer.new(:transformers, :header)
+    include Dry::Equalizer(:transformers, :header)
 
     defines :relation, :register_as, :symbolize_keys,
       :prefix, :prefix_separator, :inherit_header, :reject_keys
@@ -62,9 +59,7 @@ module ROM
     #
     # @api private
     def self.build(header = self.header, processor = :transproc)
-      processor = Mapper.processors.fetch(processor)
-      transformers = headers(header).map(&processor.method(:build))
-      new(transformers, header)
+      new(header, processor)
     end
 
     # @api private
@@ -76,8 +71,11 @@ module ROM
     end
 
     # @api private
-    def initialize(transformers, header)
-      @transformers = Array(transformers)
+    def initialize(header, processor = :transproc)
+      processor = Mapper.processors.fetch(processor)
+      @transformers = self.class.headers(header).map do |header|
+        processor.build(self, header)
+      end
       @header = header
     end
 

data/lib/rom/mapper/model_dsl.rb

@@ -48,7 +48,10 @@ module ROM
       # @api private
       def build_class
         return klass if klass
-        return builder.call(attributes.map(&:first)) if builder
+        included_attrs = attributes.reject do |_name, opts|
+          opts && opts[:exclude]
+        end
+        builder.call(included_attrs.map(&:first)) if builder
       end
     end
   end

data/lib/rom/mapper/version.rb

@@ -1,5 +1,5 @@
 module ROM
   class Mapper
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0.beta1'.freeze
   end
 end

data/lib/rom/processor/transproc.rb

@@ -21,6 +21,7 @@ module ROM
         import ::Transproc::ArrayTransformations
         import ::Transproc::HashTransformations
         import ::Transproc::ClassTransformations
+        import ::Transproc::ProcTransformations
 
         def self.identity(tuple)
           tuple
@@ -29,8 +30,20 @@ module ROM
         def self.filter_empty(arr)
           arr.reject { |row| row.values.all?(&:nil?) }
         end
+
+        def self.inject_union_value(tuple, name, keys, coercer)
+          values = tuple.values_at(*keys)
+          result = coercer.call(*values)
+
+          tuple.merge(name => result)
+        end
       end
 
+      # @return [Mapper] mapper that this processor belongs to
+      #
+      # @api private
+      attr_reader :mapper
+
       # @return [Header] header from a mapper
       #
       # @api private
@@ -58,12 +71,13 @@ module ROM
       # @return [Transproc::Function]
       #
       # @api private
-      def self.build(header)
-        new(header).to_transproc
+      def self.build(mapper, header)
+        new(mapper, header).to_transproc
       end
 
       # @api private
-      def initialize(header)
+      def initialize(mapper, header)
+        @mapper = mapper
         @header = header
         @model = header.model
         @mapping = header.mapping
@@ -111,8 +125,13 @@ module ROM
       # @api private
       def visit_attribute(attribute)
         coercer = attribute.meta[:coercer]
-        if coercer
-          t(:map_value, attribute.name, coercer)
+        if attribute.union?
+          compose do |ops|
+            ops << t(:inject_union_value, attribute.name, attribute.key, coercer)
+            ops << t(:reject_keys, attribute.key)
+          end
+        elsif coercer
+          t(:map_value, attribute.name, t(:bind, mapper, coercer))
         elsif attribute.typed?
           t(:map_value, attribute.name, t(:"to_#{attribute.type}"))
         end
@@ -369,7 +388,7 @@ module ROM
       #
       # @api private
       def row_proc_from(attribute)
-        new(attribute.header).row_proc
+        new(mapper, attribute.header).row_proc
       end
 
       # Return a new instance of the processor

data/rom-mapper.gemspec

@@ -15,9 +15,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {spec}/*`.split("\n")
   gem.license       = 'MIT'
 
-  gem.add_dependency 'transproc', '~> 0.3'
-  gem.add_dependency 'equalizer', '~> 0.0', '>= 0.0.10'
-  gem.add_dependency 'rom-support', '~> 0.1', '>= 0.1.0'
+  gem.add_dependency 'dry-equalizer', '~> 0.2'
+  gem.add_dependency 'rom-support', '~> 1.0.0.beta1'
 
   gem.add_development_dependency 'rake', '~> 10.3'
   gem.add_development_dependency 'rspec', '~> 3.3'

data/spec/integration/mapper_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+describe ROM::Mapper do
+  let(:mapper_klass) do
+    Class.new(ROM::Mapper).tap do |mapper_klass|
+      mapper_klass.class_eval(&mapper_body)
+    end
+  end
+  let(:mapper) { mapper_klass.build }
+
+  subject { mapper.call(tuples) }
+
+  describe '.attribute' do
+    context 'with block' do
+      let(:tuples) { [{ key: 'bar' }] }
+      let(:results) { [{ key: 'foo_bar' }] }
+      let(:mapper_body) do
+        proc do
+          attribute(:key) { |key| [prefix, key].join('_') }
+        
+          def prefix
+            'foo'
+          end
+        end
+      end
+
+      it 'creates the attribute from the proc with the mapper as the binding' do
+        is_expected.to match_array(results)
+      end
+    end
+  end
+
+  describe '.embedded' do
+    context 'with block' do
+      let(:tuples) { [{ items: { key: 'bar' } }] }
+      let(:results) { [{ items: { key: 'foo_bar' } }] }
+      let(:mapper_body) do
+        proc do
+          embedded :items, type: :hash do
+            attribute(:key) { |key| [prefix, key].join('_') }
+          end
+        
+          def prefix
+            'foo'
+          end
+        end
+      end
+
+      it 'creates the attribute from the proc with the mapper as the binding' do
+        is_expected.to match_array(results)
+      end
+    end
+  end
+
+  describe '.wrap' do
+    context 'attribute with block' do
+      let(:tuples) { [{ key: 'bar' }] }
+      let(:results) { [{ items: { key: 'foo_bar' } }] }
+      let(:mapper_body) do
+        proc do
+          wrap :items do
+            attribute(:key) { |key| [prefix, key].join('_') }
+          end
+        
+          def prefix
+            'foo'
+          end
+        end
+      end
+
+      it 'creates the attribute from the proc with the mapper as the binding' do
+        is_expected.to match_array(results)
+      end
+    end
+  end
+
+  describe '.unwrap' do
+    context 'attribute with block' do
+      let(:tuples) { [{ items: { key: 'bar' } }] }
+      let(:results) { [{ key: 'foo_bar' }] }
+      let(:mapper_body) do
+        proc do
+          unwrap :items do
+            attribute(:key) { |key| [prefix, key].join('_') }
+          end
+        
+          def prefix
+            'foo'
+          end
+        end
+      end
+
+      it 'creates the attribute from the proc with the mapper as the binding' do
+        is_expected.to match_array(results)
+      end
+    end
+  end
+end

data/spec/unit/rom/mapper/model_dsl_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe ROM::Mapper::ModelDSL do
+  describe '#model' do
+    it 'calls the builder with non-excluded attributes only' do
+      definition_class = Class.new do
+        include ROM::Mapper::ModelDSL
+
+        def initialize
+          @attributes = [[:name], [:title, { exclude: true }]]
+          @builder = ->(attrs) { Struct.new(*attrs) }
+        end
+      end
+      model_instance = definition_class.new.model.new
+      expect(model_instance).to respond_to(:name)
+      expect(model_instance).to_not respond_to(:title)
+    end
+  end
+end

data/spec/unit/rom/processor/transproc_spec.rb

@@ -2,8 +2,9 @@ require 'spec_helper'
 require 'virtus'
 
 describe ROM::Processor::Transproc do
-  subject(:transproc) { ROM::Processor::Transproc.build(header) }
+  subject(:transproc) { ROM::Processor::Transproc.build(binding, header) }
 
+  let(:binding) { nil }
   let(:header) { ROM::Header.coerce(attributes, options) }
   let(:options) { {} }
 
@@ -67,6 +68,29 @@ describe ROM::Processor::Transproc do
     end
   end
 
+  describe 'key from exsisting keys' do
+    let(:attributes) do
+      coercer = ->(a,b) { b + a }
+      [[:c, {from: [:a, :b], coercer: coercer} ]]
+    end
+
+    let(:relation) do
+      [
+        {a: 'works', b: 'this'}
+      ]
+    end
+
+    let (:expected_result) do
+      [
+        {c: 'thisworks'}
+      ]
+    end
+
+    it 'returns tuples a new key added based on exsiting keys' do
+      expect(transproc[relation]).to eql(expected_result)
+    end
+  end
+
   describe 'rejecting keys' do
     let(:options) { { reject_keys: true } }
 

metadata

@@ -1,69 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rom-mapper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0.beta1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: transproc
+  name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: equalizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rom-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +88,6 @@ files:
 - lib/rom/mapper.rb
 - lib/rom/mapper/attribute_dsl.rb
 - lib/rom/mapper/dsl.rb
-- lib/rom/mapper/header.rb
 - lib/rom/mapper/model_dsl.rb
 - lib/rom/mapper/version.rb
 - lib/rom/model_builder.rb
@@ -124,10 +97,12 @@ files:
 - rakelib/mutant.rake
 - rakelib/rubocop.rake
 - rom-mapper.gemspec
+- spec/integration/mapper_spec.rb
 - spec/spec_helper.rb
 - spec/support/constant_leak_finder.rb
 - spec/support/mutant.rb
 - spec/unit/rom/mapper/dsl_spec.rb
+- spec/unit/rom/mapper/model_dsl_spec.rb
 - spec/unit/rom/mapper_spec.rb
 - spec/unit/rom/processor/transproc_spec.rb
 homepage: http://rom-rb.org
@@ -145,9 +120,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -155,3 +130,4 @@ signing_key:
 specification_version: 4
 summary: ROM mapper component
 test_files: []
+has_rdoc: 

data/lib/rom/mapper/header.rb

@@ -1,85 +0,0 @@
-# encoding: utf-8
-
-module ROM
-  class Mapper
-
-    # Mapper header wrapping axiom header and providing mapping information
-    #
-    # @private
-    class Header
-      include Enumerable, Concord.new(:header, :attributes), Adamantium
-
-      # Build a header
-      #
-      # @api private
-      def self.build(input, options = {})
-        return input if input.is_a?(self)
-
-        keys       = options.fetch(:keys, [])
-        header     = Axiom::Relation::Header.coerce(input, keys: keys)
-
-        mapping    = options.fetch(:map, {})
-        attributes = header.each_with_object({}) { |field, object|
-          attribute = Attribute.coerce(field, mapping[field.name])
-          object[attribute.name] = attribute
-        }
-
-        new(header, attributes)
-      end
-
-      # Return attribute mapping
-      #
-      # @api private
-      def mapping
-        each_with_object({}) { |attribute, hash|
-          hash.update attribute.mapping
-        }
-      end
-      memoize :mapping
-
-      # Return all key attributes
-      #
-      # @return [Array<Attribute>]
-      #
-      # @api public
-      def keys
-        # FIXME: find a way to simplify this
-        header.keys.flat_map { |key_header|
-          key_header.flat_map { |key|
-            attributes.values.select { |attribute|
-              attribute.tuple_key == key.name
-            }
-          }
-        }
-      end
-      memoize :keys
-
-      # Return attribute with the given name
-      #
-      # @return [Attribute]
-      #
-      # @api public
-      def [](name)
-        attributes.fetch(name)
-      end
-
-      # Return attribute names
-      #
-      # @api private
-      def attribute_names
-        map(&:name)
-      end
-
-      # Iterate over attributes
-      #
-      # @api private
-      def each(&block)
-        return to_enum unless block_given?
-        attributes.each_value(&block)
-        self
-      end
-
-    end # Header
-
-  end # Mapper
-end # ROM