json-schema 1.0.7 → 1.0.8

data/README.textile

@@ -18,7 +18,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-1.0.7.gem
+$ gem install json-schema-1.0.8.gem
 </pre>
 
 

data/lib/json-schema/attributes/type.rb

@@ -21,26 +21,7 @@ module JSON
         
         types.each do |type|
           if type.is_a?(String)
-            case type
-            when "string"
-              valid = data.is_a?(String)
-            when "number"
-              valid = data.is_a?(Numeric)
-            when "integer"
-              valid = data.is_a?(Integer)
-            when "boolean"
-              valid = (data.is_a?(TrueClass) || data.is_a?(FalseClass))
-            when "object"
-              valid = data.is_a?(Hash)
-            when "array"
-              valid = data.is_a?(Array)
-            when "null"
-              valid = data.is_a?(NilClass)
-            when "any"
-              valid = true
-            else
-              valid = true
-            end
+            valid = data_valid_for_type?(data, type)
           elsif type.is_a?(Hash) && union
             # Validate as a schema
             schema = JSON::Schema.new(type,current_schema.uri,validator)
@@ -89,6 +70,22 @@ module JSON
           end
         end
       end
+
+      TYPE_CLASS_MAPPINGS = {
+        "string" => String,
+        "number" => Numeric,
+        "integer" => Integer,
+        "boolean" => [TrueClass, FalseClass],
+        "object" => Hash,
+        "array" => Array,
+        "null" => NilClass,
+        "any" => Object
+      }
+
+      def self.data_valid_for_type?(data, type)
+        valid_classes = TYPE_CLASS_MAPPINGS.fetch(type) { return true }
+        Array(valid_classes).any? { |c| data.is_a?(c) }
+      end
     end
   end
 end

data/test/test_jsonschema_draft3.rb

@@ -107,7 +107,7 @@ class JSONSchemaDraft3Test < Test::Unit::TestCase
     data['a'] = true
     assert(!JSON::Validator.validate(schema,data))
     
-    assert(JSON::Validator.validate({'type' => 'objec'}, {'a' => true}))
+    assert(JSON::Validator.validate({'type' => 'object'}, {'a' => true}))
     assert(JSON::Validator.validate({'type' => 'object'}, {}))
     assert(!JSON::Validator.validate({'type' => 'object'}, []))
     assert(!JSON::Validator.validate({'type' => 'object'}, 3))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-06-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: hoxworth@gmail.com