rom-repository 5.2.2 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 550a6edbadf63192bfb25f13730d36333249b4d62a09ae50082293673ec2323d
-  data.tar.gz: ded42536cbd47227855fd97fa29c264579a25cd60f546e83e76d51f170422a8a
+  metadata.gz: 1945e400f70ab8fba8b203ab2a5894ff0c3af70dbe55a00bb20ccd33ed0663b8
+  data.tar.gz: 48e96bca0f06806b8cc03a390c3c11ecae6f1b4b05c3ae0c96e0b380c25e27d6
 SHA512:
-  metadata.gz: f190a22779c2f484ae5707f96b543b47b3682d8e55aee281d45761cc20f68aedb85b09ef19f278c09829f0ea1ef6911cc848e81d634b93b0d4ebf8447c4acaca
-  data.tar.gz: acde1423d52bc20df33ad05197de2727a20e2e8de12dd262de4a726c715a31975c1fbcfbe95d799b5030ed92e0f174e540197bf9fdb769bcc398aba422d579e3
+  metadata.gz: 42202fc4ee9f6680131f95e990eb8785ad23fd82aa67cedd1ce79249cd8bdb2318b081b31f6efc2f632f18a29d6dd17de7739f848906b997e46457416f3eacd8
+  data.tar.gz: 1ce9298b198da42a05070e5efdc6f426f7fdb0a9107428af9e3031c19296728df9ddb5bf369fb1fbec836740c4d14f6a827c48fa3cae9a83fc33de63be63a174

data/lib/rom/repository/class_interface.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'dry/core/cache'
-
 require 'rom/repository/relation_reader'
 
 module ROM
@@ -24,7 +22,14 @@ module ROM
       # @api public
       def [](name)
         fetch_or_store(name) do
-          klass = Class.new(self < Repository::Root ? self : Repository::Root)
+          base =
+            if self < Repository::Root # rubocop:disable Style/MinMaxComparison
+              self
+            else
+              Repository::Root
+            end
+
+          klass = ::Class.new(base)
           klass.root(name)
           klass
         end
@@ -51,12 +56,15 @@ module ROM
       #   @option options [Boolean] :auto_struct Enable/Disable auto-struct mapping
       #
       # @api public
-      def new(container = nil, **options)
+      def new(container = nil, root: Undefined, **options)
         container ||= options.fetch(:container)
 
-        unless relation_reader
-          relation_reader(RelationReader.new(self, container.relations.elements.keys))
-          include(relation_reader)
+        unless self < relation_reader
+          include relation_reader.new(
+            relations: container.relations.elements.keys,
+            cache: container.cache,
+            root: root
+          )
         end
 
         super(**options, container: container)
@@ -68,7 +76,7 @@ module ROM
       def inherited(klass)
         super
 
-        return if self === Repository
+        return if self === Repository # rubocop:disable Style/CaseEquality
 
         klass.extend(::Dry::Core::Cache)
         klass.commands(*commands)
@@ -98,6 +106,8 @@ module ROM
       # @return [Array<Symbol>] A list of defined command names
       #
       # @api public
+      #
+      # rubocop:disable Metrics/MethodLength
       def commands(*names, mapper: nil, use: nil, plugins_options: EMPTY_HASH, **opts)
         if names.any? || opts.any?
           @commands = names + opts.to_a
@@ -105,16 +115,28 @@ module ROM
           @commands.each do |spec|
             type, *view = Array(spec).flatten
 
-            if !view.empty?
-              define_restricted_command_method(type, view, mapper: mapper, use: use, plugins_options: plugins_options)
+            if view.empty?
+              define_command_method(
+                type,
+                mapper: mapper,
+                use: use,
+                plugins_options: plugins_options
+              )
             else
-              define_command_method(type, mapper: mapper, use: use, plugins_options: plugins_options)
+              define_restricted_command_method(
+                type,
+                view,
+                mapper: mapper,
+                use: use,
+                plugins_options: plugins_options
+              )
             end
           end
         else
           @commands ||= []
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       # @api public
       def use(plugin, **options)

data/lib/rom/repository/relation_reader.rb

@@ -3,44 +3,76 @@
 module ROM
   class Repository
     # @api private
-    class RelationReader < Module
-      # @api private
-      attr_reader :klass
-
-      # @api private
-      attr_reader :relations
-
+    class RelationReader < ::Module
       module InstanceMethods
+        private
+
         # @api private
-        def set_relation(name)
+        def prepare_relation(name, **)
           container
             .relations[name]
-            .with(auto_struct: auto_struct)
-            .struct_namespace(struct_namespace)
+            .with(
+              auto_struct: auto_struct,
+              struct_namespace: struct_namespace
+            )
+        end
+
+        # @api private
+        def relation_reader(cache, ...)
+          cache_key = relation_cache_key(...)
+          cache.fetch_or_store(*cache_key) { prepare_relation(...) }
+        end
+
+        # @api private
+        def relation_cache_key(name, **)
+          [name, auto_struct, struct_namespace]
         end
       end
 
       # @api private
-      def initialize(klass, relations)
-        @klass = klass
-        @relations = relations
-        define_readers!
+      class Readers < ::Module
+        # @api private
+        attr_reader :cache
+
+        def initialize(relations)
+          super()
+
+          include InstanceMethods
+
+          define_readers(relations)
+        end
+
+        # @api private
+        def define_readers(relations)
+          cache = Cache.new
+          relations.each do |name|
+            define_readers_for_relation(cache, name)
+          end
+        end
+
+        # @api private
+        def define_readers_for_relation(cache, name)
+          define_method(name) do |**kwargs|
+            relation_reader(cache, name, **kwargs)
+          end
+        end
       end
 
       # @api private
-      def included(klass)
-        super
-        klass.include(InstanceMethods)
-      end
+      def initialize(relations:, cache:, root: Undefined)
+        super()
 
-      private
+        add_readers(relations, cache, root)
+      end
 
       # @api private
-      def define_readers!
-        relations.each do |name|
-          define_method(name) do
-            @relations[name] ||= set_relation(name)
-          end
+      def add_readers(relations, cache, root)
+        include cache.fetch_or_store(:relation_readers) {
+          Readers.new(relations)
+        }
+
+        unless Undefined.equal?(root)
+          define_method(:root) { |**kwargs| public_send(root, **kwargs) }
         end
       end
     end

data/lib/rom/repository/root.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'dry/core/class_attributes'
-
 module ROM
   class Repository
     # A specialized repository type dedicated to work with a root relation
@@ -45,9 +43,10 @@ module ROM
       #     @return [Symbol]
       defines :root
 
-      # @!attribute [r] root
-      #   @return [Relation] The root relation
-      attr_reader :root
+      # @api public
+      def self.new(*args, **kwargs)
+        super(*args, **kwargs, root: root)
+      end
 
       # Sets descendant root relation
       #
@@ -56,13 +55,6 @@ module ROM
         super
         klass.root(root)
       end
-
-      # @see Repository#initialize
-      def initialize(*)
-        super
-        @root = set_relation(self.class.root)
-      end
-      ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
     end
   end
 end

data/lib/rom/repository/session.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'dry/equalizer'
-
 module ROM
   # TODO: finish this in 1.1.0
   #

data/lib/rom/repository/version.rb

@@ -2,6 +2,6 @@
 
 module ROM
   class Repository
-    VERSION = '5.2.2'
+    VERSION = '5.4.0'
   end
 end

data/lib/rom/repository.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'dry/core/cache'
-require 'dry/core/class_attributes'
-
 require 'rom/initializer'
 require 'rom/struct'
 require 'rom/container'
@@ -83,8 +80,9 @@ module ROM
 
     # @!method self.relation_reader
     #   Get or set relation reader module
-    #   @return [RelationReader]
+    #   @return [Module]
     defines :relation_reader
+    relation_reader RelationReader
 
     struct_namespace ROM::Struct
 
@@ -107,11 +105,10 @@ module ROM
     # Initializes a new repository object
     #
     # @api private
-    def initialize(*)
+    def initialize(*, **)
       super
       @relations = {}
     end
-    ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
     # Open a database transaction
     #
@@ -146,8 +143,8 @@ module ROM
     #   # => #<ROM::Struct::User id=1 name="Jane">
     #
     # @api public
-    def transaction(*args, &block)
-      container.gateways[:default].transaction(*args, &block)
+    def transaction(...)
+      container.gateways[:default].transaction(...)
     end
 
     # Return a string representation of a repository object

metadata

@@ -1,97 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: rom-repository
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.4.0
 platform: ruby
 authors:
 - Piotr Solnica
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-initializer
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: dry-core
+  name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rom-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '5.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.2'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '5.4'
 description: Repository abstraction for rom-rb
 email: piotr.solnica+oss@gmail.com
 executables: []
@@ -116,7 +75,7 @@ metadata:
   documentation_uri: https://api.rom-rb.org/rom/
   mailing_list_uri: https://discourse.rom-rb.org/
   bug_tracker_uri: https://github.com/rom-rb/rom/issues
-post_install_message: 
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -131,8 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Repository abstraction for rom-rb
 test_files: []