iglu-ruby-client 0.1.0 → 0.2.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e4645473809f6de1e11d74c472cec3c153da4f03
-  data.tar.gz: 60924a1fe8c5f360d9b9f12c23a406faa3c3fda8
+SHA256:
+  metadata.gz: a5f348ad495ca4e03d35075a7e9d79be3e686333cc6bd909281e495c374cb247
+  data.tar.gz: 206069a773a03d9453a3774344c1c3327073318cb540060262d7fbbdd31ad14c
 SHA512:
-  metadata.gz: 04ffb86e0346bc61fbdce2ddad023d3326e313f803cc58599c67809c78967ede9c9bad1cb319ba2d38987dcb4c4322d4c1d11174c544d4851b37f1a29c873ee9
-  data.tar.gz: e8a1eac53f5b407daabf852acd38eb584beec43677485b4ac39fece72454f2544d30f8d7973e4eb160455c16fe3c5976f30dcba21d377f5a10ce19e69773eeb7
+  metadata.gz: 6d249cbec95680becc4924c1da173eb7c15033839cc22a0623f39571646c1b034e8be88c754ab5fe88cb1463ea1abdf235db3c36be619deadcb3cd34e210f63e
+  data.tar.gz: f329af06ad188a7d6f52e0ec4d5259f16093aca503d374161f4c3125f1d92b974aa21690e8e52c2d0ee1972a6dd44980f8293191cb469678c4a8213bfe8921bb

data/README.md

@@ -1,23 +1,24 @@
 # Ruby client for Iglu
 
-[![Build Status] [travis-image]] [travis] 
-[![Release] [release-image]] [releases] 
-[![License] [license-image]] [license] 
-[![Coverage Status] [coveralls-image]] [coveralls]
+[![Build Status][travis-image]][travis]
+[![Release][release-image]][releases]
+[![License][license-image]][license]
+[![Coverage Status][coveralls-image]][coveralls]
 
-A Ruby client and resolver for **[Iglu schema repositories] [iglu-wiki]** from the team at **[Snowplow Analytics] [snowplow-website]**.
+A Ruby client and resolver for **[Iglu schema repositories][iglu-wiki]** from the team at **[Snowplow Analytics][snowplow-website]**.
 
 ## Find out more
 
-| **[Technical Docs] [techdocs]**     | **[Setup Guide] [setup]**     | **[Roadmap] [roadmap]**           | **[Contributing] [contributing]**           |
-|-------------------------------------|-------------------------------|-----------------------------------|---------------------------------------------|
-| [![i1] [techdocs-image]] [techdocs] | [![i2] [setup-image]] [setup] | [![i3] [roadmap-image]] [roadmap] | [![i4] [contributing-image]] [contributing] |
+| Technical Docs                 | Setup Guide              | Roadmap                | Contributing                     |
+|--------------------------------|--------------------------|------------------------|----------------------------------|
+| ![i1][techdocs-image]          | ![i2][setup-image]       | ![i3][roadmap-image]   | ![i4][contributing-image]        |
+| **[Technical Docs][techdocs]** | **[Setup Guide][setup]** | **[Roadmap][roadmap]** | **[Contributing][contributing]** |
 
-## Copyright and license
+## Copyright and License
 
-Iglu Ruby Client is copyright 2017 Snowplow Analytics Ltd.
+Iglu Ruby Client is © 2017 Snowplow Analytics Ltd.
 
-Licensed under the **[Apache License, Version 2.0] [license]** (the "License");
+Licensed under the **[Apache License, Version 2.0][license]** (the "License");
 you may not use this software except in compliance with the License.
 
 Unless required by applicable law or agreed to in writing, software
@@ -44,11 +45,10 @@ limitations under the License.
 [travis-image]: https://travis-ci.org/snowplow/iglu-ruby-client.png?branch=master
 
 [releases]: https://github.com/snowplow/ruby-iglu-client/releases
-[release-image]: http://img.shields.io/badge/release-0.1.0-blue.svg?style=flat
+[release-image]: http://img.shields.io/badge/release-0.2.0-blue.svg?style=flat
 
 [license]: http://www.apache.org/licenses/LICENSE-2.0
 [license-image]: http://img.shields.io/badge/license-Apache--2-blue.svg?style=flat
 
 [coveralls]: https://coveralls.io/r/snowplow/iglu-ruby-client
 [coveralls-image]: https://coveralls.io/repos/snowplow/iglu-ruby-client/badge.png
-

data/lib/iglu-client/core.rb

@@ -20,15 +20,7 @@ module Iglu
   SCHEMAVER_REGEX = Regexp.new "^([1-9][0-9]*)-(0|[1-9][0-9]*)-(0|[1-9][0-9]*)$"
 
   # Class holding SchemaVer data
-  class SchemaVer
-    attr_accessor :model, :revision, :addition
-
-    # Constructor. To initalize from string - use static parse_schemaver
-    def initialize(model, revision, addition)
-      @model = model
-      @revision = revision
-      @addition = addition
-    end
+  class SchemaVer < Struct.new(:model, :revision, :addition)
 
     # Render as string
     def as_string
@@ -38,26 +30,17 @@ module Iglu
     # Construct SchemaVer from string
     def self.parse_schemaver(version)
       model, revision, addition = version.scan(SCHEMAVER_REGEX).flatten
-      SchemaVer.new model.to_i, revision.to_i, addition.to_i
-    end
-
-    def ==(other)
-      other.model == @model && other.revision == @revision && other.addition == @addition
+      if model.nil? or revision.nil? or addition.nil?
+          raise IgluError.new "Schema version #{version} is not a valid Iglu SchemaVer"
+      else
+          SchemaVer.new model.to_i, revision.to_i, addition.to_i
+      end
     end
   end
 
 
   # Class holding Schema metadata
-  class SchemaKey
-    attr_accessor :vendor, :name, :format, :version
-
-    # Constructor. To initalize from string - use static parse_key
-    def initialize(vendor, name, format, version)
-      @vendor = vendor
-      @name = name
-      @format = format
-      @version = version
-    end
+  class SchemaKey < Struct.new(:vendor, :name, :format, :version)
 
     # Render as Iglu URI (with `iglu:`)
     def as_uri
@@ -79,10 +62,6 @@ module Iglu
         SchemaKey.new vendor, name, format, schema_ver
       end
     end
-
-    def ==(other)
-      other.vendor == @vendor && other.name == @name && other.format == @format && other.version == @version
-    end
   end
 
 

data/lib/iglu-client/registries.rb

@@ -41,13 +41,23 @@ module Iglu
         @uri = uri
       end
 
-      def lookup_schema(schema_key)
+      def lookup_schema(schema_key, max_retries = 3)
         schema_uri = "#{@uri}/schemas/#{schema_key.as_path}"
+        times_retried = 0
+
         begin
-          response = HTTParty.get(schema_uri)
+          response = HTTParty.get(schema_uri, timeout: 3)
         rescue SocketError => _
           raise IgluError.new "Iglu registry #{config.name} is not available"
+        rescue Net::ReadTimeout => e
+          if times_retried < max_retries
+            times_retried += 1
+            retry
+          else
+            raise e
+          end
         end
+
         if response.code == 200
           JSON::parse(response.body)
         else

data/lib/iglu-client/resolver.rb

@@ -16,11 +16,12 @@ module Iglu
 
   # Iglu Client. Able to fetch schemas only from Iglu Central
   class Resolver
-    attr_reader :registries, :cache
+    attr_reader :registries, :cache, :cache_ttl
 
     def initialize(registries)
       @registries = registries.unshift(Registries.bootstrap)
       @cache = Hash.new
+      @cache_ttl = 1 # hour
     end
 
     # Lookup schema in cache or try to fetch
@@ -30,6 +31,7 @@ module Iglu
       end
       failures = []
 
+      fetch_time = Time.now.getutc
       cache_result = @cache[schema_key]
 
       if cache_result.nil?          # Fetch from every registry
@@ -50,14 +52,22 @@ module Iglu
         if lookup_result.nil?
           raise Registries::ResolverError.new(failures, schema_key)
         else
-          @cache[schema_key] = lookup_result
+          store_time = Time.now.getutc
+          @cache[schema_key] = [lookup_result, store_time]
           lookup_result
         end
       else
         if cache_result.is_a?(Registries::ResolverError)
           raise cache_result
         else
-          cache_result
+          if cache_result.is_a? (Array)
+              if (cache_result[1] - fetch_time).round / 3600 >= @cache_ttl
+                @cache.delete(schema_key)
+              end
+              cache_result[0]
+          else # backward compliance
+              cache_result
+          end
         end
       end
     end
@@ -81,7 +91,7 @@ module Iglu
         Registries::EmbeddedRegistryRef.new(ref_config, config[:connection][:embedded][:path])
       elsif not config[:connection][:http].nil?
         Registries::HttpRegistryRef.new(ref_config, config[:connection][:http][:uri])
-      else 
+      else
         raise IgluError.new "Incorrect RegistryRef"
       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.1.0'
+  CLIENT_VERSION = '0.2.0.beta'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iglu-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.beta
 platform: ruby
 authors:
 - Anton Parkhomenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -101,12 +101,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.0
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Iglu