jschematic 0.0.9 → 0.1.0

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 1.9.3

data/Rakefile

@@ -1,3 +1,6 @@
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+
 desc "Run Cukes and Specs"
 task :default => ["cukes", "spec"]
 

data/features/default.feature

@@ -67,5 +67,22 @@ Feature: Core schema: default
     Then '{ "somethingElse": "foo" }' is not valid JSON
     But '{ "pi": 3.1415 }' is valid JSON
 
+  Scenario: does not fall back for boolean false
+    When the schema is:
+      """
+      {
+          "properties": {
+              "enabled": {
+                  "type": "boolean",
+                  "required": true,
+                  "default": "is delicious"
+              }
+          }
+      }
+      """
+    Then '{ "enabled": false }' is valid JSON
+    But '{}' is not valid JSON
+
+
   Scenario: default for all types
     TODO: spec

data/features/required.feature

@@ -24,6 +24,7 @@ Feature: Core schema: required
       }
       """
     Then '{}' is valid JSON
+    Then '{ "color": "red" }' is valid JSON
 
   Scenario: true
     When the schema is:
@@ -40,3 +41,19 @@ Feature: Core schema: required
     Then '{ "color": "red" }' is valid JSON
     But '{}' is not valid JSON
     And '{ "age": 24 }' is not valid JSON
+
+  Scenario: true for boolean value
+    When the schema is:
+      """
+      {
+          "properties": {
+              "enabled": {
+                  "type": "boolean",
+                  "required": true
+              }
+          }
+      }
+      """
+    Then '{ "enabled": false }' is valid JSON
+    But '{}' is not valid JSON
+    And '{ "age": 24 }' is not valid JSON

data/jschematic.gemspec

@@ -1,19 +1,22 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/jschematic/version', __FILE__)
+
 Gem::Specification.new do |s|
   s.name        = 'jschematic'
-  s.version     = '0.0.9'
-  s.authors     = ["Mike Sassak"]
+  s.version     = Jschematic::VERSION
+  s.authors     = ["Mike Sassak", "Jari Bakken"]
+  s.email       = ["msassak@gmail.com", "jari.bakken@gmail.com"]
   s.description = "JSON Schema v3 Validator"
   s.summary     = "jschematic #{s.version}"
-  s.email       = "msassak@gmail.com"
-  s.homepage    = "https://github.com/msassak/jschematic"
+  s.homepage    = "https://github.com/jarib/jschematic"
 
   s.add_dependency 'addressable'
 
   s.add_development_dependency 'cucumber'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'yajl-ruby'
+  s.add_development_dependency 'rake'
 
-  s.rubygems_version   = "1.3.7"
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
   s.extra_rdoc_files = ["LICENSE", "README.md"]

data/lib/jschematic/attributes/extends.rb

@@ -15,13 +15,15 @@ module Jschematic
         case @schema
         when String
           uri = Addressable::URI.parse(@schema)
-          schema = Schema.schema_for(uri)
+          schema = schema_for(uri)
           schema.accepts?(instance)
         when Hash
           Schema.new(@schema).accepts?(instance)
         when Array
           @schema.all? do |schema|
-            Extends.new(schema).accepts?(instance)
+            extends = Extends.new(schema)
+            extends.parent = self
+            extends.accepts?(instance)
           end
         end || fail_validation!(@schema, instance)
       end

data/lib/jschematic/attributes/properties.rb

@@ -22,11 +22,11 @@ module Jschematic
             value = nil
           end
 
-          if !value and child.default
+          if value.nil? and child.default
             value = child.default
           end
 
-          if !value and child.required?
+          if value.nil? and child.required?
             fail_validation!("#{child.name} is required", nil)
           elsif !value
             true

data/lib/jschematic/attributes/ref.rb

@@ -12,7 +12,7 @@ module Jschematic
       end
 
       def accepts?(instance)
-        schema = Schema.schema_for(@uri) || raise(SchemaNotFoundError.new(@uri))
+        schema = schema_for(@uri) || raise(SchemaNotFoundError.new(@uri))
         schema.accepts?(instance)
       end
     end

data/lib/jschematic/attributes/required.rb

@@ -21,6 +21,8 @@ module Jschematic
       def accepts?(instance)
         if @required
           instance || fail_validation!(@required, instance)
+        else
+          true
         end
       end
     end

data/lib/jschematic/context.rb

@@ -2,6 +2,29 @@ require 'jschematic/schema'
 
 module Jschematic
   class Context
+    def self.schema_for(ref)
+      if ref.relative?
+        rel = ref.omit(:scheme, :host, :port)
+        if match = schemas.find{ |ref, _| rel == ref.omit(:scheme, :host, :port) }
+          match[-1]
+        end
+      else
+        schemas[ref]
+      end
+    end
+
+    def self.add_schema(id, schema)
+      schemas[id] = schema
+    end
+
+    def self.schemas
+      @schemas ||= {}
+    end
+
+    def self.empty
+      new
+    end
+
     def initialize(*raw_schemas)
       @schemas = raw_schemas.collect{ |raw_schema| Schema.new(raw_schema) }
     end
@@ -9,5 +32,13 @@ module Jschematic
     def validate!(instance, raw_schema)
       Schema.new(raw_schema).accepts?(instance)
     end
+
+    def add_schema(id, schema)
+      self.class.add_schema(id, schema)
+    end
+
+    def schema_for(ref)
+      self.class.schema_for(ref)
+    end
   end
 end

data/lib/jschematic/element.rb

@@ -14,7 +14,7 @@ module Jschematic
     end
 
     def id
-      if @parent
+      if @parent.respond_to?(:id)
         @parent.id + @id
       else
         @id
@@ -25,6 +25,10 @@ module Jschematic
       self.class.to_s
     end
 
+    def schema_for(ref)
+      parent && parent.schema_for(ref)
+    end
+
     private
 
     def fail_validation!(expected, actual)

data/lib/jschematic/schema.rb

@@ -15,32 +15,13 @@ module Jschematic
       schema
     end
 
-    def self.schema_for(ref)
-      if ref.relative?
-        rel = ref.omit(:scheme, :host, :port)
-        if match = schemas.find{ |ref, _| rel == ref.omit(:scheme, :host, :port) }
-          match[-1]
-        end
-      else
-        schemas[ref]
-      end
-    end
-
-    def self.add_schema(id, schema)
-      schemas[id] = schema
-    end
-
-    def self.schemas
-      @schemas ||= {}
-    end
-
     attr_reader :default, :title, :description, :schema, :unknown_attributes
 
     attr_accessor :name
-    attr_writer   :parent
 
-    def initialize(raw_schema)
+    def initialize(raw_schema, parent = Context.empty)
       @raw_schema  = raw_schema.dup || {}
+      @parent = parent
 
       @default     = @raw_schema.delete("default")
       @title       = @raw_schema.delete("title") || ""
@@ -50,7 +31,7 @@ module Jschematic
 
       @unknown_attributes = {}
 
-      self.class.add_schema(@id, self) unless @id.to_s.empty?
+      @parent.add_schema(@id, self) unless @id.to_s.empty?
 
       @raw_schema.each_pair do |attribute, value|
         begin
@@ -71,6 +52,10 @@ module Jschematic
       children.any?{ |child| child.required? }
     end
 
+    def schema_for(ref)
+      parent.schema_for(ref)
+    end
+
     private
 
     def add_default(instance)

data/lib/jschematic/version.rb

@@ -0,0 +1,3 @@
+module Jschematic
+  VERSION = "0.1.0"
+end

data/spec/jschematic/attributes/ref_spec.rb

@@ -4,8 +4,7 @@ module Jschematic
   module Attributes
     describe Ref do
       describe "#accepts?" do
-        it "fails when the references schema does not exist" do
-          Schema.schemas.should be_empty
+        it "fails when the referenced schema does not exist" do
           ref = Ref.new("does_not_exist")
           expect { ref.accepts?({}) }.to raise_error(Jschematic::SchemaNotFoundError)
         end

metadata

@@ -1,88 +1,111 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jschematic
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 9
-  version: 0.0.9
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Mike Sassak
+- Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-04 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: addressable
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: JSON Schema v3 Validator
-email: msassak@gmail.com
+email:
+- msassak@gmail.com
+- jari.bakken@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
+- .gitignore
 - .rspec
-- .rvmrc
+- .travis.yml
 - Gemfile
-- Gemfile.lock
 - History.txt
 - LICENSE
 - README.md
@@ -140,6 +163,7 @@ files:
 - lib/jschematic/errors.rb
 - lib/jschematic/exceptions.rb
 - lib/jschematic/schema.rb
+- lib/jschematic/version.rb
 - spec/jschematic/attributes/disallow_spec.rb
 - spec/jschematic/attributes/divisible_by_spec.rb
 - spec/jschematic/attributes/enum_spec.rb
@@ -154,39 +178,32 @@ files:
 - spec/jschematic/errors_spec.rb
 - spec/jschematic/schema_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: https://github.com/msassak/jschematic
+homepage: https://github.com/jarib/jschematic
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: jschematic 0.0.9
-test_files: 
+summary: jschematic 0.1.0
+test_files:
 - features/default.feature
 - features/dependencies.feature
 - features/disallow.feature
@@ -220,3 +237,4 @@ test_files:
 - spec/jschematic/errors_spec.rb
 - spec/jschematic/schema_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/.rvmrc

@@ -1 +0,0 @@
-rvm --create use 1.9.2@jschematic

data/Gemfile.lock

@@ -1,40 +0,0 @@
-PATH
-  remote: .
-  specs:
-    jschematic (0.0.6)
-      addressable
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.2.4)
-    builder (3.0.0)
-    cucumber (0.10.0)
-      builder (>= 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    diff-lcs (1.1.2)
-    gherkin (2.3.3)
-      json (~> 1.4.6)
-    json (1.4.6)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    term-ansicolor (1.0.5)
-    yajl-ruby (0.7.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  cucumber
-  jschematic!
-  rspec
-  yajl-ruby