multi_json 1.3.4 → 1.3.5

data/README.md

@@ -36,7 +36,7 @@ MultiJSON falls back to [OkJson][], a simple, vendorable JSON parser.
 * [NSJSONSerialization](https://developer.apple.com/library/ios/#documentation/Foundation/Reference/NSJSONSerialization_Class/Reference/Reference.html) Wrapper for Apple's NSJSONSerialization in the Cocoa Framework (MacRuby only)
 * [OkJson][okjson] A simple, vendorable JSON parser
 
-## <a name="contributing"></a>Contributing
+## Contributing
 In the spirit of [free software][free-sw], **everyone** is encouraged to help
 improve this project.
 
@@ -57,30 +57,33 @@ Here are some ways *you* can contribute:
 
 [issues]: https://github.com/intridea/multi_json/issues
 
-## <a name="issues"></a>Submitting an Issue
+## Submitting an Issue
 We use the [GitHub issue tracker][issues] to track bugs and features. Before
 submitting a bug report or feature request, check to make sure it hasn't
-already been submitted. You can indicate support for an existing issuse by
-voting it up. When submitting a bug report, please include a [Gist][] that
-includes a stack trace and any details that may be necessary to reproduce the
-bug, including your gem version, Ruby version, and operating system. Ideally, a
-bug report should include a pull request with failing specs.
+already been submitted. When submitting a bug report, please include a [Gist][]
+that includes a stack trace and any details that may be necessary to reproduce
+the bug, including your gem version, Ruby version, and operating system.
+Ideally, a bug report should include a pull request with failing specs.
 
 [gist]: https://gist.github.com/
 
-## <a name="pulls"></a>Submitting a Pull Request
-1. Fork the project.
-2. Create a topic branch.
-3. Implement your feature or bug fix.
-4. Add specs for your feature or bug fix.
-5. Run `bundle exec rake spec`. If your changes are not 100% covered, go back
-   to step 4.
-6. Commit and push your changes.
-7. Submit a pull request. Please do not include changes to the gemspec,
-   version, or history file. (If you want to create your own version for some
-   reason, please do so in a separate commit.)
-
-## <a name="versions"></a>Supported Ruby Versions
+## Submitting a Pull Request
+1. [Fork the repository.][fork]
+2. [Create a topic branch.][branch]
+3. Add specs for your unimplemented feature or bug fix.
+4. Run `bundle exec rake spec`. If your specs pass, return to step 3.
+5. Implement your feature or bug fix.
+6. Run `bundle exec rake spec`. If your specs fail, return to step 5.
+7. Run `open coverage/index.html`. If your changes are not completely covered
+   by your tests, return to step 3.
+8. Add, commit, and push your changes.
+9. [Submit a pull request.][pr]
+
+[fork]: http://help.github.com/fork-a-repo/
+[branch]: http://learn.github.com/p/branching.html
+[pr]: http://help.github.com/send-pull-requests/
+
+## Supported Ruby Versions
 This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
@@ -109,7 +112,7 @@ implementation, you will be personally responsible for providing patches in a
 timely fashion. If critical issues for a particular implementation exist at the
 time of a major release, support for that Ruby version may be dropped.
 
-## <a name="copyright"></a>Copyright
+## Copyright
 Copyright (c) 2010 Michael Bleigh, Josh Kalderimis, Erik Michaels-Ober, and Intridea, Inc.
 See [LICENSE][] for details.
 

data/Rakefile

@@ -1,10 +1,5 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler'
-  Bundler::GemHelper.install_tasks
-rescue LoadError => e
-  warn "[WARNING]: It is recommended that you use bundler during development: gem install bundler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 desc "Run all examples"

data/lib/multi_json/adapters/oj.rb

@@ -13,6 +13,7 @@ module MultiJson
       end
 
       def self.dump(object, options={}) #:nodoc:
+        options.merge!(:indent => 2) if options[:pretty] || options['pretty']
         ::Oj.dump(object, options)
       end
     end

data/lib/multi_json/version.rb

@@ -1,3 +1,3 @@
 module MultiJson
-  VERSION = "1.3.4"
+  VERSION = "1.3.5" unless defined?(MultiJson::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000 Z
+date: 2012-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,9 +123,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3342711038323069490
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,3 +139,4 @@ test_files:
 - spec/adapter_shared_example.rb
 - spec/helper.rb
 - spec/multi_json_spec.rb
+has_rdoc: