interpol 0.8.1 → 0.9.0

data/lib/interpol/endpoint.rb

@@ -21,6 +21,32 @@ module JSON
       end
     end
   end
+
+  # Monkey patch json-schema to only allow the defined formats.
+  # We've been accidentally using invalid formats like "timestamp",
+  # so this will help ensure we only use valid ones.
+  class Validator
+    VALID_FORMATS = %w[
+      date-time date time utc-millisec regex color style
+      phone uri email ip-address ipv6 host-name
+    ]
+
+    def open(uri)
+      return super unless uri.start_with?('file://') && uri.end_with?('draft-03.json')
+      return StringIO.new(Validator.overriden_draft_03) if Validator.overriden_draft_03
+
+      schema = JSON.parse(super.read)
+      schema.fetch("properties").fetch("format")["enum"] = VALID_FORMATS
+
+      override = JSON.dump(schema)
+      Validator.overriden_draft_03 = override
+      StringIO.new(override)
+    end
+
+    class << self
+      attr_accessor :overriden_draft_03
+    end
+  end
 end
 
 module Interpol
@@ -212,18 +238,32 @@ module Interpol
   private
 
     def make_schema_strict!(raw_schema, modify_object=true)
-      return unless Hash === raw_schema
+      case raw_schema
+        when Hash then make_schema_hash_strict!(raw_schema, modify_object)
+        when Array then make_schema_array_strict!(raw_schema, modify_object)
+      end
+    end
 
+    def make_schema_hash_strict!(raw_schema, modify_object=true)
       raw_schema.each do |key, value|
         make_schema_strict!(value, key != 'properties')
       end
 
       return unless modify_object
 
-      raw_schema['additionalProperties'] ||= false
+      if raw_schema.has_key?('properties')
+        raw_schema['additionalProperties'] ||= false
+      end
+
       raw_schema['required'] = !raw_schema.delete('optional')
     end
 
+    def make_schema_array_strict!(raw_schema, modify_object=true)
+      raw_schema.each do |entry|
+        make_schema_strict!(entry, modify_object)
+      end
+    end
+
     def extract_examples_from(definition)
       fetch_from(definition, 'examples').map do |ex|
         EndpointExample.new(ex, self)

data/lib/interpol/version.rb

@@ -1,3 +1,4 @@
 module Interpol
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: interpol
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -34,14 +34,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.1
     none: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.1
     none: false
 - !ruby/object:Gem::Dependency
   name: nokogiri