b2-client 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c46280fcd18ce9df082fc3edfcddf837786817a52d70cd0e485584027807e4b8
-  data.tar.gz: 58e53bc7bec6095f7e4a541a8e6ec4fa28994cabe933b9f397fc9c0d820b9470
+  metadata.gz: fd33ba10f4089d70caa9a3c857517300cc428a1589660bff8a99f87779bff547
+  data.tar.gz: 8a641aeaa454fb3313ef25b2eef2b8120b31874dbc0fb6afb9209bf5cfcabc66
 SHA512:
-  metadata.gz: 9139847cc212553bc2d214711c1ae79db7065c0e7a456c62ae15e2908b25f6dafa2effaa72df915d3f6afb72a62f07c8b1c194bcaeabf665808000f472fa94e0
-  data.tar.gz: 6c093acb1482a0bd61c949f68d02f11782b5c4bd5fdf816d7686074c3a30499f8e95318ffe77d011a1d7b6d500c085c2de070bc88680b3efbdbd38f1f76ee0fe
+  metadata.gz: 16103376d13143f6606848a41f2aa4fafa31afec786b4b86dfc1c71e823cdacd692b4aa4b514ae7a5bdde52925ad3cb21fe57cbe6a241d0b375b5aa7cbdfef6f
+  data.tar.gz: df8e92a10236f6b0f7ae5b303cf262d8d30ad2d605398445b6b47fe65d038b206832e4286ccd234eefb97b82d01e9144df1ad7bcbef1bf819873f827f40217b7

data/lib/b2.rb

@@ -94,21 +94,10 @@ class B2
     @connection.download_url + '/file/' + bucket + '/' + filename + "?Authorization=" + response['authorizationToken']
   end
   
-  def download(bucket, filename, &block)
-    digestor = Digest::SHA1.new
-    data = ""
-    
-    @connection.get("/file/#{bucket}/#{filename}") do |response|
-      response.read_body do |chunk|
-        digestor << chunk
-        block.nil? ? (data << chunk) : block(chunk)
-      end
-      if digestor.hexdigest != resp['X-Bz-Content-Sha1']
-        raise 'file error'
-      end
-    end
-    block.nil? ? data : nil
+  def download(bucket, key, to=nil, &block)
+    @connection.download(bucket, key, to, &block)
   end
+
   
   def download_to_file(bucket, key, filename)
     file = File.open(filename, 'w')

data/lib/b2/bucket.rb

@@ -68,33 +68,7 @@ class B2
     end
     
     def download(key, to=nil, &block)
-      to = File.open(to, 'w') if to.is_a?(String)
-      data = ""
-      digestor = Digest::SHA1.new
-
-      uri = URI.parse(@connection.download_url)
-      conn = Net::HTTP.new(uri.host, uri.port)
-      conn.use_ssl = uri.scheme == 'https'
-    
-      conn.get("/file/#{@name}/#{key}") do |response|
-        
-        response.read_body do |chunk|
-          digestor << chunk
-          if to
-            to << chunk
-          elsif block
-            block(chunk)
-          else
-            data << chunk
-          end
-        end
-        
-        if digestor.hexdigest != resp['X-Bz-Content-Sha1']
-          raise 'file error'
-        end
-        
-      end
-      block.nil? && to.nil? ? data : nil
+      @connection.download(@name, key, to, &block)
     end
     
     def delete!(key)

data/lib/b2/connection.rb

@@ -83,6 +83,44 @@ class B2
       return_value
     end
     
+    def download(bucket, key, to=nil, &block)
+      to = ::File.open(to, 'wb') if to.is_a?(String)
+      digestor = Digest::SHA1.new
+      data = ""
+    
+      uri = URI.parse(@download_url)
+      conn = Net::HTTP.new(uri.host, uri.port)
+      conn.use_ssl = uri.scheme == 'https'
+
+      req = Net::HTTP::Get.new("/file/#{bucket}/#{key}")
+      req['Authorization'] = authorization_token
+      conn.start do |http|
+        http.request(req) do |response|
+          case response
+          when Net::HTTPSuccess
+            response.read_body do |chunk|
+              digestor << chunk
+              if to
+                to << chunk
+              elsif block
+                block(chunk)
+              else
+                data << chunk
+              end
+            end
+      
+            if digestor.hexdigest != response['X-Bz-Content-Sha1']
+              raise 'file error'
+            end
+          else
+            raise response.body
+          end
+        end
+      end
+    
+      block.nil? && to.nil? ? data : nil
+    end
+    
     def get(path, body=nil, &block)
       request = Net::HTTP::Get.new(path)
       

data/lib/b2/upload_chunker.rb

@@ -6,10 +6,10 @@ class B2
       @data = data
       @sha_appended = false
       @digestor = Digest::SHA1.new
-      @size = if data.is_a?(::File)
-        data.size + 40
-      elsif data.is_a?(String)
+      @size = if data.is_a?(String)
         data.bytesize + 40
+      else
+        data.size + 40
       end
     end
 

data/lib/b2/version.rb

@@ -1,3 +1,3 @@
 module B2
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: b2-client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake