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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
cb52269
Only rescue errors explicitly
iainbeeston Mar 6, 2015
d16d9b1
Update test-suite
RST-J Mar 12, 2015
701a6e2
Enabled warnings when running tests
iainbeeston Feb 10, 2015
c7dd2fc
Excluded test_helper.rb from the test files being run
iainbeeston Mar 29, 2015
6905dcb
Specified addressable 2.3.8 as a dev dependency
iainbeeston Mar 29, 2015
c8bfd03
Merge pull request #231 from iainbeeston/test-warnings
iainbeeston Apr 3, 2015
a71b74f
Explicitly notes :strict mode overrides any required properties set i…
Apr 10, 2015
6e88557
Merge pull request #252 from JKGisMe/master
iainbeeston Apr 11, 2015
710b6f2
Update README.textile
mkonecny Nov 2, 2015
21d22e4
Demonstrate failure to #register_format_validator on default_validator
Nov 24, 2015
84012d8
register_format_validator on default_validator
Nov 24, 2015
8960753
Add a schema for default_validator in test_custom_format
Nov 24, 2015
3d4f961
Merge pull request #277 from jpmckinney/register_format_validator
hoxworth Nov 24, 2015
fa7776d
Bump version
hoxworth Nov 24, 2015
5b80c53
Test all versions in test_custom_format
Nov 24, 2015
67b0336
Merge remote-tracking branch 'upstream/master'
RST-J Dec 11, 2015
d14e51b
Merge pull request #278 from jpmckinney/register_format_validator
iainbeeston Dec 22, 2015
0d26205
Updated common test suite
Dec 22, 2015
d52160e
Merge pull request #271 from mkonecny/master
iainbeeston Dec 23, 2015
31a620b
Added a changelog
Dec 23, 2015
9de1347
Merge pull request #239 from iainbeeston/rescue-explicit-errors
iainbeeston Dec 23, 2015
d898905
Speed up JSON::Validator.validate
mjc May 14, 2015
46abf88
Don't use YAML when JSON.dump will do
mjc May 18, 2015
ba16939
Don't update url fragment if it's already blank or nil
Dec 23, 2015
6967d99
Removed all references to Addressable outside JSON::Util::URI
Dec 23, 2015
111f16e
Remove ruby warnings
teoljungberg Dec 24, 2015
4744d41
Merge pull request #286 from teoljungberg/patch-1
iainbeeston Jan 8, 2016
6a1620e
Merge pull request #285 from iainbeeston/cache-normalized-uri
iainbeeston Jan 8, 2016
da77b70
Updated common test suite
Jan 8, 2016
f4183cf
Added ruby 2.3 to the travis build
Jan 8, 2016
0dc3510
Corrected ruby 2.3 build on travis
Jan 8, 2016
597952b
Bumped version to 2.6.0
Jan 8, 2016
c3c46a6
Made sure we include the module name for SchemaParseErrors
Jan 14, 2016
28f0f49
Merge pull request #293 from iainbeeston/ensure-correct-module-for-sc…
RST-J Jan 14, 2016
dbcf207
Updated changelog for w
iainbeeston Jan 14, 2016
2414110
Updated changelog for #293
iainbeeston Jan 14, 2016
516ffb3
Merge remote-tracking branch 'upstream/master'
RST-J Feb 11, 2016
a1e0aec
Fetch upstream
RST-J Feb 11, 2016
11bd6d9
Update subproject
RST-J Feb 12, 2016
301c407
Convert README.textile to markdown and improve format
lencioni Jan 31, 2016
d600833
Merge pull request #302 from lencioni/readme
iainbeeston Feb 17, 2016
f7b542e
Added the readme change to CHANGELING.md
iainbeeston Feb 17, 2016
5d57af4
Update README.md
Feb 17, 2016
e16ab7a
Merge pull request #308 from ScottKbka/master
iainbeeston Feb 18, 2016
2ab0331
Bumped version to 2.6.1
Feb 26, 2016
354490f
Corrected build status links in readme
iainbeeston Feb 26, 2016
33b2b05
Reformatted the examples to make them easier to read
Mar 18, 2016
cc9f4d0
Merge pull request #316 from iainbeeston/clearer-examples
iainbeeston Apr 15, 2016
b2e4fde
Made it possible to have refs that include URI-special characters
Apr 15, 2016
a5a45c6
Merge pull request #322 from iainbeeston/allow-special-characters-in-…
iainbeeston May 13, 2016
96b10fc
Bumped version to 2.6.2
May 13, 2016
0e279d9
Updated common test suite
iainbeeston Jun 22, 2016
d966140
Made sure test filenames match class names
Jan 8, 2016
fdf3815
Moved test_helper.rb into the support directory
Jan 8, 2016
03332fc
Moved test-specific classes out of the global namespace
iainbeeston Jun 22, 2016
ab96e9a
Merge pull request #290 from iainbeeston/tidy-tests
iainbeeston Jun 22, 2016
eb58a3c
Made sure we use the latest ruby 2.3
iainbeeston Jun 29, 2016
2fc35df
Explictly set ruby 2.3.1 on travis
iainbeeston Jun 29, 2016
2172ab6
Merge remote-tracking branch 'upstream/master'
RST-J Jul 13, 2016
841e8b2
Merge branch 'master' into 3.x
RST-J Jul 13, 2016
8e5e6dd
Reapply some changes from alternate backend removal PR and fix tests …
RST-J Jul 13, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ rvm:
- "2.0"
- "2.1"
- "2.2"
- "2.3.1"
- "jruby"
- "rbx"

Expand All @@ -15,5 +16,5 @@ install:

matrix:
include:
- rvm: "2.2"
- rvm: "2.3.1"
gemfile: "gemfiles/Gemfile.uuidtools.x"
32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Change Log
All notable changes to this project will be documented in this file.
Please keep to the changelog format described on [keepachangelog.com](http://keepachangelog.com).
This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [2.6.2] - 2016-05-13

### Fixed
- Made it possible to include colons in a $ref

### Changed
- Reformatted examples in the readme

## [2.6.1] - 2016-02-26

### Fixed
- Made sure schemas of an unrecognized type raise a SchemaParseError (not Name error)

### Changed
- Readme was converted from textile to markdown

## [2.6.0] - 2016-01-08

### Added
- Added a changelog

### Changed
- Improved performance by caching the parsing and normalization of URIs
- Made validation failures raise a `JSON::Schema::SchemaParseError` and data
loading failures a `JSON::Schema::JsonLoadError`
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ The Ruby JSON Schema library is meant to be a community effort, and as such, the

All individuals that have a pull request merged will receive collaborator access to the repository. Due to the restrictions on RubyGems authentication, permissions to release a gem must be requested along with the email desired to be associated with the release credentials.

Accepting changes to the JSON Schema library shall be made through the use of pull requests on GitHub. A pull request must receive at least two (2) "+1" comments from current contributors to the JSON Schema library before being accepted and merged. If a breaking issue and fix exists, please feel free to contact the project maintainer at [email protected] or @hoxworth for faster resolution.
Accepting changes to the JSON Schema library shall be made through the use of pull requests on GitHub. A pull request must receive at least two (2) "+1" comments from current contributors, and include a relevant changelog entry, before being accepted and merged. If a breaking issue and fix exists, please feel free to contact the project maintainer at [email protected] or @hoxworth for faster resolution.

Releases follow semantic versioning and may be made at a maintainer's discretion.
5 changes: 0 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,3 @@ source "https://rubygems.org"
gemspec

gem "json", ">= 1.7", :platforms => [:mri_19]

group :development do
gem "rake"
gem "minitest", '~> 5.0'
end
Loading