rom 0.8.1 → 0.9.0.beta1

data/spec/unit/rom/relation/lazy/combine_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ROM::Relation::Lazy, '#combine' do
+describe ROM::Relation, '#combine' do
   include_context 'users and tasks'
 
   before do
@@ -100,8 +100,8 @@ describe ROM::Relation::Lazy, '#combine' do
           { name: 'Jane', title: 'be cool', priority: 2 }
         ],
         tags: [
-          { task: 'be cool', name: 'red', user: 'Jane' },
-          { task: 'be cool', name: 'green', user: 'Jane' }
+          { task: 'be cool', name: 'red' },
+          { task: 'be cool', name: 'green' }
         ]
       }
     ]
@@ -111,7 +111,7 @@ describe ROM::Relation::Lazy, '#combine' do
 
     result = user_with_tasks_and_tags >> map_user_with_tasks_and_tags
 
-    expect(result).to match_array(expected)
+    expect(result.to_a).to eql(expected)
   end
 
   it 'supports more than one eagerly-loaded relation via chaining' do
@@ -123,8 +123,8 @@ describe ROM::Relation::Lazy, '#combine' do
           { name: 'Jane', title: 'be cool', priority: 2 }
         ],
         tags: [
-          { task: 'be cool', name: 'red', user: 'Jane' },
-          { task: 'be cool', name: 'green', user: 'Jane' }
+          { task: 'be cool', name: 'red' },
+          { task: 'be cool', name: 'green' }
         ]
       }
     ]

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

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe ROM::Relation::Lazy do
+describe ROM::Relation do
   include_context 'users and tasks'
 
-  let(:users) { rom.relations.users.to_lazy }
-  let(:tasks) { rom.relations.tasks.to_lazy }
+  let(:users) { rom.relations.users }
+  let(:tasks) { rom.relations.tasks }
 
   before do
     setup.relation(:users) do
@@ -108,12 +108,8 @@ describe ROM::Relation::Lazy do
       expect(users.call.to_a).to eql(rom.relations.users.to_a)
     end
 
-    it 'does not allow currying on already curried relation' do
-      expect { users.by_name.by_email }.to raise_error(NoMethodError, /by_email/)
-    end
-
     describe 'using mappers' do
-      subject(:users) { rom.relations.users.to_lazy(mappers: mappers) }
+      subject(:users) { rom.relations.users.with(mappers: mappers) }
 
       let(:name_list) { proc { |r| r.map { |t| t[:name] } } }
       let(:upcaser) { proc { |r| r.map(&:upcase) } }

data/spec/unit/rom/relation_spec.rb

@@ -29,20 +29,6 @@ describe ROM::Relation do
     end
   end
 
-  describe '#exposed_relations' do
-    it 'returns exposed relation name' do
-      relation_class = Class.new(ROM::Relation[:memory]) {
-        def foo
-        end
-
-        def bar
-        end
-      }
-
-      expect(relation_class.exposed_relations).to include(:foo, :bar)
-    end
-  end
-
   describe '#name' do
     before { ROM.setup(:memory) }
 

data/spec/unit/rom/setup_spec.rb

@@ -82,7 +82,7 @@ describe ROM::Setup do
       it 'resets boot to nil' do
         setup = ROM.setup(:memory)
 
-        allow(setup).to receive(:env).and_raise(StandardError)
+        allow(setup).to receive(:container).and_raise(StandardError)
 
         expect { ROM.finalize }.to raise_error(StandardError)
         expect(ROM.boot).to be(nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0.beta1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-12 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: transproc
@@ -50,6 +50,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.9
+- !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
+  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
+- !ruby/object:Gem::Dependency
+  name: rom-mapper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -111,21 +151,18 @@ files:
 - lib/rom/commands/result.rb
 - lib/rom/commands/update.rb
 - lib/rom/constants.rb
-- lib/rom/env.rb
+- lib/rom/container.rb
+- lib/rom/environment.rb
+- lib/rom/environment_plugin.rb
+- lib/rom/environment_plugins/auto_registration.rb
 - lib/rom/gateway.rb
 - lib/rom/global.rb
 - lib/rom/global/plugin_dsl.rb
-- lib/rom/header.rb
-- lib/rom/header/attribute.rb
 - lib/rom/lint/enumerable_dataset.rb
 - lib/rom/lint/gateway.rb
 - lib/rom/lint/linter.rb
 - lib/rom/lint/spec.rb
 - lib/rom/lint/test.rb
-- lib/rom/mapper.rb
-- lib/rom/mapper/attribute_dsl.rb
-- lib/rom/mapper/dsl.rb
-- lib/rom/mapper/model_dsl.rb
 - lib/rom/mapper_registry.rb
 - lib/rom/memory.rb
 - lib/rom/memory/commands.rb
@@ -133,21 +170,19 @@ files:
 - lib/rom/memory/gateway.rb
 - lib/rom/memory/relation.rb
 - lib/rom/memory/storage.rb
-- lib/rom/model_builder.rb
 - lib/rom/pipeline.rb
 - lib/rom/plugin.rb
+- lib/rom/plugin_base.rb
 - lib/rom/plugin_registry.rb
 - lib/rom/plugins/relation/registry_reader.rb
-- lib/rom/processor.rb
-- lib/rom/processor/transproc.rb
 - lib/rom/relation.rb
 - lib/rom/relation/class_interface.rb
 - lib/rom/relation/composite.rb
 - lib/rom/relation/curried.rb
 - lib/rom/relation/graph.rb
-- lib/rom/relation/lazy.rb
 - lib/rom/relation/loaded.rb
 - lib/rom/relation/materializable.rb
+- lib/rom/relation_registry.rb
 - lib/rom/repository.rb
 - lib/rom/setup.rb
 - lib/rom/setup/finalize.rb
@@ -157,15 +192,6 @@ files:
 - lib/rom/setup_dsl/mapper_dsl.rb
 - lib/rom/setup_dsl/relation.rb
 - lib/rom/setup_dsl/setup.rb
-- lib/rom/support/array_dataset.rb
-- lib/rom/support/class_builder.rb
-- lib/rom/support/class_macros.rb
-- lib/rom/support/data_proxy.rb
-- lib/rom/support/deprecations.rb
-- lib/rom/support/enumerable_dataset.rb
-- lib/rom/support/inflector.rb
-- lib/rom/support/options.rb
-- lib/rom/support/registry.rb
 - lib/rom/version.rb
 - rakelib/benchmark.rake
 - rakelib/mutant.rake
@@ -217,13 +243,10 @@ files:
 - spec/unit/rom/commands/lazy_spec.rb
 - spec/unit/rom/commands/result_spec.rb
 - spec/unit/rom/commands_spec.rb
-- spec/unit/rom/env_spec.rb
+- spec/unit/rom/container_spec.rb
 - spec/unit/rom/gateway_spec.rb
 - spec/unit/rom/global_spec.rb
-- spec/unit/rom/header_spec.rb
-- spec/unit/rom/mapper/dsl_spec.rb
 - spec/unit/rom/mapper_registry_spec.rb
-- spec/unit/rom/mapper_spec.rb
 - spec/unit/rom/memory/commands/create_spec.rb
 - spec/unit/rom/memory/commands/delete_spec.rb
 - spec/unit/rom/memory/commands/update_spec.rb
@@ -231,11 +254,10 @@ files:
 - spec/unit/rom/memory/relation_spec.rb
 - spec/unit/rom/memory/repository_spec.rb
 - spec/unit/rom/memory/storage_spec.rb
-- spec/unit/rom/model_builder_spec.rb
 - spec/unit/rom/plugin_spec.rb
-- spec/unit/rom/processor/transproc_spec.rb
 - spec/unit/rom/registry_spec.rb
 - spec/unit/rom/relation/composite_spec.rb
+- spec/unit/rom/relation/curried_spec.rb
 - spec/unit/rom/relation/graph_spec.rb
 - spec/unit/rom/relation/lazy/combine_spec.rb
 - spec/unit/rom/relation/lazy_spec.rb
@@ -243,11 +265,6 @@ files:
 - spec/unit/rom/relation_spec.rb
 - spec/unit/rom/repository_spec.rb
 - spec/unit/rom/setup_spec.rb
-- spec/unit/rom/support/array_dataset_spec.rb
-- spec/unit/rom/support/class_builder_spec.rb
-- spec/unit/rom/support/enumerable_dataset_spec.rb
-- spec/unit/rom/support/inflector_spec.rb
-- spec/unit/rom/support/options_spec.rb
 homepage: http://rom-rb.org
 licenses:
 - MIT
@@ -263,9 +280,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

data/lib/rom/header.rb

@@ -1,193 +0,0 @@
-require 'equalizer'
-
-require 'rom/support/options'
-require 'rom/header/attribute'
-
-module ROM
-  # Header provides information about data mapping of a specific relation
-  #
-  # Processors use headers to build objects that process raw relations that go
-  # through mappers.
-  #
-  # @private
-  class Header
-    include Enumerable
-    include Options
-    include Equalizer.new(:attributes, :model)
-
-    # @return [Class] optional model associated with a header
-    #
-    # @api private
-    option :model, reader: true
-
-    option :reject_keys, reader: true, default: false
-
-    # @api private
-    attr_reader :attributes
-
-    # @return [Hash] attribute key/name mapping for all primitive attributes
-    #
-    # @api private
-    attr_reader :mapping
-
-    # @return [Array] all attribute keys that are in a tuple
-    #
-    # @api private
-    attr_reader :tuple_keys
-
-    # @return [Array] all attribute names that are popping from a tuple
-    #
-    # @api private
-    attr_reader :pop_keys
-
-    # Coerce array with attribute definitions into a header object
-    #
-    # @param [Array<Array>] input attribute name/option pairs
-    #
-    # @param [Class] model optional
-    #
-    # @return [Header]
-    #
-    # @api private
-    def self.coerce(input, options = {})
-      if input.instance_of?(self)
-        input
-      else
-        attributes = input.each_with_object({}) { |pair, h|
-          h[pair.first] = Attribute.coerce(pair)
-        }
-
-        new(attributes, options)
-      end
-    end
-
-    # @api private
-    def initialize(attributes, options = {})
-      super
-      @attributes = attributes
-      initialize_mapping
-      initialize_tuple_keys
-      initialize_pop_keys
-    end
-
-    # Iterate over attributes
-    #
-    # @yield [Attribute]
-    #
-    # @api private
-    def each
-      attributes.each_value { |attribute| yield(attribute) }
-    end
-
-    # Return if there are any aliased attributes
-    #
-    # @api private
-    def aliased?
-      any?(&:aliased?)
-    end
-
-    # Return attribute keys
-    #
-    # An attribute key corresponds to tuple attribute names
-    #
-    # @api private
-    def keys
-      attributes.keys
-    end
-
-    # Return attribute identified by its name
-    #
-    # @return [Attribute]
-    #
-    # @api private
-    def [](name)
-      attributes.fetch(name)
-    end
-
-    # Return all Combined attributes
-    #
-    # @return [Array<Combined>]
-    #
-    # @api private
-    def combined
-      by_type(Combined)
-    end
-
-    # Returns all attributes that require preprocessing
-    #
-    # @return [Array<Group,Fold>]
-    #
-    # @api private
-    def preprocessed
-      by_type(Group, Fold)
-    end
-
-    # Returns all attributes that require postprocessing
-    #
-    # @return [Array<Ungroup,Unfold>]
-    #
-    # @api private
-    def postprocessed
-      by_type(Ungroup, Unfold)
-    end
-
-    # Return all Wrap attributes
-    #
-    # @return [Array<Wrap>]
-    #
-    # @api private
-    def wraps
-      by_type(Wrap)
-    end
-
-    # Return all non-primitive attributes that don't require mapping
-    #
-    # @return [Array<Group,Fold,Ungroup,Unfold,Wrap,Unwrap>]
-    #
-    # @api private
-    def non_primitives
-      preprocessed + wraps
-    end
-
-    # Return all primitive attributes that require mapping
-    #
-    # @return [Array<Attribute>]
-    #
-    # @api private
-    def primitives
-      to_a - non_primitives
-    end
-
-    private
-
-    # Find all attribute matching specific attribute class (not kind)
-    #
-    # @return [Array<Attribute>]
-    #
-    # @api private
-    def by_type(*types)
-      select { |attribute| types.include?(attribute.class) }
-    end
-
-    # Set mapping hash from primitive attributes
-    #
-    # @api private
-    def initialize_mapping
-      @mapping = primitives.map(&:mapping).reduce(:merge) || {}
-    end
-
-    # Set all tuple keys from all attributes going deep into Wrap and Group too
-    #
-    # @api private
-    def initialize_tuple_keys
-      @tuple_keys = mapping.keys + non_primitives.flat_map(&:tuple_keys)
-    end
-
-    # Set all tuple keys from all attributes popping from Unwrap and Ungroup
-    #
-    # @api private
-    def initialize_pop_keys
-      @pop_keys = mapping.values + non_primitives.flat_map(&:tuple_keys)
-    end
-  end
-end