fidor_schema 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63ab80e63895828c2013ea4769e2347307c23b7a
-  data.tar.gz: 0daa2e9e87cba18071f3a9f527d4fbf419430e8a
+  metadata.gz: e1217869917c2c480782fe5be4b130eeb390b964
+  data.tar.gz: 74cf5f1880959b32af62a69037baa2e4f75801d1
 SHA512:
-  metadata.gz: b1d0637a964ab6e1382b85286a61cdd13033e2f53aae3d90ade42fb20872857b8c6321afb3976c49e1e5107d127eef607ed202d500505a52cdebb273049a07e1
-  data.tar.gz: aae96fdec1918c399573f6ebd04c94a8c518155857bc4a6990a071c0fba56e6150e91cb8270ea2128b6a2a5165c1168648cd34ccddcc030378775900c9015a07
+  metadata.gz: 462793875cc0c364bf31614e5064da0ef3ac7f475d96b580ba795196e82a673af19c568c1a827660f22c0567c0fcf989585263643d102f2fbeefbd8ccc45d448
+  data.tar.gz: 965d875c3d985d42dd6bcf746bb84aa523c3a44daccbc91b1c65a48d0535e6373a02cf8b9661996476ea64134007f6e7b63552bd3243b0abb4e9932a04b5c206

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 A more detailed view of the changes can be found in the [commit messages](https://github.com/fidor/fidor_schema/commits/)
 
+##2015-03
+
+* remove name attribute in favour of title
+* remove nested $refs pointing to properties in favour of direct link to the related schema
+* validate the schema files against three different ruby validators
+* add $schema version to each file
+
 ##2015-02
 
 * SepaMandates filter by multiple references and ibans

data/Gemfile

@@ -1,5 +1,2 @@
 source 'https://rubygems.org'
-gem 'json-schema'
-gem 'json_schema'
-gem 'jschema'
 gemspec

data/Rakefile

@@ -8,21 +8,21 @@ RSpec::Core::RakeTask.new
 task :default => :spec
 
 
-require 'validate/validate'
+require 'validator'
 
 
 task :validate_dash do
-  Fidor::SchemaValidation.main :dash
+  Validator.run :dash
 end
 
 task :validate_underscore do
-  Fidor::SchemaValidation.main :underscore
+  Validator.run :underscore
 end
 
 task :validate_jschema do
-  Fidor::SchemaValidation.main :jschema
+  Validator.run :jschema
 end
 
 task :validate_schema => [:validate_dash, :validate_underscore, :validate_jschema] do
-  
+
 end

data/fidor_schema.gemspec

@@ -21,8 +21,16 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'activesupport'
-  spec.add_development_dependency 'json_schema_tools', '>=0.3.3'
+  spec.add_development_dependency 'json_schema_tools', '>=0.6.1'
   spec.add_development_dependency 'activemodel' # required by above
   spec.add_development_dependency 'rake'
+  # schema validation gems, for now all of them. must see which one is the most valid ;-)
 
-end
+  # most downloads on rubygems, last updated feb 2015
+  spec.add_development_dependency 'json-schema'
+  # 2nd most downloads on rubygems, last updated March 2015
+  spec.add_development_dependency 'json_schema'
+  # pretty new , last udpate sep 2014
+  spec.add_development_dependency 'jschema'
+
+end

data/lib/fidor_schema_version.rb

@@ -1,5 +1,5 @@
 module Fidor
   class Schema
-    VERSION='0.5.1'
+    VERSION='0.6.0'
   end
-end
+end

data/lib/validator/base.rb

@@ -0,0 +1,105 @@
+# This functionality is intended to run the schema, through
+# any available Schema Validators for Ruby.
+#
+# They should be valid according to draft-4 ...
+#
+# The schema validators currently being considered are:
+#
+# https://github.com/ruby-json-schema/json-schema
+# https://github.com/brandur/json_schema (note the underscore!)
+# https://github.com/Soylent/jschema
+#
+# These are the three currently available ruby validators that
+# support draft-4. (According to json-schema.org).
+#
+# Each has their quirks, we'll try to:
+#    * use each to validate each fidor schema against the json-schema meta-schema
+#    * try to load each fidor schema as a schema for validation.
+#
+require 'pathname'
+
+module Validator
+  class Base
+    # @return [Array<String>] file paths
+    attr_accessor :files_to_validate
+
+    # Run the given validator with all schema files
+    def self.run(files)
+      puts "Running validation with #{name} for #{files.length} schemas"
+      v = new(files)
+      v.validate_all
+      puts v.log_fmt
+      v
+    end
+
+    def validate_all
+      validate_schemas
+      validate_data
+    end
+
+    def validate_schemas
+      files_to_validate.each do |file|
+        schema = File.read file
+        log << "validate schema: #{file}"
+        validate schema
+      end
+    end
+
+    def validate_data
+      files_to_validate.each do |file|
+        schema = File.read file
+        log << "validate data against: #{file}"
+        use_for_validation schema
+      end
+    end
+
+
+    # Joins the logs before display
+    def log_fmt
+      res = []
+      if errors.length > 0
+        res << "#{errors.join("\n\n")}"
+        res << "="*50
+        res << "#{errors.length} with errors"
+      end
+      res << "#{success.uniq.length} Schemas passed"
+      res.join("\n")
+    end
+    # @return [Array<String>] error schemas
+    def errors
+      @errors ||= []
+    end
+    # @return [Array<String>] test log
+    def log
+      @log ||= []
+    end
+    # @return [Array<String>] successfull schema titles
+    def success
+      @success ||= []
+    end
+
+  end
+
+  def self.find_all_schema
+    # asssume we're running from rake and pwd is project root ...
+    this_dir = File.dirname(__FILE__)
+    repo_dir = Pathname.new(this_dir+"/../..").cleanpath.to_s
+
+    Dir.glob("#{repo_dir}/schema/**/*.json")
+  end
+
+
+  # @param [Symbol] validator to use
+  def self.run(validator)
+    case validator
+      when :underscore
+        Json_Schema.run find_all_schema
+      when :dash
+        JsonSchema.run find_all_schema
+      when :jschema
+        JSchema.run find_all_schema
+      else
+        puts "Unknown validator: #{validator}"
+    end
+  end
+end

data/lib/validator/j_schema.rb

@@ -0,0 +1,34 @@
+require 'jschema'
+module Validator
+  class JSchema < Base
+
+    def initialize(files_to_validate)
+      @files_to_validate = files_to_validate
+      schema_data = File.read("#{File.dirname(__FILE__)}/schema.json")
+      schema_json = JSON.parse(schema_data)
+      @meta_schema = ::JSchema.build(schema_json)
+    end
+
+    def validate(schema)
+      schema_to_test = JSON.parse(schema)
+      result = @meta_schema.validate schema_to_test
+      if !result || result.length == 0
+        success << schema_to_test['title'] || schema_to_test.keys[0]
+      else
+        errors << "Schema validation failed: #{schema_to_test['title']}\n#{result.join("\n")}"
+      end
+    end
+
+    def use_for_validation(schema)
+      schema_to_test = JSON.parse(schema)
+      begin
+       ::JSchema.build(schema_to_test)
+      rescue
+        errors << "Data validation failed: #{schema_to_test['title']}\n#{$!}"
+        # puts $!.backtrace
+      else
+        success << schema_to_test['title'] || schema_to_test.keys[0]
+      end
+    end
+  end
+end

data/lib/validator/json-schema.rb

@@ -0,0 +1,51 @@
+require 'json-schema'
+# https://github.com/ruby-json-schema/json-schema
+module Validator
+  class JsonSchema < Base
+    def initialize(files_to_validate)
+      @files_to_validate = files_to_validate
+      @meta_schema_path  = "#{File.dirname(__FILE__)}/schema.json"
+
+      # need to know the base dir of the schema to resolve relative uris.
+      # see below.
+      @schemadir = File.dirname(@files_to_validate[0])
+    end
+
+    # @param [String] schema to test against the meta schema
+    def validate(schema)
+      schema_to_test = JSON.parse(schema)
+      begin
+        result = JSON::Validator.fully_validate(@meta_schema_path, schema_to_test)
+        if !result || result.length == 0
+          success << schema_to_test['title'] || schema_to_test.keys[0]
+        else
+          errors << "Schema validation failed: #{schema_to_test['title']}\n#{result.join("\n")}"
+        end
+      rescue => e
+        errors << "Schema validation failed: #{schema_to_test['title']}\n#{e}"
+        # puts e.backtrace
+      end
+    end
+
+    def use_for_validation(schema)
+      schema_to_test = JSON.parse(schema)
+
+      # json-schema resolves relatives path relative to it's own "."
+      # not relative to the file containing the reference ...
+      base_dir = Dir.pwd
+
+      begin
+        Dir.chdir @schemadir
+        data = {}
+        result = JSON::Validator.fully_validate(schema_to_test, data)
+        if !result || result.length == 0
+          success << schema_to_test['title']
+        else
+          errors << "Data validation failed: #{schema_to_test['title']}\n#{result.join("\n")}"
+        end
+      ensure
+        Dir.chdir base_dir
+      end
+    end
+  end
+end

data/lib/validator/json_schema.rb

@@ -0,0 +1,37 @@
+require 'json_schema'
+module Validator
+  class Json_Schema < Base
+
+    def initialize files_to_validate
+      @files_to_validate = files_to_validate
+      schema_data = File.read("#{File.dirname(__FILE__)}/schema.json")
+      schema_json = JSON.parse(schema_data)
+      @schema = ::JsonSchema.parse!(schema_json)
+      @errors, @success = [], []
+    end
+
+    # @param [String] schema to test against the meta schema
+    def validate(schema)
+      schema_to_test = JSON.parse(schema)
+      begin
+        @schema.validate! schema_to_test
+      rescue
+        errors << "Schema validation failed: #{schema_to_test['title']}\n#{$!}"
+      else
+        success << File.basename(schema)
+      end
+    end
+
+    def use_for_validation(schema)
+       schema_to_test = JSON.parse(schema)
+      begin
+       ::JsonSchema.parse!(schema_to_test)
+      rescue
+        errors << "Data validation failed: #{schema_to_test['title']}\n#{$!}"
+      else
+        success << schema_to_test['title']
+      end
+    end
+
+  end
+end

data/lib/validator.rb

@@ -0,0 +1,4 @@
+require 'validator/base'
+require 'validator/json-schema'
+require 'validator/json_schema'
+require 'validator/j_schema'

data/schema/v1.0/account.json

@@ -1,7 +1,7 @@
 {
+  "$schema"     : "http://json-schema.org/draft-04/schema#",
   "type"        : "object",
-  "title"       : "Account",
-  "name"        : "account",
+  "title"       : "account",
   "description" : "A fidor bank account.",
   "properties"  : {
     "id" : {
@@ -68,9 +68,12 @@
       "type"        : "array",
       "items"       : {
         "type"       : "object",
-        "properties" : {
-          "$ref" : "./customer.json#properties"
-        }
+        "$ref" : "./customer.json#"
+//        "items"       : {
+//        "type"       : "object",
+//        "properties" : {
+//          "$ref" : "./customer.json#properties"
+//        }
       },
       "readOnly" : true
     },
@@ -107,4 +110,4 @@
       "href"         : "accounts/{id}/sepa_direct_debits"
     }
   ]
-}
+}

data/schema/v1.0/base_types/base_types.json

@@ -1,4 +1,5 @@
 {
+  "$schema"     : "http://json-schema.org/draft-04/schema#",
   "definitions" : {
     "id" : {
       "description" : "Unique identifier of the object",

data/schema/v1.0/batch_direct_debit.json

@@ -1,9 +1,8 @@
 {
-  "NOTE"        : "THIS OBJECT IS NOT SUPPORTED IN THE CURRENT API VERSION",
-  "note"        : "this file is for future reference only!",
+  "$schema"     : "http://json-schema.org/draft-04/schema#",
+  "NOTE"        : "THIS OBJECT IS NOT SUPPORTED IN THE CURRENT API VERSION, this file is for future reference only!",
   "type"        : "object",
-  "title"       : "Batch Direct Debit",
-  "name"        : "batch_direct_debit",
+  "title"       : "batch_direct_debit",
   "description" : "PREVIEW: A direct debit batch contains multiple direct debits which are processed asynchronously.",
   "required"    : ["account_id", "external_uid"],
   "properties"  : {
@@ -24,9 +23,7 @@
       "type"        : "array",
       "items"       : {
         "type"       : "object",
-        "properties" : {
-          "$ref" : "./sepa_direct_debit.json#properties"
-        }
+        "$ref" : "./sepa_direct_debit.json#"
       }
     },
     "sepa_direct_debit_ids" : {
@@ -47,9 +44,7 @@
           },
           "error" : {
             "type"       : "object",
-            "properties" : {
-              "$ref" : "./error.json#properties"
-            }
+            "$ref" : "./error.json#"
           }
         }
       }

data/schema/v1.0/batch_transfer.json

@@ -2,8 +2,7 @@
   "NOTE"        : "THIS OBJECT IS NOT SUPPORTED IN THE CURRENT API VERSION",
   "note"        : "this file is for future reference only!",
   "type"        : "object",
-  "title"       : "Batch Transfer",
-  "name"        : "batch_transfer",
+  "title"       : "batch_transfer",
   "description" : "PREVIEW: A transfer batch contains multiple transfers which are processed asynchronously.",
   "required"    : ["account_id", "external_uid"],
   "properties"  : {
@@ -24,9 +23,7 @@
       "type"        : "array",
       "items"       : {
         "type"       : "object",
-        "properties" : {
-          "$ref" : "./sepa_credit_transfer.json#properties"
-        }
+        "$ref" : "./sepa_credit_transfer.json#"
       }
     },
     "internal_transfers" : {
@@ -34,9 +31,7 @@
       "type"        : "array",
       "items"       : {
         "type"       : "object",
-        "properties" : {
-          "$ref" : "./internal_transfer.json#properties"
-        }
+        "$ref" : "./internal_transfer.json#"
       }
     },
     "sepa_credit_transfer_ids" : {
@@ -64,9 +59,7 @@
           },
           "error" : {
             "type"       : "object",
-            "properties" : {
-              "$ref" : "./error.json#properties"
-            }
+            "$ref" : "./error.json#"
           }
         }
       }
@@ -82,9 +75,7 @@
           },
           "error" : {
             "type"       : "object",
-            "properties" : {
-              "$ref" : "./error.json#properties"
-            }
+            "$ref" : "./error.json#"
           }
         }
       }

data/schema/v1.0/customer.json

@@ -1,7 +1,7 @@
 {
+  "$schema"     : "http://json-schema.org/draft-04/schema#",
   "type"        : "object",
-  "title"       : "Customer",
-  "name"        : "customer",
+  "title"       : "customer",
   "description" : "",
   "required"    : ["email", "first_name", "last_name", "gender", "title", "nick"],
   "properties"  : {
@@ -193,12 +193,12 @@
       "href" : "customers/{id}"
     },
     {
-      "rel"          : "instances",
-      "href"         : "customers"
+      "rel"  : "instances",
+      "href" : "customers"
     },
     {
-      "rel"          : "accounts",
-      "href"         : "customers/{id}/accounts"
+      "rel"  : "accounts",
+      "href" : "customers/{id}/accounts"
     }
   ]
 }

data/schema/v1.0/error.json

@@ -1,7 +1,7 @@
 {
+  "$schema"     : "http://json-schema.org/draft-04/schema#",
   "type"        : "object",
-  "title"       : "Error",
-  "name"        : "error",
+  "title"       : "error",
   "description" : "A standard error object",
   "required"    : ["message", "code", "errors"],
   "properties"  : {

data/schema/v1.0/internal_transfer.json

@@ -1,7 +1,7 @@
 {
+  "$schema"     : "http://json-schema.org/draft-04/schema#",
   "type"        : "object",
-  "title"       : "Internal Transfer",
-  "name"        : "internal_transfer",
+  "title"       : "internal_transfer",
   "description" : "A transfer initiates a transaction e.g get / send money. If the transfer fails no transaction is created!",
   "required"    : ["account_id", "receiver", "amount", "external_uid"],
   "properties"  : {

data/schema/v1.0/rate_limit.json

@@ -1,7 +1,7 @@
 {
+  "$schema"     : "http://json-schema.org/draft-04/schema#",
   "type"        : "object",
-  "title"       : "Rate limit",
-  "name"        : "rate_limit",
+  "title"       : "rate_limit",
   "description" : "Overall, remaining rate limits and the time frame until the reset.",
   "properties"  : {
     "limit" : {

data/schema/v1.0/sepa_credit_transfer.json

@@ -1,7 +1,7 @@
 {
+  "$schema"     : "http://json-schema.org/draft-04/schema#",
   "type"        : "object",
-  "title"       : "Sepa Credit Transfer",
-  "name"        : "sepa_credit_transfer",
+  "title"       : "sepa_credit_transfer",
   "description" : "A transfer initiates a transaction e.g get / send money. If the transfer fails no transaction is created!",
   "required"    : ["account_id", "amount", "external_uid"],
   "properties"  : {

data/schema/v1.0/sepa_direct_debit.json

@@ -1,7 +1,7 @@
 {
+  "$schema"     : "http://json-schema.org/draft-04/schema#",
   "type"        : "object",
-  "title"       : "Sepa Direct Debit",
-  "name"        : "sepa_direct_debit",
+  "title"       : "sepa_direct_debit",
   "description" : "A direct debit can only be performed with a valid sepa mandate, authorizing access to the debtor's account.",
   "required"    : ["account_id", "mandate_id", "amount", "collection_date", "external_uid"],
   "properties"  : {

data/schema/v1.0/sepa_mandate.json

@@ -1,7 +1,7 @@
 {
+  "$schema"     : "http://json-schema.org/draft-04/schema#",
   "type"        : "object",
-  "title"       : "Sepa Mandate",
-  "name"        : "sepa_mandate",
+  "title"       : "sepa_mandate",
   "description" : "A mandate object authorizing debits from an account.",
   "required"    : ["external_uid", "customer_id", "mandate_reference", "remote_title", "remote_name", "remote_email",
                    "remote_address_line1", "remote_address_line2", "remote_country", "remote_iban", "remote_bic",

data/schema/v1.0/transaction.json

@@ -1,7 +1,7 @@
 {
+  "$schema"     : "http://json-schema.org/draft-04/schema#",
   "type"        : "object",
-  "title"       : "Transaction",
-  "name"        : "transaction",
+  "title"       : "transaction",
   "description" : "A transaction is the result of a successful transfer or debit.",
   "properties"  : {
     "id" : {
@@ -21,28 +21,20 @@
       "type"        : "object",
       "oneOf"       : [
         {
-          "name"        : "credit_card_details",
-          "properties" : {
-            "$ref" : "./transaction_type_details/credit_card_details.json#properties"
-          }
+          "title"      : "credit_card_details",
+          "$ref" : "./transaction_type_details/credit_card_details.json#"
         },
         {
-          "name"        : "internal_transfer_details",
-          "properties" : {
-            "$ref" : "./transaction_type_details/internal_transfer_details.json#properties"
-          }
+          "title"      : "internal_transfer_details",
+          "$ref" : "./transaction_type_details/internal_transfer_details.json#"
         },
         {
-          "name"        : "sepa_credit_transfer_details",
-          "properties" : {
-            "$ref" : "./transaction_type_details/sepa_credit_transfer_details.json#properties"
-          }
+          "title"      : "sepa_credit_transfer_details",
+          "$ref" : "./transaction_type_details/sepa_credit_transfer_details.json#"
         },
         {
-          "name"        : "sepa_direct_debit_details",
-          "properties" : {
-            "$ref" : "./transaction_type_details/sepa_direct_debit_details.json#properties"
-          }
+          "title"      : "sepa_direct_debit_details",
+          "$ref" : "./transaction_type_details/sepa_direct_debit_details.json#"
         }
       ]
     },

data/schema/v1.0/transaction_type_details/credit_card_details.json

@@ -1,7 +1,7 @@
 {
+  "$schema"     : "http://json-schema.org/draft-04/schema#",
   "type"        : "object",
-  "title"       : "Credit Card Details",
-  "name"        : "credit_card_details",
+  "title"       : "credit_card_details",
   "description" : "Credit card information available in a CreditCard transaction",
   "properties"  : {
     "cc_merchant_name" : {

data/schema/v1.0/transaction_type_details/internal_transfer_details.json

@@ -1,7 +1,7 @@
 {
+  "$schema"     : "http://json-schema.org/draft-04/schema#",
   "type"        : "object",
-  "title"       : "Internal Transfer Details",
-  "name"        : "internal_transfer_details",
+  "title"       : "internal_transfer_details",
   "description" : "Remote account for a Fidor internal transfer",
   "properties"  : {
     "remote_account_id" : {

data/schema/v1.0/transaction_type_details/sepa_credit_transfer_details.json

@@ -1,7 +1,7 @@
 {
+  "$schema"     : "http://json-schema.org/draft-04/schema#",
   "type"        : "object",
-  "title"       : "Sepa Credit Transfer Details",
-  "name"        : "sepa_credit_transfer_details",
+  "title"       : "sepa_credit_transfer_details",
   "description" : "Remote account information available in a SEPA credit transfer",
   "properties"  : {
     "sepa_credit_transfer_id" : {

data/schema/v1.0/transaction_type_details/sepa_direct_debit_details.json

@@ -1,7 +1,7 @@
 {
+  "$schema"     : "http://json-schema.org/draft-04/schema#",
   "type"        : "object",
-  "title"       : "Sepa Direct Debit Details",
-  "name"        : "sepa_direct_debit_details",
+  "title"       : "sepa_direct_debit_details",
   "description" : "Remote account information for a SEPA direct debit",
   "properties"  : {
     "remote_iban" : {

data/schema/v1.0/user.json

@@ -1,7 +1,7 @@
 {
+  "$schema"     : "http://json-schema.org/draft-04/schema#",
   "type"        : "object",
-  "title"       : "User",
-  "name"        : "user",
+  "title"       : "user",
   "description" : "",
   "required"    : ["email"],
   "properties"  : {

data/spec/fidor_schema_spec.rb

@@ -24,7 +24,6 @@ describe Fidor::Schema do
       SchemaTools.schema_path = Fidor::Schema.path
       schema = SchemaTools::Reader.read('account').to_h
       expect(schema['properties']['customers']['items']['properties']['id']['type']).to eq 'string'
-
     end
 
     it 'should resolve all' do
@@ -38,4 +37,4 @@ describe Fidor::Schema do
     end
 
   end
-end
+end

data/spec/validator/j_schema_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'validator'
+
+describe Validator::JSchema do
+  it 'validates schemas against the meta schema' do
+    path = Fidor::Schema.path
+    files = Dir.glob("#{path}/**/*.json")
+    v = Validator::JSchema.new files
+    v.validate_schemas
+    expect(v.log[0]).to include('validate schema')
+    expect(v.errors).to be_empty
+  end
+
+  it 'validates schemas against blank data' do
+    path = Fidor::Schema.path
+    files = Dir.glob("#{path}/**/*.json")
+    v = Validator::JSchema.new files
+    v.validate_data
+    expect(v.log[0]).to include('validate data')
+    # expect(v.errors).to be_empty
+  end
+end

data/spec/validator/json-schema_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'validator'
+
+describe Validator::JsonSchema do
+  it 'validates schemas against the meta schema' do
+    path = Fidor::Schema.path
+    files = Dir.glob("#{path}/**/*.json")
+    v = Validator::JsonSchema.new files
+    v.validate_schemas
+    expect(v.log[0]).to include('validate schema')
+    expect(v.errors).to be_empty
+  end
+
+  it 'validates schemas against blank data' do
+    path = Fidor::Schema.path
+    files = Dir.glob("#{path}/**/*.json")
+    v = Validator::JsonSchema.new files
+    v.validate_data
+    expect(v.log[0]).to include('validate data')
+    # expect(v.errors).to be_empty
+  end
+end

data/spec/validator/json_schema_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'validator'
+
+describe Validator::Json_Schema do
+  it 'validates schemas against the meta schema' do
+    path = Fidor::Schema.path
+    files = Dir.glob("#{path}/**/*.json")
+    v = Validator::Json_Schema.new files
+    v.validate_schemas
+    expect(v.log[0]).to include('validate schema')
+    expect(v.errors).to be_empty
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fidor_schema
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Georg Leciejewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,48 @@ 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: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !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: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jschema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fidor API description. Using JSON Schema to describe the available objects,
   their fields and resource links. Beware of the BETA status, as things can change
   slightly
@@ -111,11 +153,14 @@ files:
 - lib/fidor/schema.rb
 - lib/fidor_schema.rb
 - lib/fidor_schema_version.rb
-- lib/validate/schema.json
-- lib/validate/validate.rb
+- lib/validator.rb
+- lib/validator/base.rb
+- lib/validator/j_schema.rb
+- lib/validator/json-schema.rb
+- lib/validator/json_schema.rb
+- lib/validator/schema.json
 - schema/v1.0/account.json
 - schema/v1.0/base_types/base_types.json
-- schema/v1.0/base_types/lists.json
 - schema/v1.0/batch_direct_debit.json
 - schema/v1.0/batch_transfer.json
 - schema/v1.0/customer.json
@@ -133,6 +178,9 @@ files:
 - schema/v1.0/user.json
 - spec/fidor_schema_spec.rb
 - spec/spec_helper.rb
+- spec/validator/j_schema_spec.rb
+- spec/validator/json-schema_spec.rb
+- spec/validator/json_schema_spec.rb
 homepage: https://www.fidor.de
 licenses:
 - MIT
@@ -160,3 +208,6 @@ summary: BETA Fidor API - JSON Schema
 test_files:
 - spec/fidor_schema_spec.rb
 - spec/spec_helper.rb
+- spec/validator/j_schema_spec.rb
+- spec/validator/json-schema_spec.rb
+- spec/validator/json_schema_spec.rb

data/lib/validate/validate.rb

@@ -1,184 +0,0 @@
-# This functionality is intended to run the schema, through
-# any available Schema Validators for Ruby.
-#
-# They should be valid according to draft-4 ...
-#
-# The schema validators currently being considered are:
-#
-# https://github.com/ruby-json-schema/json-schema
-# https://github.com/brandur/json_schema (note the underscore!)
-# https://github.com/Soylent/jschema
-#
-# These are the three currently available ruby validators that
-# support draft-4. (According to json-schema.org). 
-#
-# Each has their quirks, we'll try to:
-#    * use each to validate each fidor schema against the json-schema meta-schema
-#    * try to load each fidor schema as a schema for validation.
-#
-require 'pathname'
-require 'json-schema'
-require 'json_schema'
-require 'jschema'
-
-module Fidor
-  module SchemaValidation
-    
-    class Validator # Base
-      def validate_all
-         @files_to_validate.each do |file|
-          schema = File.read file
-          puts "\nvalidating: #{file}"
-          validate schema
-          puts "\nusing #{file} for validation."
-          use_for_validation schema
-        end
-      end
-    end
-    
-    # https://github.com/ruby-json-schema/json-schema
-    class JsonDashSchemaValidator < Validator
-      def initialize files_to_validate
-        @files_to_validate = files_to_validate
-        @meta_schema_fn    = "#{File.dirname(__FILE__)}/schema.json"
-
-        # need to know the base dir of the schema to resolve relative uris.
-        # see below.
-        @schemadir = File.dirname(@files_to_validate[0])
-      
-        validate_all
-      end # init
-
-      def validate schema
-        begin
-          results = JSON::Validator.fully_validate(@meta_schema_fn, schema)
-          if !results || results.length == 0 
-            puts "Passed!"
-          else
-            puts "Failed!"
-            puts results
-          end
-        rescue
-          puts "Failed! Error..."
-          puts $!
-          puts $!.backtrace
-        end
-      end
-
-      def use_for_validation schema
-        # json-schema resolves relatives path relative to it's own "."
-        # not relative to the file containing the reference ...
-        baseDirectory = Dir.pwd
-
-        begin
-          Dir.chdir @schemadir
-          data = {}
-          results = JSON::Validator.fully_validate(schema, data)
-          if !results || results.length == 0 
-            puts "Passed!"
-          else
-            puts "Failed!"
-            puts results
-          end
-        ensure
-          Dir.chdir baseDirectory
-        end
-      end
-    end
-
-    class JsonUnderscoreSchemaValidator < Validator
-      def initialize files_to_validate
-        @files_to_validate = files_to_validate 
-        schema_data = File.read("#{File.dirname(__FILE__)}/schema.json")
-        schema_json = JSON.parse(schema_data)
-        @schema = JsonSchema.parse!(schema_json)
-        validate_all
-      end 
-
-      def validate schema
-        begin
-          schema_to_test = JSON.parse(schema)
-          @schema.validate! schema_to_test
-          puts "Passed validation against meta-schema!"
-          JsonSchema.parse!(schema_to_test)
-        rescue
-          puts $!
-          puts "Failed!"
-        else
-          puts "Passed!"
-        end
-      end
-      def use_for_validation schema
-        begin
-         schema_to_test = JSON.parse(schema)
-         JsonSchema.parse!(schema_to_test)
-        rescue
-          puts $!
-          puts "Failed"
-        else
-          puts "Passed!"
-        end
-      end 
-    end
-
-    class JSchemaValidator < Validator
-      def initialize files_to_validate
-        @files_to_validate = files_to_validate
-        schema_data = File.read("#{File.dirname(__FILE__)}/schema.json")
-        schema_json = JSON.parse(schema_data)
-        @schema = JSchema.build(schema_json)
-        validate_all
-      end
-      def validate schema
-        schema_to_test = JSON.parse(schema)
-        results = @schema.validate schema_to_test
-        if !results || results.length == 0 
-          puts "Passed!"
-        else
-          puts "Failed!"
-          puts results
-        end
-      end
-      def use_for_validation schema
-        schema_to_test = JSON.parse(schema)
-        begin
-         JSchema.build(schema_to_test)
-        rescue
-          puts "Failed!"
-          puts $!
-          # puts $!.backtrace
-        else
-          puts "Passed!"
-        end
-      end
-    end
-    
-    def self.find_all_schema
-      # asssume we're running from rake and
-      # pwd is project root ...
-      this_dir = File.dirname(__FILE__)
-      repo_dir = Pathname.new(this_dir+"/../..").cleanpath.to_s
-
-      Dir.glob("#{repo_dir}/schema/*/*.json")
-    end
-    
-
-    def self.main validator
-      case validator
-        when :underscore
-          puts "Running validation with JSON_Schema"
-          JsonUnderscoreSchemaValidator.new find_all_schema
-        when :dash
-          puts "Running validation with JSON-Schema"
-          JsonDashSchemaValidator.new find_all_schema
-        when :jschema
-          puts "Running validation with JSchema"
-          JSchemaValidator.new find_all_schema
-        else
-          puts "Unknown validator: #{validator}"
-      end
-      
-    end
-  end
-end
-

data/schema/v1.0/base_types/lists.json

@@ -1,32 +0,0 @@
-{
-  "type"        : "object",
-  "title"       : "List",
-  "name"        : "list",
-  "description" : "A paginated list of objects",
-  "properties"  : {
-    "data" : {
-      "description"  : "The requested objects",
-      "type"  : "array"
-    },
-    "collection" : {
-      "type"        : "object",
-      "name"        : "collection",
-      "description" : "Pagination information for a list of returned object (not standalone)",
-      "properties"  : {
-        "current_page" : {
-          "type" : "integer"
-        },
-        "per_page" : {
-          "type" : "integer"
-        },
-        "total_entries" : {
-          "type" : "integer"
-        },
-        "total_pages" : {
-          "type" : "integer"
-        }
-      }
-    }
-  }
-}
-