rom-repository 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2939fe9e61cbec70da58fe863b4c49384feabf57
-  data.tar.gz: 7cf8ca8cfc9acb006d2065bcdfcd6fcac6c4531e
+  metadata.gz: 60e1932a1540f3a5db52bbb5a4ae073b83ee0289
+  data.tar.gz: 8a430f76a00792c4d12d94d8271b0736310dc20b
 SHA512:
-  metadata.gz: 8ee593244830ea931207b4acd726c9475543e6f8dd1bf65a3741c51f75bc1eee9fee974509fc4298005e2958500c38e2e313ed639b63f564de178cb4eb5bdb08
-  data.tar.gz: e3c05763d9d382a268ee5d29af29472826c86ac538b3b4364b80a36379ecb5d822aa5ced697fb836a111a212c700c24694c13f73f6acd0de6c04dcdd5dac145f
+  metadata.gz: 514906df2e8c7c3b33fb3cce5083d65f4b238ca1aa7ca03df9d736f0ceb4752b610d66937e372645cc0f71dd7a0d845cbcdeca27a69a8ca13a367bf75a42b3e8
+  data.tar.gz: a75e84fd982d615e4f57802a130658d5d0482c62bf0216f6cf70c6c348c4b99d50561cdcd33de73f6b7ff3700fc15702d4023711b2fe0c0c599b184dc45a77b4

data/CHANGELOG.md

@@ -1,12 +1,18 @@
+# v1.4.0 2017-07-04
+
+### Added
+
+* `Relation#map_to` available in repository relations to ease upgrade to rom 4.0 (solnic)
+* Deprecation warnings in preparation for rom 4.0 release (solnic)
+
+[Compare v1.3.3...v1.3.4](https://github.com/rom-rb/rom-repository/compare/v1.3.3...v1.3.4)
+
 # v1.3.3 2017-05-31
 
 ### Added
 
-* `Changeset#extend` to exclude steps from the `#diff` output, this allows
-  to filter out timestamp changes prior to updates so that we can avoid
-  hitting the database in case of timestamp-only changes. You still can call `.map(:touch)`
-  if you want to have `updated_at` refreshed unconditionally (flash-gordon)
-  
+* `Changeset#extend` to exclude steps from the `#diff` output, this allows to filter out timestamp changes prior to updates so that we can avoid hitting the database in case of timestamp-only changes. You still can call `.map(:touch)` if you want to have `updated_at` refreshed unconditionally (flash-gordon)
+
 ## Fixed
 
 * `aggregate` and `combine` works correctly with nested graph options where associations are aliased (solnic)

data/lib/rom/repository.rb

@@ -125,7 +125,8 @@ module ROM
 
       @relations = RelationRegistry.new do |registry, relations|
         self.class.relations.each do |name|
-          relation = container.relation(name)
+          relation = container.relations[name]
+          relation = relation.with(mappers: container.mappers[name]) if container.mappers.key?(name)
 
           proxy = RelationProxy.new(
             relation, name: name, mappers: mappers, registry: registry, auto_struct: auto_struct

data/lib/rom/repository/relation_proxy.rb

@@ -1,3 +1,5 @@
+require 'dry/core/deprecations'
+
 require 'rom/initializer'
 require 'rom/relation/materializable'
 
@@ -15,6 +17,8 @@ module ROM
     # @api public
     class RelationProxy
       extend Initializer
+      extend Dry::Core::Deprecations[:rom]
+
       include Relation::Materializable
 
       (Kernel.private_instance_methods - %i(raise)).each(&method(:undef_method))
@@ -22,6 +26,10 @@ module ROM
       include RelationProxy::Combine
       include RelationProxy::Wrap
 
+      deprecate :combine_parents
+      deprecate :combine_children
+      deprecate :wrap_parent
+
       RelationRegistryType = Types.Definition(RelationRegistry).constrained(type: RelationRegistry)
 
       # @!attribute [r] relation
@@ -89,7 +97,31 @@ module ROM
       # @api public
       def map_with(*names, **opts)
         if names.size == 1 && names[0].is_a?(Class)
-          with(meta: meta.merge(model: names[0]))
+          map_to(names[0])
+        elsif names.size > 1 && names.any? { |name| name.is_a?(Class) }
+          raise ArgumentError, 'using custom mappers and a model is not supported'
+        else
+          if opts[:auto_map] && !meta[:combine_type]
+            mappers = [mapper, *names.map { |name| relation.mappers[name] }]
+            mappers.reduce(self) { |a, e| a >> e }
+          else
+            names.reduce(self) { |a, e| a >> relation.mappers[e] }
+          end
+        end
+      end
+
+      # @api public
+      def as(*names, **opts)
+        if names.size == 1 && names[0].is_a?(Class)
+          msg = <<-STR
+            Relation#as will change behavior in 4.0. Use `map_to` instead
+              => Called at:
+                #{Kernel.caller[0..5].join("\n")}
+            STR
+
+          Dry::Core::Deprecations.warn(msg)
+
+          map_to(names[0])
         elsif names.size > 1 && names.any? { |name| name.is_a?(Class) }
           raise ArgumentError, 'using custom mappers and a model is not supported'
         else
@@ -101,7 +133,11 @@ module ROM
           end
         end
       end
-      alias_method :as, :map_with
+
+      # @api public
+      def map_to(model)
+        with(meta: meta.merge(model: model))
+      end
 
       # Return a new graph with adjusted node returned from a block
       #

data/lib/rom/repository/version.rb

@@ -1,5 +1,5 @@
 module ROM
   class Repository
-    VERSION = '1.3.3'.freeze
+    VERSION = '1.4.0'.freeze
   end
 end

data/lib/rom/struct.rb

@@ -90,12 +90,23 @@ module ROM
       __send__(name)
     end
 
+    if RUBY_VERSION < '2.3'
+      # @api private
+      def respond_to?(*)
+        super
+      end
+    else
+      # @api private
+      def respond_to_missing?(*)
+        super
+      end
+    end
+
     private
 
     def method_missing(method, *)
       super
     rescue NameError => error
-      raise if method == :to_ary
       raise MissingAttribute.new("#{ error.message } (not loaded attribute?)")
     end
   end

data/rom-repository.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {spec}/*`.split("\n")
   gem.license       = 'MIT'
 
-  gem.add_runtime_dependency 'rom', '~> 3.2', '>= 3.2.3'
+  gem.add_runtime_dependency 'rom', '~> 3.3'
   gem.add_runtime_dependency 'rom-mapper', '~> 0.5'
   gem.add_runtime_dependency 'dry-core', '~> 0.3', '>= 0.3.1'
-  gem.add_runtime_dependency 'dry-struct', '~> 0.1'
+  gem.add_runtime_dependency 'dry-struct', '~> 0.3'
 
   gem.add_development_dependency 'rake', '~> 11.2'
   gem.add_development_dependency 'rspec', '~> 3.5'

data/spec/integration/multi_adapter_spec.rb

@@ -24,18 +24,15 @@ RSpec.describe 'Repository with multi-adapters configuration' do
 
     module Test
       class Users < ROM::Relation[:sql]
-        gateway :default
-        schema(:users, infer: true)
-        register_as :sql_users
+        schema(:users, as: :sql_users, infer: true)
       end
 
       class Tasks < ROM::Relation[:memory]
-        schema(:tasks) do
+        schema(:tasks, as: :memory_tasks) do
           attribute :user_id, ROM::Types::Int
           attribute :title, ROM::Types::String
         end
 
-        register_as :memory_tasks
         gateway :memory
 
         use :key_inference

data/spec/shared/relations.rb

@@ -1,9 +1,9 @@
 RSpec.shared_context 'relations' do
-  let(:users) { rom.relation(:users) }
-  let(:tasks) { rom.relation(:tasks) }
-  let(:tags) { rom.relation(:tags) }
-  let(:posts) { rom.relation(:posts) }
-  let(:books) { rom.relation(:books) }
+  let(:users) { rom.relations[:users] }
+  let(:tasks) { rom.relations[:tasks] }
+  let(:tags) { rom.relations[:tags] }
+  let(:posts) { rom.relations[:posts] }
+  let(:books) { rom.relations[:books] }
 
   before do
     configuration.relation(:books) do
@@ -96,9 +96,7 @@ RSpec.shared_context 'relations' do
     end
 
     configuration.relation(:comments) do
-      register_as :comments
-
-      schema(:messages, infer: true) do
+      schema(:messages, as: :comments, infer: true) do
         associations do
           has_many :reactions, relation: :likes
           has_many :reactions, relation: :likes, as: :emotions
@@ -107,9 +105,7 @@ RSpec.shared_context 'relations' do
     end
 
     configuration.relation(:likes) do
-      register_as :likes
-
-      schema(:reactions, infer: true) do
+      schema(:reactions, as: :likes, infer: true) do
         associations do
           belongs_to :message, relation: :comments
         end

data/spec/unit/relation_proxy_spec.rb

@@ -8,15 +8,15 @@ RSpec.describe 'loading proxy' do
   include_context 'seeds'
 
   let(:users_proxy) do
-    ROM::Repository::RelationProxy.new(users, name: :users)
+    repo.users
   end
 
   let(:tasks_proxy) do
-    ROM::Repository::RelationProxy.new(tasks, name: :tasks)
+    repo.tasks
   end
 
   let(:tags_proxy) do
-    ROM::Repository::RelationProxy.new(tags, name: :tags)
+    repo.tags
   end
 
   describe '#inspect' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-repository
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rom-mapper
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Repository abstraction for rom-rb