autoparse 0.3.1 → 0.3.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.2
+
+* Fixed issue with booleans and default values
+* Fixed issue with class redefinition
+* Updated Launchy dependency
+
 # 0.3.1
 
 * Replaced json gem dependency with multi_json

data/Gemfile

@@ -0,0 +1,17 @@
+source :rubygems
+
+gem 'addressable', '>= 2.3.1'
+gem 'multi_json', '>= 1.0.0'
+gem 'extlib', '>= 0.9.15'
+
+group :development do
+  gem 'launchy', '>= 2.1.1'
+  gem 'yard'
+  gem 'redcarpet'
+end
+
+group :test, :development do
+  gem 'rake', '>= 0.9.0'
+  gem 'rspec', '>= 2.11.0'
+  gem 'rcov', '>= 0.9.9', :platform => :mri_18
+end

data/Gemfile.lock

@@ -0,0 +1,32 @@
+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/lib/autoparse.rb

@@ -231,8 +231,7 @@ module AutoParse
     elsif value.kind_of?(Symbol)
       value.to_s
     else
-      raise TypeError,
-        "Expected String or Symbol, got #{value.class}."
+      raise TypeError, "Expected String or Symbol, got #{value.class}."
     end
   end
 
@@ -242,11 +241,10 @@ module AutoParse
       true
     when 'false', 'no', 'n', 'off', '0'
       false
-    when 'nil', 'null', 'undefined'
+    when 'nil', 'null', 'undefined', ''
       nil
     else
-      raise TypeError,
-        "Expected boolean, got #{value.class}."
+      raise TypeError, "Expected boolean, got #{value.class}."
     end
   end
 
@@ -256,7 +254,7 @@ module AutoParse
       true
     when 'false', 'no', 'n', 'off', '0'
       false
-    when 'nil', 'null', 'undefined'
+    when 'nil', 'null', 'undefined', ''
       nil
     else
       raise TypeError, "Expected boolean, got #{value.class}."
@@ -302,29 +300,18 @@ module AutoParse
     else
       (value || []).to_ary.dup
     end)
-    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
+    items_schema = schema_class.property('items')
     value.map! do |item|
       AutoParse.import(item, items_schema)
     end
-    value
-  end
+    value  end
 
   def self.export_array(value, schema_class)
     if value == nil
       value
     elsif value.respond_to?(: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
+      items_schema = schema_class.property('items')
       value.map! do |item|
         AutoParse.export(item, items_schema)
       end

data/lib/autoparse/instance.rb

@@ -65,6 +65,25 @@ module AutoParse
       )
     end
 
+    def self.property(property_name)
+      property_key = self.keys[property_name] || property_name
+      schema_class = self.properties[property_key]
+      if !schema_class
+        if self.data[property_name]
+          schema_class = AutoParse.generate(self.data[property_name], :parent => self)
+        else
+          schema_class = self.additional_properties_schema
+        end
+      end
+      if schema_class.data['$ref']
+        # Dereference the schema if necessary.
+        schema_class = schema_class.dereference
+        # Avoid this dereference in the future.
+        self.properties[property_key] = schema_class
+      end
+      return schema_class
+    end
+    
     def self.keys
       return @keys ||= (
         if self.superclass.ancestors.include?(::AutoParse::Instance)
@@ -324,41 +343,25 @@ module AutoParse
 
     def __get__(property_name)
       property_key = self.class.keys[property_name] || property_name
-
-      schema_class = self.class.properties[property_key]
-      schema_class = self.class.additional_properties_schema if !schema_class
+      schema_class = self.class.property(property_name)
       if !schema_class
         @data[property_key]
       else
-        if schema_class.data['$ref']
-          # Dereference the schema if necessary.
-          schema_class = schema_class.dereference
-          # Avoid this dereference in the future.
-          self.class.properties[property_key] = schema_class
+        if @data.has_key?(property_key)
+          value = @data[property_key]
+        else
+          value = schema_class.data['default']
         end
-
-        value = @data[property_key] || schema_class.data['default']
-
         AutoParse.import(value, schema_class)
-      end
-    end
+      end    end
     protected :__get__
 
     def __set__(property_name, value)
       property_key = self.class.keys[property_name] || property_name
-
-      schema_class = self.class.properties[property_key]
-      schema_class = self.class.additional_properties_schema if !schema_class
+      schema_class = self.class.property(property_name)
       if !schema_class
         @data[property_key] = value
       else
-        if schema_class.data['$ref']
-          # Dereference the schema if necessary.
-          schema_class = schema_class.dereference
-          # Avoid this dereference in the future.
-          self.class.properties[property_key] = schema_class
-        end
-
         @data[property_key] = AutoParse.export(value, schema_class)
       end
     end

data/lib/autoparse/version.rb

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

data/spec/autoparse/instance_spec.rb

@@ -22,6 +22,7 @@ require 'autoparse'
 require 'addressable/uri'
 
 describe AutoParse::Instance, 'with an empty schema' do
+  include JSONMatchers
   before do
     @parser = AutoParse::EMPTY_SCHEMA
   end
@@ -65,11 +66,12 @@ describe AutoParse::Instance, 'with an empty schema' do
 
   it 'should convert to a JSON string' do
     instance = @parser.new({"be" => "brief"})
-    instance.to_json.should == '{"be":"brief"}'
+    instance.to_json.should be_json '{"be":"brief"}'
   end
 end
 
 describe AutoParse::Instance, 'with the geo schema' do
+  include JSONMatchers
   before do
     @uri = Addressable::URI.new(
       :scheme => 'file',
@@ -144,11 +146,12 @@ describe AutoParse::Instance, 'with the geo schema' do
       "latitude" => 37.422,
       "longitude" => -122.084
     })
-    instance.to_json.should == '{"latitude":37.422,"longitude":-122.084}'
+    instance.to_json.should be_json '{"latitude":37.422,"longitude":-122.084}'
   end
 end
 
 describe AutoParse::Instance, 'with the address schema' do
+  include JSONMatchers
   before do
     @uri = Addressable::URI.new(
       :scheme => 'file',
@@ -264,6 +267,7 @@ describe AutoParse::Instance, 'with the address schema' do
 end
 
 describe AutoParse::Instance, 'with the person schema' do
+  include JSONMatchers
   before do
     @uri = Addressable::URI.new(
       :scheme => 'file',
@@ -362,11 +366,12 @@ describe AutoParse::Instance, 'with the person schema' do
       "name" => "Bob Aman",
       "age" => 29
     })
-    instance.to_json.should == '{"name":"Bob Aman","age":29}'
+    instance.to_json.should be_json '{"name":"Bob Aman","age":29}'
   end
 end
 
 describe AutoParse::Instance, 'with the adult schema' do
+  include JSONMatchers
   before do
     @person_uri = Addressable::URI.new(
       :scheme => 'file',
@@ -478,11 +483,12 @@ describe AutoParse::Instance, 'with the adult schema' do
       "name" => "Bob Aman",
       "age" => 29
     })
-    instance.to_json.should == '{"name":"Bob Aman","age":29}'
+    instance.to_json.should be_json '{"name":"Bob Aman","age":29}'
   end
 end
 
 describe AutoParse::Instance, 'with the user list schema' do
+  include JSONMatchers
   before do
     @person_uri = Addressable::URI.new(
       :scheme => 'file',
@@ -654,13 +660,14 @@ describe AutoParse::Instance, 'with the user list schema' do
         }
       }
     })
-    instance.to_json.should == (
+    instance.to_json.should be_json (
       '{"users":{"bobaman@google.com":{"name":"Bob Aman","age":29}}}'
     )
   end
 end
 
 describe AutoParse::Instance, 'with the positive schema' do
+  include JSONMatchers
   before do
     @positive_uri = Addressable::URI.new(
       :scheme => 'file',
@@ -692,6 +699,7 @@ describe AutoParse::Instance, 'with the positive schema' do
 end
 
 describe AutoParse::Instance, 'with the account schema' do
+  include JSONMatchers
   before do
     @positive_uri = Addressable::URI.new(
       :scheme => 'file',
@@ -797,11 +805,12 @@ describe AutoParse::Instance, 'with the account schema' do
       "accountNumber" => "12345",
       "balance" => 1000
     })
-    instance.to_json.should == '{"accountNumber":"12345","balance":1000}'
+    instance.to_json.should be_json '{"accountNumber":"12345","balance":1000}'
   end
 end
 
 describe AutoParse::Instance, 'with the card schema' do
+  include JSONMatchers
   before do
     @address_uri = Addressable::URI.new(
       :scheme => 'file',
@@ -1130,11 +1139,12 @@ describe AutoParse::Instance, 'with the card schema' do
       "givenName" => "Robert",
       "familyName" => "Aman"
     })
-    instance.to_json.should == '{"givenName":"Robert","familyName":"Aman"}'
+    instance.to_json.should be_json '{"givenName":"Robert","familyName":"Aman"}'
   end
 end
 
 describe AutoParse::Instance, 'with the calendar schema' do
+  include JSONMatchers
   before do
     @geo_uri = Addressable::URI.new(
       :scheme => 'file',
@@ -1303,11 +1313,11 @@ describe AutoParse::Instance, 'with the calendar schema' do
 
   it 'should convert to a JSON string' do
     instance = @calendar_parser.new({
-      "dtstart" => "1592-03-14T00:00:00Z",
       "dtend" => "1592-03-14T23:59:59Z",
+      "dtstart" => "1592-03-14T00:00:00Z",
       "summary" => "Pi Day"
     })
-    instance.to_json.should == (
+    instance.to_json.should be_json (
       '{"dtend":"1592-03-14T23:59:59Z",' +
       '"dtstart":"1592-03-14T00:00:00Z",'+
       '"summary":"Pi Day"}'
@@ -1316,6 +1326,7 @@ describe AutoParse::Instance, 'with the calendar schema' do
 end
 
 describe AutoParse::Instance, 'with the node schema' do
+  include JSONMatchers
   before do
     @uri = Addressable::URI.new(
       :scheme => 'file',
@@ -1446,10 +1457,136 @@ describe AutoParse::Instance, 'with the node schema' do
 
   it 'should convert to a JSON string' do
     instance = @parser.new({
+      "left" => nil,
       "value" => 42,
+      "right" => nil
+    })
+    instance.to_json.should be_json '{"left":null,"value":42,"right":null}'
+  end
+end
+
+describe AutoParse::Instance, 'with the booleans schema' do
+  include JSONMatchers
+  before do
+    @uri = Addressable::URI.new(
+      :scheme => 'file',
+      :host => '',
+      :path => File.expand_path(File.join(spec_dir, './data/booleans.json'))
+    )
+    @schema_data = JSON.parse(File.open(@uri.path, 'r') { |f| f.read })
+    @parser = AutoParse.generate(@schema_data, :uri => @uri)
+  end
+
+  it 'should have the correct URI' do
+    @parser.uri.should === @uri
+  end
+
+  it 'should accept a valid booleans input' do
+    instance = @parser.new({
+      "guaranteed" => false,
+      "truthy" => true,
+      "accurate" => false
+    })
+    instance.should be_valid
+  end
+
+  it 'should expose values via generated accessors' do
+    instance = @parser.new({
+      "guaranteed" => false,
+      "truthy" => true,
+      "accurate" => false
+    })
+    instance.truthy.should == true
+    instance.untrue.should == false
+    instance.accurate.should == false
+    instance.maybe.should == nil
+    instance.guaranteed.should == false
+  end
+
+  it 'should alter output structure via generated mutators' do
+    instance = @parser.new
+    instance.truthy = true
+    instance.untrue = false
+    instance.accurate = false
+    instance.guaranteed = false
+    instance.to_hash.should == {
+      "truthy" => true,
+      "untrue" => false,
+      "accurate" => false,
+      "guaranteed" => false
+    }
+  end
+
+  it 'should be coerceable to a Hash value' do
+    instance = @parser.new({
+      "guaranteed" => false,
+      "truthy" => true,
+      "accurate" => false
+    })
+    instance.to_hash.should == {
+      "guaranteed" => false,
+      "truthy" => true,
+      "accurate" => false
+    }
+  end
+
+  it 'should convert to a JSON string' do
+    instance = @parser.new({
       "left" => nil,
+      "value" => 42,
       "right" => nil
     })
-    instance.to_json.should == '{"left":null,"value":42,"right":null}'
+    instance.to_json.should be_json '{"left":null,"value":42,"right":null}'
+  end
+end
+
+describe AutoParse::Instance, 'with the file schema' do
+  def load_schema(file, uri)
+    json = JSON.parse(File.read(file))
+    return AutoParse.generate(json, :uri => Addressable::URI.parse(uri))
+  end
+
+  before do
+    @data = {
+     "kind" => "drive#fileList",
+     "items" => [
+      {
+       "kind" => "drive#file",
+       "id" => "0Bz2X2-r-Ou9fYTJFLVFYZENzMjA",
+       "editable" => "false",
+       "parents" => [
+        {
+         "kind" => "drive#parentReference",
+         "id" => "0AD2X2-r-Ou9fUk9PVA",
+         "isRoot" => "true"
+        }
+       ]
+      }
+     ]
+    }
+    @filelist_parser = load_schema('spec/data/filelist.json', 'https://www.googleapis.com/drive/v2/#FileList')
+    @file_parser = load_schema('spec/data/file.json', 'https://www.googleapis.com/drive/v2/#File')
+    @parentref_parser = load_schema('spec/data/parentref.json', 'https://www.googleapis.com/drive/v2/#ParentReference')
+  end
+
+  it 'should not redefine parent schemas' do
+    file = @filelist_parser.new(@data)
+    file.should be_an_instance_of @filelist_parser
+    file.items.first.should be_an_instance_of @file_parser
+    file.items.first.parents.first.should be_an_instance_of @parentref_parser
+
+    file = @filelist_parser.new(@data)
+    file.should be_an_instance_of @filelist_parser
+    file.items.first.should be_an_instance_of @file_parser
+    file.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
+    file.items.first.should be_an_instance_of @file_parser
+    file.items.first.editable.should == false
+    file.items.first.parents.first.should be_an_instance_of @parentref_parser
+    file.items.first.parents.first.is_root.should == true
   end
 end

data/spec/data/booleans.json

@@ -0,0 +1,25 @@
+{
+  "description":"A bunch of booleans",
+  "type":"object",
+  "properties": {
+    "truthy": {
+      "type": "boolean",
+      "default": null
+    },
+    "untrue": {
+      "type": "boolean",
+      "default": false
+    },
+    "accurate": {
+      "type": "boolean",
+      "default": true
+    },
+    "maybe": {
+      "type": "boolean"
+    },
+    "guaranteed": {
+      "type": "boolean",
+      "required": true
+    }
+  }
+}

data/spec/data/file.json

@@ -0,0 +1,173 @@
+{
+    "id": "File",
+    "type": "object",
+    "description": "The metadata for a file.",
+    "properties": {
+        "alternateLink": {
+            "type": "string",
+            "description": "A link for opening the file in a browser."
+        },
+        "createdDate": {
+            "type": "string",
+            "description": "Create time for this file (formatted ISO8601 timestamp).",
+            "format": "date-time"
+        },
+        "description": {
+            "type": "string",
+            "description": "A short description of the file."
+        },
+        "downloadUrl": {
+            "type": "string",
+            "description": "Short term download URL for the file. This will only be populated on files with content stored in Drive."
+        },
+        "editable": {
+            "type": "boolean",
+            "description": "Whether the file can be edited by the current user."
+        },
+        "embedLink": {
+            "type": "string",
+            "description": "A link for embedding the file."
+        },
+        "etag": {
+            "type": "string",
+            "description": "ETag of the file."
+        },
+        "exportLinks": {
+            "type": "object",
+            "description": "Links for exporting Google Docs to specific formats.",
+            "additionalProperties": {
+                "type": "string",
+                "description": "A mapping from export format to URL"
+            }
+        },
+        "fileExtension": {
+            "type": "string",
+            "description": "The file extension used when downloading this file. This field is read only. To set the extension, include it on title when creating the file. This will only be populated on files with content stored in Drive."
+        },
+        "fileSize": {
+            "type": "string",
+            "description": "The size of the file in bytes. This will only be populated on files with content stored in Drive.",
+            "format": "int64"
+        },
+        "id": {
+            "type": "string",
+            "description": "The id of the file."
+        },
+        "indexableText": {
+            "type": "object",
+            "description": "Indexable text attributes for the file (can only be written)",
+            "properties": {
+                "text": {
+                    "type": "string",
+                    "description": "The text to be indexed for this file"
+                }
+            }
+        },
+        "kind": {
+            "type": "string",
+            "description": "The type of file. This is always drive#file.",
+            "default": "drive#file"
+        },
+        "labels": {
+            "type": "object",
+            "description": "A group of labels for the file.",
+            "properties": {
+                "hidden": {
+                    "type": "boolean",
+                    "description": "Whether this file is hidden from the user."
+                },
+                "restricted": {
+                    "type": "boolean",
+                    "description": "Whether viewers are prevented from downloading this file."
+                },
+                "starred": {
+                    "type": "boolean",
+                    "description": "Whether this file is starred by the user."
+                },
+                "trashed": {
+                    "type": "boolean",
+                    "description": "Whether this file has been trashed."
+                },
+                "viewed": {
+                    "type": "boolean",
+                    "description": "Whether this file has been viewed by this user."
+                }
+            }
+        },
+        "lastModifyingUserName": {
+            "type": "string",
+            "description": "Name of the last user to modify this file. This will only be populated if a user has edited this file."
+        },
+        "lastViewedByMeDate": {
+            "type": "string",
+            "description": "Last time this file was viewed by the user (formatted RFC 3339 timestamp).",
+            "format": "date-time"
+        },
+        "md5Checksum": {
+            "type": "string",
+            "description": "An MD5 checksum for the content of this file. This will only be populated on files with content stored in Drive."
+        },
+        "mimeType": {
+            "type": "string",
+            "description": "The MIME type of the file."
+        },
+        "modifiedByMeDate": {
+            "type": "string",
+            "description": "Last time this file was modified by the user (formatted RFC 3339 timestamp).",
+            "format": "date-time"
+        },
+        "modifiedDate": {
+            "type": "string",
+            "description": "Last time this file was modified by anyone (formatted RFC 3339 timestamp).",
+            "format": "date-time"
+        },
+        "originalFilename": {
+            "type": "string",
+            "description": "The filename when uploading this file. This will only be populated on files with content stored in Drive."
+        },
+        "ownerNames": {
+            "type": "array",
+            "description": "Name(s) of the owner(s) of this file.",
+            "items": {
+                "type": "string"
+            }
+        },
+        "parents": {
+            "type": "array",
+            "description": "Collection of parent folders which contain this file.\nSetting this field will put the file in all of the provided folders. On insert, if no folders are provided, the file will be placed in the default root folder.",
+            "items": {
+                "$ref": "#ParentReference"
+            }
+        },
+        "permissionsLink": {
+            "type": "string",
+            "description": "A link to the permissions collection."
+        },
+        "quotaBytesUsed": {
+            "type": "string",
+            "description": "The number of quota bytes used by this file.",
+            "format": "int64"
+        },
+        "selfLink": {
+            "type": "string",
+            "description": "A link back to this file."
+        },
+        "sharedWithMeDate": {
+            "type": "string",
+            "description": "Time at which this file was shared with the user (formatted RFC 3339 timestamp).",
+            "format": "date-time"
+        },
+        "thumbnailLink": {
+            "type": "string",
+            "description": "A link to the file's thumbnail."
+        },
+        "title": {
+            "type": "string",
+            "description": "The title of this file."
+        },
+        "writersCanShare": {
+            "type": "boolean",
+            "description": "Whether writers can share the document with other users."
+        }
+    }
+}

data/spec/data/filelist.json

@@ -0,0 +1,35 @@
+{
+    "id": "FileList",
+    "type": "object",
+    "description": "A list of files.",
+    "properties": {
+        "etag": {
+            "type": "string",
+            "description": "The ETag of the list."
+        },
+        "items": {
+            "type": "array",
+            "description": "The actual list of files.",
+            "items": {
+                "$ref": "#File"
+            }
+        },
+        "kind": {
+            "type": "string",
+            "description": "This is always drive#fileList.",
+            "default": "drive#fileList"
+        },
+        "nextLink": {
+            "type": "string",
+            "description": "A link to the next page of files."
+        },
+        "nextPageToken": {
+            "type": "string",
+            "description": "The page token for the next page of files."
+        },
+        "selfLink": {
+            "type": "string",
+            "description": "A link back to this list."
+        }
+    }
+}

data/spec/data/parentref.json

@@ -0,0 +1,28 @@
+{
+    "id": "ParentReference",
+    "type": "object",
+    "description": "A reference to a file's parent.",
+    "properties": {
+        "id": {
+            "type": "string",
+            "description": "The ID of the parent."
+        },
+        "isRoot": {
+            "type": "boolean",
+            "description": "Whether or not the parent is the root folder."
+        },
+        "kind": {
+            "type": "string",
+            "description": "This is always drive#parentReference.",
+            "default": "drive#parentReference"
+        },
+        "parentLink": {
+            "type": "string",
+            "description": "A link to the parent."
+        },
+        "selfLink": {
+            "type": "string",
+            "description": "A link back to this reference."
+        }
+    }
+}

data/spec/spec_helper.rb

@@ -5,3 +5,26 @@ $:.unshift(lib_dir)
 $:.uniq!
 
 require 'autoparse'
+require 'json'
+
+module JSONMatchers
+  class EqualsJson
+    def initialize(expected)
+      @expected = JSON.parse(expected)
+    end
+    def matches?(target)
+      @target = JSON.parse(target)
+      @target.eql?(@expected)
+    end
+    def failure_message
+      "expected #{@target.inspect} to be #{@expected}"
+    end
+    def negative_failure_message
+      "expected #{@target.inspect} not to be #{@expected}"
+    end
+  end
+  
+  def be_json(expected)
+    EqualsJson.new(expected)
+  end
+end

data/tasks/gem.rake

@@ -25,14 +25,13 @@ namespace :gem do
     s.extra_rdoc_files = %w( README.md )
     s.rdoc_options.concat ['--main',  'README.md']
 
-    s.add_runtime_dependency('addressable', '~> 2.2.3')
+    s.add_runtime_dependency('addressable', '>= 2.3.1')
     s.add_runtime_dependency('multi_json', '>= 1.0.0')
     s.add_runtime_dependency('extlib', '>= 0.9.15')
 
-    s.add_development_dependency('rake', '~> 0.8.3')
-    s.add_development_dependency('rspec', '~> 2.6.0')
-    s.add_development_dependency('launchy', '~> 0.3.2')
-    s.add_development_dependency('diff-lcs', '~> 1.1.2')
+    s.add_development_dependency('rake', '>= 0.9.0')
+    s.add_development_dependency('rspec', '>= 2.11.0')
+    s.add_development_dependency('launchy', '>= 2.1.1')
 
     s.require_path = 'lib'
   end
@@ -87,4 +86,4 @@ end
 desc 'Alias to gem:package'
 task 'gem' => 'gem:package'
 
-task 'clobber' => ['gem:clobber_package']
+task 'gem:release' => 'gem:gemspec'

data/tasks/git.rake

@@ -19,10 +19,15 @@ namespace :git do
       v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
       abort "Versions don't match #{v} vs #{PKG_VERSION}" if v != PKG_VERSION
 
+      git_status = `git status`
+      if git_status !~ /nothing to commit \(working directory clean\)/
+        abort "Working directory isn't clean."
+      end
+
       tag = "#{PKG_NAME}-#{PKG_VERSION}"
       msg = "Release #{PKG_NAME}-#{PKG_VERSION}"
 
-      existing_tags = `git tag -l #{PKG_NAME}-*`.split("\n")
+      existing_tags = `git tag -l #{PKG_NAME}-*`.split('\n')
       if existing_tags.include?(tag)
         warn('Tag already exists, deleting...')
         unless system "git tag -d #{tag}"

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: autoparse
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Bob Aman
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-10 00:00:00 Z
+date: 2012-07-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -23,14 +18,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 2
-        - 3
-        version: 2.2.3
+        version: 2.3.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,11 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :runtime
   version_requirements: *id002
@@ -57,11 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 37
-        segments: 
-        - 0
-        - 9
-        - 15
         version: 0.9.15
   type: :runtime
   version_requirements: *id003
@@ -71,14 +51,9 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 8
-        - 3
-        version: 0.8.3
+        version: 0.9.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -87,14 +62,9 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
+        version: 2.11.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -103,32 +73,11 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 3
-        - 2
-        version: 0.3.2
+        version: 2.1.1
   type: :development
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: diff-lcs
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
-        version: 1.1.2
-  type: :development
-  version_requirements: *id007
 description: |
   An implementation of the JSON Schema specification. Provides automatic parsing
   for any given JSON Schema.
@@ -149,15 +98,18 @@ files:
 - spec/data/account.json
 - spec/data/address.json
 - spec/data/adult.json
+- spec/data/booleans.json
 - spec/data/calendar.json
 - spec/data/card.json
-- spec/data/chaos.json
+- spec/data/file.json
+- spec/data/filelist.json
 - spec/data/geo.json
 - spec/data/hyper-schema.json
 - spec/data/interfaces.json
 - spec/data/json-ref.json
 - spec/data/links.json
 - spec/data/node.json
+- spec/data/parentref.json
 - spec/data/person.json
 - spec/data/positive.json
 - spec/data/schema.json
@@ -173,6 +125,8 @@ files:
 - tasks/yard.rake
 - website/index.html
 - CHANGELOG.md
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - Rakefile
 - README.md
@@ -190,23 +144,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: autoparse
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A parsing system based on JSON Schema.

data/spec/data/chaos.json

@@ -1,22 +0,0 @@
-{
-  "description" : "A union type",
-  "type" : ["null", {
-    "properties" : {
-      "chaos": {
-        "type":"string",
-        "format": "url"
-      }
-    }
-  }, {
-    "properties" : {
-      "chaos": {
-        "type":"string",
-        "format": "date-time"
-      }
-    }
-  }, {
-    "properties" : {
-      "chaos": {"type":["boolean", "number"]}
-    }
-  }]
-}