rom-core 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46a9964ca6426508b30b41ed76d3aaeacecbd88c
-  data.tar.gz: a3a664e1cbf35744d5778486626e7e9685b44ec4
+  metadata.gz: 1cea9b3d9020f60a964a7105e7ac77e32e954126
+  data.tar.gz: 1e74ac03ad226c75e291d58163ffb0e3caff57eb
 SHA512:
-  metadata.gz: b59133ac784a48fc5c4e984745b5504cd7e88c52b90b51cb575e7b98a7cff3866799754350b6161f81d430976b2d14346b07d64a7a9dc5973062427f055645ed
-  data.tar.gz: c03960ab283be71525c34bf106f1a76a800fe208925417160af2437a93b2663664d9a8b78f4335c9414fe92a0d2e6c562d44db09cd6e7b2db3092b64ba85740b
+  metadata.gz: 776153acc7f3bce777c713d37a706456e58165e78c0c4c7ffbe598c301250de2bb93b845524fe1b6f2b04b10bfdf109e46f166e5bda33471040aaa254949130e
+  data.tar.gz: b1bc73e397c05f2c5372d16d5dba21f153669dde45b89a2129bf01b45adafbfbe325969d0b6cbac7c84225f7b7bfd1d5d1418decb266e601bafa0226b3a99f87

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v4.0.2 2017-11-02
+
+## Added
+
+* Schemas have access to finalized relation registry (GustavoCaso + flash-gordon + solnic)
+
+## Fixed
+
+* Defining schema uses default attribute class correctly again (v-kolesnikov)
+* Primary key name(s) are preserved when projecting schemas (flash-gordon + solnic)
+* Global command cache was replaced with a local one (flash-gordon)
+
 # v4.0.1 2017-10-22
 
 ## Internal

data/lib/rom/command_compiler.rb

@@ -1,5 +1,4 @@
 require 'dry/core/inflector'
-require 'dry/core/cache'
 
 require 'rom/initializer'
 require 'rom/commands'
@@ -14,7 +13,6 @@ module ROM
   #
   # @api private
   class CommandCompiler
-    extend Dry::Core::Cache
     extend Initializer
 
     # @api private
@@ -58,6 +56,10 @@ module ROM
     #   @return [Array<Symbol>] Meta data for a command
     option :meta, optional: true
 
+    # @!attribute [r] cache
+    #   @return [Cache] local cache instance
+    option :cache, default: -> { Cache.new }
+
     # Return a specific command type for a given adapter and relation AST
     #
     # This class holds its own registry where all generated commands are being
@@ -79,7 +81,7 @@ module ROM
     #
     # @api private
     def call(*args)
-      fetch_or_store(args.hash) do
+      cache.fetch_or_store(args.hash) do
         type, adapter, ast, plugins, meta = args
 
         compiler = with(

data/lib/rom/relation.rb

@@ -19,7 +19,6 @@ require 'rom/relation/composite'
 require 'rom/relation/combined'
 require 'rom/relation/wrap'
 require 'rom/relation/materializable'
-require 'rom/relation/commands'
 require 'rom/association_set'
 
 require 'rom/types'

data/lib/rom/schema.rb

@@ -54,6 +54,7 @@ module ROM
 
       unless schema.frozen?
         schema.finalize_attributes!(gateway: gateway, relations: registry)
+        schema.set!(:relations, registry)
       end
     end
 
@@ -95,11 +96,11 @@ module ROM
     # @!attribute [r] primary_key_name
     #   @return [Symbol] The name of the primary key. This is set because in
     #                    most of the cases relations don't have composite pks
-    attr_reader :primary_key_name
+    option :primary_key_name, optional: true
 
     # @!attribute [r] primary_key_names
     #   @return [Array<Symbol>] A list of all pk names
-    attr_reader :primary_key_names
+    option :primary_key_names, optional: true
 
     alias_method :to_ary, :attributes
 
@@ -116,6 +117,7 @@ module ROM
     def self.define(name, attributes: EMPTY_ARRAY, attr_class: Attribute, **options)
       new(
         name,
+        attr_class: attr_class,
         attributes: attributes(attributes, attr_class),
         **options
       ) { |schema| yield(schema) if block_given? }
@@ -415,6 +417,12 @@ module ROM
       [:schema, [name, attributes.map(&:to_ast)]]
     end
 
+    # @api private
+    def set!(key, value)
+      instance_variable_set("@#{ key }", value)
+      options[key] = value
+    end
+
     private
 
     # @api private
@@ -443,17 +451,11 @@ module ROM
     # @api private
     def initialize_primary_key_names
       if primary_key.size > 0
-        @primary_key_name = primary_key[0].meta[:name]
-        @primary_key_names = primary_key.map { |type| type.meta[:name] }
+        set!(:primary_key_name, primary_key[0].meta[:name])
+        set!(:primary_key_names, primary_key.map { |type| type.meta[:name] })
       end
     end
 
-    # @api private
-    def set!(key, value)
-      instance_variable_set("@#{ key }", value)
-      options[key] = value
-    end
-
     memoize :count_index, :name_index, :source_index, :to_ast, :to_input_hash, :to_output_hash
   end
 end

data/lib/rom/setup/finalize/finalize_relations.rb

@@ -90,7 +90,7 @@ module ROM
 
         notifications.trigger(
           'configuration.relations.schema.set',
-          schema: schema, relation: klass, adapter: klass.adapter
+          schema: schema, relation: klass, registry: registry, adapter: klass.adapter
         )
 
         rel_key = schema.name.to_sym

data/lib/rom/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Core
-    VERSION = '4.0.1'.freeze
+    VERSION = '4.0.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-core
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-22 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -107,6 +107,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -114,6 +117,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement