rom 1.0.0.beta2 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af2e4985b3912be1a9942114f7a9046e424450fe
-  data.tar.gz: 9cf96e69185a58d5018a9d995aac749f80bda4bc
+  metadata.gz: 1eab20d270a39e65a4d1f5e2e41156e54a8eafbd
+  data.tar.gz: 15a527fedc410f638e188b33a97118978c7dffe0
 SHA512:
-  metadata.gz: 7f8e4877c911b76cdfee5b391ee4de5e5cc858ccfe4469ab0755495d47eb6091f9afcfc4289fd6247f6f00b7848cacef67f8c2e75309d7023354f2a0c39ff7a2
-  data.tar.gz: 25102c27b87b024b58870441bd3b38a7aa2ee334e1b23200c0f27d2abc6ff1b8b29df86327c397ea6dad9251b33eb6092450e1d3579d85e21b3f520d749ed3aa
+  metadata.gz: 676f11bdda029acf7704e36ec088454d3c076640a922da42c4c9871d4dc7362decf3b8c4c878fe90dc467a6adc7eb61baa3d48e124fb9cace4525d3a973fd78f
+  data.tar.gz: f490fc9f8e7c617d8738c2e9205254e43ceaf4de6a4a1c435f9d4c386ad3e3fee5166acf0d326a5a5e96e5aa46bb7f3eb5948e1f4f7f9b38c3ca5851739a9f5d

data/CHANGELOG.md

@@ -20,6 +20,10 @@
   in the input (solnic)
 - Command graph no longer rescues from any exception (solnic)
 
+### Fixed
+
+- `Relation.register_as` properly overrides inherited value (solnic)
+
 [Compare v0.9.1...HEAD](https://github.com/rom-rb/rom/compare/v0.9.1...HEAD)
 
 ## v0.9.1 2015-08-21

data/lib/rom/relation/class_interface.rb

@@ -77,6 +77,8 @@ module ROM
           # @api public
           def self.register_as(value = Undefined)
             if value == Undefined
+              return @register_as if defined?(@register_as)
+
               super_val = super()
 
               if superclass == ROM::Relation[adapter]

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '1.0.0.beta2'.freeze
+  VERSION = '1.0.0.rc1'.freeze
 end

data/rom.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.add_runtime_dependency 'dry-equalizer', '~> 0.2'
-  gem.add_runtime_dependency 'rom-support', '~> 1.0.0.beta1'
-  gem.add_runtime_dependency 'rom-mapper', '~> 0.3.0.beta1'
+  gem.add_runtime_dependency 'rom-support', '~> 1.0.0.rc1'
+  gem.add_runtime_dependency 'rom-mapper', '~> 0.3.0.rc1'
 
   gem.add_development_dependency 'rake', '~> 10.3'
   gem.add_development_dependency 'rspec', '~> 3.3'

data/spec/unit/rom/relation_spec.rb

@@ -76,14 +76,14 @@ describe ROM::Relation do
       expect(Test::Users.register_as).to eq(:guests)
     end
 
-    it "defaults to :name for descendant classes" do
+    it "defaults to :dataset of parent class" do
       class Test::SuperUsers < ROM::Relation[:memory]
         dataset :users
       end
 
       class Test::DescendantUsers < Test::SuperUsers; end
 
-      expect(Test::DescendantUsers.register_as).to eq(:test_descendant_users)
+      expect(Test::DescendantUsers.register_as).to be(:users)
     end
 
     it "sets custom value for super and descendant classes" do
@@ -98,6 +98,20 @@ describe ROM::Relation do
       expect(Test::SuperUsers.register_as).to eq(:users)
       expect(Test::DescendantUsers.register_as).to eq(:descendant_users)
     end
+
+    it "sets provided value overriding inherited value" do
+      module Test
+        class BaseRelation < ROM::Relation[:memory]
+        end
+
+        class UsersRelation < BaseRelation
+          register_as :users
+          dataset :users
+        end
+      end
+
+      expect(Test::UsersRelation.register_as).to be(:users)
+    end
   end
 
   describe '#name' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-equalizer
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta1
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta1
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: rom-mapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.beta1
+        version: 0.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.beta1
+        version: 0.3.0.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -281,9 +281,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby Object Mapper
 test_files: []
-has_rdoc: