Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 3.x to include current master #347

Closed
wants to merge 61 commits into from
Closed

Update 3.x to include current master #347

wants to merge 61 commits into from

Commits on Mar 6, 2015

  1. Only rescue errors explicitly

    There are a lot of places in the code where we rescue any error, at all.
    That's quite dangerous, as it could conceal bugs.
    
    I've changed it so that we always specify which error class we want to
    catch. Mostly it's been a minor change, but there are two API changes:
    
    * When it comes to loading data I've had to introduce an explicit list
      of protocols which we can load json over (otherwise it's possible to
      have a uri with a scheme that makes no sense - it'd still be a valid
      uri but loading from it is impossible). I've used the list of
      protocols that addressable recognizes for now.
    * No matter what JSON parser you use, we now always raise a
      JSON::Schema::JsonParseError. Without doing this it would be tricky to
      handle parser errors identically, for all parsers (the other option
      would be to catch a long list of potential parse errors, but this
      seems more sensible).
    iainbeeston committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    cb52269 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2015

  1. Update test-suite

    RST-J committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    d16d9b1 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2015

  1. Configuration menu
    Copy the full SHA
    701a6e2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c7dd2fc View commit details
    Browse the repository at this point in the history
  3. Specified addressable 2.3.8 as a dev dependency

    Older versions raised ruby warnings
    iainbeeston committed Mar 29, 2015
    Configuration menu
    Copy the full SHA
    6905dcb View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2015

  1. Merge pull request voxpupuli#231 from iainbeeston/test-warnings

    Enabled warnings when running tests
    iainbeeston committed Apr 3, 2015
    Configuration menu
    Copy the full SHA
    c8bfd03 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2015

  1. Explicitly notes :strict mode overrides any required properties set i…

    …n the schema
    JKGisMe authored and JKGisMe committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    a71b74f View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2015

  1. Merge pull request voxpupuli#252 from JKGisMe/master

    Explicitly notes :strict overrides any required properties set in schema
    iainbeeston committed Apr 11, 2015
    Configuration menu
    Copy the full SHA
    6e88557 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2015

  1. Update README.textile

    mkonecny committed Nov 2, 2015
    Configuration menu
    Copy the full SHA
    710b6f2 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2015

  1. Configuration menu
    Copy the full SHA
    21d22e4 View commit details
    Browse the repository at this point in the history
  2. register_format_validator on default_validator

    James McKinney committed Nov 24, 2015
    Configuration menu
    Copy the full SHA
    84012d8 View commit details
    Browse the repository at this point in the history
  3. Add a schema for default_validator in test_custom_format

    James McKinney committed Nov 24, 2015
    Configuration menu
    Copy the full SHA
    8960753 View commit details
    Browse the repository at this point in the history
  4. Merge pull request voxpupuli#277 from jpmckinney/register_format_vali…

    …dator
    
    register_format_validator on default_validator
    hoxworth committed Nov 24, 2015
    Configuration menu
    Copy the full SHA
    3d4f961 View commit details
    Browse the repository at this point in the history
  5. Bump version

    hoxworth committed Nov 24, 2015
    Configuration menu
    Copy the full SHA
    fa7776d View commit details
    Browse the repository at this point in the history
  6. Test all versions in test_custom_format

    James McKinney committed Nov 24, 2015
    Configuration menu
    Copy the full SHA
    5b80c53 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2015

  1. Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	test/test-suite
    RST-J committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    67b0336 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2015

  1. Merge pull request voxpupuli#278 from jpmckinney/register_format_vali…

    …dator
    
    Test all versions in test_custom_format
    iainbeeston committed Dec 22, 2015
    Configuration menu
    Copy the full SHA
    d14e51b View commit details
    Browse the repository at this point in the history
  2. Updated common test suite

    Iain Beeston committed Dec 22, 2015
    Configuration menu
    Copy the full SHA
    0d26205 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2015

  1. Merge pull request voxpupuli#271 from mkonecny/master

    Update README.textile to fix schema validation example
    iainbeeston committed Dec 23, 2015
    Configuration menu
    Copy the full SHA
    d52160e View commit details
    Browse the repository at this point in the history
  2. Added a changelog

    Iain Beeston committed Dec 23, 2015
    Configuration menu
    Copy the full SHA
    31a620b View commit details
    Browse the repository at this point in the history
  3. Merge pull request voxpupuli#239 from iainbeeston/rescue-explicit-errors

    Only rescue errors explicitly
    iainbeeston committed Dec 23, 2015
    Configuration menu
    Copy the full SHA
    9de1347 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2015

  1. Speed up JSON::Validator.validate

    Addressible's URI parsing shows up at the top of the profiler for our use case.
    
    This patch adds a cache to JSON::Util::URI.normalized_uri, to trade CPU time for memory.
    
    There are other expensive Addressible methods that should be cached elsewhere.
    
    benchmark: https://github.com/mjc/json-schema-perf
    
    MRI 2.2.2 before: 825.363  (± 6.2%) i/s
    MRI 2.2.2 after:  1.436k (± 4.5%) i/s
    
    1.74x faster
    
    JRuby 1.7.20 before: 1.445k (± 2.5%) i/s
    JRuby 1.7.20 after: 2.272k (± 6.1%) i/s
    
    1.57x faster
    mjc authored and Iain Beeston committed Dec 24, 2015
    Configuration menu
    Copy the full SHA
    d898905 View commit details
    Browse the repository at this point in the history
  2. Don't use YAML when JSON.dump will do

    mjc authored and Iain Beeston committed Dec 24, 2015
    Configuration menu
    Copy the full SHA
    46abf88 View commit details
    Browse the repository at this point in the history
  3. Don't update url fragment if it's already blank or nil

    Addressable::URI#fragment= triggers a revalidation of the URL, which is
    super slow.  Don't do this when it isn't necessary.
    Iain Beeston committed Dec 24, 2015
    Configuration menu
    Copy the full SHA
    ba16939 View commit details
    Browse the repository at this point in the history
  4. Removed all references to Addressable outside JSON::Util::URI

    Hopefully this will make it easier to change in future
    Iain Beeston committed Dec 24, 2015
    Configuration menu
    Copy the full SHA
    6967d99 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2016

  1. Remove ruby warnings

    For the unused variable `validator`
    teoljungberg committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    111f16e View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2016

  1. Merge pull request voxpupuli#286 from teoljungberg/patch-1

    Remove ruby warnings
    iainbeeston committed Jan 8, 2016
    Configuration menu
    Copy the full SHA
    4744d41 View commit details
    Browse the repository at this point in the history
  2. Merge pull request voxpupuli#285 from iainbeeston/cache-normalized-uri

    Redux: speed up JSON::Validator.validate
    iainbeeston committed Jan 8, 2016
    Configuration menu
    Copy the full SHA
    6a1620e View commit details
    Browse the repository at this point in the history
  3. Updated common test suite

    Iain Beeston committed Jan 8, 2016
    Configuration menu
    Copy the full SHA
    da77b70 View commit details
    Browse the repository at this point in the history
  4. Added ruby 2.3 to the travis build

    Iain Beeston committed Jan 8, 2016
    Configuration menu
    Copy the full SHA
    f4183cf View commit details
    Browse the repository at this point in the history
  5. Corrected ruby 2.3 build on travis

    Iain Beeston committed Jan 8, 2016
    Configuration menu
    Copy the full SHA
    0dc3510 View commit details
    Browse the repository at this point in the history
  6. Bumped version to 2.6.0

    Iain Beeston committed Jan 8, 2016
    Configuration menu
    Copy the full SHA
    597952b View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2016

  1. Made sure we include the module name for SchemaParseErrors

    If you pass an unrecognized object for the schema, we should be raising a SchemaParseError, however instead right now a NameError is raised, beacuse we're not correctly qualifying the error class with it's module.
    
    I've corrected the class/module name and added tests.
    
    This fixes voxpupuli#292
    Iain Beeston committed Jan 14, 2016
    2 Configuration menu
    Copy the full SHA
    c3c46a6 View commit details
    Browse the repository at this point in the history
  2. Merge pull request voxpupuli#293 from iainbeeston/ensure-correct-modu…

    …le-for-schema-parse-errors
    
    Made sure we include the module name for SchemaParseErrors
    RST-J committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    28f0f49 View commit details
    Browse the repository at this point in the history
  3. Updated changelog for w

    iainbeeston committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    dbcf207 View commit details
    Browse the repository at this point in the history
  4. Updated changelog for voxpupuli#293

    Forgot to do this in the PR
    iainbeeston committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    2414110 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2016

  1. Configuration menu
    Copy the full SHA
    516ffb3 View commit details
    Browse the repository at this point in the history
  2. Fetch upstream

    RST-J committed Feb 11, 2016
    Configuration menu
    Copy the full SHA
    a1e0aec View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2016

  1. Update subproject

    RST-J committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    11bd6d9 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2016

  1. Convert README.textile to markdown and improve format

    This started as a straight up automated conversion via pandoc:
    
      pandoc README.textile -o README.md
    
    I then followed up by fixing the images it did not convert properly,
    removing extraneous backslashes that it added, and adding finced code
    blocks for syntax highlighting. I also replaced <code>...</code>
    with backticks and adjusted some whitespace.
    lencioni committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    301c407 View commit details
    Browse the repository at this point in the history
  2. Merge pull request voxpupuli#302 from lencioni/readme

    Convert readme to markdown
    iainbeeston committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    d600833 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f7b542e View commit details
    Browse the repository at this point in the history
  4. Update README.md

    Making it a little easier to read the descriptions of the three validate methods.
    Scott Kobewka committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    5d57af4 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2016

  1. Merge pull request voxpupuli#308 from ScottKbka/master

    Update README.md
    iainbeeston committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    e16ab7a View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2016

  1. Bumped version to 2.6.1

    Iain Beeston committed Feb 26, 2016
    Configuration menu
    Copy the full SHA
    2ab0331 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    354490f View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2016

  1. Reformatted the examples to make them easier to read

    Iain Beeston committed Mar 18, 2016
    Configuration menu
    Copy the full SHA
    33b2b05 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2016

  1. Merge pull request voxpupuli#316 from iainbeeston/clearer-examples

    Reformatted the examples to make them easier to read
    iainbeeston committed Apr 15, 2016
    Configuration menu
    Copy the full SHA
    cc9f4d0 View commit details
    Browse the repository at this point in the history
  2. Made it possible to have refs that include URI-special characters

    Turns out that before:
    
    * if you had a ref that included a colon, the text before the colon was
      treated as the scheme and the text after the colon as a path
    * the unescape_uri method was actually only parsing the path of the
      uri (therefore anything before a colon was being stripped when passed
      to unescape_uri)
    
    Fixes voxpupuli#319
    Iain Beeston committed Apr 15, 2016
    Configuration menu
    Copy the full SHA
    b2e4fde View commit details
    Browse the repository at this point in the history

Commits on May 13, 2016

  1. Merge pull request voxpupuli#322 from iainbeeston/allow-special-chara…

    …cters-in-refs
    
    Made it possible to have refs that include URI-special characters
    iainbeeston committed May 13, 2016
    Configuration menu
    Copy the full SHA
    a5a45c6 View commit details
    Browse the repository at this point in the history
  2. Bumped version to 2.6.2

    Iain Beeston committed May 13, 2016
    Configuration menu
    Copy the full SHA
    96b10fc View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2016

  1. Updated common test suite

    iainbeeston committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    0e279d9 View commit details
    Browse the repository at this point in the history
  2. Made sure test filenames match class names

    Iain Beeston authored and iainbeeston committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    d966140 View commit details
    Browse the repository at this point in the history
  3. Moved test_helper.rb into the support directory

    Iain Beeston authored and iainbeeston committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    fdf3815 View commit details
    Browse the repository at this point in the history
  4. Moved test-specific classes out of the global namespace

    To avoid unintended side-effects
    iainbeeston committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    03332fc View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ab96e9a View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2016

  1. Configuration menu
    Copy the full SHA
    eb58a3c View commit details
    Browse the repository at this point in the history
  2. Explictly set ruby 2.3.1 on travis

    Travis doesn't support 2.3 yet
    iainbeeston committed Jun 29, 2016
    Configuration menu
    Copy the full SHA
    2fc35df View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2016

  1. Configuration menu
    Copy the full SHA
    2172ab6 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into 3.x

    RST-J committed Jul 13, 2016
    Configuration menu
    Copy the full SHA
    841e8b2 View commit details
    Browse the repository at this point in the history
  3. Reapply some changes from alternate backend removal PR and fix tests …

    …after merge mistakes
    RST-J committed Jul 13, 2016
    Configuration menu
    Copy the full SHA
    8e5e6dd View commit details
    Browse the repository at this point in the history