rom-repository 1.0.0.beta1 → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5e3e3120dbe44e4f2f116cfe7aaaba6b2ef0a7e
-  data.tar.gz: 1e29da4f4c4c2c8c6cf7d9a70c794365419bc18d
+  metadata.gz: cdb0dfc90b48097d286f0d5b79790560d79c8fdd
+  data.tar.gz: ed15356517cc1dff17729d851e53b77f75727075
 SHA512:
-  metadata.gz: b40d4d1a1c984998a0f58287cf586dd151251f9e9cabddcf22fff0a23e944f7113a1ffef5be76e6c44560d99d9c4d7bcecbb78f074f5079057ac71f7da0708a8
-  data.tar.gz: 8ec19211a0103e67f33578166bb781c1d42271d04e5561451e023aaccc4722d90b9e2fa3061cc1a021efca5c5f13fad00b105f9d72cfb66c1a4f86a679422c13
+  metadata.gz: cc5b70717bbfb200cad2dc539f89c438398ae3dd3c6fb3f10f8d1c58c48e2be2b5d7bc01a729f738400e9b5021dbb070aa14fbdaec98c5ec8f30b57511e6448c
+  data.tar.gz: 88d6e30ab3107d583119ab1ed2a48bb83e138b2bc5026235acbb1a6932302a34037bb5315de976479d0c58895cb841026fe3239f8c3326e2093d882faf84942e

data/CHANGELOG.md

@@ -11,6 +11,7 @@
 * Ability to define custom changeset classes that can be instantiated via `repo.changeset(MyChangesetClass[:rel_name]).data(some_data)` where `MyChangesetClass` inherits from a core changeset class (solnic)
 * `Changeset.map` which accepts a block and exposes a DSL for data transformations (all [transproc hash methods](https://github.com/solnic/transproc)) are available (solnic)
 * `Changeset#associate` method that accepts another changeset or parent data and an association identifier, ie `post_changeset.associate(user, :author)` (solnic)
+* You can now use `wrap_parent` in combined relations too (which is gazillion times faster than `combine_parents`) (solnic)
 
 ### Changed
 

data/lib/rom/repository/command_compiler.rb

@@ -169,7 +169,7 @@ module ROM
 
           finalize_command_class(klass, relation)
 
-          registry[rel_name][type] = klass.build(relation, input: relation.schema_hash)
+          registry[rel_name][type] = klass.build(relation, input: relation.input_schema)
         end
       end
 

data/lib/rom/repository/relation_proxy.rb

@@ -84,7 +84,7 @@ module ROM
       #
       # @api private
       def with(new_options)
-        __new__(relation, new_options)
+        __new__(relation, options.merge(new_options))
       end
 
       # Returns if this relation is combined aka a relation graph
@@ -189,7 +189,7 @@ module ROM
       #
       # @api private
       def wraps
-        meta.fetch(:wraps, [])
+        meta.fetch(:wraps, EMPTY_ARRAY)
       end
 
       # Forward to relation and wrap it with proxy if response was a relation too

data/lib/rom/repository/relation_proxy/combine.rb

@@ -17,7 +17,7 @@ module ROM
         # @api private
         def combined(name, keys, type)
           meta = { keys: keys, combine_type: type, combine_name: name }
-          with(name: name, meta: meta)
+          with(name: name, meta: self.meta.merge(meta))
         end
 
         # Combine with other relations

data/lib/rom/repository/relation_proxy/wrap.rb

@@ -38,7 +38,8 @@ module ROM
         def wrap_parent(options)
           wrap(
             options.each_with_object({}) { |(name, parent), h|
-              h[name] = [parent, combine_keys(parent, relation, :children)]
+              keys = combine_keys(parent, relation, :children)
+              h[name] = [parent, keys]
             }
           )
         end

data/lib/rom/repository/struct_builder.rb

@@ -50,9 +50,7 @@ module ROM
       end
 
       def visit_attribute(attr)
-        unless attr.foreign_key?
-          [attr.aliased? && !attr.wrapped? ? attr.alias : attr.name, attr.type]
-        end
+        [attr.aliased? && !attr.wrapped? ? attr.alias : attr.name, attr.type]
       end
 
       def build_class(name, parent, &block)

data/lib/rom/repository/version.rb

@@ -1,5 +1,5 @@
 module ROM
   class Repository
-    VERSION = '1.0.0.beta1'.freeze
+    VERSION = '1.0.0.beta2'.freeze
   end
 end

data/spec/integration/command_spec.rb

@@ -37,9 +37,9 @@ RSpec.describe ROM::Repository, '#command' do
       expect(user.name).to eql('Jane Doe')
     end
 
-    it 'uses schema_hash for command input' do
+    it 'uses input_schema for command input' do
       create_user = repo.command(create: :users)
-      expect(create_user.input).to eql(repo.users.schema_hash)
+      expect(create_user.input).to eql(repo.users.input_schema)
     end
 
     it 'caches commands' do

data/spec/integration/repository_spec.rb

@@ -95,6 +95,17 @@ RSpec.describe 'ROM repository' do
     expect(jane.labels[1].name).to eql('blue')
   end
 
+  it 'loads children and its parents via wrap' do
+    posts = repo.posts.wrap_parent(author: repo.users)
+
+    label = repo.labels.combine(many: { posts: posts }).first
+
+    expect(label.name).to eql('red')
+    expect(label.posts.size).to be(1)
+    expect(label.posts[0].title).to eql('Hello From Jane')
+    expect(label.posts[0].author.name).to eql('Jane')
+  end
+
   it 'loads a parent via custom fks' do
     post = repo.posts.combine(:author).where(title: 'Hello From Jane').one
 

data/spec/shared/repo.rb

@@ -53,7 +53,7 @@ RSpec.shared_context('repo') do
       end
 
       def task_with_user
-        tasks.find(id: 2).combine_parents(one: users)
+        tasks.find(tasks[:id].qualified => 2).wrap_parent(user: users)
       end
 
       def task_with_owner

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-repository
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.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-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom