Commits on Nov 28, 2011
  1. Bump version to version 1.0.4

    sferik committed Nov 28, 2011
Commits on Oct 23, 2011
  1. bypassing the load path is bad practice, lets respect the load path a…

    …nd it will respect us back :)
    joshk committed Oct 23, 2011
  2. merge and resolve conflicts

    joshk committed Oct 23, 2011
  3. removed rbx-2.0 from the travis yml as only one version of rbx is pro…

    …vided by travis, as recommended by the rbx guys
    joshk committed Oct 23, 2011
Commits on Oct 17, 2011
  1. Merge pull request #28 from bsiggelkow/encode-pretty

    Encode pretty
    Michael Bleigh committed Oct 17, 2011
Commits on Sep 24, 2011
Commits on Sep 23, 2011
  1. Options can be passed to an engine on encode

    - Pass options straight thru to Yajl
    - OkJson ignores options
    - Pre-process options for Json/Json-Pure
      For these if :pretty => true is passed, the
      option is converted to the default set of options
      used by these libraries when pretty_generate is invoked
    - Common code for json and json-pure refactored into the
      JsonCommon module
    - Specs for all above behaviors
    bsiggelkow committed Sep 23, 2011
Commits on Sep 18, 2011
  1. Merge pull request #24 from jamesarosen/warning

    Add warning when using ok_json
    joshk committed Sep 18, 2011
  2. Add warning when using ok_json. Closes #23

    James A. Rosen committed Sep 18, 2011
  3. Cleaned up tests

     * ensured that neither ::Yajl nor ::JSON is defined for the
       default_engine tests, even if they are run after other tests
     * broke the setup and teardown of the ok_json spec into
       before(:each) and after(:each) blocks
    James A. Rosen committed Sep 18, 2011
Commits on Sep 17, 2011
  1. Travis removed Ruby 1.9.1 support

    Rationale: [ci skip]
    sferik committed Sep 17, 2011
Commits on Sep 16, 2011
Commits on Sep 13, 2011
  1. Allow OkJson to fallback to to_json if the object responds to to_json

    This allows for other non core ruby classes to be encoded correctly. Also, based on advice from OkJson, OkJson has now been name-spaced as MultiJson::OkJson.
    joshk committed Sep 13, 2011
  2. Merge pull request #22 from mbbx6spp/master

    Fix for #21: MultiJson::DecodeError should contain string attempting to be parsed
    joshk committed Sep 13, 2011
  3. Set data context to DecodeError exception #21

    Sometimes indirect clients of MultiJson have no easy way to determine the data
    attempting to be parsed into JSON, therefore a data attribute is added to
    MultiJson::DecodeError class and attribute is set when raising the exception.
    mbbx6spp committed Sep 13, 2011
Commits on Sep 12, 2011
  1. When testing with Travis, don't test yajl on jruby

    This includes the default engine test, and yajl specific tests.
    Also, for the load path changing code in the helper, check if the dirs are already on the load path, otherwise they are added AGAIN.
    joshk committed Sep 12, 2011
  2. during testing, lets check for the json gem being the default best en…

    …gine for jruby, engines with c-exts are still considered experimental in jruby
    joshk committed Sep 12, 2011
Commits on Sep 8, 2011
  1. Revert "Update CI image URL [ci skip]"

    This reverts commit e6c5b04.
    sferik committed Sep 8, 2011
Commits on Sep 6, 2011
  1. Namespace doc tasks

    sferik committed Sep 6, 2011
Commits on Sep 1, 2011
  1. Update CI image URL [ci skip]

    sferik committed Sep 1, 2011
Commits on Aug 27, 2011
  1. Make Rakefile executable

    sferik committed Aug 27, 2011
Commits on Aug 19, 2011
  1. Merge pull request #20 from talbright/master

    Remove git dependency from gemspec
    sferik committed Aug 19, 2011
Commits on Aug 15, 2011
  1. Update gemspec [ci skip]

    sferik committed Aug 15, 2011
Commits on Aug 13, 2011
  1. Add anchors [ci skip]

    sferik committed Aug 13, 2011
Commits on Aug 8, 2011
  1. Revert "Remove JRuby support"

    This reverts commit d138aae.
    sferik committed Aug 8, 2011
Commits on Aug 6, 2011
  1. Add official support for Rubinius [ci skip]

    Happy Rubinius Day!
    sferik committed Aug 6, 2011