inventory_refresh 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3393dbd829d48263fc51a06fa2c659045239142f4f325a2c894296eb640045d
-  data.tar.gz: eea18674f3145f38ead40f221d62cb158e66174860509c4bc669713a1b7f2bb7
+  metadata.gz: 3230d7d712cf1e8ca4c20f070dae17686b8f879b34a4eb7cd59eafa00705ee44
+  data.tar.gz: 1242373300c55514fc0f3795826712babda1cc5d14983d0273c63e1214515ea9
 SHA512:
-  metadata.gz: eb24a4daf33a937c914536dd93ad192aaf5a81fb7528888b3d22f12a46c2180634efa7d992a2f810a5c0479f341991080e9d54e115e8e5e7c58b5cc80a917e47
-  data.tar.gz: 9a0d525bd2df33aa7892d75968c95ac41afcd0a974f5376025e94f2d328097b652e93acc57bba43ed5451c26dd39f8180f6c9429d16ed49a4c09fdb50ada21b1
+  metadata.gz: f1e9aaccce8ca7179137b24eeba2f8bacc2d7c0401891ff6fbdbf03d99786c4bcfa65cb5bf81b461a7edfe5a62de8b21ee00ab8007e326c6afcf8debc685a616
+  data.tar.gz: fbf7e26bdb0d42e50253fdb9f70734a299c5f30df3fa64b6a05d68f2c80e6a8e1c06dbec902a1a3845e860cf86dd6add8931cf9ef809055534b327b370a2f375

data/.github/workflows/ci.yaml

@@ -48,6 +48,7 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
+      timeout-minutes: 30
     - name: Prepare tests
       run: bundle exec rake spec:setup
     - name: Run tests

data/CHANGELOG.md

@@ -5,6 +5,22 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [2.0.0] - 2022-09-06
+### Added
+- Add timeout-minutes to setup-ruby job (#110)
+- Add ruby3 compliant parameters for lazy_find (#112)
+- Handle two hash arguments to lazy_find (#114)
+
+### Removed
+- **BREAKING** Remove deprecated find_by/lazy_find_by methods
+
+## [1.1.0] - 2022-05-03
+### Changed
+- Ruby 3 keyword arguments (#109)
+
+### Added
+- Cron for GitHub Actions (#108)
+
 ## [1.0.0] - 2022-02-09
 ### Changed
 - Run rubocop -A (#102)

data/lib/inventory_refresh/inventory_collection/index/proxy.rb

@@ -3,6 +3,7 @@ require "inventory_refresh/inventory_collection/index/type/local_db"
 require "inventory_refresh/inventory_collection/index/type/skeletal"
 require "inventory_refresh/logging"
 require "active_support/core_ext/module/delegation"
+require "active_support/deprecation"
 
 module InventoryRefresh
   class InventoryCollection
@@ -77,7 +78,6 @@ module InventoryRefresh
         end
 
         def find(reference, ref: primary_index_ref)
-          # TODO(lsmola) lazy_find will support only hash, then we can remove the _by variant
           # TODO(lsmola) this method should return lazy too, the rest of the finders should be deprecated
           return if reference.nil?
 
@@ -95,22 +95,25 @@ module InventoryRefresh
           end
         end
 
-        def find_by(manager_uuid_hash, ref: primary_index_ref)
-          # TODO(lsmola) deprecate this, it's enough to have find method
-          find(manager_uuid_hash, :ref => ref)
-        end
+        def lazy_find(manager_uuid = nil, opts = {}, ref: primary_index_ref, key: nil, default: nil, transform_nested_lazy_finds: false, **manager_uuid_hash)
+          # TODO(lsmola) also, it should be enough to have only 1 find method, everything can be lazy, until we try to
+          # access the data
 
-        def lazy_find_by(manager_uuid_hash, ref: primary_index_ref, key: nil, default: nil)
-          # TODO(lsmola) deprecate this, it's enough to have lazy_find method
+          ref                         = opts[:ref] if opts.key?(:ref)
+          key                         = opts[:key] if opts.key?(:key)
+          default                     = opts[:default] if opts.key?(:default)
+          transform_nested_lazy_finds = opts[:transform_nested_lazy_finds] if opts.key?(:transform_nested_lazy_finds)
 
-          lazy_find(manager_uuid_hash, :ref => ref, :key => key, :default => default)
-        end
+          manager_uuid_hash.update(opts.except(:ref, :key, :default, :transform_nested_lazy_finds))
 
-        def lazy_find(manager_uuid, ref: primary_index_ref, key: nil, default: nil, transform_nested_lazy_finds: false)
-          # TODO(lsmola) also, it should be enough to have only 1 find method, everything can be lazy, until we try to
-          # access the data
-          # TODO(lsmola) lazy_find will support only hash, then we can remove the _by variant
-          return if manager_uuid.nil?
+          # Skip if no manager_uuid is provided
+          return if manager_uuid.nil? && manager_uuid_hash.blank?
+
+          raise ArgumentError, "only one of manager_uuid or manager_uuid_hash must be passed" unless !!manager_uuid ^ !!manager_uuid_hash.present?
+
+          ActiveSupport::Deprecation.warn("Passing a hash for options is deprecated and will be removed in an upcoming release.") if opts.present?
+
+          manager_uuid ||= manager_uuid_hash
 
           assert_index(manager_uuid, ref)
 

data/lib/inventory_refresh/version.rb

@@ -1,3 +1,3 @@
 module InventoryRefresh
-  VERSION = "1.1.0".freeze
+  VERSION = "2.0.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inventory_refresh
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - ManageIQ Developers
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -163,7 +163,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.21.2
 description: Topological Inventory Persister
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -238,7 +238,7 @@ licenses:
 - Apache-2.0
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -253,8 +253,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
 summary: Topological Inventory Persister
 test_files: []