seiso-import_master 3.0.0.M2 → 3.0.0.M3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWZjNDQ1MTc4NmM3MmQ4M2Q2YTU3YzkyZGVmYTQ5YjU1MTE3OTcyZA==
+    YTIzN2IxMmE5NzM5OTJkMTc1N2E4MmUwNzY0ZmNkOWUxYmFmNTNjMQ==
   data.tar.gz: !binary |-
-    MzhmMDM3ODMwMGViYWYwMmRlNjdjMjY0ZGQ4YjFkYjMyMmViODgwYg==
+    ZDAzZDE4NGE0YTc2NjExOGJiZjMzMGIzZDRlY2U1YWI4ZTkwYWM1MQ==
 SHA512:
   metadata.gz: !binary |-
-    NDI4NjIxOTA2NmI0NGNiMmI5MzRlZDg1Mzk4YzNlZGQzN2VhOTIzMDFjYTcz
-    ODVlY2Y5MzhiY2M3ZDNjMWYwNzg1ZDY1Mzc2NjRmZGZmMDNjMGJlNTA3MTEx
-    Y2VkNjE1MzU5YzMzMTBmNGVkZGM3YzNlNTkyNTJjNDVlNDAzMDc=
+    NmYwYTU4ODgyOTgxNGEyZjZlM2Y5YTFiYjNhNzgwOTcxNWJmYmJhMWFmNzY5
+    NGU0MGQwMzc1NWEzY2YxYjNhNTViMjI1ZTExZWIyYzk3ZDM0NGU5NzU1Yjhk
+    YWE4M2ZiM2U1MjdlMWRmZjMwMjIwMjBlYTFmYzk0YWZmNzgxNmM=
   data.tar.gz: !binary |-
-    OWE3MGExNzY1NjMzMmM2OTBiODRmNTQ2YmNkOGYxMzI0OGJhNDg0ODBhYTFl
-    MzAzNDY5ZDJmMTVlOTVkYmJkZjI0MGZiMjA2OGRjNjE1ODBjNzgzYjZmMjBl
-    YTE4ZGM3ZmE3NDYwMGRjNWFiMDlmMzg5ODE0N2U0N2EyNjgwZTc=
+    ZTJkOThlMTQ3MzJiOWEyNTQ0NTczYjM5MjI2MWUzODk4ZTY5NTBlMzg3NTFk
+    NmJhYTU5Mjg3ZTQwYWJiMzg4YzU5ZGYwMDgzM2Y2MmE2NDhjZTk0M2JmMTky
+    YzY1MDE2MjVmZWI4NzM3MzQ5YmI3NDA0MGZlZDI4MjI5YTY5MWI=

data/lib/seiso/import_master.rb

@@ -86,8 +86,8 @@ module Seiso
 
         # IMPORTANT: Don't display the message, because Faraday includes the request headers, which include the base64
         # encoded password.
-#        @log.error "Failed to import file #{file}: #{e.message}"
-        @log.error "Failed to import file #{file}"
+        @log.error "Failed to import file #{file}: #{e.message}"
+#        @log.error "Failed to import file #{file}"
 
         # FIXME For now, just re-raise the exception, as we want to see where the bugs are.
         return false

data/lib/seiso/import_master/util/item_resolver.rb

@@ -27,11 +27,12 @@ class Seiso::ImportMaster
 
     # Returns the item URI, or nil if either key is nil or the item doesn't exist.
     def item_uri(type, key)
-      cached_uri = get_cached_uri(type, key)
-      return cached_uri unless cached_uri.nil?
+      return nil if key.nil?
 
       @log.info "Getting item URI: type=#{type}, key=#{key}"
-      return nil if key.nil?
+      item_uri = get_cached_uri(type, key)
+      return item_uri unless item_uri.nil?
+
       search = @special_searches[type]
 
       if search == nil
@@ -61,18 +62,16 @@ class Seiso::ImportMaster
     end
 
     def get_cached_uri(type, key)
-      type_cache = @cache[type]
+      type_cache = @uri_cache[type]
       return nil if type_cache.nil?
       type_cache[key]
     end
 
     def put_cached_uri(type, key, uri)
-      type_cache = @cache[type]
-      if type_cache.nil?
-        type_cache = {}
-        @cache[type] = type_cache
+      if @uri_cache[type].nil?
+        @uri_cache[type] = {}
       end
-      type[key] = uri
+      @uri_cache[type][key] = uri
     end
   end
 end

data/seiso-import_master.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'seiso-import_master'
-  spec.version       = '3.0.0.M2'
+  spec.version       = '3.0.0.M3'
   spec.authors       = ['Willie Wheeler']
   spec.email         = ['wwheeler@expedia.com']
   spec.summary       = 'Imports Seiso data master files into Seiso.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: seiso-import_master
 version: !ruby/object:Gem::Version
-  version: 3.0.0.M2
+  version: 3.0.0.M3
 platform: ruby
 authors:
 - Willie Wheeler