rom 2.0.2 → 3.0.0

data/spec/unit/rom/relation_spec.rb

@@ -1,6 +1,6 @@
 require 'rom/memory'
 
-describe ROM::Relation do
+RSpec.describe ROM::Relation do
   subject(:relation) { Class.new(ROM::Relation).new(dataset) }
 
   let(:dataset) { ROM::Memory::Dataset.new([jane, joe]) }
@@ -196,7 +196,7 @@ describe ROM::Relation do
 
   describe "#with" do
     it "returns a new instance with the original dataset and given custom options" do
-      relation = Class.new(ROM::Relation) { option :custom }.new([])
+      relation = Class.new(ROM::Relation) { option :custom }.new([], custom: true)
 
       custom_opts = { mappers: "Custom Mapper Registry" }
       new_relation = relation.with(custom_opts).with(custom: true)
@@ -217,13 +217,28 @@ describe ROM::Relation do
     end
   end
 
-  describe '#schema_hash' do
+  describe '#schema' do
+    it 'returns an empty schema by default' do
+      relation = Class.new(ROM::Relation) {
+        def self.name
+          'Test::SomeRelation'
+        end
+      }.new([])
+
+      expect(relation.schema).to be_empty
+      expect(relation.schema.inferrer).to be(ROM::Schema::DEFAULT_INFERRER)
+      expect(relation.schema.name).to be(:test_some_relation)
+      expect(relation.schema?).to be(false)
+    end
+  end
+
+  describe '#input_schema' do
     it 'returns a schema hash type' do
       relation = Class.new(ROM::Relation[:memory]) do
         schema { attribute :id, ROM::Types::Coercible::Int }
       end.new([])
 
-      expect(relation.schema_hash[id: '1']).to eql(id: 1)
+      expect(relation.input_schema[id: '1']).to eql(id: 1)
     end
 
     it 'returns a plain Hash coercer when there is no schema' do
@@ -231,7 +246,7 @@ describe ROM::Relation do
 
       tuple = [[:id, '1']]
 
-      expect(relation.schema_hash[tuple]).to eql(id: '1')
+      expect(relation.input_schema[tuple]).to eql(id: '1')
     end
   end
 end

data/spec/unit/rom/schema/accessing_attributes_spec.rb

@@ -0,0 +1,52 @@
+require 'rom/schema'
+
+RSpec.describe ROM::Schema, '#[]' do
+  context 'with a schema' do
+    subject(:schema) do
+      define_schema(:users, id: :Int, name: :String, email: :String)
+    end
+
+    it 'returns an attribute identified by its canonical name' do
+      expect(schema[:email]).to eql(define_type(:email, :String, source: :users))
+    end
+
+    it 'returns an aliased attribute identified by its canonical name' do
+      expect(schema.rename(id: :user_id)[:id]).to eql(define_type(:id, :Int, source: :users, alias: :user_id))
+    end
+
+    it 'raises KeyError when attribute is not found' do
+      expect { schema[:not_here] }.to raise_error(KeyError, /not_here/)
+    end
+  end
+
+  context 'with a merged schema' do
+    subject(:schema) do
+      left.merge(right.__send__(:new, right.map { |attr| attr.meta(source: :tasks) }))
+    end
+
+    let(:left) do
+      define_schema(:users, id: :Int, name: :String)
+    end
+
+    let(:right) do
+      define_schema(:tasks, id: :Int, title: :String)
+    end
+
+    it 'returns an attribute identified by its canonical name' do
+      expect(schema[:id]).to eql(define_type(:id, :Int, source: :users))
+    end
+
+    it 'returns an attribute identified by its canonical name when its unique' do
+      expect(schema[:title]).to eql(define_type(:title, :String, source: :tasks))
+    end
+
+    it 'returns an attribute identified by its canonical name and its source' do
+      expect(schema[:id, :tasks]).to eql(define_type(:id, :Int, source: :tasks))
+    end
+
+    it 'raises KeyError when attribute is not found' do
+      expect { schema[:not_here] }.to raise_error(KeyError, /not_here/)
+      expect { schema[:not_here, :tasks] }.to raise_error(KeyError, /not_here/)
+    end
+  end
+end

data/spec/unit/rom/schema/append_spec.rb

@@ -0,0 +1,17 @@
+require 'rom/schema'
+
+RSpec.describe ROM::Schema, '#append' do
+  subject(:schema) { left.append(*right) }
+
+  let(:left) do
+    define_schema(:users, id: :Int, name: :String)
+  end
+
+  let(:right) do
+    define_schema(:tasks, user_id: :Int)
+  end
+
+  it 'returns a new schema with attributes from two schemas' do
+    expect(schema.map(&:name)).to eql(%i[id name user_id])
+  end
+end

data/spec/unit/rom/schema/exclude_spec.rb

@@ -0,0 +1,15 @@
+require 'rom/schema'
+
+RSpec.describe ROM::Schema, '#exclude' do
+  subject(:schema) do
+    define_schema(:users, id: :Int, name: :String, email: :String)
+  end
+
+  let(:excluded) do
+    schema.exclude(:id, :name)
+  end
+
+  it 'returns projected schema with renamed attributes using provided prefix' do
+    expect(excluded.map(&:name)).to eql(%i[email])
+  end
+end

data/spec/unit/rom/schema/finalize_spec.rb

@@ -0,0 +1,59 @@
+require 'rom/schema'
+
+RSpec.describe ROM::Schema, '#finalize!' do
+  context 'without inferrer' do
+    subject(:schema) do
+      define_schema(:users, id: :Int, name: :String)
+    end
+
+    before { schema.finalize! }
+
+    it 'returns a frozen canonical schema' do
+      expect(schema).to be_frozen
+    end
+  end
+
+  context 'with inferrer' do
+    subject(:schema) do
+      ROM::Schema.define(:users, attributes: attributes, inferrer: inferrer)
+    end
+
+    let(:inferrer) do
+      proc { [[define_type(:name, :String)], [:id, :age]]}
+    end
+
+    context 'when all required attributes are present' do
+      let(:attributes) do
+        [define_type(:id, :Int), define_type(:age, :Int)]
+      end
+
+      it 'concats defined attributes with inferred attributes' do
+        expect(schema.finalize!.map(&:name)).to eql(%i[id age name])
+      end
+    end
+
+    context 'when inferred attributes are overridden' do
+      let(:attributes) do
+        [define_type(:id, :Int),
+         define_type(:age, :Int),
+         define_type(:name, :String).meta(custom: true)]
+      end
+
+      it 'respects overridden attributes' do
+        expect(schema.finalize!.map(&:name)).to eql(%i[id age name])
+        expect(schema[:name].meta[:custom]).to be(true)
+      end
+    end
+
+    context 'when some attributes are missing' do
+      let(:attributes) do
+        []
+      end
+
+      it 'raises error' do
+        expect { schema.finalize! }.
+          to raise_error(ROM::Schema::MissingAttributesError, /missing attributes in :users schema: :id, :age/)
+      end
+    end
+  end
+end

data/spec/unit/rom/schema/key_predicate_spec.rb

@@ -0,0 +1,15 @@
+require 'rom/schema'
+
+RSpec.describe ROM::Schema, '#key?' do
+  subject(:schema) do
+    define_schema(:users, name: :String)
+  end
+
+  it 'returns true when an attribute exists' do
+    expect(schema.key?(:name)).to be(true)
+  end
+
+  it 'returns false when an attribute does not exist' do
+    expect(schema.key?(:foo)).to be(false)
+  end
+end

data/spec/unit/rom/schema/merge_spec.rb

@@ -0,0 +1,17 @@
+require 'rom/schema'
+
+RSpec.describe ROM::Schema, '#merge' do
+  subject(:schema) { left.merge(right) }
+
+  let(:left) do
+    define_schema(:users, id: :Int, name: :String)
+  end
+
+  let(:right) do
+    define_schema(:tasks, user_id: :Int)
+  end
+
+  it 'returns a new schema with attributes from two schemas' do
+    expect(schema.map(&:name)).to eql(%i[id name user_id])
+  end
+end

data/spec/unit/rom/schema/prefix_spec.rb

@@ -0,0 +1,16 @@
+require 'rom/schema'
+
+RSpec.describe ROM::Schema, '#prefix' do
+  subject(:schema) do
+    define_schema(:users, id: :Int, name: :String)
+  end
+
+  let(:prefixed) do
+    schema.prefix(:user)
+  end
+
+  it 'returns projected schema with renamed attributes using provided prefix' do
+    expect(prefixed.map(&:alias)).to eql(%i[user_id user_name])
+    expect(prefixed.map { |attr| attr.meta[:name] }).to eql(%i[id name])
+  end
+end

data/spec/unit/rom/schema/project_spec.rb

@@ -0,0 +1,15 @@
+require 'rom/schema'
+
+RSpec.describe ROM::Schema, '#project' do
+  subject(:schema) do
+    define_schema(:users, id: :Int, name: :String, age: :Int)
+  end
+
+  it 'projects provided attribute names' do
+    expect(schema.project(:name, :age).map(&:name)).to eql(%i[name age])
+  end
+
+  it 'projects provided attributes' do
+    expect(schema.project(schema[:name], schema[:age]).map(&:name)).to eql(%i[name age])
+  end
+end

data/spec/unit/rom/schema/rename_spec.rb

@@ -0,0 +1,22 @@
+require 'rom/schema'
+
+RSpec.describe ROM::Schema, '#rename' do
+  subject(:schema) do
+    define_schema(
+      :users,
+      user_id: :Int, user_name: :String, user_email: :String
+    )
+  end
+
+  let(:renamed) do
+    schema.rename(user_id: :id, user_name: :name)
+  end
+
+  it 'returns projected schema with renamed attributes' do
+    expect(renamed.map(&:name)).to eql(%i[user_id user_name user_email])
+    expect(renamed.map(&:alias)).to eql([:id, :name, nil])
+    expect(renamed.all?(&:aliased?)).to be(false)
+    expect(renamed[:user_id]).to be_aliased
+    expect(renamed[:user_name]).to be_aliased
+  end
+end

data/spec/unit/rom/schema/type_spec.rb

@@ -0,0 +1,49 @@
+require 'rom/schema/attribute'
+
+RSpec.describe ROM::Schema::Attribute do
+  describe '#inspect' do
+    context 'with a primitive definition' do
+      subject(:type) do
+        ROM::Schema::Attribute.new(ROM::Types::Int).meta(name: :id, primary_key: true)
+      end
+
+      specify do
+        expect(type.inspect).to eql("#<ROM::Schema::Attribute[Integer] name=:id primary_key=true>")
+      end
+    end
+
+    context 'with a sum' do
+      subject(:type) do
+        ROM::Schema::Attribute.new(ROM::Types::Bool).meta(name: :admin)
+      end
+
+      specify do
+        expect(type.inspect).to eql("#<ROM::Schema::Attribute[TrueClass | FalseClass] name=:admin>")
+      end
+    end
+  end
+
+  describe '#aliased' do
+    subject(:type) do
+      ROM::Schema::Attribute.new(ROM::Types::String).meta(name: :user_name)
+    end
+
+    specify do
+      expect(type.as(:name).meta[:alias]).to eql(:name)
+    end
+  end
+
+  describe '#method_missing' do
+    subject(:type) do
+      ROM::Schema::Attribute.new(ROM::Types::Int).meta(name: :id, primary_key: true)
+    end
+
+    specify do
+      expect(type.meta).to eql(name: :id, primary_key: true)
+    end
+
+    specify do
+      expect { type.not_here }.to raise_error(NoMethodError, /not_here/)
+    end
+  end
+end

data/spec/unit/rom/schema/uniq_spec.rb

@@ -0,0 +1,21 @@
+require 'rom/schema'
+
+RSpec.describe ROM::Schema, '#uniq' do
+  subject(:schema) { left.merge(right) }
+
+  let(:left) do
+    define_schema(:users, id: :Int, name: :String)
+  end
+
+  let(:right) do
+    define_schema(:tasks, id: :Int, user_id: :Int)
+  end
+
+  it 'returns a new schema with unique attributes from two schemas' do
+    expect(schema.uniq.map(&:name)).to eql(%i[id name user_id])
+  end
+
+  it 'accepts a block' do
+    expect(schema.uniq(&:primitive).map(&:name)).to eql(%i[id name])
+  end
+end

data/spec/unit/rom/schema/wrap_spec.rb

@@ -0,0 +1,17 @@
+require 'rom/schema'
+
+RSpec.describe ROM::Schema, '#wrap' do
+  subject(:schema) do
+    define_schema(:users, id: :Int, name: :String)
+  end
+
+  let(:wrapped) do
+    schema.wrap(:users)
+  end
+
+  it 'returns projected schema with renamed attributes using provided prefix' do
+    expect(wrapped.map(&:alias)).to eql(%i[users_id users_name])
+    expect(wrapped.map { |attr| attr.meta[:name] }).to eql(%i[id name])
+    expect(wrapped.all?(&:wrapped?)).to be(true)
+  end
+end

data/spec/unit/rom/schema_spec.rb

@@ -1,8 +1,8 @@
 RSpec.describe ROM::Schema do
   describe '#to_h' do
     it 'returns hash with attributes' do
-      attrs = { id: ROM::Types::Int, name: ROM::Types::String }
-      schema = ROM::Schema.new(:name, attrs)
+      attrs = { id: ROM::Types::Int.meta(name: :id), name: ROM::Types::String.meta(name: :name) }
+      schema = ROM::Schema.define(:name, attributes: attrs.values)
 
       expect(schema.to_h).to eql(attrs)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -44,42 +44,74 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
-  name: rom-support
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+- !ruby/object:Gem::Dependency
+  name: dry-initializer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: rom-mapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.5'
 description: Persistence and mapping toolkit for Ruby
 email: piotr.solnica@gmail.com
 executables: []
@@ -119,6 +151,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -128,7 +161,9 @@ files:
 - README.md
 - Rakefile
 - lib/rom.rb
+- lib/rom/array_dataset.rb
 - lib/rom/association_set.rb
+- lib/rom/auto_curry.rb
 - lib/rom/command.rb
 - lib/rom/command_registry.rb
 - lib/rom/commands.rb
@@ -157,10 +192,13 @@ files:
 - lib/rom/constants.rb
 - lib/rom/container.rb
 - lib/rom/create_container.rb
+- lib/rom/data_proxy.rb
+- lib/rom/enumerable_dataset.rb
 - lib/rom/environment.rb
 - lib/rom/gateway.rb
 - lib/rom/global.rb
 - lib/rom/global/plugin_dsl.rb
+- lib/rom/initializer.rb
 - lib/rom/lint/enumerable_dataset.rb
 - lib/rom/lint/gateway.rb
 - lib/rom/lint/linter.rb
@@ -172,6 +210,7 @@ files:
 - lib/rom/memory/dataset.rb
 - lib/rom/memory/gateway.rb
 - lib/rom/memory/relation.rb
+- lib/rom/memory/schema.rb
 - lib/rom/memory/storage.rb
 - lib/rom/memory/types.rb
 - lib/rom/pipeline.rb
@@ -182,8 +221,7 @@ files:
 - lib/rom/plugins/configuration/configuration_dsl.rb
 - lib/rom/plugins/relation/key_inference.rb
 - lib/rom/plugins/relation/registry_reader.rb
-- lib/rom/plugins/relation/view.rb
-- lib/rom/plugins/relation/view/dsl.rb
+- lib/rom/registry.rb
 - lib/rom/relation.rb
 - lib/rom/relation/class_interface.rb
 - lib/rom/relation/composite.rb
@@ -192,8 +230,10 @@ files:
 - lib/rom/relation/loaded.rb
 - lib/rom/relation/materializable.rb
 - lib/rom/relation/name.rb
+- lib/rom/relation/view_dsl.rb
 - lib/rom/relation_registry.rb
 - lib/rom/schema.rb
+- lib/rom/schema/attribute.rb
 - lib/rom/schema/dsl.rb
 - lib/rom/setup.rb
 - lib/rom/setup/auto_registration.rb
@@ -206,6 +246,7 @@ files:
 - lib/rom/setup/finalize/finalize_mappers.rb
 - lib/rom/setup/finalize/finalize_relations.rb
 - lib/rom/support/configurable.rb
+- lib/rom/transaction.rb
 - lib/rom/types.rb
 - lib/rom/version.rb
 - log/.gitkeep
@@ -236,6 +277,8 @@ files:
 - spec/integration/commands/graph_spec.rb
 - spec/integration/commands/update_spec.rb
 - spec/integration/commands_spec.rb
+- spec/integration/gateways/extending_relations_spec.rb
+- spec/integration/gateways/setting_logger_spec.rb
 - spec/integration/mappers/combine_spec.rb
 - spec/integration/mappers/deep_embedded_spec.rb
 - spec/integration/mappers/definition_dsl_spec.rb
@@ -265,8 +308,6 @@ files:
 - spec/integration/relations/inheritance_spec.rb
 - spec/integration/relations/reading_spec.rb
 - spec/integration/relations/registry_dsl_spec.rb
-- spec/integration/repositories/extending_relations_spec.rb
-- spec/integration/repositories/setting_logger_spec.rb
 - spec/integration/setup_spec.rb
 - spec/shared/command_behavior.rb
 - spec/shared/command_graph.rb
@@ -281,29 +322,37 @@ files:
 - spec/spec_helper.rb
 - spec/support/constant_leak_finder.rb
 - spec/support/mutant.rb
+- spec/support/schema.rb
 - spec/support/types.rb
 - spec/test/memory_repository_lint_test.rb
+- spec/unit/rom/array_dataset_spec.rb
 - spec/unit/rom/association_set_spec.rb
+- spec/unit/rom/auto_curry_spec.rb
 - spec/unit/rom/commands/graph_spec.rb
 - spec/unit/rom/commands/lazy_spec.rb
+- spec/unit/rom/commands/pre_and_post_processors_spec.rb
 - spec/unit/rom/commands/result_spec.rb
 - spec/unit/rom/commands_spec.rb
 - spec/unit/rom/configurable_spec.rb
 - spec/unit/rom/configuration_spec.rb
 - spec/unit/rom/container_spec.rb
 - spec/unit/rom/create_container_spec.rb
+- spec/unit/rom/enumerable_dataset_spec.rb
 - spec/unit/rom/environment_spec.rb
 - spec/unit/rom/gateway_spec.rb
 - spec/unit/rom/mapper_registry_spec.rb
 - spec/unit/rom/memory/commands_spec.rb
 - spec/unit/rom/memory/dataset_spec.rb
+- spec/unit/rom/memory/gateway_spec.rb
+- spec/unit/rom/memory/inheritance_spec.rb
 - spec/unit/rom/memory/relation_spec.rb
-- spec/unit/rom/memory/repository_spec.rb
 - spec/unit/rom/memory/storage_spec.rb
 - spec/unit/rom/plugin_spec.rb
 - spec/unit/rom/plugins/command/schema_spec.rb
 - spec/unit/rom/plugins/relation/key_inference_spec.rb
-- spec/unit/rom/plugins/relation/view_spec.rb
+- spec/unit/rom/registry_spec.rb
+- spec/unit/rom/relation/attribute_reader_spec.rb
+- spec/unit/rom/relation/call_spec.rb
 - spec/unit/rom/relation/composite_spec.rb
 - spec/unit/rom/relation/curried_spec.rb
 - spec/unit/rom/relation/graph_spec.rb
@@ -312,7 +361,20 @@ files:
 - spec/unit/rom/relation/loaded_spec.rb
 - spec/unit/rom/relation/name_spec.rb
 - spec/unit/rom/relation/schema_spec.rb
+- spec/unit/rom/relation/view_spec.rb
 - spec/unit/rom/relation_spec.rb
+- spec/unit/rom/schema/accessing_attributes_spec.rb
+- spec/unit/rom/schema/append_spec.rb
+- spec/unit/rom/schema/exclude_spec.rb
+- spec/unit/rom/schema/finalize_spec.rb
+- spec/unit/rom/schema/key_predicate_spec.rb
+- spec/unit/rom/schema/merge_spec.rb
+- spec/unit/rom/schema/prefix_spec.rb
+- spec/unit/rom/schema/project_spec.rb
+- spec/unit/rom/schema/rename_spec.rb
+- spec/unit/rom/schema/type_spec.rb
+- spec/unit/rom/schema/uniq_spec.rb
+- spec/unit/rom/schema/wrap_spec.rb
 - spec/unit/rom/schema_spec.rb
 - spec/unit/rom/setup/auto_registration_spec.rb
 homepage: http://rom-rb.org

data/lib/rom/plugins/relation/view/dsl.rb

@@ -1,32 +0,0 @@
-module ROM
-  module Plugins
-    module Relation
-      module View
-        class DSL
-          attr_reader :name
-
-          attr_reader :attributes
-
-          attr_reader :relation_block
-
-          def initialize(name, &block)
-            @name = name
-            instance_eval(&block)
-          end
-
-          def header(*args, &block)
-            @attributes = args.size > 0 ? args.first : block
-          end
-
-          def relation(&block)
-            @relation_block = lambda(&block)
-          end
-
-          def call
-            [name, attributes, relation_block]
-          end
-        end
-      end
-    end
-  end
-end