Merge branch 'hotfix/v1.0.4'

Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in qiniu-s3.gemspec
 gemspec
+
+# platforms :jruby do
+#   gem "jruby-openssl"
+# end

lib/qiniu/rs/version.rb

@@ -2,6 +2,6 @@
 
 module Qiniu
   module RS
-    VERSION = "1.0.2"
+    VERSION = "1.0.4"
   end
 end

qiniu-rs.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "fakeweb"
+  gem.add_runtime_dependency "json"
   gem.add_runtime_dependency "rest-client"
   gem.add_runtime_dependency "mime-types"
+  gem.add_runtime_dependency "jruby-openssl" if RUBY_PLATFORM == "java"
 end