rom 3.0.0.beta1 → 3.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58d0cbbb31e4ac734e6b569dcd7c0a1bd679bd89
-  data.tar.gz: d6f72e2b130a21ba81cc66400be6da7ea179aa6c
+  metadata.gz: 7783cc66c1b765933756f1ac1aa1c90d37e457c3
+  data.tar.gz: b7303d0198ff50269246903fe532500a94fd4829
 SHA512:
-  metadata.gz: 3ae3f83681a32b2f51629a49ab3ecde5c66d2ce2ce59e6dfdb36475343a73ff4515bda9e5aa5b7ab59fb7fd81777296ee7b98b221af621f1f37bd4ae42159442
-  data.tar.gz: b688b6b8430a4f9bbe4dd43dbe066813aa354adc5d0e519107be7c3c8e226abb8498c06c2bbbd4042d6498a2ea0c63e63a73396ad1fddf342740a1c438c14045
+  metadata.gz: 228c165ca9052fc4a50963fc17929ff0f1eb6ee94a856df11d0d9dc58eae5118f908c9dbb58db4f50071a9398bf92afbd28e247f8f15753d31edc25ea76494a9
+  data.tar.gz: 836531fb06c233cdee08a8cad06c648bc498095a7914d50f3dc25553dab7e761d912b38dde9f9fcbd9638db5381e6a0506798b1e455d77c58af6360e8dc29ea3

data/Gemfile

@@ -2,8 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rom-mapper', git: 'https://github.com/rom-rb/rom-mapper.git', branch: 'master'
-
 group :console do
   gem 'pry'
   gem 'pg', platforms: [:mri]

data/lib/rom/constants.rb

@@ -22,6 +22,12 @@ module ROM
   UnsupportedRelationError = Class.new(StandardError)
   MissingAdapterIdentifierError = Class.new(StandardError)
 
+  MissingSchemaClassError = Class.new(StandardError) do
+    def initialize(klass)
+      super("#{klass.inspect} relation is missing schema_class")
+    end
+  end
+
   DuplicateConfigurationError = Class.new(StandardError)
   DuplicateContainerError = Class.new(StandardError)
 

data/lib/rom/relation/class_interface.rb

@@ -30,7 +30,11 @@ module ROM
         end
 
         klass.extend Dry::Core::ClassAttributes
-        klass.defines :adapter, :schema_class
+        klass.defines :adapter, :schema_class, :schema_inferrer, :schema_dsl
+
+        klass.schema_dsl Schema::DSL
+        klass.schema_class Schema
+        klass.schema_inferrer Schema::DEFAULT_INFERRER
 
         # Extend with functionality required by adapters *only* if this is a direct
         # descendant of an adapter-specific relation subclass
@@ -39,13 +43,9 @@ module ROM
         klass.class_eval do
           use :registry_reader
 
-          defines :gateway, :dataset, :dataset_proc, :register_as,
-                  :schema_dsl, :schema_inferrer
+          defines :gateway, :dataset, :dataset_proc, :register_as
 
           gateway :default
-          schema_dsl Schema::DSL
-          schema_class Schema
-          schema_inferrer nil
 
           dataset default_name
 
@@ -160,15 +160,25 @@ module ROM
       # @param [Boolean] infer Whether to do an automatic schema inferring
       #
       # @api public
-      def schema(dataset = nil, infer: false, &block)
+      def schema(dataset = nil, as: nil, infer: false, &block)
         if defined?(@schema)
           @schema
         elsif block || infer
           self.dataset(dataset) if dataset
-          self.register_as(self.dataset) unless register_as
+
+          if as
+            self.register_as(as)
+          else
+            self.register_as(self.dataset) unless register_as
+          end
 
           name = Name[register_as, self.dataset]
           inferrer = infer ? schema_inferrer : nil
+
+          unless schema_class
+            raise MissingSchemaClassError.new(self)
+          end
+
           dsl = schema_dsl.new(name, schema_class: schema_class, inferrer: inferrer, &block)
 
           @schema = dsl.call
@@ -283,6 +293,12 @@ module ROM
         @schemas ||= {}
       end
 
+      # @api private
+      def default_schema(relation)
+        relation_class = relation.class
+        relation_class.schema || relation_class.schema_class.define(relation_class.default_name)
+      end
+
       # Hook to finalize a relation after its instance was created
       #
       # @api private

data/lib/rom/relation.rb

@@ -51,9 +51,7 @@ module ROM
     #                    schema (if it was defined) and sets an empty one as
     #                    the fallback
     #   @api public
-    option :schema, reader: true, optional: true, default: -> relation {
-      relation.class.schema || Schema.define(Dry::Core::Inflector.underscore(relation.class.name || EMPTY_STRING).to_sym)
-    }
+    option :schema, reader: true, default: method(:default_schema).to_proc
 
     # @!attribute [r] schema_hash
     #   @return [Object#[]] tuple processing function, uses schema or defaults to Hash[]

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '3.0.0.beta1'.freeze
+  VERSION = '3.0.0.beta2'.freeze
 end

data/spec/integration/mappers/ungroup_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe 'Mapper definition DSL' do
       { type: 'home' },
       {}
     ])
-    users.insert(name: 'Jane')
+    users.insert(name: 'Jane', emails: [])
   end
 
   describe 'ungroup' do

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

@@ -85,6 +85,24 @@ RSpec.describe ROM::Relation, '.schema' do
     expect(Test::Users.register_as).to be(:test_users)
   end
 
+  it 'allows setting both dataset and relation alias' do
+    class Test::Users < ROM::Relation[:memory]
+      schema(:test_users, as: :users) { }
+    end
+
+    expect(Test::Users.register_as).to be(:users)
+    expect(Test::Users.dataset).to be(:test_users)
+  end
+
+  it 'raises error when schema_class is missing' do
+    class Test::Users < ROM::Relation[:memory]
+      schema_class nil
+    end
+
+    expect { Test::Users.schema(:test) { } }.
+      to raise_error(ROM::MissingSchemaClassError, "Test::Users relation is missing schema_class")
+  end
+
   describe '#schema' do
     it 'returns defined schema' do
       class Test::Users < ROM::Relation[:memory]

data/spec/unit/rom/relation_spec.rb

@@ -219,14 +219,15 @@ RSpec.describe ROM::Relation do
 
   describe '#schema' do
     it 'returns an empty schema by default' do
-      relation = Class.new(ROM::Relation[:memory]) {
+      relation = Class.new(ROM::Relation) {
         def self.name
-          'SomeRelation'
+          'Test::SomeRelation'
         end
       }.new([])
 
       expect(relation.schema).to be_empty
-      expect(relation.schema.name).to be(:some_relation)
+      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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta1
+  version: 3.0.0.beta2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby