summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml5
-rw-r--r--README.md4
-rw-r--r--json.gemspecbin5474 -> 5474 bytes
3 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 7debc10..2c493b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,10 +12,11 @@ rvm:
- 2.4
- 2.5
- ruby-head
+ - jruby
matrix:
allow_failures:
- - rvm: jruby
- - rvm: ruby-head
- rvm: 1.9.3
+ - rvm: ruby-head
+ - rvm: jruby
script: "bundle exec rake"
sudo: false
diff --git a/README.md b/README.md
index 720a1a5..1b15cf1 100644
--- a/README.md
+++ b/README.md
@@ -156,7 +156,7 @@ not been required yet.
The JSON module doesn't extend `Exception` by default. If you convert an `Exception`
object to JSON, it will by default only include the exception message.
-To include the full details, you must either load the load the `json/add/core` mentioned
+To include the full details, you must either load the `json/add/core` mentioned
above, or specifically load the exception addition:
```ruby
@@ -207,7 +207,7 @@ JSON representation later. In this case it's `Range`, but any namespace of
the form `A::B` or `::A::B` will do. All other keys are arbitrary and can be
used to store the necessary data to configure the object to be deserialised.
-If a the key `json_class` is found in a JSON object, the JSON parser checks
+If the key `json_class` is found in a JSON object, the JSON parser checks
if the given class responds to the `json_create` class method. If so, it is
called with the JSON object converted to a Ruby hash. So a range can
be deserialised by implementing `Range.json_create` like this:
diff --git a/json.gemspec b/json.gemspec
index 24795b2..e2e4f4a 100644
--- a/json.gemspec
+++ b/json.gemspec
Binary files differ