Merge pull request #114 from liluo/dev

updated runtime dependency mime-types version
2026-08-09 21:06:19 +10:00 · 2014-12-14 23:08:09 +08:00 · 2014-12-14 16:39:17 +08:00 · 2014-12-11 23:40:07 +08:00 · 2014-12-11 23:36:53 +08:00 · 2014-12-11 23:08:17 +08:00
6 changed files with 12 additions and 7 deletions
@@ -1,5 +1,9 @@
 ## CHANGE LOG

+### v6.4.1
+
+- 将 mime-types 的依赖版本升级到 2.4.3 。 [https://github.com/qiniu/ruby-sdk/pull/113](https://github.com/qiniu/ruby-sdk/pull/113)
+
 ### v6.4.0

 - 为 put_with_put_policy() 添加 opts 参数，允许使用 :content_type 键指定上传文件的 mime type。 [https://github.com/qiniu/ruby-sdk/pull/111](https://github.com/qiniu/ruby-sdk/pull/111)
@@ -1,9 +1,9 @@
 PATH
  remote: .
  specs:
-    qiniu (6.4.0)
+    qiniu (6.4.1)
      json (~> 1.7)
-      mime-types (~> 1.19)
+      mime-types (~> 2.4.3)
      rest-client (~> 1.6)
      ruby-hmac (~> 0.4)

@@ -15,7 +15,7 @@

 在您 Ruby 应用程序的 `Gemfile` 文件中，添加如下一行代码：

-    gem 'qiniu', '~> 6.3.1'
+    gem 'qiniu', '~> 6.4.1'

 然后，在应用程序所在的目录下，可以运行 `bundle` 安装依赖包：

@@ -34,13 +34,14 @@ 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

        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
@@ -48,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
@@ -4,7 +4,7 @@ module Qiniu
    module Version
      MAJOR = 6
      MINOR = 4
-      PATCH = 0
+      PATCH = 1
      # Returns a version string by joining <tt>MAJOR</tt>, <tt>MINOR</tt>, and <tt>PATCH</tt> with <tt>'.'</tt>
      #
      # Example
@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
  gem.add_development_dependency "fakeweb", "~> 1.3"
  gem.add_runtime_dependency "json", "~> 1.7"
  gem.add_runtime_dependency "rest-client", "~> 1.6"
-  gem.add_runtime_dependency "mime-types", "~> 1.19"
+  gem.add_runtime_dependency "mime-types", "~> 2.4.3"
  gem.add_runtime_dependency "ruby-hmac", "~> 0.4"
  gem.add_runtime_dependency "jruby-openssl", "~> 0.7" if RUBY_PLATFORM == "java"
 end
Author	SHA1	Message	Date
Bai Long	5332645665	Merge pull request #114 from liluo/dev updated runtime dependency mime-types version	2014-12-14 23:08:09 +08:00
liluo	946442f782	updated runtime dependency mime-types version	2014-12-14 16:39:17 +08:00
Bai Long	8e4805cf68	[ci skip]	2014-12-11 23:40:07 +08:00
Bai Long	78147d76f8	Merge pull request #113 from BluntBlade/master 将 mime-types 依赖版本升级至 2.4.3 。	2014-12-11 23:36:53 +08:00
Liang Tao	2bb0514df4	更新 README 说明，将版本号提到最新。	2014-12-11 23:08:17 +08:00
Liang Tao	0bca27457a	将 mime-types 依赖版本升级到 2.4.3 。	2014-12-11 23:05:25 +08:00
Bai Long	b21833779e	Merge pull request #112 from dekexu/master 七牛up_host的修改	2014-12-11 22:47:05 +08:00
xudeke	a64fb3a63e	real merge	2014-12-10 14:42:34 +08:00
deco	0d2f2f23dd	usage added	2014-12-10 10:12:50 +08:00
xudeke	d0b4fb7412	ok	2014-12-09 21:18:27 +08:00
xudeke	40bf2cfbbb	string keys to symbol	2014-12-09 21:17:17 +08:00
deco	4e80a5ec98	Update README.md	2014-12-09 20:30:16 +08:00
xudeke	4fbfdbf472	允许海外服务器高速上传	2014-12-09 14:18:30 +08:00
xudeke	d14fe23e45	ok	2014-12-09 14:16:59 +08:00
deco	3d0578cb88	Update README.md	2014-12-09 13:18:12 +08:00
deco	09b8921d20	七牛海外服务器上传	2014-12-09 13:12:44 +08:00