autoparse 0.3.2 → 0.3.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.3.3
+
+* Fixed issue with parent class redefinition
+
 # 0.3.2
 
 * Fixed issue with booleans and default values

data/lib/autoparse.rb

@@ -15,6 +15,8 @@
 require 'autoparse/instance'
 require 'autoparse/version'
 require 'addressable/uri'
+require 'multi_json'
+require 'compat/multi_json'
 
 module AutoParse
   def self.schemas
@@ -138,7 +140,7 @@ module AutoParse
     end
 
     # Register the new schema.
-    self.schemas[schema.uri] = schema
+    self.schemas[schema.uri] = schema unless parent && parent.uri == schema.uri
     return schema
   end
 
@@ -332,7 +334,7 @@ module AutoParse
     elsif value.respond_to?(:to_hash)
       value.to_hash
     elsif value.respond_to?(:to_json)
-      MultiJson.decode(value.to_json)
+      MultiJson.load(value.to_json)
     else
       raise TypeError, "Expected Hash, got #{value.class}."
     end

data/lib/autoparse/instance.rb

@@ -14,6 +14,7 @@
 
 
 require 'multi_json'
+require 'compat/multi_json'
 require 'time'
 require 'autoparse/inflection'
 require 'addressable/uri'
@@ -458,7 +459,7 @@ module AutoParse
     #   Ignores extra arguments to avoid throwing errors w/ certain JSON
     #   libraries.
     def to_json(*args)
-      return MultiJson.encode(self.to_hash)
+      return MultiJson.dump(self.to_hash)
     end
 
     ##

data/lib/autoparse/version.rb

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

data/lib/compat/multi_json.rb

@@ -0,0 +1,17 @@
+gem 'multi_json', '>= 1.0.0'
+require 'multi_json'
+
+unless MultiJson.respond_to?(:load)
+  module MultiJson
+    class <<self
+      alias :load :decode
+    end
+  end
+end
+unless MultiJson.respond_to?(:dump)
+  module MultiJson
+    class <<self
+      alias :dump :encode
+    end
+  end
+end

data/spec/autoparse/instance_spec.rb

@@ -1581,6 +1581,47 @@ describe AutoParse::Instance, 'with the file schema' do
     file.items.first.parents.first.should be_an_instance_of @parentref_parser
   end
 
+
+  it 'should not redefine the parent when accessing anonymous children' do
+    file_json = {
+      "kind" => "drive#file",
+      "id" => "0Bz2X2-r-Ou9fYTJFLVFYZENzMjA",
+      "parents" => [
+        {
+          "kind" => "drive#parentReference",
+          "id" => "0AD2X2-r-Ou9fUk9PVA",
+       }]        
+    }
+
+    list_json = {
+     "kind" => "drive#fileList",
+     "items" => [
+      {
+       "kind" => "drive#file",
+       "id" => "0Bz2X2-r-Ou9fYTJFLVFYZENzMjA",
+       "parents" => [
+        {
+         "kind" => "drive#parentReference",
+         "id" => "0AD2X2-r-Ou9fUk9PVA",
+        }
+       ],
+      }
+     ]
+    }
+
+    file = @file_parser.new(file_json)
+    file.should be_an_instance_of @file_parser
+    file.parents.first.should be_an_instance_of @parentref_parser
+
+    # Regression check for bug where accessing the parents property would redefine
+    # file. This resulted in an inability to parse that type later on, such as when
+    # used in the items array.
+    list = @filelist_parser.new(list_json)
+    list.should be_an_instance_of @filelist_parser
+    list.items.first.should be_an_instance_of @file_parser
+    list.items.first.parents.first.should be_an_instance_of @parentref_parser
+  end
+
   it 'should handle booleans correctly' do
     file = @filelist_parser.new(@data)
     file.should be_an_instance_of @filelist_parser

metadata

@@ -1,99 +1,129 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: autoparse
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.3
   prerelease: 
-  version: 0.3.2
 platform: ruby
-authors: 
+authors:
 - Bob Aman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-26 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 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.1
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: extlib
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: extlib
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.15
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.15
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.1
   type: :development
-  version_requirements: *id006
-description: |
-  An implementation of the JSON Schema specification. Provides automatic parsing
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+description: ! 'An implementation of the JSON Schema specification. Provides automatic
+  parsing
+
   for any given JSON Schema.
 
+'
 email: bobaman@google.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
+- lib/autoparse.rb
 - lib/autoparse/inflection.rb
 - lib/autoparse/instance.rb
 - lib/autoparse/version.rb
-- lib/autoparse.rb
+- lib/compat/multi_json.rb
 - spec/autoparse/instance_spec.rb
 - spec/data/account.json
 - spec/data/address.json
@@ -123,40 +153,35 @@ files:
 - tasks/rdoc.rake
 - tasks/spec.rake
 - tasks/yard.rake
-- website/index.html
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
-- Rakefile
 - README.md
+- Rakefile
 homepage: http://autoparse.rubyforge.org/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-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 
-      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 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: autoparse
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A parsing system based on JSON Schema.
 test_files: []
-

data/Gemfile.lock

@@ -1,32 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.3.1)
-    diff-lcs (1.1.3)
-    extlib (0.9.15)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rcov (1.0.0)
-    redcarpet (2.1.1)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
-    yard (0.8.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  addressable (>= 2.3.1)
-  extlib (>= 0.9.15)
-  multi_json (>= 1.0.0)
-  rake (>= 0.9.0)
-  rcov (>= 0.9.9)
-  redcarpet
-  rspec (>= 2.11.0)
-  yard

data/website/index.html

@@ -1,95 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title>AutoParse</title>
-    <style type="text/css">
-      * {
-        font-size: 100%;
-        margin: 0;
-        padding: 0;
-      }
-      
-      body {
-        font-family: "Lucida Grande", Verdana, sans-serif;
-        margin: 1em;
-      }
-      
-      a {
-        color: #880000;
-      }
-
-      a:visited {
-        color: #333333;
-      }
-      
-      h1 {
-        font-size: 2em;
-        margin: 0 0 0.8em 0;
-        text-align: center;
-      }
-      
-      h2 {
-        font-size: 1em;
-        margin: 0.8em 0;
-      }
-      
-      p {
-        margin: 0.8em 0;
-      }
-
-      ul {
-        font-size: 0.9em;
-        margin: 0 0 0 1.5em;
-      }
-      
-      div {
-        width: 50%;
-        margin: 0 auto;
-        padding: 0.8em;
-        background-color: #AA5852;
-        border: 2px solid #C2645D;
-      }
-
-      @media print {
-        body {
-          font-size: 0.9em;
-        }
-        
-        a {
-          text-decoration: none;
-          color: #000;
-        }
-      }
-    </style>
-  </head>
-  <body>
-    <h1>AutoParse</h1>
-    <div>
-      <p>
-        An implementation of the JSON Schema specification.
-      </p>
-      <ul>
-        <li>
-          <a href="http://rubyforge.org/projects/autoparse/">
-            Project Page
-          </a>
-        </li>
-        <li>
-          <a href="http://github.com/sporkmonger/autoparse/tree/">
-            GitHub Page
-          </a>
-        </li>
-        <li><a href="/api/">API</a></li>
-        <li><a href="/specdoc/">Specifications</a></li>
-        <li><a href="/coverage/">Code Coverage</a></li>
-      </ul>
-      <p>
-        You know what to do:
-      </p>
-      <p>
-        <code>sudo gem install autoparse</code>
-      </p>
-    </div>
-  </body>
-</html>