autoparse 0.3.0 → 0.3.1

data/CHANGELOG.md

@@ -0,0 +1,36 @@
+# 0.3.1
+
+* Replaced json gem dependency with multi_json
+* Fixed issue with certain JSON libraries breaking on automatic #to_json calls
+
+# 0.3.0
+
+* Fixed handling of additional properties w/ a set schema
+* Modified index methods to allow either raw or parsed access
+* Modified index methods to default to parsed access
+
+# 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
+
+# 0.2.0
+
+* Added support for union types
+* Added support for recursive references
+* Aixed vestigial code from refactoring extraction
+* Fixed issue with references when schema URI is not supplied
+* Fixed issue with missing gem dependencies
+
+# 0.1.0
+
+* Initial release

data/README.md

@@ -1,7 +1,7 @@
 # AutoParse
 
 <dl>
-  <dt>Homepage</dt><dd><a href="http://autoparse.rubyforge.org/">http://autoparse.rubyforge.org/</a></dd>
+  <dt>Homepage</dt><dd><a href="http://code.google.com/p/ruby-autoparse/">http://code.google.com/p/ruby-autoparse/</a></dd>
   <dt>Author</dt><dd><a href="mailto:bobaman@google.com">Bob Aman</a></dd>
   <dt>Copyright</dt><dd>Copyright © 2010 Google, Inc.</dd>
   <dt>License</dt><dd>Apache 2.0</dd>
@@ -10,11 +10,7 @@
 # Description
 
 An implementation of the JSON Schema specification. Provides automatic parsing
-for any given JSON Schema.
-
-# Example Usage
-
-    # Some code goes here.
+for a given JSON Schema.
 
 # Requirements
 

data/Rakefile

@@ -4,17 +4,13 @@ $:.uniq!
 
 require 'rubygems'
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/contrib/rubyforgepublisher'
 
+gem 'rspec', '~> 1.2.9'
 begin
   require 'spec/rake/spectask'
 rescue LoadError
-  STDERR.puts 'Please install rspec:'
-  STDERR.puts 'sudo gem install rspec'
+  STDERR.puts "Please install rspec:"
+  STDERR.puts "sudo gem install rspec"
   exit(1)
 end
 

data/lib/autoparse.rb

@@ -345,7 +345,7 @@ module AutoParse
     elsif value.respond_to?(:to_hash)
       value.to_hash
     elsif value.respond_to?(:to_json)
-      ::JSON.parse(value.to_json)
+      MultiJson.decode(value.to_json)
     else
       raise TypeError, "Expected Hash, got #{value.class}."
     end

data/lib/autoparse/instance.rb

@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 
-require 'json'
+require 'multi_json'
 require 'time'
 require 'autoparse/inflection'
 require 'addressable/uri'
@@ -446,8 +446,16 @@ module AutoParse
       return @data
     end
 
-    def to_json
-      return ::JSON.generate(self.to_hash)
+    ##
+    # Converts the instance value to JSON.
+    #
+    # @return [String] The instance value converted to JSON.
+    #
+    # @note
+    #   Ignores extra arguments to avoid throwing errors w/ certain JSON
+    #   libraries.
+    def to_json(*args)
+      return MultiJson.encode(self.to_hash)
     end
 
     ##

data/lib/autoparse/version.rb

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

data/tasks/gem.rake

@@ -1,4 +1,7 @@
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
+require 'rake/clean'
+
+CLOBBER.include('pkg')
 
 namespace :gem do
   GEM_SPEC = Gem::Specification.new do |s|
@@ -22,8 +25,8 @@ namespace :gem do
     s.extra_rdoc_files = %w( README.md )
     s.rdoc_options.concat ['--main',  'README.md']
 
-    s.add_runtime_dependency('addressable', '~> 2.2.2')
-    s.add_runtime_dependency('json', '>= 1.4.6')
+    s.add_runtime_dependency('addressable', '~> 2.2.3')
+    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')
@@ -34,7 +37,7 @@ namespace :gem do
     s.require_path = 'lib'
   end
 
-  Rake::GemPackageTask.new(GEM_SPEC) do |p|
+  Gem::PackageTask.new(GEM_SPEC) do |p|
     p.gem_spec = GEM_SPEC
     p.need_tar = true
     p.need_zip = true
@@ -45,6 +48,21 @@ namespace :gem do
     puts GEM_SPEC.to_ruby
   end
 
+  desc "Generates .gemspec file"
+  task :gemspec do
+    spec_string = GEM_SPEC.to_ruby
+
+    begin
+      Thread.new { eval("$SAFE = 3\n#{spec_string}", binding) }.join
+    rescue
+      abort "unsafe gemspec: #{$!}"
+    else
+      File.open("#{GEM_SPEC.name}.gemspec", 'w') do |file|
+        file.write spec_string
+      end
+    end
+  end
+
   desc 'Install the gem'
   task :install => ['clobber', 'gem:package'] do
     sh "#{SUDO} gem install --local pkg/#{GEM_SPEC.full_name}"

data/tasks/git.rake

@@ -10,7 +10,7 @@ namespace :git do
 
     desc 'Create a new tag in the Git repository'
     task :create do
-      changelog = File.open('CHANGELOG', 'r') { |file| file.read }
+      changelog = File.open('CHANGELOG.md', 'r') { |file| file.read }
       puts '-' * 80
       puts changelog
       puts '-' * 80

data/tasks/rdoc.rake

@@ -1,4 +1,15 @@
-require 'rake/rdoctask'
+require 'rubygems'
+begin
+  # We prefer to use the RDoc gem over the site version.
+  gem 'rdoc'
+rescue Gem::LoadError
+end unless defined?(RDoc)
+
+require 'rdoc/task'
+require 'rake/clean'
+
+CLOBBER.include('doc', 'ri')
+CLOBBER.uniq!
 
 namespace :doc do
   desc 'Generate RDoc documentation'
@@ -8,7 +19,7 @@ namespace :doc do
     rdoc.options << '--line-numbers' << '--inline-source' <<
       '--accessor' << 'cattr_accessor=object' << '--charset' << 'utf-8'
     rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-    rdoc.rdoc_files.include('README', 'CHANGELOG', 'LICENSE')
+    rdoc.rdoc_files.include('README.md', 'CHANGELOG.md', 'LICENSE')
     rdoc.rdoc_files.include('lib/**/*.rb')
   end
 
@@ -16,11 +27,4 @@ namespace :doc do
   task :ri do
     sh 'rdoc --ri -o ri .'
   end
-
-  desc 'Remove ri products'
-  task :clobber_ri do
-    rm_r 'ri' rescue nil
-  end
 end
-
-task 'clobber' => ['doc:clobber_rdoc', 'doc:clobber_ri']

data/tasks/yard.rake

@@ -10,7 +10,7 @@ begin
       yardoc.name = 'yard'
       yardoc.options = ['--verbose']
       yardoc.files = [
-        'lib/**/*.rb', 'ext/**/*.c', 'README', 'CHANGELOG', 'LICENSE'
+        'lib/**/*.rb', 'ext/**/*.c', 'README.md', 'CHANGELOG.md', 'LICENSE'
       ]
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autoparse
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Bob Aman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-10 00:00:00 Z
+date: 2012-02-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -25,28 +25,28 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 2
         - 2
-        - 2
-        version: 2.2.2
+        - 3
+        version: 2.2.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: multi_json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 23
         segments: 
         - 1
-        - 4
-        - 6
-        version: 1.4.6
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -169,11 +169,10 @@ files:
 - tasks/git.rake
 - tasks/metrics.rake
 - tasks/rdoc.rake
-- tasks/rubyforge.rake
 - tasks/spec.rake
 - tasks/yard.rake
 - website/index.html
-- CHANGELOG
+- CHANGELOG.md
 - LICENSE
 - Rakefile
 - README.md
@@ -207,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: autoparse
-rubygems_version: 1.8.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A parsing system based on JSON Schema.

data/CHANGELOG

@@ -1,31 +0,0 @@
-== 0.3.0
-
-* fixed handling of additional properties w/ a set schema
-* modified index methods to allow either raw or parsed access
-* modified index methods to default to parsed access
-
-== 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
-
-== 0.2.0
-
-* added support for union types
-* added support for recursive references
-* fixed vestigial code from refactoring extraction
-* fixed issue with references when schema URI is not supplied
-* fixed issue with missing gem dependencies
-
-== 0.1.0
-
-* initial release

data/tasks/rubyforge.rake

@@ -1,103 +0,0 @@
-namespace :gem do
-  desc 'Package and upload to RubyForge'
-  task :release => ['gem:package'] do |t|
-    require 'rubyforge'
-
-    v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
-    abort "Versions don't match #{v} vs #{PROJ.version}" if v != PKG_VERSION
-    pkg = "pkg/#{GEM_SPEC.full_name}"
-
-    rf = RubyForge.new
-    rf.configure
-    puts 'Logging in...'
-    rf.login
-
-    c = rf.userconfig
-    changelog = File.open('CHANGELOG') { |file| file.read }
-    c['release_changes'] = changelog
-    c['preformatted'] = true
-
-    files = ["#{pkg}.tgz", "#{pkg}.zip", "#{pkg}.gem"]
-
-    puts "Releasing #{PKG_NAME} v. #{PKG_VERSION}"
-    rf.add_release RUBY_FORGE_PROJECT, PKG_NAME, PKG_VERSION, *files
-  end
-end
-
-namespace :doc do
-  desc 'Publish RDoc to RubyForge'
-  task :release => ['doc:rdoc'] do
-    require 'rake/contrib/sshpublisher'
-    require 'yaml'
-
-    config = YAML.load(
-      File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-    )
-    host = "#{config['username']}@rubyforge.org"
-    remote_dir = RUBY_FORGE_PATH + '/api'
-    local_dir = 'doc'
-    if !File.exist?('website/api')
-      system('mkdir website/api')
-    end
-    Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-  end
-end
-
-namespace :spec do
-  desc 'Publish specdoc to RubyForge'
-  task :release => ['spec:specdoc'] do
-    require 'rake/contrib/sshpublisher'
-    require 'yaml'
-
-    config = YAML.load(
-      File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-    )
-    host = "#{config['username']}@rubyforge.org"
-    remote_dir = RUBY_FORGE_PATH + '/specdoc'
-    local_dir = 'specdoc'
-    if !File.exist?('website/specdoc')
-      system('mkdir website/specdoc')
-    end
-    Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-  end
-
-  namespace :rcov do
-    desc 'Publish coverage report to RubyForge'
-    task :release => ['spec:rcov'] do
-      require 'rake/contrib/sshpublisher'
-      require 'yaml'
-
-      config = YAML.load(
-        File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-      )
-      host = "#{config['username']}@rubyforge.org"
-      remote_dir = RUBY_FORGE_PATH + '/coverage'
-      local_dir = 'coverage'
-      if !File.exist?('website/coverage')
-        system('mkdir website/coverage')
-      end
-      Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-    end
-  end
-end
-
-namespace :website do
-  desc 'Publish website to RubyForge'
-  task :init do
-    require 'rake/contrib/sshpublisher'
-    require 'yaml'
-
-    config = YAML.load(
-      File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-    )
-    host = "#{config['username']}@rubyforge.org"
-    remote_dir = RUBY_FORGE_PATH
-    local_dir = 'website'
-    Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-  end
-
-  desc 'Publish website to RubyForge'
-  task :release => [
-    'website:init', 'doc:release', 'spec:release', 'spec:rcov:release'
-  ]
-end