Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

...
  • 1 commit
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Commits on Feb 22, 2012
Kurt Stephens Neither json or json_pure works on JRuby 1.6.6. 76f7d1e
2  Gemfile
View
@@ -1,7 +1,7 @@
# -*- ruby -*-
source "http://rubygems.org"
gem 'uuid', '~> 2.3.5'
- gem 'json', '~> 1.6.5'
+ # gem 'json', '~> 1.6.5' # Fails to load under jruby 1.6.6
gem 'libxml-ruby', '~> 2.2.2'
gem 'httpclient', '~> 2.2.4'
gem 'zmq', '~> 2.1.4'
2  lib/asir/coder/json.rb
View
@@ -1,7 +1,9 @@
require 'asir'
+unless RUBY_PLATFORM =~ /java/
gem 'json'
require 'json/ext'
+end
module ASIR
class Coder
3  spec/debug_helper.rb
View
@@ -1,8 +1,9 @@
require 'rubygems'
case (RUBY_PLATFORM rescue 'UNKNOWN')
when /java/
- # NOTHING!
+ # gem 'json_pure' # Fails to load under jruby 1.6.6
else
+ gem 'json'
case RUBY_VERSION
when /^1\.9/
gem 'ruby-debug19'
2  spec/json_spec.rb
View
@@ -2,6 +2,7 @@
require 'asir/coder/json'
describe "ASIR::Coder::JSON" do
+unless RUBY_PLATFORM =~ /java/
before(:each) do
@enc = ASIR::Coder::JSON.new
@dec = @enc.dup
@@ -123,4 +124,5 @@ class Object
=end
end
end
+end

No commit comments for this range

Something went wrong with that request. Please try again.