rom 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 078640069bc820b095d68303b641a154635a91f6
-  data.tar.gz: 79499e687dc324c807495be3e332cd27dee00002
+  metadata.gz: 9779926f8873d5ee6b2156b79ea81d295a25d4d6
+  data.tar.gz: 1c773434740d811cf17d0719947a362b2195a0d3
 SHA512:
-  metadata.gz: cd576e0492c38c4b68ac39a7a9fe406d333035658d014541aa379698c08649064a93b1cb7db762d8c327d0f01fa1eb4b1e62c9d3693c83e1e97f0887286966c7
-  data.tar.gz: e930878f5a01d11b9c2c1cd09e2fddfb91584ac7c2daca875acb06f772921bafaa8755dd7fcedece03c7b9ebe04d75f277f1f9a42efd01780db8f08de728b2dd
+  metadata.gz: bd347260359221fe2e8fb474f59c1d09407ed11a933682e963d80938fbf485eabf45f54e533b211a9e4bbd7f31b803e429cbb7790a31f01b2b9a6a46b3879686
+  data.tar.gz: 518d3e583b9bf233ad0624c0a029a83c9ef1d468b9e7ccae429bbd43267a6904cf883c5216dc98546c47fdee2e2e3d5940c9750863a54eda6bace8cfe759b0f7

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-## v3.0.0 to-be-released
+## v3.0.1 2017-02-01
+
+## Fixed
+
+* ViewDSL exposes schemas that have access to all relations (solnic)
+
+[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
 
 ## Added
 

data/lib/rom/relation/class_interface.rb

@@ -224,6 +224,14 @@ module ROM
       #       end
       #     end
       #
+      #   @example View with a schema extended with foreign attributes
+      #     class Users < ROM::Relation[:sql]
+      #       view(:index) do
+      #         schema { append(relations[:tasks][:title]) }
+      #         relation { |name| where(name: name) }
+      #       end
+      #     end
+      #
       # @return [Symbol] view method name
       #
       # @api public
@@ -330,9 +338,9 @@ module ROM
       # Hook to finalize a relation after its instance was created
       #
       # @api private
-      def finalize(_container, relation)
+      def finalize(registry, relation)
         schemas = relation.schemas.reduce({}) do |h, (a, e)|
-          h.update(a => e.is_a?(Proc) ? instance_exec(&e) : e)
+          h.update(a => e.is_a?(Proc) ? instance_exec(registry, &e) : e)
         end
         relation.schemas.update(schemas)
         relation

data/lib/rom/relation/view_dsl.rb

@@ -1,12 +1,26 @@
 module ROM
   class Relation
+    # ViewDSL is exposed in `Relation.view` method
+    #
+    # This is used to establish pre-defined relation views with explicit schemas.
+    # Such views can be used to compose relations together, even from multiple
+    # adapters.
+    #
+    # @api public
     class ViewDSL
+      # @!attribute [r] name
+      #   @return [Symbol] The view name (relation method)
       attr_reader :name
 
+      # @!attribute [r] relation_block
+      #   @return [Proc] The relation block that will be evaluated by the view method
       attr_reader :relation_block
 
+      # @!attribute [r] new_schema
+      #   @return [Proc] The schema proc returned by the schema DSL
       attr_reader :new_schema
 
+      # @api private
       def initialize(name, schema, &block)
         @name = name
         @schema = schema
@@ -15,14 +29,33 @@ module ROM
         instance_eval(&block)
       end
 
+      # Define a schema for a relation view
+      #
+      # @return [Proc]
+      #
+      # @see Relation::ClassInterface.view
+      #
+      # @api public
       def schema(&block)
-        @new_schema = -> { @schema.instance_exec(&block) }
+        @new_schema = -> relations { @schema.with(relations: relations).instance_exec(&block) }
       end
 
+      # Define a relation block for a relation view
+      #
+      # @return [Proc]
+      #
+      # @see Relation::ClassInterface.view
+      #
+      # @api public
       def relation(&block)
         @relation_block = lambda(&block)
       end
 
+      # Return procs captured by the DSL
+      #
+      # @return [Array]
+      #
+      # @api private
       def call
         [name, new_schema, relation_block]
       end

data/lib/rom/version.rb

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

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

@@ -4,6 +4,18 @@ require 'rom/memory'
 RSpec.describe ROM::Relation, '.view' do
   subject(:relation) { relation_class.new(ROM::Memory::Dataset.new([])) }
 
+  let(:registry) do
+    { tasks: tasks }
+  end
+
+  let(:tasks) do
+    Class.new(ROM::Relation[:memory]) do
+      schema do
+        attribute :title, ROM::Types::String
+      end
+    end.new([])
+  end
+
   it 'returns view method name' do
     klass = Class.new(ROM::Relation[:memory]) {
       schema { attribute :id, ROM::Types::Int }
@@ -20,6 +32,10 @@ RSpec.describe ROM::Relation, '.view' do
       relation << { id: 2, name: 'Jane' }
     end
 
+    it 'appends foreign attributes' do
+      expect(relation.schemas[:foreign_attributes].map(&:name)).to eql(%i[id name title])
+    end
+
     it 'uses projected schema for view schema' do
       expect(relation.schemas[:names].map(&:name)).to eql(%i[name])
     end
@@ -44,7 +60,7 @@ RSpec.describe ROM::Relation, '.view' do
   context 'with an explicit schema' do
     before do
       # this is normally called automatically during setup
-      relation_class.finalize({}, relation)
+      relation_class.finalize(registry, relation)
     end
 
     include_context 'relation with views' do
@@ -55,6 +71,16 @@ RSpec.describe ROM::Relation, '.view' do
             attribute :name, ROM::Types::String
           end
 
+          view(:foreign_attributes) do
+            schema do
+              append(relations[:tasks][:title])
+            end
+
+            relation do
+              self
+            end
+          end
+
           view(:names) do
             schema do
               project(:name)
@@ -83,7 +109,7 @@ RSpec.describe ROM::Relation, '.view' do
     before do
       # this is normally called automatically during setup
       relation_class.schema.finalize!
-      relation_class.finalize({}, relation)
+      relation_class.finalize(registry, relation)
     end
 
     include_context 'relation with views' do
@@ -96,6 +122,16 @@ RSpec.describe ROM::Relation, '.view' do
 
           schema(:users, infer: true)
 
+          view(:foreign_attributes) do
+            schema do
+              append(relations[:tasks][:title])
+            end
+
+            relation do
+              self
+            end
+          end
+
           view(:names) do
             schema do
               project(:name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -397,7 +397,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 4
 summary: Ruby Object Mapper