bbs_uploader 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8677050c417b473757a3652b759ebe4908f20e73
-  data.tar.gz: 9e90d6441b50fbed226a2887bbdc765a3fa6ad41
+  metadata.gz: 5a6493e66e376c7fc95de0b042ad07fed9513589
+  data.tar.gz: cba63d2d2124b7523c985cff4135014e389b7f25
 SHA512:
-  metadata.gz: 73fa29aaa3e03b83d196b06391368652b9b3d5a40f3e32d080d46dc6235d10d6066403a1c3e071eb8b3a3bff53f50f5cb36070c2d2851abf7756880249af33f8
-  data.tar.gz: 50f4cedcd2d7ddc248c31b8144f45d66e5eda9f34c139df3938d0ec919b7374fa121c1fb1e9f66d69d960173079c83514f6d894583b2ba44326b688ceaa70374
+  metadata.gz: 71c1a42c39aad4e4a362fb5a2589be96ea6dd3f78e1afc4e0562facc8f62d7f522428947b4c46550974c4b77472a4f471be8ec3242ca9568a28224cd96047b8a
+  data.tar.gz: 23687eb9066ef25c007edf1c39b458d3522ac55f8cc9466b68af871d0549cdabc3fbd1e11fa5c67c56a882c761686ed1f5ca109a563ddc7ccd9f39b7e5f48930

data/README.md

@@ -22,8 +22,60 @@ Or install it yourself as:
 
 ## Usage
 
+**命令行使用:**
 
+使用指南： 
 
+```
+Usage: bbs_uploader [options]
+    -i, --input-file [file]          Input file can be URL, image file or other file
+    -h, --help                       Show this message
+    -v, --version                    Print version
+```
+
+调用实例： 
+
+```
+$ bbs_uploader ~/Downloads/test.jpg
+D, [2016-11-15T16:31:52.906672 #30130] DEBUG -- : Query bss-image hosts Success: {"ttl"=>86400, "http"=>{"io"=>["http://iovip.qbox.me"], "up"=>["http://up.qiniu.com", "http://upload.qiniu.com", "-H up.qiniu.com http://183.136.139.16"]}, "https"=>{"io"=>["https://iovip.qbox.me"], "up"=>["https://up.qbox.me"]}}
+图片上传成功!
+链接为: http://ognvcf5x6.bkt.clouddn.com/bbs_image/test.jpg
+markdown 链接: ![](http://ognvcf5x6.bkt.clouddn.com/bbs_image/test.jpg)
+
+$ bin/bbs_uploader http://xiajian.github.io/assets/images/dongxiang.png
+下载文件的地址: http://xiajian.github.io/assets/images/dongxiang.png
+/tmp/dongxiang.png
+D, [2016-11-21T09:57:43.758140 #49294] DEBUG -- : Query bss-image hosts Success: {"ttl"=>86400, "http"=>{"io"=>["http://iovip.qbox.me"], "up"=>["http://up.qiniu.com", "http://upload.qiniu.com", "-H up.qiniu.com http://183.136.139.16"]}, "https"=>{"io"=>["https://iovip.qbox.me"], "up"=>["https://up.qbox.me"]}}
+上传成功!
+链接为: http://ognvcf5x6.bkt.clouddn.com/bbs_image/dongxiang.png
+
+markdown 链接: ![](http://ognvcf5x6.bkt.clouddn.com/bbs_image/dongxiang.png)
+```
+
+![](http://ognvcf5x6.bkt.clouddn.com/bbs_image/test.jpg)
+
+**编程使用:** 
+
+```
+BbsUploader.qiniu = {
+  access_key: 'your access key',
+  secret_key: 'your secret key',
+  bucket: "your bucket",
+  bucket_domain: "your application domain"
+}
+
+# 超集方法：可以上传任意的文件
+BbsUploader.upload '~/Downloads/test.jpg'
+BbsUploader.upload 'http://xiajian.github.io/assets/images/dongxiang.png'
+
+BbsUploader.upload_image '~/Downloads/test.jpg'
+BbsUploader.upload_file '~/Downloads/install.php'
+
+```
+
+然后，就祝你安好！！！
+
+> PS: 思考 网盘以及 CDN 在部署的上区别。 CDN 内容分发，网盘就是云存储。 这就不明白，SB！！
 
 ## Development
 
@@ -33,10 +85,9 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/bbs_uploader. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/xiajian/bbs_uploader. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/bin/bbs_uploader

@@ -21,12 +21,7 @@ OptionParser.new do |opts|
     exit
   end
 
-  opts.on('-i', '--input-file [file]', 'Default: xxx.jpg') do |file|
-    unless File.exist? file
-      puts "输入的文件 #{file} 不存在，请检查后重试"
-      exit
-    end
-
+  opts.on('-i', '--input-file [file]', 'Input file can be URL, image file or other file') do |file|
     options[:input_file] = File.absolute_path file
   end
 end.parse!
@@ -34,15 +29,12 @@ end.parse!
 if options[:input_file].nil?
   file = ARGV[0]
 
-  if !file.nil? && File.exists?(file)
-    options[:input_file] = File.absolute_path file
-  elsif !file.nil?
-    puts "输入的文件 #{ARGV[0]} 不存在，请检查后重试"
-    exit
-  elsif file.nil?
-    puts "没有选择上传的图片"
-    exit
+  if file.nil?
+   puts "没有选择上传的文件"
+   exit
   end
+
+  options[:input_file] = file
 end
 
-BbsUploader.upload_image options[:input_file]
+BbsUploader.upload options[:input_file]

data/lib/bbs_uploader/ruby_regex.rb

@@ -0,0 +1,78 @@
+# Copy from https://github.com/eparreno/ruby_regex/blob/master/lib/ruby_regex.rb
+# All Rights belong to author Emili Parreno(https://github.com/eparreno)
+module BbsUploader
+  module RubyRegex
+    # Username
+    # This regular expression doesn't validate username's length
+    Username = /\A[a-zA-Z0-9_]*\z/
+
+    # Dni (spanish ID card)
+    Dni = /\A\d{8}[A-Za-z]{1}\z/
+
+    # URL
+    Url = URL = /(\A\z)|(\A(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?\z)/ix
+
+    # Domain
+    Domain = /(\A\z)|(\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?)?\z)/ix
+
+    # CreditCard
+    # Validates Credit Card numbers, Checks if it contains 16 numbers in groups of 4 separated by -, space or nothing
+    CreditCard = /\A(\d{4}-){3}\d{4}\z|\A(\d{4}\s){3}\d{4}\z|\A\d{16}\z/
+
+    # MasterCard credit card
+    MasterCard = /\A5[1-5]\d{14}\z/
+
+    # Visa credit card
+    Visa = /\A4\d{15}\z/
+
+    # US Social Security
+    USSocialSecurity = /\A\d{3}-\d{2}-\d{4}\z/
+
+    # General postal code
+    # Validates a 5 digits postal code
+    GeneralPostalCode = /\A\d{5}\z/
+
+    # US ZIP code
+    # Validates US ZIP Code (basic and extended format)
+    ZIPCode = /\A(\d{5}\z)|(\d{5}-\d{4}\z)/
+
+    # Twitter username
+    TwitterUsername = /\A([a-z0-9\_])+\z/ix
+
+    # Github username
+    GithubUsername = /\A([a-z0-9\_\-])+\z/ix
+
+    # Slideshare username
+    SlideshareUsername = /\A([a-z0-9])+\z/ix
+
+    # Del.icio.us username
+    DeliciousUsername = /\A([a-z0-9\_\-])+\z/ix
+
+    # Email
+    # From the email regex research: http://fightingforalostcause.net/misc/2006/compare-email-regex.php
+    # Authors: James Watts and Francisco Jose Martin Moreno
+    Email = /\A([\w\!\#\z\%\&\'\*\+\-\/\=\?\\A\`{\|\}\~]+\.)*[\w\+-]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)\z/i
+
+    # UUID
+    # Validates a UUID as defined: http://en.wikipedia.org/wiki/Universally_unique_identifier
+    UUID = /\A([0-9a-fA-F]{32}|[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})\z/
+
+    # Date DB format YYYY-MM-DD
+    # I know it will validate 2001-02-31 but is I think we are focusing in formats more than in parsing
+    DBDate = /\A\d{4}-(#{("01".."12").to_a.join("|")})-(#{("01".."31").to_a.join("|")})\z/
+
+    # Date Time DB format YYYY-MM-DD hh:mm:ss
+    DBDateTime = /\A\d{4}-(#{("01".."12").to_a.join("|")})-(#{("01".."31").to_a.join("|")})\s(#{("00".."23").to_a.join("|")}):(#{("00".."59").to_a.join("|")}):(#{("00".."59").to_a.join("|")})\z/
+
+    # SpanishBankAccountNumber
+    SpanishBankAccountNumber = /\A\d{4}[ -]?\d{4}[ -]?\d{2}[ -]?\d{10}\z/
+
+    # IBAN
+    # Source: http://snipplr.com/view/15322/iban-regex-all-ibans/
+    # You have to remove spaces or any separator character from the original field before use this regex
+    IBAN = /[a-zA-Z]{2}[0-9]{2}[a-zA-Z0-9]{4}[0-9]{7}([a-zA-Z0-9]?){0,16}/
+
+    # MacAddress
+    MacAddress = /\A([0-9A-F]{2}[:-]){5}([0-9A-F]{2})\z/i
+  end
+end

data/lib/bbs_uploader/version.rb

@@ -1,3 +1,3 @@
 module BbsUploader
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/bbs_uploader.rb

@@ -1,10 +1,20 @@
 require "qiniu"
+require "open-uri"                # 下载文件
 require "bbs_uploader/version"
+require "bbs_uploader/ruby_regex"
 
 module BbsUploader
   # Your code goes here...
   IMAGE_URL_REGEXP = /http:\/\/.*[jpg|png|jpeg]$/
 
+  IMAGE_FILE_REGEXP = /.*[jpg|png|jpeg|gif|bmp]$/
+
+  module FileType
+    IMAGE = 'image'.freeze
+
+    FILE = 'file'.freeze
+  end
+
   class << self
     @@qiniu = {}
 
@@ -26,12 +36,48 @@ module BbsUploader
       }.merge(options)
     end
 
-    def upload_image(file_path)
-      # 构建鉴权对象
+    # 下载文件 - 依赖本地的 tmp 目录, 需要 `open-uri`
+    #
+    # 参考: http://stackoverflow.com/questions/2263540/how-do-i-download-a-binary-file-over-http
+    #
+    # @param {String} url - 网络上的 URL 地址
+    # @param {String} file_path - 下载指定的文件路径地址
+    #
+    # @return {String} file_path - 文件在当前系统的中的路径
+    def download(url, file_path = '')
+      puts "下载文件的地址: #{url}"
+
+      if file_path == ''.freeze
+        file_path = "/tmp/#{url.scan(/.*\/([^\/]*)/).flatten[0]}"
+      end
+
+      if File.exist? file_path
+        `rm -rf #{file_path}`
+      end
+
+      File.open(file_path, 'wb') do |saved_file|
+        open(url, 'rb') do |read_file|
+          saved_file.write(read_file.read)
+        end
+      end
+
+      file_path
+    rescue => e
+      puts "下载文件发生异常: #{e}"
+
+      ''
+    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]
 
-      key = "bbs_image/#{File.basename(file_path)}"
+      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，就表示不指定资源名，将使用默认的资源名
@@ -50,22 +96,54 @@ module BbsUploader
       )
 
       if code == 200
-        image_url = "http://#{self.qiniu[:bucket_domain]}/#{result['key']}"
+        file_url = "http://#{self.qiniu[:bucket_domain]}/#{result['key']}"
 
-        puts "图片上传成功! \n链接为: #{image_url} \nmarkdown 链接: #{markdown_image_link(image_url)}"
+        puts "上传成功! \n链接为: #{file_url}"
 
-        image_url
+        file_url
       else
-        puts '上传图片失败'
+        puts '上传文件失败'
 
         nil
       end
     rescue => e
-      puts "上传图片发生异常: #{e}"
+      puts "上传发生异常: #{e}"
 
       nil
     end
 
+    def upload_image(file_path)
+      if file_path =~ IMAGE_FILE_REGEXP
+        image_url = upload_file file_path, FileType::IMAGE
+
+        puts "markdown 链接: #{markdown_image_link(image_url)}"
+
+        image_url
+      else
+        puts '不是图片文件，请选择重新选择！！'
+      end
+    end
+
+    def upload(resource = '')
+      if resource =~ RubyRegex::URL
+        file_path = download resource
+
+        if file_path =~ IMAGE_FILE_REGEXP
+          upload_image file_path
+        end
+      elsif File.exist? resource
+        file_path = File.absolute_path(resource)
+
+        if resource =~ IMAGE_FILE_REGEXP
+          upload_image file_path
+        else
+          upload_file file_path
+        end
+      else
+        puts "输入的文件 #{resource} 不存在，请检查后重试"
+      end
+    end
+
     def markdown_image_link(image_url)
       if image_url && image_url.is_a?(String) && IMAGE_URL_REGEXP.match(image_url)
         "![](#{image_url})"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbs_uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - xiajian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qiniu
@@ -72,6 +72,7 @@ files:
 - bin/console
 - bin/setup
 - lib/bbs_uploader.rb
+- lib/bbs_uploader/ruby_regex.rb
 - lib/bbs_uploader/version.rb
 homepage: https://github.com/xiajian/bbs_uploader
 licenses: