hashema 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0320697b5755730fd8ffa18843b0f3b496cfd739
+  data.tar.gz: 8bf8bcedb3d51e880d5a13c499754c3fc604a5c0
+SHA512:
+  metadata.gz: f8e5882479f1cbb3a9923575812eafc7d78281a69fd070f6ac488468e4b9d002ccfaca37b41717522df1d8429a2559251b07c321941f09a388f99a28aaafda12
+  data.tar.gz: 98a5238131421fb6fe61ff625cf2cbd71ffaaada4d2280df5079f25540709aa0e6cdb872336eb05a229d6819116ff2d894ffe3640cb5db1a03b7c35c5d154a7b

data/lib/hashema/conform_to_schema.rb

@@ -1,5 +1,7 @@
 RSpec::Matchers.define :conform_to_schema do |schema|
   match do |actual|
+    @schema = schema
+    @actual = actual
     @validator = Hashema::Validator.new(actual, schema)
     @validator.valid?
   end
@@ -13,7 +15,7 @@ RSpec::Matchers.define :conform_to_schema do |schema|
   end
 
   def failure_message_when_negated
-    "expected\n#{actual.inspect}\nnot to match schema\n#{schema.inspect}"
+    "expected\n#{@actual.inspect}\nnot to match schema\n#{@schema.inspect}"
   end
 
   def failure_message_for_should_not

data/lib/hashema/validator.rb

@@ -3,6 +3,7 @@ module Hashema
     def initialize(actual, schema)
       @actual = actual
       @schema = schema
+      @withholding_judgement = false
       match! @actual, @schema
     end
 
@@ -31,25 +32,54 @@ module Hashema
     end
 
     def match_hash!(actual, schema, path)
+      if actual.is_a? Hash
+        if schema.keys.sort == actual.keys.sort
+          match_hash_with_same_keys! actual, schema, path
+        else
+          report_mismatched_key_sets! actual, schema, path
+        end
+      else
+        report_error "expected #{format_path path} to be a Hash, but got #{actual.class}"
+        false
+      end
+    end
+
+    def match_hash_with_same_keys!(actual, schema, path)
       recording_mismatches actual, schema, path do
-        schema.keys.sort == actual.keys.sort and
         actual.all? do |key, value|
           match! value, schema[key], path + [key]
         end
       end
     end
 
+    def report_mismatched_key_sets!(actual, schema, path)
+      extras = actual.keys - schema.keys
+      missing = schema.keys - actual.keys
+      error = "expected #{format_path path} to have a different set of keys\n"
+      error += "the extra keys were:\n  #{extras.map(&:inspect).join("\n  ")}\n" if extras.any?
+      error += "the missing keys were:\n  #{missing.map(&:inspect).join("\n  ")}\n" if missing.any?
+      report_error error
+      false
+    end
+
     def match_array!(actual, schema, path)
-      recording_mismatches actual, schema, path do
-        actual.is_a? Array and
-        actual.each_with_index.all? { |elem, i| match! elem, schema[0], path + [i] }
+      if actual.is_a? Array
+        recording_mismatches actual, schema, path do
+          actual.is_a? Array and
+          actual.each_with_index.all? { |elem, i| match! elem, schema[0], path + [i] }
+        end
+      else
+        report_error "expected #{format_path path} to be an Array, but got #{actual.class}"
+        false
       end
     end
 
     def match_alternatives!(actual, alternatives, path)
-      recording_mismatches actual, alternatives, path, true do
+      recording_mismatches actual, alternatives, path do
         alternatives.any? do |alternative|
-          match! actual, alternative, path
+          withholding_judgement actual, alternatives, path do
+            match! actual, alternative, path
+          end
         end
       end
     end
@@ -60,14 +90,31 @@ module Hashema
       end
     end
 
-    def recording_mismatches(actual, schema, path, overwrite=false)
+    def withholding_judgement(actual, schema, path)
+      original_withholding_judgement = @withholding_judgement
+      @withholding_judgement = true
+      returned = yield
+      @withholding_judgement = original_withholding_judgement
+      returned
+    end
+
+    def recording_mismatches(actual, schema, path)
       if yield
         true
       else
-        mismatch = "expected /#{path.join("/")} to match\n#{schema.inspect}\nbut got\n#{actual.inspect}"
-        @mismatch = mismatch if !@mismatch || overwrite
+        report_error "expected #{format_path path} to match\n#{schema.inspect}\nbut got\n#{actual.inspect}"
         false
       end
     end
+
+    def report_error(error)
+      unless @withholding_judgement
+        @mismatch ||= error
+      end
+    end
+
+    def format_path(path)
+      "/#{path.join("/")}"
+    end
   end
 end

data/lib/hashema/version.rb

@@ -1,5 +1,5 @@
 module Hashema
   module Version
-    STRING = '0.0.1'
+    STRING = '0.0.2'
   end
 end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: hashema
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Ben Christel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
 description: Assert that JSONable objects conform to a schema
@@ -43,27 +40,27 @@ files:
 homepage: http://github.com/benchristel/hashema
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
-summary: hashema-0.0.1
+specification_version: 4
+summary: hashema-0.0.2
 test_files: []
+has_rdoc: