Skip to content
Commits on Mar 13, 2012
  1. @sferik

    Explicitly specify language

    sferik committed
Commits on Feb 18, 2012
  1. @sferik

    Bump version to version 1.1.0

    sferik committed
Commits on Feb 15, 2012
  1. @sferik

    Merge pull request #34 from Overbryd/macruby_nsjsonserialization

    sferik committed
    Macruby NSJSONSerialization
  2. @Overbryd

    Using NSMutableString and NSJSONReadingMutableLeaves h/t @alloy

    Overbryd committed
    Thanks to comments from @alloy Ruby compatibility has been improved.
    Also loading framework 'Foundation' on top of `lib/multi_json/engines/nsjsonserialization.rb` to ensure that it works even if the user has not loaded the Foundation framework.
Commits on Feb 10, 2012
  1. @Overbryd

    Updated README.md for NSJSONSerialization

    Overbryd committed
    Added a list of supported engines
    Added note for MacRuby support
Commits on Feb 8, 2012
  1. @Overbryd

    NSJSONSerialization support for MacRuby

    Overbryd committed
    Implemented NSJSONSerialization as a subclass of MultiJson::Engines::OKJson for best compatibility to the MultiJson spec.
    :nsjsonserialization is exclusively available for MacRuby.
  2. @Overbryd

    Ignore .rbenv*

    Overbryd committed
Commits on Jan 28, 2012
  1. @sferik

    Merge pull request #33 from kyledrake/master

    sferik committed
    Make note of symbolize_keys in README
Commits on Jan 26, 2012
  1. @kyledrake
Commits on Jan 15, 2012
  1. @sferik

    Fix order-dependency bug in specs

    sferik committed
Commits on Jan 10, 2012
  1. @sferik
Commits on Dec 17, 2011
  1. @sferik

    Only show status of master branch

    sferik committed
  2. @sferik
Commits on Dec 12, 2011
  1. @sferik

    Use HTTPS rubygems source

    sferik committed
Commits on Dec 5, 2011
  1. @sferik

    Remove unnecessary additions

    sferik committed
Commits on Dec 4, 2011
  1. @sferik
  2. @sferik
Commits on Dec 1, 2011
  1. @sferik
  2. @sferik

    Add dependency status [ci skip]

    sferik committed
Commits on Nov 28, 2011
  1. @sferik

    Bump version to version 1.0.4

    sferik committed
Commits on Oct 23, 2011
  1. @joshk

    bypassing the load path is bad practice, lets respect the load path a…

    joshk committed
    …nd it will respect us back :)
  2. @joshk
  3. @joshk

    merge and resolve conflicts

    joshk committed
  4. @joshk

    removed rbx-2.0 from the travis yml as only one version of rbx is pro…

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

    Michael Bleigh committed
    Encode pretty
Commits on Sep 24, 2011
  1. @bsiggelkow
Commits on Sep 23, 2011
  1. @bsiggelkow

    Options can be passed to an engine on encode

    bsiggelkow committed
    - 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
Commits on Sep 18, 2011
  1. @joshk

    Merge pull request #24 from jamesarosen/warning

    joshk committed
    Add warning when using ok_json
  2. Add warning when using ok_json. Closes #23

    James A. Rosen committed
  3. Cleaned up tests

    James A. Rosen committed
     * 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
Commits on Sep 17, 2011
  1. @sferik

    Travis removed Ruby 1.9.1 support

    sferik committed
    Rationale: https://gist.github.com/1223640 [ci skip]
Commits on Sep 16, 2011
  1. @sferik
Commits on Sep 13, 2011
  1. @joshk

    Allow OkJson to fallback to to_json if the object responds to to_json

    joshk committed
    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.
  2. @joshk
  3. @joshk

    Merge pull request #22 from mbbx6spp/master

    joshk committed
    Fix for #21: MultiJson::DecodeError should contain string attempting to be parsed
Something went wrong with that request. Please try again.