b2-client 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90351edd9bc9e92242bf093a853d0ee2c9a2f2dc7bd5c6d5f9d4a11f966c7082
-  data.tar.gz: f244abd20dafe43ea6e1c259637ce6d8182d6595997e7148dc4e313128fafbf5
+  metadata.gz: 006350eee9b61b446739d43bb95ade334a923b1580d8b979af6649835c4c0194
+  data.tar.gz: e3ee2264a88ff6d7b1992207ecb5b7a7d40fde199fabe1d001f701c91d22d70c
 SHA512:
-  metadata.gz: f8062646a787ed2d5fdd7b7d1ffe4ccd359f3dc4fed0f43f8210bae0c7d20dbcaa9cb552cb44b7a26a4160a9729d9dbf140276c8adf39f42f74c022f9ece3cc8
-  data.tar.gz: af4f4d63cb24311935f3fcb273b294c61597624ed15dca8def02ebffade49e618d549169bc0708421d005dca1fcebb9c58c7acd8da7e0f7ade326cee8ab8dbe1
+  metadata.gz: 287e941dec6ed6c401aae3a8980e95c9ee3ab49d887d3741113ad45724442f3278173c4ecfd07f4359bd133d0210ca404de2790e9ba717b0f5986987934be806
+  data.tar.gz: cc66419b6b343872265126c4edc2551d5c837475401a5bb082f574bfa374f2deb75789bef334246830fa58bfa29b25f6129440309bf43373b66d1092ce8c606b

data/lib/b2.rb

@@ -13,25 +13,14 @@ class B2
   def initialize(account_id:, application_key:)
     @account_id = account_id
     @connection = B2::Connection.new(account_id, application_key)
-    @buckets_cache = []
   end
   
   def buckets
-    @connection.post('/b2api/v1/b2_list_buckets', {accountId: @account_id})['buckets'].map do |b|
-      B2::Bucket.new(b, @connection)
-    end
-  end
-
-  def lookup_bucket_id(name)
-    bucket = @buckets_cache.find{ |b| b.name == name }
-    return bucket.id if bucket
-    
-    @buckets_cache = buckets
-    @buckets_cache.find{ |b| b.name == name }&.id
+    @connection.buckets
   end
   
   def file(bucket, key)
-    bucket_id = lookup_bucket_id(bucket)
+    bucket_id = @connection.lookup_bucket_id(bucket)
     
     file = @connection.post('/b2api/v1/b2_list_file_names', {
       bucketId: bucket_id,
@@ -55,7 +44,7 @@ class B2
   
   def get_upload_token(bucket)
     @connection.post("/b2api/v1/b2_get_upload_url", {
-      bucketId: lookup_bucket_id(bucket)
+      bucketId: @connection.lookup_bucket_id(bucket)
     })
   end
   
@@ -86,13 +75,8 @@ class B2
     end
   end
   
-  def get_download_url(bucket, filename, expires_in: 3_600)
-    response = @connection.post("/b2api/v1/b2_get_download_authorization", {
-      bucketId: lookup_bucket_id(bucket),
-      fileNamePrefix: filename,
-      validDurationInSeconds: expires_in
-    })
-    @connection.download_url + '/file/' + bucket + '/' + filename + "?Authorization=" + response['authorizationToken']
+  def get_download_url(bucket, filename, **options)
+    @connection.get_download_url(bucket, filename, **options)
   end
   
   def download(bucket, key, to=nil, &block)

data/lib/b2/bucket.rb

@@ -67,6 +67,10 @@ class B2
       file ? B2::File.new(file.merge({'bucketId' => @id}), @connection) : nil
     end
     
+    def get_download_url(key, **options)
+      @connection.get_download_url(@name, key, **options)
+    end
+
     def download(key, to=nil, &block)
       @connection.download(@name, key, to, &block)
     end

data/lib/b2/connection.rb

@@ -33,6 +33,7 @@ class B2
       @recommended_part_size = resp['recommendedPartSize']
       @auth_token = resp['authorizationToken']
       @download_url = resp['downloadUrl']
+      @buckets_cache = []
     end
     
     def disconnect!
@@ -82,7 +83,30 @@ class B2
 
       return_value
     end
+
+    def buckets
+      post('/b2api/v1/b2_list_buckets', {accountId: @account_id})['buckets'].map do |b|
+        B2::Bucket.new(b, self)
+      end
+    end
+
+    def lookup_bucket_id(name)
+      bucket = @buckets_cache.find{ |b| b.name == name }
+      return bucket.id if bucket
     
+      @buckets_cache = buckets
+      @buckets_cache.find{ |b| b.name == name }&.id
+    end
+
+    def get_download_url(bucket, filename, expires_in: 3_600)
+      response = post("/b2api/v1/b2_get_download_authorization", {
+        bucketId: lookup_bucket_id(bucket),
+        fileNamePrefix: filename,
+        validDurationInSeconds: expires_in
+      })
+      @download_url + '/file/' + bucket + '/' + filename + "?Authorization=" + response['authorizationToken']
+    end
+
     def download(bucket, key, to=nil, &block)
       opened_file = (to && to.is_a?(String))
       to = ::File.open(to, 'wb') if to.is_a?(String)

data/lib/b2/version.rb

@@ -1,3 +1,3 @@
 class B2
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: b2-client
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake