iglu-ruby-client 0.1.0.beta → 0.1.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e73421a2bfedada5669ee7482883196a824ffebc
-  data.tar.gz: ea2ab1d53ecb6594a8bce2f299c2efcb366fdafa
+  metadata.gz: 3bf4ff6bce88c9734846c1f4ed5bd0d1a2c3846f
+  data.tar.gz: 035b84bf32c0b1d1aed5a6b404cc96f92403f2a8
 SHA512:
-  metadata.gz: ea6bbef26f62f7e2ad2b85527a80f64ea9751bf555dbea95ddd20fcceec79d12e2d083ef3e53ec2764dee233b02e75c5287f3c9c9127f5c89791f272c54e40aa
-  data.tar.gz: 4640a5303b0761eec70916f3763a9094d47c164801e4c15bddf223507a866eb8f1470c580bf147634a554d94cd6fed8007d0719958311072eaf710e11fa247c5
+  metadata.gz: 0fa0563292bd560ee0c4ee21bf39a02c6a1e8bf84ea0e06807f7d1f3593a778c3c131740d86e8394b70a133b1dc35bf8985640be899a0dccf1b9e8b61e3d8a9f
+  data.tar.gz: 483b95c1ea2e9d11be70b5682efc6a66da78871d4d93a8c6078204ca70bebb57d74503cf1e2f1e10cfe5e39a0c449ef57f2387585a932399b9fdc52c3e256e24

data/lib/iglu-client/bootstrap.rb

@@ -1,7 +1,10 @@
 module Iglu
   module Registries
     config = Iglu::Registries::RegistryRefConfig.new "Iglu Client Embedded", 0, []
-    @@registry = Iglu::Registries::EmbeddedRegistryRef.new config, "iglu-client-embedded"
+    root = File.dirname(Iglu::Resolver.method(:parse).source_location[0])
+    path = File.join(root, '..', '..', 'assets', "iglu-client-embedded")
+
+    @@registry = Iglu::Registries::EmbeddedRegistryRef.new(config, path)
 
     # Registry embedded straight into iglu-client gem
     def self.bootstrap

data/lib/iglu-client/registries.rb

@@ -65,12 +65,11 @@ module Iglu
         @class_priority = 1
         @descriptor = "embedded"
 
-        @path = path
-        @root = "assets"
+        @root = path
       end
 
       def lookup_schema(schema_key)
-        schema_path = File.join(@root, @path, 'schemas', schema_key.as_path)
+        schema_path = File.join(@root, 'schemas', schema_key.as_path)
         content = File.read(schema_path)
         JSON::parse(content)
       rescue Errno::ENOENT => _
@@ -86,6 +85,10 @@ module Iglu
       def initialize(registry)
         @registry = registry
       end
+
+      def to_s
+        "Not found at #{@registry}"
+      end
     end
 
     class LookupFailure
@@ -95,13 +98,20 @@ module Iglu
         @reason = reason
         @registry = registry
       end
+
+      def to_s
+        "Lookup failure at #{@registry} because #{@reason}"
+      end
     end
 
     class ResolverError < StandardError
-      attr_reader :lookups
+      attr_reader :lookups, :schema_key
 
       def initialize(lookups)
         @lookups = lookups
+        @schema_key = schema_key
+        message = "Schema [#{schema_key.as_uri}] was not found with in [#{lookups.length}] registries with following attempts: [#{lookups.map { |lookup| lookup.to_s }.join('; ')}]"
+        super(message)
       end
     end
 

data/lib/iglu-client/resolver.rb

@@ -48,7 +48,7 @@ module Iglu
         end
 
         if lookup_result.nil?
-          raise Registries::ResolverError.new failures
+          raise Registries::ResolverError.new(failures, schema_key)
         else
           @cache[schema_key] = lookup_result
           lookup_result
@@ -112,16 +112,15 @@ module Iglu
       JSON::Validator.validate!(schema, data)
     end
 
-
-    # Primary method. Validate self-describing JSON instance
-    def self.validate(json)
-      JSON::Validator.validate!(schema, data)
-    end
-
     def prioritize_repos(schema_key, repository_refs)
       repository_refs.sort_by do |ref|
-        [!ref.vendor_matched(schema_key), ref.class_priority, ref.config.priority]
+        [Resolver.btoi(!ref.vendor_matched(schema_key)), ref.class_priority, ref.config.priority]
       end
     end
+
+    # Convert boolean to int
+    def self.btoi(b)
+      if b then 1 else 0 end
+    end
   end
 end

data/lib/iglu-client/self_describing_json.rb

@@ -33,7 +33,7 @@ module Iglu
   
     # Check if JSON is valid (throw exception otherwise)
     def validate(resolver)
-      @valid = resolver.validate(to_json)
+      @valid = resolver.validate(self.to_json)
       @valid
     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.beta'
+  CLIENT_VERSION = '0.1.0.beta.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iglu-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta
+  version: 0.1.0.beta.2
 platform: ruby
 authors:
 - Anton Parkhomenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,11 +41,17 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
@@ -50,6 +59,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
 description: Iglu Client is used to resolve JSON Schemas and validate self-describing