render 0.0.8 → 0.0.9

data/spec/unit/render/schema_spec.rb

@@ -18,16 +18,39 @@ module Render
         end
 
         it "is set to preloaded definition" do
-          definition_title = :preloaded_schema
-          definition = { title: definition_title, properties: { title: { type: String } } }
+          definition_id = :preloaded_schema
+          definition = { id: definition_id, properties: { title: { type: String } } }
           Definition.load!(definition)
-          Schema.new(definition_title).definition.should == definition
+
+          Schema.new(definition_id).definition.should == definition
         end
 
         it "raises an error if definition is not found and argument is not a schema" do
           expect {
             Schema.new(:does_not_exists)
-          }.to raise_error(Errors::DefinitionNotFound)
+          }.to raise_error(Errors::Definition::NotFound)
+        end
+
+        # This is probably not the best form
+        describe "non-container definitions" do
+          it "creates Object container for subschemas" do
+            non_container_definition = {
+              students: { type: Array, items: { type: String } },
+              teacher: { type: Object, properties: { name: { type: String } } }
+            }
+
+            converted_definition = {
+              type: Object,
+              properties: {
+                students: { type: Array, items: { type: String } },
+                teacher: { type: Object, properties: { name:  { type: String } } }
+              }
+            }
+
+            non_container_schema = Schema.new(non_container_definition)
+            converted_schema = Schema.new(converted_definition)
+            non_container_schema.definition.should == converted_schema.definition
+          end
         end
       end
 
@@ -44,16 +67,16 @@ module Render
 
       describe "#array_attribute" do
         it "is set for array schemas" do
-          archetype_schema = {
+          simple_schema = {
             type: Array,
             items: {
               type: String
             }
           }
 
-          attribute = Schema.new(archetype_schema).array_attribute
-          attribute.type.should == String
-          attribute.archetype.should == true
+          attribute = Schema.new(simple_schema).array_attribute
+          attribute.types.should == [String]
+          attribute.simple.should == true
         end
       end
 
@@ -69,8 +92,158 @@ module Render
 
           schema = Schema.new(simple_schema)
           schema.hash_attributes.size.should == 2
-          schema.hash_attributes.any? { |a| a.name == :name && a.type == String }.should == true
-          schema.hash_attributes.any? { |a| a.name == :genre && a.type == String }.should == true
+          schema.hash_attributes.any? { |a| a.name == :name && a.types == [String] }.should == true
+          schema.hash_attributes.any? { |a| a.name == :genre && a.types == [String] }.should == true
+        end
+      end
+
+      describe "$ref" do
+        before(:each) do
+          @original_instances = Definition.instances.dup
+        end
+
+        after(:each) do
+          Definition.instances = @original_instances
+        end
+
+        it "creates subschemas for absolute references" do
+          topping_definition = {
+            id: "http://pizzas.local/schema#topping",
+            type: Object, properties: { name: { type: String } }
+          }
+          Definition.load!(topping_definition)
+
+          pizza_definition = {
+            type: Object,
+            properties: {
+              toppings: { type: Array, items: { :$ref => "http://pizzas.local/schema#topping" } }
+            }
+          }
+          pizza_schema = Schema.new(pizza_definition)
+
+          pizza_schema.definition.should == {
+            type: Object,
+            properties: {
+              toppings: {
+                type: Array,
+                items: {
+                  id: "http://pizzas.local/schema#topping",
+                  type: Object,
+                  properties: { name: { type: String } }
+                }
+              }
+            }
+          }
+        end
+
+        it "creates subschemas for relative references from root" do
+          definition = {
+            definitions: {
+              address: {
+                type: Object,
+                properties: { number: { type: Integer } }
+              }
+            },
+            type: Object,
+            properties: {
+              address: { :$ref => "#/definitions/address" }
+            }
+          }
+          schema = Schema.new(definition)
+
+          schema.definition[:properties].should == {
+            address: {
+              type: Object,
+              properties: { number: { type: Integer } }
+            }
+          }
+        end
+
+        it "creates nested subschemas for relative references from root" do
+          definition = {
+            definitions: {
+              address: {
+                type: Object,
+                properties: { number: { type: Integer } }
+              }
+            },
+            type: Object,
+            properties: {
+              primary_location: {
+                type: Object,
+                properties: {
+                  address: { :$ref => "#/definitions/address" }
+                }
+              }
+            }
+          }
+          schema = Schema.new(definition)
+
+          schema.definition[:properties].should == {
+            primary_location: {
+              type: Object,
+              properties: {
+                address: {
+                  type: Object,
+                  properties: {
+                    number: { type: Integer }
+                  }
+                }
+              }
+            }
+          }
+        end
+
+        it "interpolates closest relative definition" do
+          definition = {
+            definitions: { year: { type: :number } },
+            type: Object,
+            properties: {
+              book: {
+                definitions: { year: { type: Integer } },
+                type: Object,
+                properties: {
+                  year: { :$ref => "definitions/year" }
+                }
+              }
+            }
+          }
+
+          parsed_definition = Schema.new(definition).definition
+          year_schema = parsed_definition.fetch(:properties).fetch(:book).fetch(:properties).fetch(:year)
+          year_schema.fetch(:type).should == Integer
+        end
+
+        it "interpolates root-relative definition when specified" do
+          definition = {
+            definitions: { year: { type: :number } },
+            type: Object,
+            properties: {
+              book: {
+                definitions: { year: { type: Integer } },
+                type: Object,
+                properties: {
+                  year: { :$ref => "#/definitions/year" }
+                }
+              }
+            }
+          }
+
+          parsed_definition = Schema.new(definition).definition
+          parsed_definition.fetch(:properties).fetch(:book).fetch(:properties).fetch(:year).fetch(:type).should == :number
+        end
+
+        it "expands to empty schema if no ref is found" do
+          definition = {
+            type: Object,
+            properties: {
+              year_relative: { :$ref => "definitions/year" },
+              year_root: { :$ref => "#/definitions/year" }
+            }
+          }
+
+          Schema.new(definition).definition.fetch(:properties).fetch(:year_relative).should == {}
+          Schema.new(definition).definition.fetch(:properties).fetch(:year_root).should == {}
         end
       end
     end
@@ -104,7 +277,7 @@ module Render
     describe "#render!" do
       before(:each) do
         Definition.load!({
-          title: :film,
+          id: :film,
           type: Object,
           properties: {
             genre: { type: String }
@@ -112,35 +285,6 @@ module Render
         })
       end
 
-      describe "#raw_data" do
-        it "is set from endpoint response" do
-          schema = Schema.new(:film)
-          schema.stub({ request: { response: :body } })
-          schema.render!
-          schema.raw_data.should == { response: :body }
-        end
-
-        it "is set to explicit_data when offline" do
-          Render.stub({ live: false })
-          schema = Schema.new(:film)
-          schema.render!({ explicit: :value })
-          schema.raw_data.should == { explicit: :value }
-        end
-
-        it "is yielded" do
-          Render.stub({ live: false })
-          schema = Schema.new(:film)
-
-          data = { explicit: :value }
-          schema.should_receive(:serialize!).with(data)
-          schema.serialized_data = :serialized_data
-
-          expect { |a_block|
-            schema.render!(data, &a_block)
-          }.to yield_with_args(:serialized_data)
-        end
-      end
-
       context "request" do
         it "raises error if endpoint does not return a 2xx" do
           endpoint = "http://endpoint.local"
@@ -175,20 +319,7 @@ module Render
           schema = Schema.new(:film)
           schema.hash_attributes.first.should_receive(:serialize).with(genre, anything).and_return({ genre: genre })
 
-          schema.render!(nil, endpoint).should == { film: data }
-        end
-
-        it "is serialized value nested under #universal_title" do
-          Render.stub({ live: false })
-          definition = {
-            title: :film,
-            universal_title: :imdb_films_show,
-            type: Object,
-            properties: {
-              genre: { type: String }
-            }
-          }
-          Schema.new(definition).render!.should have_key(:imdb_films_show)
+          schema.render!(nil, endpoint).should == data
         end
       end
 

data/spec/unit/render/type_spec.rb

@@ -15,12 +15,35 @@ module Render
         Type.parse("integer").should == Integer
       end
 
+      it "returns constant for symbols" do
+        Type.parse(:integer).should == Integer
+      end
+
       it "returns nil if no type is found" do
         Type.parse("not-a-type").should == nil
       end
     end
 
     describe ".parse!" do
+      it "returns ruby classes for standard json types" do
+        Type.parse!("string").should == String
+        Type.parse!("number").should == Float
+        Type.parse!("integer").should == Integer
+        Type.parse!("object").should == Object
+        Type.parse!("array").should == Array
+        Type.parse!("boolean").should == Type::Boolean
+        Type.parse!("null").should == NilClass
+      end
+
+      it "returns ruby classes for standard json formats" do
+        Type.parse!("uri").should == URI
+        Type.parse!("date-time").should == DateTime
+        Type.parse!("ipv4").should == Type::IPv4
+        Type.parse!("ipv6").should == Type::IPv6
+        Type.parse!("email").should == Type::Email
+        Type.parse!("hostname").should == Type::Hostname
+      end
+
       it "returns constant for string" do
         Type.parse("integer").should == Integer
       end
@@ -48,18 +71,6 @@ module Render
         it "returns UUID for uuid" do
           Type.parse("uUId").should == UUID
         end
-
-        it "returns Boolean for boolean" do
-          Type.parse("boolean").should == Render::Type::Boolean
-        end
-
-        it "returns Float for number" do
-          Type.parse("FloAt").should == Float
-        end
-
-        it "returns Time for date-time" do
-          Type.parse("date-time").should == Time
-        end
       end
     end
 
@@ -72,7 +83,7 @@ module Render
         Type.find(:foo).should_not be
       end
 
-      describe "user type" do
+      describe "user types" do
         before(:each) do
           @original_types = Type.instances.dup
           module ::Foo; module Boolean; end; end
@@ -89,5 +100,69 @@ module Render
         end
       end
     end
+
+    describe ".to" do
+      it "maintains nil values" do
+        Type.to([Float], nil).should == nil
+      end
+
+      it "returns nil for undefined classes" do
+        Type.to([nil], {}).should == nil
+      end
+
+      it "converts to floats" do
+        Type.to([Float], "2").should == 2
+      end
+
+      it "converts to Integers" do
+        Type.to([Integer], "1.2").should == 1
+      end
+
+      it "converts to Strings" do
+        Type.to([String], 2).should == "2"
+      end
+
+      describe "enum" do
+        it "returns valid enum" do
+          enums = [:foo, :bar]
+          Type.to([Type::Enum], :foo, enums).should == :foo
+        end
+
+        it "return nil for invalid enums" do
+          enums = [:foo]
+          Type.to([Type::Enum], :bar, enums).should == nil
+        end
+      end
+
+      describe "boolean" do
+        it "converts strings" do
+          Type.to([Type::Boolean], "true").should eq(true)
+          Type.to([Type::Boolean], "false").should eq(false)
+        end
+
+        it "returns nil for invalid booleans" do
+          Type.to([Type::Boolean], "foo").should == nil
+        end
+      end
+
+      it "returns value for unknown types" do
+        class Foo; end
+
+        Type.to([Foo], :bar).should == :bar
+
+        Render.send(:remove_const, :Foo)
+      end
+
+      context "multiple types" do
+        it "returns value in original type if valid" do
+          Type.to([Integer, Float], 2.0).should == 2.0
+        end
+
+        it "returns value of first class if original type is not valid" do
+          Type.to([Integer, String], 2.0).should == 2
+        end
+      end
+
+    end
   end
 end

metadata

@@ -1,88 +1,116 @@
 --- !ruby/object:Gem::Specification
 name: render
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
+  prerelease: 
 platform: ruby
 authors:
 - Steve Weber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: uuid
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: 2.3.7
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.3.7
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '10.1'
-  type: :development
+        version: 2.3.5
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 2.3.5
 - !ruby/object:Gem::Dependency
-  name: uuid
+  name: macaddr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
-  name: macaddr
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
-  type: :runtime
+        version: '1.3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '10.1'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -137,6 +170,8 @@ files:
 - Gemfile.lock
 - LICENSE.txt
 - initialize.rb
+- lib/json/draft-04/hyper-schema.json
+- lib/json/draft-04/schema.json
 - lib/render.rb
 - lib/render/attributes/array_attribute.rb
 - lib/render/attributes/attribute.rb
@@ -148,6 +183,7 @@ files:
 - lib/render/extensions/symbolizable_hash.rb
 - lib/render/generator.rb
 - lib/render/graph.rb
+- lib/render/json_schema.rb
 - lib/render/schema.rb
 - lib/render/type.rb
 - lib/render/version.rb
@@ -180,26 +216,27 @@ files:
 homepage: https://github.com/stevenweber/render
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 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: 2.2.1
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: With a JSON schema, Render will manage requests, dependent request and build
   meaningful, extensible sample data for testing.
 test_files: