iglu-ruby-client 0.2.0.beta.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 639804d0a0d0e3000ebdf016eb18cfe82de1a5bd4fccf14e6c4fadf427fff099
-  data.tar.gz: 693980d18aebd691e106cf1140a01a906fbf467d69ae34196a2cc74e878713da
+  metadata.gz: 0a74ac41f7b9da9975017fb31119063de09b60774cdeb5c8ecf5cddb2f45471c
+  data.tar.gz: 63f2aaece15b6870a525bf590027b5a8ee6dd88d24c879ef0b63da55e7409ba9
 SHA512:
-  metadata.gz: 39996ef92d933d8b9d47e21df020af4287edc519ab7c5f9546cfea38bb304c94f076760d284b9993e6d2aaa72da35faa7a40d90b12f3fb5436f1c471c304f27e
-  data.tar.gz: d8721692049d4780e3d1331003c885e45495cf0dc298bee52160ec785d91042005429d74107d6447e5c5c57301c4a9296f487b42c5076d6f89799418ad7cd9a4
+  metadata.gz: 2e7c12dc0b4e03501ce858a452690a318b5219f7b3bfac236696ee5211b102953d7648ca59645ec7ec1152a9defbf2373a162b8b8f4d6e3d538dd0cd8621f3c6
+  data.tar.gz: 0e0d59c3256592091df824ab8ab30e1249dbe30808ba9c8769ace1a9bf05f98df42974efa85bdb7af3861915b7c89067cf489e5602f37e6ac234e5a34cd5511a

data/lib/iglu-client/resolver.rb

@@ -18,21 +18,35 @@ module Iglu
   class Resolver
     attr_reader :registries, :cache, :cacheTtl
 
-    def initialize(registries, cacheTtl=60)
+    def initialize(registries, cacheTtl=nil)
       @registries = registries.unshift(Registries.bootstrap)
       @cache = Hash.new
-      @cacheTtl = cacheTtl.nil? ? 60 : cacheTtl
+      @cacheTtl = cacheTtl
     end
 
     # Lookup schema in cache or try to fetch
     def lookup_schema(schema_key)
+      lookup_time = Time.now.getutc
       if schema_key.is_a?(String)
         schema_key = SchemaKey.parse_key(schema_key)
       end
       failures = []
 
-      fetch_time = Time.now.getutc
       cache_result = @cache[schema_key]
+      if not cache_result.nil?
+        if not @cacheTtl.nil?
+          store_time = cache_result[1]
+          time_diff = (lookup_time - store_time).round
+          if time_diff >= @cacheTtl
+            @cache.delete(schema_key)
+            cache_result = nil
+          else
+            return cache_result[0]
+          end
+        else
+          return cache_result[0]
+        end
+      end
 
       if cache_result.nil?          # Fetch from every registry
         for registry in prioritize_repos(schema_key, @registries) do
@@ -56,21 +70,6 @@ module Iglu
           @cache[schema_key] = [lookup_result, store_time]
           lookup_result
         end
-      else
-        if cache_result.is_a?(Registries::ResolverError)
-          raise cache_result
-        else
-          if cache_result.is_a? (Array)
-              store_time = cache_result[1]
-              time_diff = (fetch_time - store_time).round
-              if time_diff >= @cacheTtl
-                 @cache.delete(schema_key)
-               end
-               cache_result[0]
-          else # backward compliance
-              cache_result
-          end
-        end
       end
     end
 

data/lib/iglu-client/version.rb

@@ -10,5 +10,5 @@
 # See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
 
 module Iglu
-  CLIENT_VERSION = '0.2.0.beta.3'
+  CLIENT_VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iglu-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Anton Parkhomenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -98,15 +98,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.10
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.1
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Iglu