blumquist 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 483e9c180b39596478efde4ee3979745358b3c49
-  data.tar.gz: a87b488598a2be1322c3cadfff04646426dc0cf3
+  metadata.gz: be0386ec7a441132a1b6c5f6a230341218c357bc
+  data.tar.gz: d744092db33a8cd3f753645f99599f428291b5ee
 SHA512:
-  metadata.gz: f9d25548bf324c88a7b909ec2ee416f28b3ce5c61d0ae20733ca87a89e7f8e416f274edc85b6ad967f259db5b6f22ff938539206901fadd15c67eb3032f244f4
-  data.tar.gz: e2235e061456a355abbc856fa1f552906e56177ef72491a5e074f4a790ef3422dc5f2b3d6bd8fb3021c86e1a6ded9f2a795365f038b2b868e2abe41c18f2b8da
+  metadata.gz: eab80f79b5a23c652f00291243bb79db5b9f4b5454d5f32fd6b8344f97ea52003e0c2d9a97171f54d29418d5e7a1b6815db838eb0be31cce8d3547d73c8fb135
+  data.tar.gz: 0f346735db4c91f040a1ec6f39e245000293404a643b6ec7153be20353d73ba3b39a8a16e64a9d9bff99b8dcb7883b66de1167e7da63b997312453e3b34e7b32

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+# 0.2.0 (Oct-30-15)
+- validate objects (if desired)
+- use keyword arguments (in <2.0 compat mode)

data/README.md

@@ -68,19 +68,22 @@ data = {
 ... an object with getters for all properties defined in the schema
 
 ```ruby
-> b = Blumquist.new(schema, data)
-=> #<Blumquist:0x....>
+> b = Blumquist.new(schema: schema, data: data)
+=> #<Blumquist:0x0....>
 > b.name
 => "Moviepilot, Inc."
 > b.old_addresses.first.street
 => "Blücherstr. 22"
 ```
 
-## TODO
+### Validation
 
-- Put it to use, fix bugs
-- Validate data against schema and reject invalid data
+By default, Blumquist will validate the data. If you don't want that to happen, do as follows:
 
+```ruby
+> b = Blumquist.new(schema: schema, data: data, validate: false)
+=> ...
+```
 
 ## Installation
 

data/blumquist.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "json-schema"
 
   spec.add_development_dependency "bundler", "~> 1"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/blumquist.rb

@@ -1,27 +1,33 @@
 require "blumquist/version"
 require 'active_support/core_ext/hash/indifferent_access'
 require 'json'
+require 'json-schema'
 
 class Blumquist
-  def initialize(schema, data)
+  def initialize(options)
     # Poor man's deep clone: json 🆗 🆒
-    @data = JSON.parse(data.to_json)
-    @schema = schema.with_indifferent_access
+    @data = JSON.parse(options.fetch(:data).to_json)
+    @schema = options.fetch(:schema).with_indifferent_access
+    @validate = options.fetch(:validate, true)
 
     validate_schema
+    validate_data
+
     resolve_json_pointers
     define_getters
   end
 
   private 
 
+  def validate_data
+    return unless @validate
+    JSON::Validator.validate!(@schema, @data)
+  end
+
   def validate_schema
     if @schema[:type] != 'object'
       raise "Can only deal with 'object' types, not '#{@schema[:type]}'"
     end
-    unless @schema[:properties].is_a?(Hash)
-      raise "Properties are a #{@schema[:properties].class.name}, not a Hash"
-    end
   end
 
   def resolve_json_pointers
@@ -82,7 +88,7 @@ class Blumquist
     sub_schema = @schema[:properties][property].merge(
       definitions: @schema[:definitions]
     )
-    @data[property] = Blumquist.new(sub_schema, @data[property])
+    @data[property] = Blumquist.new(schema: sub_schema, data: @data[property], validate: @validate)
   end
 
   def blumquistify_array(property)
@@ -92,7 +98,7 @@ class Blumquist
     )
     @data[property] ||= []
     @data[property] = @data[property].map do |item|
-      Blumquist.new(sub_schema, item)
+      Blumquist.new(schema: sub_schema, data: item, validate: @validate)
     end
   end
 end

data/lib/blumquist/version.rb

@@ -1,3 +1,3 @@
 class Blumquist
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blumquist
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jannis Hermanns
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +159,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile