rom 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9779926f8873d5ee6b2156b79ea81d295a25d4d6
-  data.tar.gz: 1c773434740d811cf17d0719947a362b2195a0d3
+  metadata.gz: e937480122a0f25c272a123788205fca636c3914
+  data.tar.gz: 14f714ced390387ee4e3008c6ac7028ec3ffb342
 SHA512:
-  metadata.gz: bd347260359221fe2e8fb474f59c1d09407ed11a933682e963d80938fbf485eabf45f54e533b211a9e4bbd7f31b803e429cbb7790a31f01b2b9a6a46b3879686
-  data.tar.gz: 518d3e583b9bf233ad0624c0a029a83c9ef1d468b9e7ccae429bbd43267a6904cf883c5216dc98546c47fdee2e2e3d5940c9750863a54eda6bace8cfe759b0f7
+  metadata.gz: f88ca6fd4d17cce1332c5005f422e4b8fbbfa86e4acd72e602b89322b1a35f22ab8a176fa1dd5e497de78e32432e133b6cc9ba8e08b9d4ac6bf54e65dd0feccd
+  data.tar.gz: b2e112e5baaa3d27b035ef18143b81576c1a86fda420e2ad8d96e350f4b7ad7a8328f03c8edc12b6b1f927af3d9d1f3d210eb048c7c5e5733c08a67d466c8b0c

data/CHANGELOG.md

@@ -1,4 +1,17 @@
-## v3.0.1 2017-02-01
+# v3.0.2 2017-02-24
+
+## Added
+
+* `Schema::Attribute#key` which returns tuple key name, either alias or canonical name (solnic)
+
+## Fixed
+
+* Fix the error message for missing association (flash-gordon)
+* Curried relation called without any arguments will raise an ArgumentError (solnic)
+
+[Compare v3.0.1...v3.0.2](https://github.com/rom-rb/rom/compare/v3.0.1...v3.0.2)
+
+# v3.0.1 2017-02-01
 
 ## Fixed
 
@@ -6,7 +19,7 @@
 
 [Compare v3.0.0...v3.0.1](https://github.com/rom-rb/rom/compare/v3.0.0...v3.0.1)
 
-## v3.0.0 2017-01-29
+# v3.0.0 2017-01-29
 
 ## Added
 
@@ -40,7 +53,7 @@
 
 [Compare v2.0.2...v3.0.0](https://github.com/rom-rb/rom/compare/v2.0.2...v3.0.0)
 
-## v2.0.2 2016-11-11
+# v2.0.2 2016-11-11
 
 ## Added
 
@@ -53,7 +66,7 @@
 
 [Compare v2.0.1...v2.0.2](https://github.com/rom-rb/rom/compare/v2.0.1...v2.0.2)
 
-## v2.0.1 2016-09-30
+# v2.0.1 2016-09-30
 
 ### Added
 
@@ -66,7 +79,7 @@
 
 [Compare v2.0.0...v2.0.1](https://github.com/rom-rb/rom/compare/v2.0.0...v2.0.1)
 
-## v2.0.0 2016-07-27
+# v2.0.0 2016-07-27
 
 ### Added
 
@@ -104,7 +117,7 @@
 
 [Compare v1.0.0...v2.0.0](https://github.com/rom-rb/rom/compare/v1.0.0...v2.0.0)
 
-## v1.0.0 2016-01-06
+# v1.0.0 2016-01-06
 
 ### Added
 
@@ -132,7 +145,7 @@
 
 [Compare v0.9.1...v1.0.0](https://github.com/rom-rb/rom/compare/v0.9.1...v1.0.0)
 
-## v0.9.1 2015-08-21
+# v0.9.1 2015-08-21
 
 This is a small bug-fix release which addresses a couple of issues for inline
 setup DSL and multi-environments.
@@ -152,7 +165,7 @@ setup DSL and multi-environments.
 
 [Compare v0.9.0...v0.9.1](https://github.com/rom-rb/rom/compare/v0.9.0...v0.9.1)
 
-## v0.9.0 2015-08-19
+# v0.9.0 2015-08-19
 
 ### Added
 
@@ -184,7 +197,7 @@ setup DSL and multi-environments.
 
 [Compare v0.8.1...v0.9.0](https://github.com/rom-rb/rom/compare/v0.8.1...v0.9.0)
 
-## v0.8.1 2015-07-12
+# v0.8.1 2015-07-12
 
 ### Fixed
 
@@ -196,7 +209,7 @@ setup DSL and multi-environments.
 
 [Compare v0.8.0...v0.8.1](https://github.com/rom-rb/rom/compare/v0.8.0...v0.8.1)
 
-## v0.8.0 2015-06-22
+# v0.8.0 2015-06-22
 
 ### Added
 
@@ -224,7 +237,7 @@ setup DSL and multi-environments.
 
 [Compare v0.7.1...v0.8.0](https://github.com/rom-rb/rom/compare/v0.7.1...v0.8.0)
 
-## v0.7.1 2015-05-22
+# v0.7.1 2015-05-22
 
 ### Added
 
@@ -242,7 +255,7 @@ setup DSL and multi-environments.
 
 [Compare v0.7.0...v0.7.1](https://github.com/rom-rb/rom/compare/v0.7.0...v0.7.1)
 
-## v0.7.0 2015-05-17
+# v0.7.0 2015-05-17
 
 ### Added
 
@@ -276,7 +289,7 @@ setup DSL and multi-environments.
 
 [Compare v0.6.2...v0.7.0](https://github.com/rom-rb/rom/compare/v0.6.2...v0.7.0)
 
-## v0.6.2 2015-04-14
+# v0.6.2 2015-04-14
 
 ### Changed
 
@@ -288,7 +301,7 @@ setup DSL and multi-environments.
 
 [Compare v0.6.1...v0.6.2](https://github.com/rom-rb/rom/compare/v0.6.1...v0.6.2)
 
-## v0.6.1 2015-04-04
+# v0.6.1 2015-04-04
 
 ### Added
 
@@ -301,7 +314,7 @@ setup DSL and multi-environments.
 
 [Compare v0.6.0...v0.6.1](https://github.com/rom-rb/rom/compare/v0.6.0...v0.6.1)
 
-## v0.6.0 2015-03-22
+# v0.6.0 2015-03-22
 
 ### Added
 
@@ -342,7 +355,7 @@ setup DSL and multi-environments.
 
 [Compare v0.5.0...v0.6.0](https://github.com/rom-rb/rom/compare/v0.5.0...v0.6.0)
 
-## v0.5.0 2014-12-31
+# v0.5.0 2014-12-31
 
 ### Added
 
@@ -383,7 +396,7 @@ setup DSL and multi-environments.
 
 [Compare v0.4.2...v0.5.0](https://github.com/rom-rb/rom/compare/v0.4.2...v0.5.0)
 
-## v0.4.2 2014-12-19
+# v0.4.2 2014-12-19
 
 ### Added
 
@@ -399,7 +412,7 @@ setup DSL and multi-environments.
 
 [Compare v0.4.1...v0.4.2](https://github.com/rom-rb/rom/compare/v0.4.1...v0.4.2)
 
-## v0.4.1 2014-12-15
+# v0.4.1 2014-12-15
 
 ### Added
 
@@ -416,7 +429,7 @@ setup DSL and multi-environments.
 
 [Compare v0.4.0...v0.4.1](https://github.com/rom-rb/rom/compare/v0.4.0...v0.4.1)
 
-## v0.4.0 2014-12-06
+# v0.4.0 2014-12-06
 
 ### Added
 
@@ -436,7 +449,7 @@ setup DSL and multi-environments.
 
 [Compare v0.3.1...v0.4.0](https://github.com/rom-rb/rom/compare/v0.3.1...v0.4.0)
 
-## v0.3.1 2014-11-25
+# v0.3.1 2014-11-25
 
 ### Added
 
@@ -452,14 +465,14 @@ setup DSL and multi-environments.
 
 [Compare v0.3.0...v0.3.1](https://github.com/rom-rb/rom/compare/v0.3.0...v0.3.1)
 
-## v0.3.0 2014-11-24
+# v0.3.0 2014-11-24
 
 This version is a rewrite that introduces a new, simplified architecture based
 on a new adapter interface.
 
 [Compare v0.2.0...v0.3.0](https://github.com/rom-rb/rom/compare/v0.2.0...v0.3.0)
 
-## v0.2.0 2014-04-06
+# v0.2.0 2014-04-06
 
 ### Added
 
@@ -482,19 +495,19 @@ on a new adapter interface.
 
 [Compare v0.1.2...v0.2.0](https://github.com/rom-rb/rom/compare/v0.1.2...v0.2.0)
 
-## v0.1.2 2013-09-02
+# v0.1.2 2013-09-02
 
 * [updated] [rom-relation](https://github.com/rom-rb/rom-relation/blob/v0.1.2/Changelog.md#v012-2013-09-02)
 
 [Compare v0.1.1...v0.1.2](https://github.com/rom-rb/rom/compare/v0.1.1...v0.1.2)
 
-## v0.1.1 2013-08-30
+# v0.1.1 2013-08-30
 
 * [updated] [rom-relation](https://github.com/rom-rb/rom-relation/blob/v0.1.1/Changelog.md#v011-2013-08-30)
 * [updated] [rom-session](https://github.com/rom-rb/rom-session/blob/v0.1.1/Changelog.md#v011-2013-08-30)
 
 [Compare v0.1.0...v0.1.1](https://github.com/rom-rb/rom/compare/v0.1.0...v0.1.1)
 
-## v0.1.0 2013-08-23
+# v0.1.0 2013-08-23
 
 First public release

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2014 Ruby Object Mapper Team
+Copyright (c) 2013-2017 Ruby Object Mapper Team
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/rom/association_set.rb

@@ -21,10 +21,17 @@ module ROM
       if key?(key)
         super
       else
-        super(singularize(key))
+        sk = singularize(key)
+
+        if key?(sk)
+          super(sk)
+        else
+          super
+        end
       end
     end
 
+    # @api private
     def singularize(key)
       Dry::Core::Inflector.singularize(key).to_sym
     end

data/lib/rom/relation/curried.rb

@@ -38,6 +38,8 @@ module ROM
 
           if arity == all_args.size
             Loaded.new(relation.__send__(name.relation, *all_args))
+          elsif args.empty?
+            raise ArgumentError, "curried #{relation.class}##{name.to_sym} relation was called without any arguments"
           else
             __new__(relation, curry_args: all_args)
           end

data/lib/rom/schema.rb

@@ -227,7 +227,7 @@ module ROM
     #
     # @api public
     def wrap(prefix = name.dataset)
-      new(map { |attr| attr.wrapped(prefix) })
+      new(map { |attr| attr.wrapped? ? attr : attr.wrapped(prefix) })
     end
 
     # Return FK attribute for a given relation name
@@ -342,7 +342,7 @@ module ROM
     # @api private
     def to_output_hash
       Types::Coercible::Hash.schema(
-        map { |attr| [attr.name, attr.to_read_type] }.to_h
+        map { |attr| [attr.key, attr.to_read_type] }.to_h
       )
     end
 

data/lib/rom/schema/attribute.rb

@@ -173,6 +173,31 @@ module ROM
         meta[:name]
       end
 
+      # Return tuple key
+      #
+      # When schemas are projected with aliased attributes, we need a simple access to tuple keys
+      #
+      # @example
+      #   class Tasks < ROM::Relation[:memory]
+      #     schema do
+      #       attribute :user_id, Types::Int.meta(alias: :id)
+      #       attribute :name, Types::String
+      #     end
+      #   end
+      #
+      #   Users.schema[:id].key
+      #   # :id
+      #
+      #   Users.schema.project(Users.schema[:id].aliased(:user_id)).key
+      #   # :user_id
+      #
+      # @return [Symbol]
+      #
+      # @api public
+      def key
+        meta[:alias] || name
+      end
+
       # Return attribute's alias
       #
       # @example

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '3.0.1'.freeze
+  VERSION = '3.0.2'.freeze
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-if ENV['COVERAGE'] == 'true' && RUBY_ENGINE == 'ruby' && RUBY_VERSION == '2.3.1'
+if ENV['COVERAGE'] == 'true' && RUBY_ENGINE == 'ruby' && RUBY_VERSION == '2.4.0'
   require "simplecov"
   SimpleCov.start do
     add_filter '/spec/'

data/spec/unit/rom/association_set_spec.rb

@@ -24,4 +24,25 @@ RSpec.describe ROM::AssociationSet do
       expect(fallback).to have_received(:done)
     end
   end
+
+  describe '#[]' do
+    let(:users) { BasicObject.new }
+    let(:posts) { BasicObject.new }
+    let(:set) { ROM::AssociationSet.new(users: users, post: posts) }
+
+    it 'fetches association' do
+      expect(set[:users]).to be users
+    end
+
+    it 'tries to fetch under singularized key' do
+      expect(set[:post]).to be posts
+    end
+
+    it 'throws exception on missing association' do
+      expect { set[:labels] }.to raise_error(
+        ROM::Registry::ElementNotFoundError,
+        ":labels doesn't exist in ROM::AssociationSet registry"
+      )
+    end
+  end
 end

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

@@ -17,16 +17,21 @@ RSpec.describe ROM::Relation::Curried do
   end
 
   describe '#call' do
-    let(:relation) { users_relation.by_name.call('Jane') }
+    let(:relation) { users_relation.by_name }
 
     it 'materializes a relation' do
-      expect(relation).to match_array([
-        name: 'Jane', email: 'jane@doe.org'
-      ])
+      expect(relation.('Jane').to_a).to eql([name: 'Jane', email: 'jane@doe.org'])
     end
 
     it 'returns a loaded relation' do
-      expect(relation.source).to eql(users_relation.by_name('Jane'))
+      expect(relation.('Jane').source).to eql(users_relation.by_name('Jane'))
+    end
+
+    it 'raises argument error if no arguments were provided' do
+      expect { relation.() }.
+        to raise_error(
+             ArgumentError,
+             "curried #{users_relation.class}#by_name relation was called without any arguments")
     end
   end
 

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

@@ -0,0 +1,28 @@
+require  'rom/memory'
+
+RSpec.describe ROM::Relation, '#output_schema' do
+  subject(:relation) do
+    Class.new(ROM::Relation[:memory]) do
+      schema do
+        attribute :id, ROM::Types::String, read: ROM::Types::Int
+        attribute :name, ROM::Types::String
+      end
+    end.new(ROM::Memory::Dataset.new([]))
+  end
+
+  let(:schema) do
+    relation.schema
+  end
+
+  it 'returns output_schema based on canonical schema' do
+    expect(relation.output_schema).
+      to eql(ROM::Types::Coercible::Hash.schema(id: schema[:id].to_read_type, name: schema[:name].type))
+  end
+
+  it 'returns output_schema based on projected schema' do
+    projected = relation.project(schema[:id].aliased(:user_id))
+
+    expect(projected.output_schema).
+      to eql(ROM::Types::Coercible::Hash.schema(user_id: projected.schema[:id].to_read_type))
+  end
+end

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

@@ -13,5 +13,6 @@ RSpec.describe ROM::Schema, '#wrap' 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)
+    expect(wrapped.wrap(:foo)).to eql(wrapped)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -360,6 +360,7 @@ files:
 - spec/unit/rom/relation/lazy_spec.rb
 - spec/unit/rom/relation/loaded_spec.rb
 - spec/unit/rom/relation/name_spec.rb
+- spec/unit/rom/relation/output_schema_spec.rb
 - spec/unit/rom/relation/schema_spec.rb
 - spec/unit/rom/relation/view_spec.rb
 - spec/unit/rom/relation_spec.rb