blumquist 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2c0790e62786b58b745937e719400b92650cefc
-  data.tar.gz: 5ebd25f60ea10ab9daa1cf7e85463dcc46d0e0ba
+  metadata.gz: f84d2a4e6b928cf36942d379b3ab5b6150ff81a9
+  data.tar.gz: df2f57544abd446f73c4dffdd6b1790215d93ed3
 SHA512:
-  metadata.gz: 90570084208102b04cb5f8278f1c39775ed56f310b456fbb6e2811b5289452afb8f9b38593ec96f7f1fb92de4111d1bae047985ef80e159621267549c387b3bc
-  data.tar.gz: 54f672eace3b69cabdb67232988690e04a4012b2ab146ddd6cb5455b269bc12068d0fc29a6e98d7ec2fcde1d778038fb5fc672fdfdf8bae87e6c003fb31a3399
+  metadata.gz: b21c80d08cd1d633467fa384549be02170229c2dd8e66271db3636d51db0829f7daf957e4edfa14330a528cb776cbc007ab9b484db32d00f811628f7caa277a7
+  data.tar.gz: a9ebe5d7ed5fa53852f38f202c686cca5ee6ebc68b436615685006165406e591506b1c44226dffab634c6062b7083960d93331c323575c5d3054343b4ea03bb2

data/lib/blumquist.rb

@@ -26,7 +26,9 @@ class Blumquist
 
   def validate_data
     return unless @validate
-    JSON::Validator.validate!(@schema, @data)
+    errors = JSON::Validator.fully_validate(@schema, @data)
+    return true if errors.length == 0
+    raise(Errors::ValidationError, [errors, @schema, @data])
   end
 
   def validate_schema
@@ -56,6 +58,16 @@ class Blumquist
     %w{null boolean number string}.include? type.to_s
   end
 
+  def value_is_of_primitive_type?(value, type)
+    case type
+    when 'null'    then value.nil?
+    when 'boolean' then value === true or value === false
+    when 'number'  then value.is_a?(Numeric)
+    when 'string'  then value.is_a?(String)
+    else false
+    end
+  end
+
   def define_getters
     @schema[:properties].each do |property, type_def|
       # The type_def can contain one or more types.
@@ -177,6 +189,11 @@ class Blumquist
       # We found no matching object definition.
       # If a primitve is part of the `oneOfs,
       # that's no problem though.
+      #
+      # TODOs this is only ok if data is actually of that primitive type
+      #
+      # Also check https://gist.github.com/jayniz/e8849ea528af6d205698 and
+      # https://github.com/ruby-json-schema/json-schema/issues/319
       return data if primitive_allowed
 
       # We didn't find a schema in oneOf that matches our data

data/lib/blumquist/errors.rb

@@ -5,3 +5,4 @@ require 'blumquist/errors/invalid_pointer'
 require 'blumquist/errors/missing_array_items_type'
 require 'blumquist/errors/missing_properties'
 require 'blumquist/errors/no_compatible_one_of'
+require 'blumquist/errors/validation'

data/lib/blumquist/errors/validation.rb

@@ -0,0 +1,9 @@
+class Blumquist
+  module Errors
+    class ValidationError < Blumquist::Error
+      def initialize(errors)
+        super(errors.to_json)
+      end
+    end
+  end
+end

data/lib/blumquist/errors/validation_error.rb

@@ -0,0 +1,9 @@
+class Blumquist
+  module Errors
+    class ValidationError < Blumquist::Error
+      def initialize(json_schema_gem_exception, schema, data)
+        super("#{json_schema_gem_exception} for #{data.to_json}")
+      end
+    end
+  end
+end

data/lib/blumquist/version.rb

@@ -1,3 +1,3 @@
 class Blumquist
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blumquist
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jannis Hermanns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -190,6 +190,8 @@ files:
 - lib/blumquist/errors/no_compatible_one_of.rb
 - lib/blumquist/errors/unsupported_schema.rb
 - lib/blumquist/errors/unsupported_type.rb
+- lib/blumquist/errors/validation.rb
+- lib/blumquist/errors/validation_error.rb
 - lib/blumquist/version.rb
 homepage: https://github.com/moviepilot/blumquist
 licenses:
@@ -211,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Turn some data and a json schema into an immutable object with getters from