bbs_uploader 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16b663d5ba712829ab142fa9ecab043e7d8e77c3
-  data.tar.gz: 5b2bd2ca3c304aa247298e18c1d8dd56b3ca9ef2
+  metadata.gz: 15e274d18ec55de0c89e135fdd64961d1e943762
+  data.tar.gz: 872be5c72d36b8b9715db4c16662898723b24955
 SHA512:
-  metadata.gz: ed92c7efbbb058a2e8063814311215265d9757eb681e705c0624415c3d2b7fdc96965b3bae7e9ec19a8968bba5c82e4fd2c2637295bd099b2aa9a791d8023609
-  data.tar.gz: 25e27f4976fa6da8ec0882acb62106925626e5babf308f9fec6d7b6034bfca0b756dc8104f5d6acf6a246c8229ccf0ad24103331f9d523787f69e66262c79e17
+  metadata.gz: a16f5c146174f9800a1f71dc8cc768eb9bd6fbf84c0399af1ef57b56a17f70eca1eaeed756307753dc88da55cd2a15279e2ecc9b4f4c597b9e023507f8d94535
+  data.tar.gz: 4dcc08008f20839f9baca4e6d8e24f610387e9c2ae35debc24f085ab89dd70da9c284ddd490ab3603d00304002d57a63a7f9246734a5c8d836fcb4b84bc34465

data/README.md

@@ -19,6 +19,17 @@ And then execute:
 Or install it yourself as:
 
     $ gem install bbs_uploader
+    
+或者单独安装: 
+
+```
+\curl -sSL https://get.rvm.io | bash -s stable # 安装 rvm，ubuntu/centos 上的 ruby 版本太老
+source /etc/profile.d/rvm.sh   # 运行 rvm.sh 的脚本 
+rvm install 2.3.1
+rvm 2.3.1  --default
+gem install bundler
+gem install bbs_uploader # gem 的创建时通过 bundler 创建的
+```
 
 ## Usage
 

data/lib/bbs_uploader.rb

@@ -6,15 +6,19 @@ require "bbs_uploader/ruby_regex"
 
 module BbsUploader
   # Your code goes here...
-  IMAGE_URL_REGEXP = /http:\/\/.*[jpg|png|jpeg]$/
+  IMAGE_URL_REGEXP = /http:\/\/.*(jpg|png|jpeg)$/
 
-  IMAGE_FILE_REGEXP = /.*[jpg|png|jpeg|gif|bmp]$/
+  IMAGE_FILE_REGEXP = /.*(jpg|png|jpeg|gif|bmp)$/
 
   module FileType
     IMAGE = 'image'.freeze
 
     FILE = 'file'.freeze
   end
+  
+  module Code
+    SUCCESS = 200
+  end
 
   class << self
     @@qiniu = {}
@@ -71,35 +75,49 @@ module BbsUploader
       ''
     end
 
-    def upload_file(file_path, file_type = FileType::FILE)
-      Qiniu.establish_connection! access_key: self.qiniu[:access_key],
-                                  secret_key: self.qiniu[:secret_key]
+    # 返回文件的状态码
+    def get_file_info(key)
+      establish_connection
+      
+      # 获取文件信息
+      code, result, response_headers = Qiniu::Storage.stat(
+          self.qiniu[:bucket], # 存储空间
+          key # 资源名
+      )
+      
+      code
+    end
 
+    def upload_file(file_path, file_type = FileType::FILE)
       key = if file_type == FileType::FILE
               "bbs_file/#{File.basename(file_path)}"
             elsif file_type == FileType::IMAGE
               "bbs_image/#{File.basename(file_path)}"
             end
-
-      put_policy = Qiniu::Auth::PutPolicy.new(
-          self.qiniu[:bucket], # 存储空间
-          key, # 指定上传的资源名，如果传入 nil，就表示不指定资源名，将使用默认的资源名
-          3600 # token 过期时间，默认为 3600 秒，即 1 小时
-      )
-
-      uptoken = Qiniu::Auth.generate_uptoken(put_policy)
-
-      # 调用 upload_with_token_2 方法上传
-      code, result = Qiniu::Storage.upload_with_token_2(
-          uptoken,
-          file_path,
-          key,
-          nil, # 可以接受一个 Hash 作为自定义变量，请参照 http://developer.qiniu.com/article/kodo/kodo-developer/up/vars.html#xvar
-          bucket: self.qiniu[:bucket]
-      )
-
-      if code == 200
-        file_url = "http://#{self.qiniu[:bucket_domain]}/#{result['key']}"
+              
+      unless (code = get_file_info(key)) == Code::SUCCESS
+        establish_connection
+        
+        put_policy = Qiniu::Auth::PutPolicy.new(
+            self.qiniu[:bucket], # 存储空间
+            key, # 指定上传的资源名，如果传入 nil，就表示不指定资源名，将使用默认的资源名
+            3600 # token 过期时间，默认为 3600 秒，即 1 小时
+        )
+
+        uptoken = Qiniu::Auth.generate_uptoken(put_policy)
+
+        # 调用 upload_with_token_2 方法上传
+        code, result = Qiniu::Storage.upload_with_token_2(
+            uptoken,
+            file_path,
+            key,
+            nil, # 可以接受一个 Hash 作为自定义变量，请参照 http://developer.qiniu.com/article/kodo/kodo-developer/up/vars.html#xvar
+            bucket: self.qiniu[:bucket]
+        )
+      end
+      
+      if code == Code::SUCCESS
+        file_url = "http://#{self.qiniu[:bucket_domain]}/#{key}"
 
         puts "上传成功! \n链接为: #{file_url}"
 
@@ -195,5 +213,12 @@ module BbsUploader
         generate_markdown_format options[:input_directory]
       end
     end
+    
+    protected
+    
+    def establish_connection
+      Qiniu.establish_connection! access_key: self.qiniu[:access_key],
+                                  secret_key: self.qiniu[:secret_key]
+    end
   end
 end

data/lib/bbs_uploader/version.rb

@@ -1,3 +1,3 @@
 module BbsUploader
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbs_uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - xiajian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-10 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qiniu