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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da51b71a2c43743d65d3ae8e8a757f7b6e30c95427260a61c67b759b56cd5c5a
-  data.tar.gz: 5947d3b179e7ecb3077075c580fb5081654e7f3e335b8d5fb581e113489de455
+  metadata.gz: 639804d0a0d0e3000ebdf016eb18cfe82de1a5bd4fccf14e6c4fadf427fff099
+  data.tar.gz: 693980d18aebd691e106cf1140a01a906fbf467d69ae34196a2cc74e878713da
 SHA512:
-  metadata.gz: 02afe73fd5dd697f5b036e6ae83273855db7bb5fcccb308428cd4a9663da55609d475c926f7b1b1776ed9a02e90f98c4f1134fb74da73470f381d51b9acafce5
-  data.tar.gz: 7a3035dd22a5143b782f3ff0c49a01e8cbf07c2001e50cb46c169d4ef1a5b975771ede85499a624e601ea8447a980fb95854eacf54957ee494c929afa38230d6
+  metadata.gz: 39996ef92d933d8b9d47e21df020af4287edc519ab7c5f9546cfea38bb304c94f076760d284b9993e6d2aaa72da35faa7a40d90b12f3fb5436f1c471c304f27e
+  data.tar.gz: d8721692049d4780e3d1331003c885e45495cf0dc298bee52160ec785d91042005429d74107d6447e5c5c57301c4a9296f487b42c5076d6f89799418ad7cd9a4

data/lib/iglu-client/resolver.rb

@@ -16,12 +16,12 @@ module Iglu
 
   # Iglu Client. Able to fetch schemas only from Iglu Central
   class Resolver
-    attr_reader :registries, :cache, :cache_ttl
+    attr_reader :registries, :cache, :cacheTtl
 
-    def initialize(registries)
+    def initialize(registries, cacheTtl=60)
       @registries = registries.unshift(Registries.bootstrap)
       @cache = Hash.new
-      @cache_ttl = 1 # hour
+      @cacheTtl = cacheTtl.nil? ? 60 : cacheTtl
     end
 
     # Lookup schema in cache or try to fetch
@@ -61,10 +61,12 @@ module Iglu
           raise cache_result
         else
           if cache_result.is_a? (Array)
-              if (cache_result[1] - fetch_time).round / 3600 >= @cache_ttl
-                @cache.delete(schema_key)
-              end
-              cache_result[0]
+              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
@@ -77,9 +79,9 @@ module Iglu
       schema = Registries.bootstrap.lookup_schema(schema_key)
       data = get_data(json)
       if JSON::Validator.validate!(schema, data)
-        # cache_size = data[:cacheSize]
         registries = data[:repositories].map do |registry| parse_registry(registry) end
-        Resolver.new(registries)
+        cacheTtl = json[:data][:cacheTtl]
+        Resolver.new(registries, cacheTtl)
       else
         throw IgluError.new "Invalid resolver configuration"
       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.2'
+  CLIENT_VERSION = '0.2.0.beta.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iglu-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta.2
+  version: 0.2.0.beta.3
 platform: ruby
 authors:
 - Anton Parkhomenko