ncore 3.3.0 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0104ef39fd536e1845266782c236e1a00af04c0c6187b62567f247f3558f51bd
-  data.tar.gz: 99668e3c3ee5b104f2ec649a6dce845821943c9b67e361d0721a64ea9e5e94f0
+  metadata.gz: 36ef02739c4a1da72bcddc653c521e617947618f18819df4cf03d5e83695c7bd
+  data.tar.gz: fb2363f1754bb367126b871faeaaa0327869166f276715dbde1ec9cea698f41a
 SHA512:
-  metadata.gz: 257d7bd01c3f0c77b5b7c6f65d6bba245c8a7331627003ea1a72af9664eaf8a19026bc21df976c2499106f3701ef712a9b0a92b3754ec784468b9eb2783171b8
-  data.tar.gz: 2858e6b9cd9c067b41ebe4ba2968747db8553af7fe37c2a3e69abda1f22d60f8e841fce7e4b8dcf204ba6a5bbf6debf601fb18b111cc4a6f050ce47195042685
+  metadata.gz: d5f6e466021e4ddfdd378ebc381e515931861a51cd3df4c1340de887f044f47ffe8721a0a94f6c3fb4e59c44eeb78abd94a21e6682ec8ce999072b74e7fa3d3c
+  data.tar.gz: 195dc54e8e8414819ceef4d0714ac1118cf9bae7fc03143019c18d8fa5fe4d800b8850a9ded557667d85a970329dc9589ee2e5363ceb3546d43bfcf90d433349

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+#### 3.3.4
+
+- Fix :cache option on Ruby 3.0
+
+#### 3.3.3
+
+- Handle recursion in #inspect
+
+#### 3.3.2
+
+- Ruby 3.0 compatibility
+
+#### 3.3.1
+
+- Fix module_parent when using ActiveSupport 5.2
+
 #### 3.3.0
 
 - Allow  headers: {}  as part of params/attribs everywhere

data/lib/ncore.rb

@@ -40,3 +40,4 @@ end
 
 require 'ncore/rails/action_controller' if defined?(::ActionController)
 require 'ncore/rails/active_model'
+require 'ncore/rails/module_fix'

data/lib/ncore/attributes.rb

@@ -160,10 +160,14 @@ module NCore
     end
 
 
-    def load(data:, errors: nil, metadata: nil)
-      self.metadata = metadata || {}.with_indifferent_access
-      self.errors = parse_errors(errors)
-      data.each do |k,v|
+    def load(args={})
+      raise ArgumentError, "Missing :data" unless args.key?(:data)
+      extra_keys = args.keys - %i(data errors metadata)
+      raise ArgumentError, "Unexpected keys: #{extra_keys.inpsect}" if extra_keys.any?
+
+      self.metadata = args[:metadata] || {}.with_indifferent_access
+      self.errors = parse_errors(args[:errors])
+      args[:data].each do |k,v|
         if respond_to? "#{k}="
           send "#{k}=", self.class.interpret_type(v, api_creds)
         else

data/lib/ncore/client_cache.rb

@@ -26,7 +26,7 @@ module NCore
         end
 
         if store && req[:method] == :get
-          store.fetch request_cache_key(req.slice(:url, :headers)), cache_opts do
+          store.fetch request_cache_key(**req.slice(:url, :headers)), cache_opts do
             super
           end
         else

data/lib/ncore/rails/module_fix.rb

@@ -0,0 +1,19 @@
+# ActiveSupport 6.0 changed :parent -> :module_parent
+# This continues to support AS <= 5.2.
+
+module NCore
+  module ModuleFix
+    extend ActiveSupport::Concern
+
+      included do
+        alias :module_parent :parent
+        alias :module_parent_name :parent_name
+        alias :module_parents :parents
+      end
+
+  end
+end
+
+unless Module.respond_to?(:module_parent)
+  Module.include NCore::ModuleFix
+end

data/lib/ncore/util.rb

@@ -62,7 +62,15 @@ module NCore
 
 
     def inspect
-      "#<#{self.class}:0x#{'%016x'%self.object_id} id: #{id.inspect}, attribs: #{@attribs.except(:id).inspect}, metadata: #{metadata.inspect}>"
+      base = "#{self.class}:0x#{'%016x'%self.object_id} id: #{id.inspect}"
+      @@inspect_chain ||= []
+      return "#<#{base}, ...>" if @@inspect_chain.include? self
+      begin
+        @@inspect_chain.push self
+        "#<#{base}, attribs: #{@attribs.except(:id).inspect}, metadata: #{metadata.inspect}>"
+      ensure
+        @@inspect_chain.pop
+      end
     end
 
   end

data/lib/ncore/version.rb

@@ -1,3 +1,3 @@
 module NCore
-  VERSION = '3.3.0'
+  VERSION = '3.3.4'
 end

data/ncore.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activemodel', '>= 5.2', '< 6.2'
   spec.add_dependency 'excon', '~> 0.32'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ncore
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.4
 platform: ruby
 authors:
 - Notioneer Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-15 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -48,16 +48,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +117,7 @@ files:
 - lib/ncore/rails/action_controller.rb
 - lib/ncore/rails/active_model.rb
 - lib/ncore/rails/log_subscriber.rb
+- lib/ncore/rails/module_fix.rb
 - lib/ncore/singleton_base.rb
 - lib/ncore/util.rb
 - lib/ncore/version.rb
@@ -140,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: NCore - Gem for building REST API clients