render 0.0.9 → 0.1.0

data/lib/render/schema.rb

@@ -66,7 +66,12 @@ module Render
     private
 
     def require_attributes!
-      definition.fetch(:required, []).each do |required_attribute|
+      return unless definition.has_key?(:required)
+
+      required_attributes = definition.fetch(:required)
+      return if [true, false].include?(required_attributes)
+
+      required_attributes.each do |required_attribute|
         attribute = attributes.detect { |attribute| attribute.name == required_attribute.to_sym }
         attribute.required = true
       end
@@ -97,7 +102,8 @@ module Render
 
         if instance_value.has_key?(:$ref)
           ref = instance_value.fetch(:$ref)
-          ref_definition = Definition.find(ref, false) || find_local_schema(ref, current_scope)
+          ref_definition = find_foreign_definition(ref)
+          ref_definition ||= find_local_schema(ref, current_scope)
           instance_value.replace(ref_definition)
         end
 
@@ -105,6 +111,15 @@ module Render
       end
     end
 
+    def find_foreign_definition(ref)
+      exact_match = Definition.find(ref, false)
+      return exact_match if !exact_match.nil?
+
+      foreign_root_path, foreign_root_scope = ref.split(ROOT_POINTER)
+      fuzzy_match = Definition.instances.detect { |id, definition| id.match(%r{^#{foreign_root_path}}) }
+      find_at_path(foreign_root_scope.split(POINTER_SEPARATOR), fuzzy_match[1]) if fuzzy_match
+    end
+
     def find_local_schema(ref, scopes)
       paths = ref.split(POINTER_SEPARATOR)
       if (paths.first == ROOT_POINTER)
@@ -120,8 +135,8 @@ module Render
       find_at_path(scopes + path) || find_at_closest_scope(path, scopes[0...-1])
     end
 
-    def find_at_path(paths)
-      paths.reduce(definition) do |reduction, path|
+    def find_at_path(paths, working_definition = definition)
+      paths.reduce(working_definition) do |reduction, path|
         reduction[path.to_sym] || return
       end
     end

data/lib/render/version.rb

@@ -1,3 +1,3 @@
 module Render
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/functional/render/schema_spec.rb

@@ -80,6 +80,20 @@ module Render
         schema.attributes[0].required.should_not be
         schema.attributes[1].required.should be
       end
+
+      it "is silently ignores draft-3 boolean requires" do
+        draft_3_definition = {
+          type: Object,
+          required: true,
+          properties: {
+            title: { type: String }
+          }
+        }
+
+        expect {
+          Schema.new(draft_3_definition).render!
+        }.to_not raise_error
+      end
     end
   end
 end

data/spec/unit/render/schema_spec.rb

@@ -136,6 +136,31 @@ module Render
           }
         end
 
+        it "interpolates definitions from foreign schema" do
+          foreign_definition = {
+            id: "http://foreign.com/foo#",
+            type: Object,
+            properties: {
+              title: { type: String }
+            }
+          }
+          Definition.load!(foreign_definition)
+
+          definition = {
+            type: Object,
+            properties: {
+              :$ref => "http://foreign.com/foo#properties"
+            }
+          }
+          schema = Schema.new(definition)
+          schema.definition.should == {
+            type: Object,
+            properties: {
+              title: { type: String }
+            }
+          }
+        end
+
         it "creates subschemas for relative references from root" do
           definition = {
             definitions: {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: render
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid