lib/adiwg/mdtranslator/readers/mdJson/mdJson_validator.rb in adiwg-mdtranslator-1.2.1 vs lib/adiwg/mdtranslator/readers/mdJson/mdJson_validator.rb in adiwg-mdtranslator-1.3.0

@@ -6,11 +6,13 @@
 #   Stan Smith 2014-08-21 parsed json-schema validation message to readable text
 #   Stan Smith 2014-09-26 added processing of minor release numbers
 #   Stan Smith 2014-12-01 changed adiwgJson to mdJson in version name check
 #   Stan Smith 2014-12-03 changed class name to MdJsonValidation from AdiwgJsonValidation
 #   Stan Smith 2014-12-11 added namespace
+#   Stan Smith 2015-06-22 replace global ($response) with passed in object (responseObj)
 
+
 require 'json'
 require 'json-schema'
 require 'adiwg-mdjson_schemas'
 # temporary json-schema patch
 # waiting for rubygem json-schema patch
@@ -21,34 +23,34 @@
         module Readers
             module MdJson
 
                 # validate json against the adiwg-json_schemas
                 # only one schema version is supported at this time
-                def self.validate(file)
-                    begin
+                def self.validate(file, responseObj)
 
+                    begin
                         schema = ADIWG::MdjsonSchemas::Utils.schema_path
                         aValErrs = Array.new
-                        if $response[:readerValidationLevel] == 'strict'
+                        if responseObj[:readerValidationLevel] == 'strict'
                             aValErrs = JSON::Validator.fully_validate(schema, file, :strict => true, :errors_as_objects => true)
-                        elsif $response[:readerValidationLevel] == 'normal'
+                        elsif responseObj[:readerValidationLevel] == 'normal'
                             aValErrs = JSON::Validator.fully_validate(schema, file, :errors_as_objects => true)
                         end
 
                         if aValErrs.length > 0
-                            $response[:readerValidationPass] = false
-                            $response[:readerValidationMessages] << 'mdJson schema validation Failed - see following message(s):\n'
-                            $response[:readerValidationMessages] = aValErrs
+                            responseObj[:readerValidationPass] = false
+                            responseObj[:readerValidationMessages] << 'mdJson schema validation Failed - see following message(s):\n'
+                            responseObj[:readerValidationMessages] << aValErrs
                             return
                         end
                     rescue JSON::Schema::ValidationError
-                        $response[:readerValidationPass] = false
-                        $response[:readerValidationMessages] << 'mdJson schema validation Failed - see following message(s):\n'
-                        $response[:readerValidationMessages] << $!.message
+                        responseObj[:readerValidationPass] = false
+                        responseObj[:readerValidationMessages] << 'mdJson schema validation Failed - see following message(s):\n'
+                        responseObj[:readerValidationMessages] << $!.message
                         return
                     end
 
-                    $response[:readerValidationPass] = true
+                    responseObj[:readerValidationPass] = true
                 end
 
             end
         end
     end