bkblz 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a78f7af9b064373a818c24c9f74c5402a153317f
-  data.tar.gz: 76c95a222b762d6b741313849c92be7162546aa8
+  metadata.gz: 276cd7b864f9a13fd8a32ea5839514f041afbd02
+  data.tar.gz: c87c7242a87241a7b6e48f3bef5aab55117ef37b
 SHA512:
-  metadata.gz: '028ede1e92325f7808d1dc3769f8c29b9ac4017bd50ff26205e90bcb6cb6ed288e3f13765f2f11262c5d7a58700b4782fef4f7a9ea0f4d37e56fb1941bf5c3ff'
-  data.tar.gz: 9ba3b10ead315fced6c2ab188fa75db3544bfe2da810f662955f0583c285cd33efa10d2138d8bb9cac5f6df07aee9414257fb8f3655dd8a5eac6a5faab4c56a5
+  metadata.gz: 5ac0e9aa47318c48169be640350dede4d116d83b15980520b99289e19ea9b1ae7a2ae79c5a24a8e3c0e92f3dc7733e311888630b099ff150705a293a77715d10
+  data.tar.gz: 53ac8463bd04b6a747f853837f825a6cb1908c1c55cefa837c472e0a83f575f12933969ed540ffb40fa9aad7c7d6a8f64f9553eca91ae4e3330c4366087c9956

data/bin/bkblz

@@ -127,6 +127,25 @@ module Bkblz
       print_model file_info
     end
 
+    desc "downloadbyname <bucket> <name> <dir>", "downloads file by <bucket> " +
+      "and <name> to directory <dir>"
+    def downloadbyname(bucket_name, file_name, dir_path)
+      parse_opts
+
+      file_info = run_task do
+        Bkblz::Task::DownloadFile.run Bkblz.config, {
+          :file_name => file_name,
+          :bucket_name => bucket_name,
+          :dir_path => dir_path,
+          :use_filename => true
+        }
+      end
+
+      print_header "File Info"
+      print_model file_info
+    end
+
+    # TODO(erick): Rename to downloadbyid
     desc "download <id> <dir>", "downloads file <id> to directory <dir>"
     def download(file_id, dir_path)
       parse_opts
@@ -134,7 +153,8 @@ module Bkblz
       file_info = run_task do
         Bkblz::Task::DownloadFile.run Bkblz.config, {
           :file_id => file_id,
-          :dir_path => dir_path
+          :dir_path => dir_path,
+          :use_filename => options[:by_name]
         }
       end
 

data/lib/bkblz/task/download_file.rb

@@ -4,14 +4,22 @@ module Bkblz
   module Task
     class DownloadFile < BaseTask
 
-      task_param :file_id, :required => true
       task_param :dir_path, :required => true
 
+      # for downalod by id
+      task_param :file_id
+
+      # for download by name
+      task_param :bucket_name
+      task_param :file_name
+      task_param :use_filename
+
       def run_internal(session, params)
-        partial_file_info =
-          Bkblz::V1::Model::PartialFileInfo.new :file_id => params[:file_id]
-        download_file_info = session.send(
-          Bkblz::V1::DownloadFileByIdRequest.new partial_file_info).to_model
+        download_file_info = if params[:use_filename]
+                               download_by_name(session, params)
+                             else
+                               download_by_id(session, params)
+                             end
 
         unless download_file_info.sha1 == Digest::SHA1.hexdigest(download_file_info.body)
           raise "invalid checksum"
@@ -37,6 +45,25 @@ module Bkblz
         map[:body] = "<omitted>"
         Bkblz::V1::Model::FileDownload.new map
       end
+
+      def download_by_name(session, params)
+        raise 'missing file name' unless params[:file_name]
+        raise 'missing bucket name' unless params[:bucket_name]
+
+        bucket = find_bucket_by_name session, params[:bucket_name]
+        file = params[:file_name]
+        session.send(
+          Bkblz::V1::DownloadFileByNameRequest.new bucket, file).to_model
+      end
+
+      def download_by_id(session, params)
+        raise 'missing file id' unless params[:file_id]
+
+        partial_file_info =
+          Bkblz::V1::Model::PartialFileInfo.new :file_id => params[:file_id]
+        session.send(
+          Bkblz::V1::DownloadFileByIdRequest.new partial_file_info).to_model
+      end
     end
   end
 end

data/lib/bkblz/v1/download_file.rb

@@ -60,7 +60,8 @@ module Bkblz
 
       private
       def url_for_file(session)
-        session.create_url(["file", @bucket.bucket_name, @file_name].join "/")
+        session.create_download_url(
+          ["file", @bucket.bucket_name, @file_name].join "/")
       end
     end
   end

data/lib/bkblz/v1/session.rb

@@ -37,6 +37,11 @@ module Bkblz
         !!auth_response && !!auth_response.authorization_token
       end
 
+      def create_download_url(url_suffix)
+        check_authorized
+        URI.join auth_response.download_url, url_suffix
+      end
+
       def create_url(url_suffix)
         check_authorized
         URI.join auth_response.api_url, url_suffix

data/lib/bkblz/version.rb

@@ -1,3 +1,3 @@
 module Bkblz
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bkblz
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Erick Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-26 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor