autoparse 0.2.1 → 0.2.3

data/CHANGELOG

@@ -1,3 +1,13 @@
+== 0.2.3
+
+* fixed stupid bug in inspect method
+
+== 0.2.2
+
+* the AutoParse.generate method was changed to use an options Hash
+* fixed some issues around array imports and exports
+* schemas of type object should now correctly inherit their id URI values
+
 == 0.2.1
 
 * fixed URI resolution when base URI is missing

data/lib/autoparse.rb

@@ -21,7 +21,9 @@ module AutoParse
     @schemas ||= {}
   end
 
-  def self.generate(schema_data, uri=nil)
+  def self.generate(schema_data, options={})
+    uri = options[:uri]
+    parent = options[:parent]
     if schema_data["extends"]
       super_uri = uri + Addressable::URI.parse(schema_data["extends"])
       super_schema = self.schemas[super_uri]
@@ -37,6 +39,9 @@ module AutoParse
       @uri = Addressable::URI.parse(uri)
       @uri.normalize! if @uri != nil
       @schema_data = schema_data
+      if !self.uri && parent
+        @uri = parent.uri
+      end
 
       def self.additional_properties_schema
         # Override the superclass implementation so we're not always returning
@@ -57,12 +62,9 @@ module AutoParse
           property_schema = property_super_schema.data.merge(property_schema)
         end
 
-        if schema_data.has_key?('id')
-          property_schema_class = AutoParse.generate(property_schema)
-        else
-          # If the schema has no ID, it inherits the ID from the parent schema.
-          property_schema_class = AutoParse.generate(property_schema, @uri)
-        end
+        # If the schema has no ID, it inherits the ID from the parent schema.
+        property_schema_class =
+          AutoParse.generate(property_schema, :parent => self)
 
         self.properties[property_key] = property_schema_class
         self.keys[property_name] = property_key
@@ -101,7 +103,7 @@ module AutoParse
             value = self[stripped_method]
           else
             # Method not found.
-            super
+            super(method, *params, &block)
           end
           # If additionalProperties is simply set to true, no parsing takes
           # place and all values are treated as 'any'.
@@ -115,7 +117,9 @@ module AutoParse
 
       elsif schema_data['additionalProperties']
         # Unknown properties follow the supplied schema.
-        ap_schema = AutoParse.generate(schema_data['additionalProperties'])
+        ap_schema = AutoParse.generate(
+          schema_data['additionalProperties'], :parent => self
+        )
         @additional_properties_schema = ap_schema
         define_method('method_missing') do |method, *params, &block|
           # We need to convert from Ruby calling style to JavaScript calling
@@ -172,6 +176,54 @@ module AutoParse
     return schema
   end
 
+  def self.import(value, schema_class, type=nil)
+    type = schema_class.data['type'] if type == nil
+    case type
+    when 'string'
+      return AutoParse.import_string(value, schema_class)
+    when 'boolean'
+      return AutoParse.import_boolean(value, schema_class)
+    when 'integer'
+      return AutoParse.import_integer(value, schema_class)
+    when 'number'
+      return AutoParse.import_number(value, schema_class)
+    when 'array'
+      return AutoParse.import_array(value, schema_class)
+    when 'object'
+      return AutoParse.import_object(value, schema_class)
+    when 'null'
+      return nil
+    when Array
+      return AutoParse.import_union(value, schema_class)
+    else
+      return AutoParse.import_any(value, schema_class)
+    end
+  end
+
+  def self.export(value, schema_class, type=nil)
+    type = schema_class.data['type'] if type == nil
+    case type
+    when 'string'
+      AutoParse.export_string(value, schema_class)
+    when 'boolean'
+      AutoParse.export_boolean(value, schema_class)
+    when 'integer'
+      AutoParse.export_integer(value, schema_class)
+    when 'number'
+      AutoParse.export_number(value, schema_class)
+    when 'array'
+      AutoParse.export_array(value, schema_class)
+    when 'object'
+      AutoParse.export_object(value, schema_class)
+    when 'null'
+      nil
+    when Array
+      AutoParse.export_union(value, schema_class)
+    else
+      AutoParse.export_any(value, schema_class)
+    end
+  end
+
   def self.import_string(value, schema_class)
     if value != nil
       format = schema_class.data['format']
@@ -278,39 +330,39 @@ module AutoParse
   end
 
   def self.import_array(value, schema_class)
-    array = (if value != nil && !value.respond_to?(:to_ary)
+    value = (if value != nil && !value.respond_to?(:to_ary)
       raise TypeError,
         "Expected Array, got #{value.class}."
     else
-      value.to_ary
+      (value || []).to_ary.dup
     end)
     items_data = schema_class.data['items']
-    if items_data && items_data['$ref']
-      if schema_class && schema_class.uri
-        items_uri =
-          schema_class.uri + Addressable::URI.parse(items_data['$ref'])
-      else
-        items_uri = Addressable::URI.parse(items_data['$ref'])
-      end
-      items_schema = AutoParse.schemas[items_uri]
-      if items_schema
-        array.map! do |item|
-          items_schema.new(item)
-        end
-      else
-        raise ArgumentError,
-          "Could not find schema: #{items_uri}."
-      end
+    items_schema = AutoParse.generate(items_data, :parent => schema_class)
+    if items_schema.data['$ref']
+      # Dereference the schema if necessary.
+      items_schema = items_schema.dereference
     end
-    array
+    value.map! do |item|
+      AutoParse.import(item, items_schema)
+    end
+    value
   end
 
   def self.export_array(value, schema_class)
-    # FIXME: Each item in the Array needs to be exported as well.
     if value == nil
       value
     elsif value.respond_to?(:to_ary)
-      value.to_ary
+      value = value.to_ary.dup
+      items_data = schema_class.data['items']
+      items_schema = AutoParse.generate(items_data, :parent => schema_class)
+      if items_schema.data['$ref']
+        # Dereference the schema if necessary.
+        items_schema = items_schema.dereference
+      end
+      value.map! do |item|
+        AutoParse.export(item, items_schema)
+      end
+      value
     else
       raise TypeError, "Expected Array, got #{value.class}."
     end
@@ -335,54 +387,16 @@ module AutoParse
 
   def self.import_union(value, schema_class)
     import_type = match_type(
-      value, schema_class.data['type'], schema_class.uri
+      value, schema_class.data['type'], schema_class
     )
-    case import_type
-    when 'string'
-      AutoParse.import_string(value, schema_class)
-    when 'boolean'
-      AutoParse.import_boolean(value, schema_class)
-    when 'integer'
-      AutoParse.import_integer(value, schema_class)
-    when 'number'
-      AutoParse.import_number(value, schema_class)
-    when 'array'
-      AutoParse.import_array(value, schema_class)
-    when 'object'
-      AutoParse.import_object(value, schema_class)
-    when 'null'
-      nil
-    when Class
-      AutoParse.import_object(value, import_type)
-    else
-      AutoParse.import_any(value, schema_class)
-    end
+    AutoParse.import(value, schema_class, import_type)
   end
 
   def self.export_union(value, schema_class)
     export_type = match_type(
-      value, schema_class.data['type'], schema_class.uri
+      value, schema_class.data['type'], schema_class
     )
-    case export_type
-    when 'string'
-      AutoParse.export_string(value, schema_class)
-    when 'boolean'
-      AutoParse.export_boolean(value, schema_class)
-    when 'integer'
-      AutoParse.export_integer(value, schema_class)
-    when 'number'
-      AutoParse.export_number(value, schema_class)
-    when 'array'
-      AutoParse.export_array(value, schema_class)
-    when 'object'
-      AutoParse.export_object(value, schema_class)
-    when 'null'
-      nil
-    when Class
-      AutoParse.export_object(value, export_type)
-    else
-      AutoParse.export_any(value, schema_class)
-    end
+    AutoParse.export(value, schema_class, export_type)
   end
 
   def self.import_any(value, schema_class)
@@ -397,7 +411,7 @@ module AutoParse
   # Given a value and a union of types, selects the type which is the best
   # match for the given value. More than one type may match the value, in which
   # case, the first type in the union will be returned.
-  def self.match_type(value, union, base_uri=nil)
+  def self.match_type(value, union, parent=nil)
     possible_types = [union].flatten.compact
     # Strict pass
     for type in possible_types
@@ -419,11 +433,7 @@ module AutoParse
         return 'null' if value.nil?
       when Hash
         # Schema embedded directly.
-        unless base_uri
-          schema_class = AutoParse.generate(type)
-        else
-          schema_class = AutoParse.generate(type, base_uri)
-        end
+        schema_class = AutoParse.generate(type, :parent => parent)
         if type['$ref']
           schema_class = schema_class.dereference
         end

data/lib/autoparse/instance.rb

@@ -29,9 +29,20 @@ module AutoParse
     def self.dereference
       if @schema_data['$ref']
         # Dereference the schema if necessary.
-        schema_uri =
-          self.uri + Addressable::URI.parse(@schema_data['$ref'])
+        ref_uri = Addressable::URI.parse(@schema_data['$ref'])
+        if self.uri
+          schema_uri =
+            self.uri + Addressable::URI.parse(@schema_data['$ref'])
+        else
+          if ref_uri.relative?
+            warn("Schema URI is relative, could not resolve against parent.")
+          else
+            warn("Could not resolve URI against parent.")
+          end
+          schema_uri = ref_uri
+        end
         schema_class = AutoParse.schemas[schema_uri]
+        warn("Schema URI mismatch.") if schema_class.uri != schema_uri
         if schema_class == nil
           raise ArgumentError,
             "Could not find schema: #{@schema_data['$ref']}. " +
@@ -137,13 +148,7 @@ module AutoParse
       else
         # This is highly ineffecient, but currently hard to avoid given the
         # schema is anonymous, making lookups very difficult.
-        if schema_data.has_key?('id')
-          schema = AutoParse.generate(schema_data)
-        else
-          # If the schema has no ID, it inherits the ID from the parent schema,
-          # which should be `self`.
-          schema = AutoParse.generate(schema_data, self.uri)
-        end
+        schema = AutoParse.generate(schema_data, :parent => self)
         begin
           return schema.new(property_value).valid?
         rescue TypeError, ArgumentError, ::JSON::ParserError
@@ -334,26 +339,7 @@ module AutoParse
 
       value = self[property_key] || schema_class.data['default']
 
-      case schema_class.data['type']
-      when 'string'
-        AutoParse.import_string(value, schema_class)
-      when 'boolean'
-        AutoParse.import_boolean(value, schema_class)
-      when 'integer'
-        AutoParse.import_integer(value, schema_class)
-      when 'number'
-        AutoParse.import_number(value, schema_class)
-      when 'array'
-        AutoParse.import_array(value, schema_class)
-      when 'object'
-        AutoParse.import_object(value, schema_class)
-      when 'null'
-        nil
-      when Array
-        AutoParse.import_union(value, schema_class)
-      else
-        AutoParse.import_any(value, schema_class)
-      end
+      AutoParse.import(value, schema_class)
     end
     protected :__get__
 
@@ -368,26 +354,7 @@ module AutoParse
         self.class.properties[property_key] = schema_class
       end
 
-      case schema_class.data['type']
-      when 'string'
-        self[property_key] = AutoParse.export_string(value, schema_class)
-      when 'boolean'
-        self[property_key] = AutoParse.export_boolean(value, schema_class)
-      when 'integer'
-        self[property_key] = AutoParse.export_integer(value, schema_class)
-      when 'number'
-        self[property_key] = AutoParse.export_number(value, schema_class)
-      when 'array'
-        self[property_key] = AutoParse.export_array(value, schema_class)
-      when 'object'
-        self[property_key] = AutoParse.export_object(value, schema_class)
-      when 'null'
-        self[property_key] = nil
-      when Array
-        self[property_key] = AutoParse.export_union(value, schema_class)
-      else
-        self[property_key] = AutoParse.export_any(value, schema_class)
-      end
+      self[property_key] = AutoParse.export(value, schema_class)
     end
     protected :__set__
 
@@ -465,14 +432,10 @@ module AutoParse
     #
     # @return [String] The instance's state, as a <code>String</code>.
     def inspect
-      if self.class.respond_to?(:description)
-        sprintf(
-          "#<%s:%#0x DESC:'%s'>",
-          self.class.to_s, self.object_id, self.class.description
-        )
-      else
-        sprintf("#<%s:%#0x>", self.class.to_s, self.object_id)
-      end
+      sprintf(
+        "#<%s:%#0x DATA:%s>",
+        self.class.to_s, self.object_id, self.to_hash.inspect
+      )
     end
   end
 

data/lib/autoparse/version.rb

@@ -18,7 +18,7 @@ unless defined? AutoParse::VERSION
     module VERSION
       MAJOR = 0
       MINOR = 2
-      TINY  = 1
+      TINY  = 3
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/autoparse/instance_spec.rb

@@ -77,7 +77,7 @@ describe AutoParse::Instance, 'with the geo schema' do
       :path => File.expand_path(File.join(spec_dir, './data/geo.json'))
     )
     @schema_data = JSON.parse(File.open(@uri.path, 'r') { |f| f.read })
-    @parser = AutoParse.generate(@schema_data, @uri)
+    @parser = AutoParse.generate(@schema_data, :uri => @uri)
   end
 
   it 'should have the correct URI' do
@@ -156,7 +156,7 @@ describe AutoParse::Instance, 'with the address schema' do
       :path => File.expand_path(File.join(spec_dir, './data/address.json'))
     )
     @schema_data = JSON.parse(File.open(@uri.path, 'r') { |f| f.read })
-    @parser = AutoParse.generate(@schema_data, @uri)
+    @parser = AutoParse.generate(@schema_data, :uri => @uri)
   end
 
   it 'should have the correct URI' do
@@ -271,7 +271,7 @@ describe AutoParse::Instance, 'with the person schema' do
       :path => File.expand_path(File.join(spec_dir, './data/person.json'))
     )
     @schema_data = JSON.parse(File.open(@uri.path, 'r') { |f| f.read })
-    @parser = AutoParse.generate(@schema_data, @uri)
+    @parser = AutoParse.generate(@schema_data, :uri => @uri)
   end
 
   it 'should have the correct URI' do
@@ -375,7 +375,9 @@ describe AutoParse::Instance, 'with the adult schema' do
     )
     @person_schema_data =
       JSON.parse(File.open(@person_uri.path, 'r') { |f| f.read })
-    @person_parser = AutoParse.generate(@person_schema_data, @person_uri)
+    @person_parser = AutoParse.generate(
+      @person_schema_data, :uri => @person_uri
+    )
 
     @adult_uri = Addressable::URI.new(
       :scheme => 'file',
@@ -384,7 +386,7 @@ describe AutoParse::Instance, 'with the adult schema' do
     )
     @adult_schema_data =
       JSON.parse(File.open(@adult_uri.path, 'r') { |f| f.read })
-    @adult_parser = AutoParse.generate(@adult_schema_data, @adult_uri)
+    @adult_parser = AutoParse.generate(@adult_schema_data, :uri => @adult_uri)
   end
 
   it 'should have the correct URI' do
@@ -489,7 +491,9 @@ describe AutoParse::Instance, 'with the positive schema' do
     )
     @positive_schema_data =
       JSON.parse(File.open(@positive_uri.path, 'r') { |f| f.read })
-    @positive_parser = AutoParse.generate(@positive_schema_data, @positive_uri)
+    @positive_parser = AutoParse.generate(
+      @positive_schema_data, :uri => @positive_uri
+    )
   end
 
   it 'should have the correct URI' do
@@ -518,7 +522,9 @@ describe AutoParse::Instance, 'with the account schema' do
     )
     @positive_schema_data =
       JSON.parse(File.open(@positive_uri.path, 'r') { |f| f.read })
-    @positive_parser = AutoParse.generate(@positive_schema_data, @positive_uri)
+    @positive_parser = AutoParse.generate(
+      @positive_schema_data, :uri => @positive_uri
+    )
 
     @account_uri = Addressable::URI.new(
       :scheme => 'file',
@@ -527,7 +533,9 @@ describe AutoParse::Instance, 'with the account schema' do
     )
     @account_schema_data =
       JSON.parse(File.open(@account_uri.path, 'r') { |f| f.read })
-    @account_parser = AutoParse.generate(@account_schema_data, @account_uri)
+    @account_parser = AutoParse.generate(
+      @account_schema_data, :uri => @account_uri
+    )
   end
 
   it 'should have the correct URI' do
@@ -624,7 +632,9 @@ describe AutoParse::Instance, 'with the card schema' do
     )
     @address_schema_data =
       JSON.parse(File.open(@address_uri.path, 'r') { |f| f.read })
-    @address_parser = AutoParse.generate(@address_schema_data, @address_uri)
+    @address_parser = AutoParse.generate(
+      @address_schema_data, :uri => @address_uri
+    )
 
     @geo_uri = Addressable::URI.new(
       :scheme => 'file',
@@ -633,7 +643,7 @@ describe AutoParse::Instance, 'with the card schema' do
     )
     @geo_schema_data =
       JSON.parse(File.open(@geo_uri.path, 'r') { |f| f.read })
-    @geo_parser = AutoParse.generate(@geo_schema_data, @geo_uri)
+    @geo_parser = AutoParse.generate(@geo_schema_data, :uri => @geo_uri)
 
     @card_uri = Addressable::URI.new(
       :scheme => 'file',
@@ -642,7 +652,7 @@ describe AutoParse::Instance, 'with the card schema' do
     )
     @card_schema_data =
       JSON.parse(File.open(@card_uri.path, 'r') { |f| f.read })
-    @card_parser = AutoParse.generate(@card_schema_data, @card_uri)
+    @card_parser = AutoParse.generate(@card_schema_data, :uri => @card_uri)
   end
 
   it 'should have the correct URI' do
@@ -940,7 +950,7 @@ describe AutoParse::Instance, 'with the calendar schema' do
     )
     @geo_schema_data =
       JSON.parse(File.open(@geo_uri.path, 'r') { |f| f.read })
-    @geo_parser = AutoParse.generate(@geo_schema_data, @geo_uri)
+    @geo_parser = AutoParse.generate(@geo_schema_data, :uri => @geo_uri)
 
     @calendar_uri = Addressable::URI.new(
       :scheme => 'file',
@@ -949,7 +959,9 @@ describe AutoParse::Instance, 'with the calendar schema' do
     )
     @calendar_schema_data =
       JSON.parse(File.open(@calendar_uri.path, 'r') { |f| f.read })
-    @calendar_parser = AutoParse.generate(@calendar_schema_data, @calendar_uri)
+    @calendar_parser = AutoParse.generate(
+      @calendar_schema_data, :uri => @calendar_uri
+    )
   end
 
   it 'should have the correct URI' do
@@ -1118,7 +1130,7 @@ describe AutoParse::Instance, 'with the node schema' do
       :path => File.expand_path(File.join(spec_dir, './data/node.json'))
     )
     @schema_data = JSON.parse(File.open(@uri.path, 'r') { |f| f.read })
-    @parser = AutoParse.generate(@schema_data, @uri)
+    @parser = AutoParse.generate(@schema_data, :uri => @uri)
   end
 
   it 'should have the correct URI' do

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: autoparse
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Bob Aman
@@ -15,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 Z
+date: 2011-10-21 00:00:00 +03:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -25,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 2
@@ -41,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 4
@@ -57,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 37
         segments: 
         - 0
         - 9
@@ -73,7 +70,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 57
         segments: 
         - 0
         - 8
@@ -89,7 +85,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 2
         - 6
@@ -105,7 +100,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 3
@@ -121,7 +115,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 1
@@ -176,6 +169,7 @@ files:
 - LICENSE
 - Rakefile
 - README.md
+has_rdoc: true
 homepage: http://autoparse.rubyforge.org/
 licenses: []
 
@@ -190,7 +184,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -199,14 +192,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: autoparse
-rubygems_version: 1.8.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A parsing system based on JSON Schema.