inventory_refresh 0.1.1 → 0.2.2

data/lib/inventory_refresh/target_collection.rb

@@ -76,5 +76,17 @@ module InventoryRefresh
     def manager_refs_by_association_reset
       @manager_refs_by_association = nil
     end
+
+    # Returns list of ems_refs
+    # @return [Array<String>]
+    def references(collection)
+      manager_refs_by_association.try(:[], collection).try(:[], :ems_ref)&.to_a || []
+    end
+
+    # Returns list of names
+    # @return [Array<String>]
+    def name_references(collection)
+      manager_refs_by_association.try(:[], collection).try(:[], :name)&.to_a || []
+    end
   end
 end

data/lib/inventory_refresh/version.rb

@@ -1,3 +1,3 @@
 module InventoryRefresh
-  VERSION = "0.1.1".freeze
+  VERSION = "0.2.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inventory_refresh
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,42 +16,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.6
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.6
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: more_core_extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ancestry
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +78,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.11.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +128,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +192,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- bundler.d/.gitkeep
 - config/database.yml
 - inventory_refresh.gemspec
 - lib/inventory_refresh.rb
@@ -166,8 +201,13 @@ files:
 - lib/inventory_refresh/graph.rb
 - lib/inventory_refresh/graph/topological_sort.rb
 - lib/inventory_refresh/inventory_collection.rb
+- lib/inventory_refresh/inventory_collection/builder.rb
 - lib/inventory_refresh/inventory_collection/data_storage.rb
 - lib/inventory_refresh/inventory_collection/graph.rb
+- lib/inventory_refresh/inventory_collection/helpers.rb
+- lib/inventory_refresh/inventory_collection/helpers/associations_helper.rb
+- lib/inventory_refresh/inventory_collection/helpers/initialize_helper.rb
+- lib/inventory_refresh/inventory_collection/helpers/questions_helper.rb
 - lib/inventory_refresh/inventory_collection/index/proxy.rb
 - lib/inventory_refresh/inventory_collection/index/type/base.rb
 - lib/inventory_refresh/inventory_collection/index/type/data.rb
@@ -177,20 +217,23 @@ files:
 - lib/inventory_refresh/inventory_collection/references_storage.rb
 - lib/inventory_refresh/inventory_collection/scanner.rb
 - lib/inventory_refresh/inventory_collection/serialization.rb
+- lib/inventory_refresh/inventory_collection/unconnected_edge.rb
 - lib/inventory_refresh/inventory_object.rb
 - lib/inventory_refresh/inventory_object_lazy.rb
 - lib/inventory_refresh/logging.rb
 - lib/inventory_refresh/null_logger.rb
+- lib/inventory_refresh/persister.rb
 - lib/inventory_refresh/save_collection/base.rb
-- lib/inventory_refresh/save_collection/recursive.rb
 - lib/inventory_refresh/save_collection/saver/base.rb
 - lib/inventory_refresh/save_collection/saver/batch.rb
-- lib/inventory_refresh/save_collection/saver/concurrent_safe.rb
 - lib/inventory_refresh/save_collection/saver/concurrent_safe_batch.rb
 - lib/inventory_refresh/save_collection/saver/default.rb
+- lib/inventory_refresh/save_collection/saver/partial_upsert_helper.rb
+- lib/inventory_refresh/save_collection/saver/retention_helper.rb
 - lib/inventory_refresh/save_collection/saver/sql_helper.rb
 - lib/inventory_refresh/save_collection/saver/sql_helper_update.rb
 - lib/inventory_refresh/save_collection/saver/sql_helper_upsert.rb
+- lib/inventory_refresh/save_collection/sweeper.rb
 - lib/inventory_refresh/save_collection/topological_sort.rb
 - lib/inventory_refresh/save_inventory.rb
 - lib/inventory_refresh/target.rb
@@ -215,8 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Topological Inventory Persister

data/lib/inventory_refresh/save_collection/recursive.rb

@@ -1,52 +0,0 @@
-require "inventory_refresh/save_collection/base"
-
-module InventoryRefresh::SaveCollection
-  class Recursive < InventoryRefresh::SaveCollection::Base
-    class << self
-      # Saves the passed InventoryCollection objects by recursively passing the graph
-      #
-      # @param ems [ExtManagementSystem] manager owning the inventory_collections
-      # @param inventory_collections [Array<InventoryRefresh::InventoryCollection>] array of InventoryCollection objects
-      #        for saving
-      def save_collections(ems, inventory_collections)
-        graph = InventoryRefresh::InventoryCollection::Graph.new(inventory_collections)
-        graph.build_directed_acyclic_graph!
-
-        graph.nodes.each do |inventory_collection|
-          save_collection(ems, inventory_collection, [])
-        end
-      end
-
-      private
-
-      # Saves the one passed InventoryCollection object
-      #
-      # @param ems [ExtManagementSystem] manager owning the inventory_collections
-      # @param inventory_collection [InventoryRefresh::InventoryCollection] InventoryCollection object for saving
-      # @param traversed_collections [Array<InventoryRefresh::InventoryCollection>] array of traversed InventoryCollection
-      #        objects, that we use for detecting possible cycle
-      def save_collection(ems, inventory_collection, traversed_collections)
-        unless inventory_collection.kind_of?(::InventoryRefresh::InventoryCollection)
-          raise "A InventoryRefresh::SaveInventory needs a InventoryCollection object, it got: #{inventory_collection.inspect}"
-        end
-
-        return if inventory_collection.saved?
-
-        traversed_collections << inventory_collection
-
-        unless inventory_collection.saveable?
-          inventory_collection.dependencies.each do |dependency|
-            next if dependency.saved?
-            if traversed_collections.include?(dependency)
-              raise "Edge from #{inventory_collection} to #{dependency} creates a cycle"
-            end
-            save_collection(ems, dependency, traversed_collections)
-          end
-        end
-
-        logger.debug("Saving #{inventory_collection} of size #{inventory_collection.size}")
-        save_inventory_object_inventory(ems, inventory_collection)
-      end
-    end
-  end
-end

data/lib/inventory_refresh/save_collection/saver/concurrent_safe.rb

@@ -1,71 +0,0 @@
-require "inventory_refresh/save_collection/saver/base"
-
-module InventoryRefresh::SaveCollection
-  module Saver
-    class ConcurrentSafe < InventoryRefresh::SaveCollection::Saver::Base
-      # TODO(lsmola) this strategy does not make much sense, it's better to use concurent_safe_batch and make batch size
-      # configurable
-      private
-
-      # Updates the passed record with hash data and stores primary key value into inventory_object.
-      #
-      # @param record [ApplicationRecord] record we want to update in DB
-      # @param hash [Hash] data we want to update the record with
-      # @param inventory_object [InventoryRefresh::InventoryObject] InventoryObject instance where we will store primary
-      #        key value
-      def update_record!(record, hash, inventory_object)
-        assign_attributes_for_update!(hash, time_now)
-        record.assign_attributes(hash.except(:id))
-
-        if !inventory_object.inventory_collection.check_changed? || record.changed?
-          update_query = inventory_object.inventory_collection.model_class.where(:id => record.id)
-          if hash[:remote_data_timestamp]
-            timestamp_field = inventory_collection.model_class.arel_table[:remote_data_timestamp]
-            update_query    = update_query.where(timestamp_field.lt(hash[:remote_data_timestamp]))
-          end
-
-          update_query.update_all(hash)
-          inventory_collection.store_updated_records(record)
-        end
-
-        inventory_object.id = record.id
-      end
-
-      # Creates a new record in the DB using the passed hash data
-      #
-      # @param hash [Hash] hash with data we want to persist to DB
-      # @param inventory_object [InventoryRefresh::InventoryObject] InventoryObject instance where we will store primary
-      #        key value
-      def create_record!(hash, inventory_object)
-        all_attribute_keys = hash.keys
-        data               = inventory_collection.model_class.new(hash).attributes.symbolize_keys
-
-        # TODO(lsmola) abstract common behavior into base class
-        all_attribute_keys << :type if supports_sti?
-        all_attribute_keys << :created_at if supports_created_at?
-        all_attribute_keys << :updated_at if supports_updated_at?
-        all_attribute_keys << :created_on if supports_created_on?
-        all_attribute_keys << :updated_on if supports_updated_on?
-        hash_for_creation = if inventory_collection.use_ar_object?
-                              record = inventory_collection.model_class.new(data)
-                              values_for_database!(all_attribute_keys,
-                                                   record.attributes.symbolize_keys)
-                            elsif serializable_keys?
-                              values_for_database!(all_attribute_keys,
-                                                   data)
-                            else
-                              data
-                            end
-
-        assign_attributes_for_create!(hash_for_creation, time_now)
-
-        result_id = ActiveRecord::Base.connection.execute(
-          build_insert_query(all_attribute_keys, [hash_for_creation])
-        )
-
-        inventory_object.id = result_id.to_a.try(:first).try(:[], "id")
-        inventory_collection.store_created_records(inventory_object)
-      end
-    end
-  end
-end