backblaze 0.2.0 → 0.2.1.pre.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58cfca96218c6f265a44d93fdeaf373a51431b7f
-  data.tar.gz: 12856ac81e879a92feb8177a17a1d15b83df8504
+  metadata.gz: 1ee1b40ead4140aa561944ed21649e6f18bedd92
+  data.tar.gz: 3ce3761e93d95621c2f91b00314b76d31d97514b
 SHA512:
-  metadata.gz: 02635c9ba73cbadd3610481e70bc92cd93b42a8fefa4005aaed57e3683b5c60d6a45ef641f074156a341924d515f59dab6b29fe8e25b6cc0c1f250b92dae04cb
-  data.tar.gz: 1d1a3dcc23ada161c464dff4f93864062ffee887400403629ff7753faab660e964b288c39e164137eccf4902a9b6d7ac2bcc24b5860ba5f71901f39ae8b170e1
+  metadata.gz: a81b1a91b36f177ca9a9d5db6fd2ef1746dba735dc452ebc6a140f8af516967a7ec41a2cf805878c430fcae4419a6bec2d433d0df86f596eb405fae6695f3a72
+  data.tar.gz: ed2809cd93d183382c6b81b32f8d2b1d19025f1f8be947aac4c4f1cdbe62cebf84771f30c798235c63a324f5d588567dc77a7f761d38f5c29377c1c8fa85b2f3

data/backblaze.gemspec

@@ -27,4 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "httparty"
+
+  spec.required_ruby_version = '>= 2.1.0'
 end

data/lib/backblaze/b2.rb

@@ -2,6 +2,9 @@ require "backblaze/b2/base"
 require "backblaze/b2/bucket"
 require "backblaze/b2/file"
 require "backblaze/b2/file_version"
+require 'net/http'
+require 'tempfile'
+require 'digest/sha1'
 
 module Backblaze::B2
   class << self

data/lib/backblaze/b2/base.rb

@@ -40,7 +40,7 @@ module Backblaze::B2
       files.compact
     end
 
-    def file_list(limit:, retreived:, first_file:, start_field:, bucket_id:, file_name: nil)
+    def file_list(limit:, retreived:, first_file:, start_field:, bucket_id:, file_name: nil, first: true)
       params = {'bucketId'.freeze => bucket_id}
       if limit == -1
         params['maxFileCount'.freeze] = 1000
@@ -51,19 +51,29 @@ module Backblaze::B2
       else
         return []
       end
-      unless first_file.nil?
+      if first_file.nil?
+        if file_name && start_field == 'startFileId' && first
+          params['startFileName'] = file_name
+        end
+      else
         params[start_field] = first_file
       end
 
+      p params
+
       response = post("/b2_list_file_#{start_field == 'startFileName' ? 'names' : 'versions'}", body: params.to_json)
 
+      raise Backblaze::FileError.new(response) unless response.code == 200
+
       files = response['files'.freeze]
       halt = false
       files.map! do |f|
         if halt
+          p f
           nil
         else
           ret = Hash[f.map{|k,v| [Backblaze::Utils.underscore(k).to_sym, v]}]
+          p ret
           if file_name && file_name != ret[:file_name]
             halt = true
           end
@@ -85,7 +95,8 @@ module Backblaze::B2
           limit: limit,
           retreived: retreived,
           start_field: start_field,
-          bucket_id: bucket_id
+          bucket_id: bucket_id,
+          first: false
         )
       else
         files

data/lib/backblaze/b2/bucket.rb

@@ -105,6 +105,10 @@ module Backblaze::B2
       files
     end
 
+    def upload_url
+      self.class.upload_url(bucket_id: bucket_id)
+    end
+
     class << self
       ##
       # Create a bucket
@@ -128,6 +132,12 @@ module Backblaze::B2
         new(params)
       end
 
+      def upload_url(bucket_id:)
+        response = post('/b2_get_upload_url', body: {bucketId: bucket_id}.to_json)
+        raise Backblaze::BucketError.new(response) unless response.code / 100 == 2
+        {url: response['uploadUrl'], token: response['authorizationToken']}
+      end
+
       ##
       # List buckets for account
       # @return [Array<Backblaze::Bucket>] buckets for this account

data/lib/backblaze/b2/file.rb

@@ -12,8 +12,88 @@ module Backblaze::B2
       end
     end
 
-    def [](version)
-      versions[version]
+    class << self
+      def create(data:, bucket:, name: nil, base_name: '', content_type: 'b2/x-auto', info: {})
+        raise ArgumentError.new('data must not be nil') if data.nil?
+
+        case bucket
+        when String
+          upload_url = Bucket.upload_url(bucket_id: bucket)
+        when Bucket
+          upload_url = bucket.upload_url
+        else
+          raise ArgumentError.new('You must pass a bucket')
+        end
+
+        close_file = false
+        case data
+        when String
+          data.force_encoding('ASCII-8BIT')
+          raise ArgumentError.new('Must provide a file name for data') if name.nil?
+        when ::File, Tempfile
+          data.binmode
+          data.rewind
+          if name.nil?
+            raise ArgumentError.new('Must provide a file name with Tempfiles') if data.is_a? Tempfile
+            name = ::File.basename(data)
+          end
+        else
+          raise ArgumentError.new('Must provide a file name with streams') if name.nil?
+          if data.respond_to?(:read)
+            close_file = true
+            temp = Tempfile.new(name)
+            temp.binmode
+            IO.copy_stream(data, temp)
+            data = temp
+            data.rewind
+          else
+            raise ArgumentError.new('Unsuitable data type. Please read the docs.')
+          end
+        end
+
+        uri = URI(upload_url[:url])
+        req = Net::HTTP::Post.new(uri)
+
+        req.add_field("Authorization", upload_url[:token])
+        req.add_field("X-Bz-File-Name", "#{base_name}/#{name}".tr_s('/', '/').sub(/\A\//, ''))
+        req.add_field("Content-Type", content_type)
+        req.add_field("Content-Length", data.size)
+
+        digest = Digest::SHA1.new
+        if data.is_a? String
+          digest.update(data)
+          req.body = data
+        else
+          digest.file(data)
+          data.rewind
+          req.body_stream = data
+        end
+
+        req.add_field("X-Bz-Content-Sha1", digest)
+
+        info.first(10).map do |key, value|
+          req.add_field("X-Bz-Info-#{URI.encode(key)}", value)
+        end
+
+        http = Net::HTTP.new(req.uri.host, req.uri.port)
+        http.use_ssl = (req.uri.scheme == 'https')
+        res = http.start {|make| make.request(req)}
+
+        response = JSON.parse(res.body)
+
+        raise Backblaze::FileError.new(response) unless res.code.to_i == 200
+
+        params = {
+          file_name: response['fileName'],
+          bucket_id: response['bucketId'],
+          size: response['contentLength'],
+          file_id: response['fileId'],
+          upload_timestamp: Time.now.to_i * 1000,
+          action: 'upload'
+        }
+
+        File.new(params)
+      end
     end
 
     def file_name
@@ -29,6 +109,14 @@ module Backblaze::B2
       @versions
     end
 
+    def download_url(bucket:)
+      "#{Backblaze::B2.download_url}/file/#{bucket.is_a?(Bucket) ? bucket.name : bucket}/#{file_name}"
+    end
+
+    def file_id_download_url
+      latest.download_url
+    end
+
     def latest
       @versions.first
     end

data/lib/backblaze/b2/file_version.rb

@@ -20,6 +20,10 @@ module Backblaze::B2
       @get_info
     end
 
+    def download_url
+      "#{Backblaze::B2.download_url}#{Backblaze::B2.api_path}b2_download_file_by_id?fileId=#{file_id}"
+    end
+
     def destroy!
       response = post('/b2_delete_file_version', body: {fileName: file_name, fileId: file_id}.to_json)
       raise Backblaze::FileError.new(response) unless response.code == 200

data/lib/backblaze/version.rb

@@ -1,3 +1,3 @@
 module Backblaze
-  VERSION = "0.2.0"
+  VERSION = "0.2.1-beta"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backblaze
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1.pre.beta
 platform: ruby
 authors:
 - Winston Durand
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-21 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,12 +148,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5