json-schema 1.0.4 → 1.0.5

data/README.textile

@@ -18,7 +18,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-1.0.4.gem
+$ gem install json-schema-1.0.5.gem
 </pre>
 
 
@@ -93,6 +93,54 @@ rescue JSON::Schema::ValidationError
 end
 </pre>
 
+
+h3. Fully validate against a schema and catch all errors
+
+<pre>
+require 'rubygems'
+require 'json-schema'
+  
+schema = {
+  "type" => "object",
+  "properties" => {
+    "a" => {"type" => "integer", "required" => true},
+    "b" => {"type" => "string", "required" => "true"}
+  }
+}
+  
+data = {
+  "a" => "taco"
+}
+
+errors = JSON::Validator.fully_validate(schema, data)
+
+# ["The property '#/a' of type String did not match the following type: integer in schema 03179a21-197e-5414-9611-e9f63e8324cd#", "The property '#/' did not contain a required property of 'b' in schema 03179a21-197e-5414-9611-e9f63e8324cd#"] 
+</pre>
+
+h3. Fully validate against a schema and catch all errors as objects
+
+<pre>
+require 'rubygems'
+require 'json-schema'
+  
+schema = {
+  "type" => "object",
+  "properties" => {
+    "a" => {"type" => "integer", "required" => true},
+    "b" => {"type" => "string", "required" => "true"}
+  }
+}
+  
+data = {
+  "a" => "taco"
+}
+
+errors = JSON::Validator.fully_validate(schema, data, :errors_as_objects => true)
+
+# [{:message=>"The property '#/a' of type String did not match the following type: integer in schema 03179a21-197e-5414-9611-e9f63e8324cd#", :schema=>#<URI::Generic:0x103a76198 URL:03179a21-197e-5414-9611-e9f63e8324cd#>, :failed_attribute=>"Type", :fragment=>"#/a"}, {:message=>"The property '#/' did not contain a required property of 'b' in schema 03179a21-197e-5414-9611-e9f63e8324cd#", :schema=>#<URI::Generic:0x103a76198 URL:03179a21-197e-5414-9611-e9f63e8324cd#>, :failed_attribute=>"Properties", :fragment=>"#/"}]
+
+</pre>
+
 h3. Validate a JSON object against a JSON schema object, while also validating the schema itself
 
 <pre>

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

@@ -5,8 +5,61 @@ module JSON
         schemas = current_schema.schema['extends']
         schemas = [schemas] if !schemas.is_a?(Array)
         schemas.each do |s|
-          schema = JSON::Schema.new(s,current_schema.uri,validator)
-          schema.validate(data, fragments, options)
+          if s.is_a?(Hash)
+            schema = JSON::Schema.new(s,current_schema.uri,validator)
+            schema.validate(data, fragments, options)
+          elsif s.is_a?(String)
+            temp_uri = URI.parse(s)
+            if temp_uri.relative?
+              temp_uri = current_schema.uri.clone
+              # Check for absolute path
+              path = s.split("#")[0]
+              if path.nil? || path == ''
+                temp_uri.path = current_schema.uri.path
+              elsif path[0,1] == "/"
+                temp_uri.path = Pathname.new(path).cleanpath.to_s
+              else
+                temp_uri = current_schema.uri.merge(path)
+              end
+              temp_uri.fragment = s.split("#")[1]
+            end
+            temp_uri.fragment = "" if temp_uri.fragment.nil?
+
+            # Grab the parent schema from the schema list
+            schema_key = temp_uri.to_s.split("#")[0] + "#"
+
+            ref_schema = JSON::Validator.schemas[schema_key]
+
+            if ref_schema
+              # Perform fragment resolution to retrieve the appropriate level for the schema
+              target_schema = ref_schema.schema
+              fragments = temp_uri.fragment.split("/")
+              fragment_path = ''
+              fragments.each do |fragment|
+                if fragment && fragment != ''
+                  if target_schema.is_a?(Array)
+                    target_schema = target_schema[fragment.to_i]
+                  else
+                    target_schema = target_schema[fragment]
+                  end
+                  fragment_path = fragment_path + "/#{fragment}"
+                  if target_schema.nil?
+                    raise SchemaError.new("The fragment '#{fragment_path}' does not exist on schema #{ref_schema.uri.to_s}")
+                  end
+                end
+              end
+
+              # We have the schema finally, build it and validate!
+              schema = JSON::Schema.new(target_schema,temp_uri,validator)
+              schema.validate(data, fragments, options)
+            else
+              message = "The extended schema '#{temp_uri.to_s}' cannot be found"
+              validation_error(message, fragments, current_schema, self, options[:record_errors])
+            end
+          else
+            message = "The property '#{build_fragment(fragments)}' was not a valid schema"
+            validation_error(message, fragments, current_schema, self, options[:record_errors])
+          end
         end
       end
     end

data/lib/json-schema/validator.rb

@@ -228,6 +228,9 @@ module JSON
       if parent_schema.schema["$ref"]
         load_ref_schema(parent_schema, parent_schema.schema["$ref"])
       end
+      if parent_schema.schema["extends"] && parent_schema.schema["extends"].is_a?(String)
+        load_ref_schema(parent_schema, parent_schema.schema["extends"])
+      end
 
       # Check for schemas in union types
       ["type", "disallow"].each do |key|
@@ -271,12 +274,14 @@ module JSON
 
     # Either load a reference schema or create a new schema
     def handle_schema(parent_schema, obj)
-      schema_uri = parent_schema.uri.clone
-      schema = JSON::Schema.new(obj,schema_uri,@options[:version])
-      if obj['id']
-        Validator.add_schema(schema)
+      if obj.is_a?(Hash)
+        schema_uri = parent_schema.uri.clone
+        schema = JSON::Schema.new(obj,schema_uri,@options[:version])
+        if obj['id']
+          Validator.add_schema(schema)
+        end
+        build_schemas(schema)
       end
-      build_schemas(schema)
     end
 
 

metadata

@@ -1,33 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: json-schema
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 4
-  version: 1.0.4
+version: !ruby/object:Gem::Version
+  version: 1.0.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Kenny Hoxworth
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-14 00:00:00 -05:00
-default_executable: 
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: hoxworth@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
 - LICENSE.md
-files: 
+files:
 - lib/json-schema/attributes/additionalitems.rb
 - lib/json-schema/attributes/additionalproperties.rb
 - lib/json-schema/attributes/dependencies.rb
@@ -66,37 +57,42 @@ files:
 - resources/draft-03.json
 - README.textile
 - LICENSE.md
-has_rdoc: true
+- test/test_extended_schema.rb
+- test/test_files.rb
+- test/test_full_validation.rb
+- test/test_jsonschema_draft1.rb
+- test/test_jsonschema_draft2.rb
+- test/test_jsonschema_draft3.rb
+- test/test_schema_validation.rb
+- test/data/bad_data_1.json
+- test/data/good_data_1.json
+- test/schemas/good_schema_1.json
+- test/schemas/good_schema_2.json
 homepage: http://github.com/hoxworth/json-schema/tree/master
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+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.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby JSON Schema Validator
-test_files: 
+test_files:
 - test/test_extended_schema.rb
 - test/test_files.rb
 - test/test_full_validation.rb