From 09b8921d20255ef6b10f1e3114eaef70765c9859 Mon Sep 17 00:00:00 2001 From: deco Date: Tue, 9 Dec 2014 13:12:44 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=B8=83=E7=89=9B=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/qiniu/config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/qiniu/config.rb b/lib/qiniu/config.rb index 7be3887..b7a3e44 100755 --- a/lib/qiniu/config.rb +++ b/lib/qiniu/config.rb @@ -21,7 +21,7 @@ module Qiniu :auth_url => "https://acc.qbox.me/oauth2/token", :rs_host => "http://rs.qiniu.com", :rsf_host => "http://rsf.qbox.me", - :up_host => "http://up.qiniu.com", + :up_host => "http://up.qiniug.com", :pub_host => "http://pu.qbox.me:10200", :eu_host => "http://eu.qbox.me", :access_key => "", From 3d0578cb883a161fe75abf5cd910f730d6a90094 Mon Sep 17 00:00:00 2001 From: deco Date: Tue, 9 Dec 2014 13:18:12 +0800 Subject: [PATCH 2/8] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index a3362c7..2ab290d 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # Qiniu Resource (Cloud) Storage SDK for Ruby ## 关于 +(个人陈述)此ruby sdk从七牛官方fork过来，修改了七牛的upload—host，这样可以从海外上传到七牛的海外服务器，速度挺快。 +配合：carrierwave-qiniu插件一块使用，效果不错。 + 此 Ruby SDK 适用于 Ruby 1.9.x, 2.0.x, 2.1.x, jruby版本，基于 [七牛云存储官方API](http://developer.qiniu.com/docs/v6/index.html) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。 From d14fe23e45be056023afd86538dc0eb4a2930e6a Mon Sep 17 00:00:00 2001 From: xudeke Date: Tue, 9 Dec 2014 14:16:59 +0800 Subject: [PATCH 3/8] ok --- lib/qiniu/config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/qiniu/config.rb b/lib/qiniu/config.rb index b7a3e44..7be3887 100755 --- a/lib/qiniu/config.rb +++ b/lib/qiniu/config.rb @@ -21,7 +21,7 @@ module Qiniu :auth_url => "https://acc.qbox.me/oauth2/token", :rs_host => "http://rs.qiniu.com", :rsf_host => "http://rsf.qbox.me", - :up_host => "http://up.qiniug.com", + :up_host => "http://up.qiniu.com", :pub_host => "http://pu.qbox.me:10200", :eu_host => "http://eu.qbox.me", :access_key => "", From 4fbfdbf47281230526f145a561124fb12b0d2e8e Mon Sep 17 00:00:00 2001 From: xudeke Date: Tue, 9 Dec 2014 14:18:30 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=AB=98=E9=80=9F=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/qiniu/config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/qiniu/config.rb b/lib/qiniu/config.rb index 7be3887..33d373b 100755 --- a/lib/qiniu/config.rb +++ b/lib/qiniu/config.rb @@ -34,7 +34,7 @@ module Qiniu :tmpdir => Dir.tmpdir + File::SEPARATOR + 'QiniuRuby' } - REQUIRED_OPTION_KEYS = [:access_key, :secret_key] + REQUIRED_OPTION_KEYS = [:access_key, :secret_key, :up_host] attr_reader :settings, :default_params From 4e80a5ec985ed7c9bafdb097d1b4671c76eb0902 Mon Sep 17 00:00:00 2001 From: deco Date: Tue, 9 Dec 2014 20:30:16 +0800 Subject: [PATCH 5/8] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2ab290d..463dfcd 100755 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ (个人陈述)此ruby sdk从七牛官方fork过来，修改了七牛的upload—host，这样可以从海外上传到七牛的海外服务器，速度挺快。 配合：carrierwave-qiniu插件一块使用，效果不错。 +Qiniu海外接口：up.qiniug.com 此 Ruby SDK 适用于 Ruby 1.9.x, 2.0.x, 2.1.x, jruby版本，基于 [七牛云存储官方API](http://developer.qiniu.com/docs/v6/index.html) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。 From 40bf2cfbbbe9b20f0d5e078df936c6f6526a3182 Mon Sep 17 00:00:00 2001 From: xudeke Date: Tue, 9 Dec 2014 21:17:17 +0800 Subject: [PATCH 6/8] string keys to symbol --- lib/qiniu/config.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/qiniu/config.rb b/lib/qiniu/config.rb index 33d373b..94f0aa0 100755 --- a/lib/qiniu/config.rb +++ b/lib/qiniu/config.rb @@ -41,6 +41,7 @@ module Qiniu def load config_file if File.exist?(config_file) config_options = YAML.load_file(config_file) + config_options.symbolize_keys! initialize_connect(config_options) else raise MissingConfError, config_file From 0d2f2f23dd88c212edf0726bb62ebb7c99dbb85a Mon Sep 17 00:00:00 2001 From: deco Date: Wed, 10 Dec 2014 10:12:50 +0800 Subject: [PATCH 7/8] usage added --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 463dfcd..7404533 100755 --- a/README.md +++ b/README.md @@ -6,6 +6,12 @@ Qiniu海外接口：up.qiniug.com +使用配置文件qiniu.yml +文件内容： + up_host: up.qiniug.com +调用： + Qiniu::Config.load（yml_path） + 此 Ruby SDK 适用于 Ruby 1.9.x, 2.0.x, 2.1.x, jruby版本，基于 [七牛云存储官方API](http://developer.qiniu.com/docs/v6/index.html) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。 ## 状态 From a64fb3a63eb1c396e811fd7e95ab87568cf71e7c Mon Sep 17 00:00:00 2001 From: xudeke Date: Wed, 10 Dec 2014 14:42:20 +0800 Subject: [PATCH 8/8] real merge --- lib/qiniu/config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/qiniu/config.rb b/lib/qiniu/config.rb index 94f0aa0..68bd762 100755 --- a/lib/qiniu/config.rb +++ b/lib/qiniu/config.rb @@ -49,7 +49,7 @@ module Qiniu end def initialize_connect options = {} - @settings = DEFAULT_OPTIONS.merge(options) + @settings = DEFAULT_OPTIONS.merge!(options) REQUIRED_OPTION_KEYS.each do |opt| raise MissingArgsError, [opt] unless @settings.has_key?(opt) end