Merge pull request #33 from petergoldstein/feature/make_multi_json_op…

…tional

Make MultiJson optional for Ruby 1.9+

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem 'json', '>= 1.2.4'
-gem 'multi_json', '~> 1.0'
+gem 'multi_json', '~> 1.0', :platforms => :ruby_18
 gem 'jruby-openssl', :platforms => :jruby
 
 gem 'rubysl', '~> 2.0', :platforms => :rbx

Rakefile

@@ -8,7 +8,6 @@ Echoe.new('jwt', '0.1.11') do |p|
   p.author         = "Jeff Lindsay"
   p.email          = "[email protected]"
   p.ignore_pattern = ["tmp/*"]
-  p.runtime_dependencies = ["multi_json >=1.5"]
   p.development_dependencies = ["echoe >=4.6.3"]
   p.licenses       = "MIT"
 end

lib/jwt/json.rb

@@ -1,16 +1,30 @@
 module JWT
   module Json
+    if RUBY_VERSION >= "1.9" && !defined?(MultiJson)
+      require 'json'
 
-    require "multi_json"
+      def decode_json(encoded)
+        JSON.parse(encoded)
+      rescue JSON::ParserError
+        raise JWT::DecodeError.new("Invalid segment encoding")
+      end
 
-    def decode_json(encoded)
-      MultiJson.decode(encoded)
-    rescue MultiJson::LoadError
-      raise JWT::DecodeError.new("Invalid segment encoding")
-    end
+      def encode_json(raw)
+        JSON.generate(raw)
+      end
+
+    else
+      require "multi_json"
+
+      def decode_json(encoded)
+        MultiJson.decode(encoded)
+      rescue MultiJson::LoadError
+        raise JWT::DecodeError.new("Invalid segment encoding")
+      end
 
-    def encode_json(raw)
-      MultiJson.encode(raw)
+      def encode_json(raw)
+        MultiJson.encode(raw)
+      end
     end
   end
 end