jschematic 0.0.1 → 0.0.2

data/History.txt

@@ -0,0 +1,7 @@
+== 0.0.2
+* Refactored Properties and PatternProperties so the latter inherits from the former (Mike Sassak)
+* Simple IPv4 CIDR format support (Mike Sassak)
+* Extracted Composite mixin and refactored Schema and Properties to use it (Mike Sassak)
+
+== 0.0.1
+* First release (Mike Sassak)

data/features/default.feature

@@ -15,7 +15,6 @@ Feature: Core schema: default
               "name": "Gristle Thornbody"
           }
       }
-
       """
       Then '{ "age": 35 }' is valid JSON
 

data/features/format.feature

@@ -23,6 +23,21 @@ Feature: Core schema: format
       | ""                         |
       | "fe80::202:b3ff:fe1e:8329" |
 
+  Scenario: IPv4 CIDR
+    When the schema is:
+      """
+      {
+          "type": "string",
+          "format": "cidr"
+      }
+      """
+    Then '"192.168.0.1/23"' is valid JSON
+    But these are not valid JSON:
+      | ""            |
+      | "192.168.0.1" |
+      | "6.7.8.9/0"   |
+      | "1.2.3.4/33"  |
+
   Scenario: IPv6
     When the schema is:
       """

data/features/pattern_properties.feature

@@ -13,6 +13,50 @@ Feature: Core schema: patternProperties
       | { "name": "Felizberto" }        |
       | { "firstName": "Fitzheraldo" }  |
       | { "fullName": "Inigo Montoya" } |
+      | { "doesNotMatch": 12345678 }    |
     But these are not valid JSON:
-      | { "name": 2112 }      |
-      | { "named": "Werner" } | 
+      | { "name": 2112 }         |
+      | { "aNiceName": [1,2,3] } |
+
+  Scenario: multiple patterns
+    When the schema is:
+      """
+      {
+          "patternProperties": {
+              "^foos": { "type": "string" },
+              "umber$": { "type": "integer" }
+          }
+      }
+      """
+    Then these are valid JSON:
+      | { "foosball": "is a silly game" } |
+      | { "number": 2112 }                |
+    But these are not valid JSON:
+      | { "humber": "Fourty-two" }        |
+      | { "foos": 2112 }                  |
+
+  Scenario: pattern with vanilla property
+    When the schema is:
+      """
+      {
+          "properties": {
+              "a": { "type": "string" }
+          },
+
+          "patternProperties": {
+              "a": { "enum": ["fnord", 42] }
+          }
+      }
+      """
+    Then this is valid JSON:
+      """
+      {
+          "a": "fnord",
+          "apple": 42,
+          "aardvark": "fnord"
+      }
+      """
+    But these are not valid JSON:
+      | { "a": 42 }          |
+      | { "apple": "6 * 9" } |
+      | { "aardvark": 41 }   |

data/features/properties.feature

@@ -85,7 +85,7 @@ Feature: Core Schema: properties & additionalProperties
       }
       """
 
-  Scenario: additionalProperties defined by a schema 
+  Scenario: additionalProperties defined by a schema
     When the schema is:
       """
       {

data/jschematic.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'jschematic'
-  s.version     = '0.0.1'
+  s.version     = '0.0.2'
   s.authors     = ["Mike Sassak"]
   s.description = "JSON Schema v3 Validator"
   s.summary     = "jschematic #{s.version}"

data/lib/jschematic/attributes/format.rb

@@ -10,6 +10,8 @@ module Jschematic
           Uri.new
         when "ip-address", "ipv6"
           Ip.new(format)
+        when "cidr"
+          Cidr.new(format)
         else
           NullFormat.new
         end
@@ -44,6 +46,16 @@ module Jschematic
         end
       end
 
+      class Cidr
+        include Jschematic::Element
+
+        def accepts?(addr_with_cidr)
+          addr, cidr = addr_with_cidr.split("/")
+          return false unless cidr && (1..32).include?(cidr.to_i)
+          Ip.new("ip-address").accepts?(addr)
+        end
+      end
+
       class NullFormat
         include Jschematic::Element
 

data/lib/jschematic/attributes/pattern_properties.rb

@@ -1,22 +1,15 @@
-require 'jschematic/element'
+require 'jschematic/attributes/properties'
 
 module Jschematic
   module Attributes
-    class PatternProperties
-      include Jschematic::Element
+    class PatternProperties < Properties
 
-      def initialize(schema)
-        @schema = schema
-      end
+      private
 
-      def accepts?(instance)
-        instance.all? do |property, value|
-          if match = @schema.find{ |re, schema| property =~ Regexp.new(re) }
-            Schema.new(match[1]).accepts?(value)
-          else
-            false
-          end
-        end || fail_validation!(@schema, instance)
+      def find_instance_for(instance, wanted_name)
+        instance.find do |property_name, _|
+          property_name =~ Regexp.new(wanted_name)
+        end
       end
     end
   end

data/lib/jschematic/attributes/properties.rb

@@ -1,38 +1,52 @@
-require 'jschematic/element'
+require 'jschematic/composite'
 
 module Jschematic
   module Attributes
     class Properties
-      include Jschematic::Element
+      include Jschematic::Composite
 
       def initialize(properties)
-        @schemas = properties.inject({}) do |schemas, (name, schema)|
-          schemas[name] = Schema.new(schema)
-          schemas[name].parent = self
-          schemas
+        properties.each_pair do |name, raw_schema|
+          schema = Schema.with_name(raw_schema, name)
+          add_child(schema)
         end
       end
 
       def accepts?(instance)
-        @schemas.all? do |name, schema|
-          value = instance.fetch(name) do |missing|
-            return true unless schema.required?
-            fail_validation!(missing, nil) unless schema.default 
-            schema.default
+        children.all? do |child|
+          match = find_instance_for(instance, child.name)
+
+          if match
+            value = match.last
+          else
+            value = nil
+          end
+
+          if !value and child.default
+            value = child.default
           end
-          schema.accepts?(value) || fail_validation!(name, value)
-        end
-      end
 
-      def each(&block)
-        @schemas.values.each do |schema|
-          block.call(schema)
+          if !value and child.required?
+            fail_validation!("#{child.name} is required", nil)
+          elsif !value
+            true
+          else
+            child.accepts?(value) || fail_validation!(child.name, value)
+          end
         end
       end
 
       def id
         @parent.id
       end
+
+      private
+
+      def find_instance_for(instance, wanted_name)
+        instance.find do |property_name, _|
+          property_name == wanted_name
+        end
+      end
     end
   end
 end

data/lib/jschematic/composite.rb

@@ -0,0 +1,22 @@
+require 'jschematic/element'
+
+module Jschematic
+  module Composite
+    include Enumerable
+    include Jschematic::Element
+
+    def children
+      @children ||= []
+    end
+
+    def add_child(child)
+      child.parent = self
+      children << child
+    end
+
+    def each(&block)
+      block.call(self)
+      children.each{ |child| child.each(&block) }
+    end
+  end
+end

data/lib/jschematic/schema.rb

@@ -1,16 +1,24 @@
 require 'addressable/uri'
 
 require 'jschematic/errors'
-require 'jschematic/element'
+require 'jschematic/composite'
 require 'jschematic/attributes'
 
 module Jschematic
   class Schema
-    include Enumerable
-    include Jschematic::Element
+    include Jschematic::Composite
+
+    # TODO: Spec
+    def self.with_name(raw_schema, name)
+      schema = new(raw_schema)
+      schema.name = name
+      schema
+    end
 
     attr_reader :default, :title, :description, :id
-    attr_writer :parent
+
+    attr_accessor :name
+    attr_writer   :parent
 
     def initialize(raw_schema)
       @raw_schema  = raw_schema.dup || {}
@@ -20,13 +28,10 @@ module Jschematic
       @description = @raw_schema.delete("description") || ""
       @id          = Addressable::URI.parse(@raw_schema.delete("id") || "")
 
-      @attributes = []
-
       @raw_schema.each_pair do |attribute, value|
         begin
           attribute = Attributes[attribute].new(value){ |dep| @raw_schema[dep] }
-          attribute.parent = self
-          @attributes << attribute
+          add_child(attribute)
         rescue NameError => e
           # Not finding an attribute is not necessarily an error, but this is
           # obviously not the right way to handle it. Need to find a better way to
@@ -39,16 +44,11 @@ module Jschematic
     end
 
     def accepts?(instance)
-      @attributes.all?{ |child| child.accepts?(add_default(instance)) }
+      children.all?{ |child| child.accepts?(add_default(instance)) }
     end
 
     def required?
-      @attributes.any?{ |child| child.required? }
-    end
-
-    def each(&block)
-      block.call(self)
-      @attributes.each{ |child| child.each(&block) }
+      children.any?{ |child| child.required? }
     end
 
     def id

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Mike Sassak
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 -06:00
+date: 2011-02-22 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,6 +83,7 @@ files:
 - .rvmrc
 - Gemfile
 - Gemfile.lock
+- History.txt
 - LICENSE
 - README.md
 - Rakefile
@@ -125,6 +126,7 @@ files:
 - lib/jschematic/attributes/required.rb
 - lib/jschematic/attributes/type.rb
 - lib/jschematic/attributes/unique_items.rb
+- lib/jschematic/composite.rb
 - lib/jschematic/element.rb
 - lib/jschematic/errors.rb
 - lib/jschematic/schema.rb
@@ -170,7 +172,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: jschematic 0.0.1
+summary: jschematic 0.0.2
 test_files: 
 - features/default.feature
 - features/dependencies.feature