fog-backblaze 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c206d62c779b21fd9771105907c940dec19a1ea0
-  data.tar.gz: 35c054e6d149c3b09ab1f3521643bc255187f5c5
+  metadata.gz: 5decfdf565507b6f9426990d2a6b4a7d5df99d1f
+  data.tar.gz: e5b109b24fbf90c10644d890a31358e236991822
 SHA512:
-  metadata.gz: a1858a028b04d845479b515cf3a9b30cf44ca3cde4265095fb40b64e4154593260615bbb6685c20b4fdc0bdcd4096188639c4a858e2791d0cded17453df78886
-  data.tar.gz: 9655f45406f1bd4ff75c35155f46d294bb6ed26b7e6b7f10d7291218107bad1f59f2cfd3f1866bfe9b60535c7ee6edc68697719115060e64fa05e76369574360
+  metadata.gz: 01cb22086898cbbc02f5daedcfb13f8315210f43769bf04c0b82f29d71804bfcd3a35c44ffe90a56f93db8861af201356c1bbe3bd04e12a4876a0a13b5dace55
+  data.tar.gz: 6898b75ab5cb46e06ede150d7b0e0b707e64d05378602279ef62b647c02c59fa49f361a27ee11b66876a14bf3e30bbed14437103372983537a5123a4fd7d7774

data/CHANGELOG.md

@@ -0,0 +1,20 @@
+0.2.0 2018-08-16
+==========================================================
+
+- Add support for api keys
+- More tests
+- Add CHANGELOG.md
+
+0.1.2 2018-05-19
+==========================================================
+
+- Support IO objects for #put_object
+- Support `options[:extra_headers]` for #put_object
+- Use autoload
+- Add #update_bucket
+- Always use `::JSON`
+
+0.1.1 2018-03-25
+==========================================================
+
+- Basic functionality

data/Gemfile

@@ -1,8 +1,12 @@
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in fog-backblaze.gemspec
+git_source(:github) do |repo_name|
+  "https://github.com/#{repo_name}.git"
+end
+
 gemspec
 
 gem "bundler", ">= 1.15"
 gem "rake", "~> 12.0"
 gem "minitest", ">= 5.0"
+gem 'minitest-reporters', '1.3.2.beta2'

data/README.md

@@ -23,6 +23,12 @@ require "fog/backblaze"
 
 connection = Fog::Storage.new(
   provider: 'backblaze',
+
+  # with one key (more secure)
+  b2_key_id: 'xxxx',
+  b2_key_token: 'zzzxxxccc'
+
+  # full access to b2 account (less secure)
   b2_account_id: '123456',
   b2_account_token: 'aaaaabbbbbccccddddeeeeeffffff111112222223333',
 

data/Rakefile

@@ -4,7 +4,7 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList["test/**/*_spec.rb"]
+  t.test_files = FileList["test/**/*_{spec,test}.rb"]
 end
 
 task :default => :test

data/examples/directory_model.rb

@@ -0,0 +1,78 @@
+require 'logger'
+require 'pp'
+
+$:.push(File.expand_path("../../lib", __FILE__))
+
+require_relative "../lib/fog/backblaze"
+
+if !ENV['B2_ACCOUNT_ID'] || ENV['B2_ACCOUNT_ID'] == ""
+  puts "Missing env B2_ACCOUNT_ID"
+  exit 1
+end
+
+if !ENV['B2_ACCOUNT_TOKEN'] || ENV['B2_ACCOUNT_TOKEN'] == ""
+  puts "Missing env B2_ACCOUNT_TOKEN"
+  exit 1
+end
+
+connection = Fog::Storage.new(
+  provider: 'backblaze',
+  b2_account_id: ENV['B2_ACCOUNT_ID'],
+  b2_account_token: ENV['B2_ACCOUNT_TOKEN'],
+
+  logger: ENV['DEBUG'] ? Logger.new(STDOUT) : nil
+)
+
+bucket_name = "fog-demo-#{Time.now.to_i}"
+
+# creating bucket with all possible options
+
+directory = connection.directories.create(
+  key: bucket_name,
+  public: false,
+  bucket_info: {
+    test_key: "Test value"
+  },
+  lifecycle_rules: [
+    {
+      fileNamePrefix: "aaa",
+      daysFromUploadingToHiding: 10,
+      daysFromHidingToDeleting: 20
+    }
+  ],
+  cors_rules: [
+    {
+      corsRuleName: "downloadFromAnyOrigin",
+      allowedOrigins: ["https"],
+      allowedHeaders: ["range"],
+      allowedOperations: [
+        "b2_download_file_by_id",
+        "b2_download_file_by_name"
+      ],
+      exposeHeaders: ["x-bz-content-sha1"],
+      maxAgeSeconds: 3600
+    }
+  ]
+)
+
+p directory
+
+# delete new bucket on exit
+at_exit do
+  directory.files.each do |file|
+    puts "removing file #{file.key}"
+    p file.destroy
+  end
+  puts "removing a bucket #{directory.key}"
+  p directory.destroy
+end
+
+# list directories (buckets)
+p connection.directories
+
+# upload in new bucket
+file = directory.files.create(
+  key:    'Gemfile.lock',
+  body:   File.open("./icco_example.rb"),
+  public: true
+)

data/lib/fog/backblaze/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Backblaze
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/lib/fog/storage/backblaze.rb

@@ -3,8 +3,9 @@ require 'digest'
 require 'cgi'
 
 class Fog::Storage::Backblaze < Fog::Service
-  requires :b2_account_id, :b2_account_token
-  recognizes :b2_bucket_name, :b2_bucket_id, :token_cache, :logger
+  #requires 
+  recognizes :b2_account_id, :b2_account_token, :b2_key_id, :b2_key_token,
+             :b2_bucket_name, :b2_bucket_id, :token_cache, :logger
 
   model_path 'fog/storage/backblaze/models'
   model       :directory

data/lib/fog/storage/backblaze/models/directory.rb

@@ -10,6 +10,17 @@ class Fog::Storage::Backblaze::Directory < Fog::Model
 
   alias_method :name, :key
 
+  def initialize(attrs)
+    attrs = attrs.dup
+    attrs['bucket_id']       = attrs['bucketId']
+    attrs['bucket_info']     = attrs['bucketInfo']
+    attrs['bucket_type']     = attrs['bucketType']
+    attrs['cors_rules']      = attrs['corsRules']
+    attrs['lifecycle_rules'] = attrs['lifecycleRules']
+
+    super(attrs)
+  end
+
   def destroy
     requires :key
     response = service.delete_bucket(key)

data/lib/fog/storage/backblaze/real.rb

@@ -28,7 +28,7 @@ class Fog::Storage::Backblaze::Real
   # call b2_create_bucket
   def put_bucket(bucket_name, extra_options = {})
     options = {
-      accountId: @options[:b2_account_id],
+      accountId: b2_account_id,
       bucketType: extra_options.delete(:public) ? 'allPublic' : 'allPrivate',
       bucketName: bucket_name,
     }.merge(extra_options)
@@ -52,7 +52,7 @@ class Fog::Storage::Backblaze::Real
   # if options[:bucketId] presents, then bucket_name is option
   def update_bucket(bucket_name, extra_options)
     options = {
-      accountId: @options[:b2_account_id],
+      accountId: b2_account_id,
       bucketId: extra_options[:bucketId] || _get_bucket_id!(bucket_name),
     }
     if extra_options.has_key?(:public)
@@ -76,22 +76,24 @@ class Fog::Storage::Backblaze::Real
   end
 
   # call b2_list_buckets
-  def list_buckets
-    response = b2_command(:b2_list_buckets, body: {accountId: @options[:b2_account_id]})
+  def list_buckets(options = {})
+    response = b2_command(:b2_list_buckets, body: {
+      accountId: b2_account_id
+    }.merge(options))
 
     response
   end
 
   # call b2_list_buckets
   def get_bucket(bucket_name)
-    response = list_buckets
+    response = list_buckets(bucketName: bucket_name)
+
     bucket = response.json['buckets'].detect do |bucket|
       bucket['bucketName'] == bucket_name
     end
 
     unless bucket
-      raise Fog::Errors::NotFound, "No bucket with name: #{bucket_name}, " +
-        "found buckets: #{response.json['buckets'].map {|b| b['bucketName']}.join(", ")}"
+      raise Fog::Errors::NotFound, "No bucket with name: #{bucket_name}"
     end
 
     response.body = bucket
@@ -106,7 +108,7 @@ class Fog::Storage::Backblaze::Real
     response = b2_command(:b2_delete_bucket,
       body: {
         bucketId: bucket_id,
-        accountId: @options[:b2_account_id]
+        accountId: b2_account_id
       }
     )
 
@@ -292,6 +294,50 @@ class Fog::Storage::Backblaze::Real
     last_response
   end
 
+  # TODO TEST
+  # call b2_create_key
+  def create_key(name, capabilities: nil, bucket_id: nil, name_prefix: nil)
+    capabilities ||= [
+      'listKeys',
+      'writeKeys',
+      'deleteKeys',
+      'listBuckets',
+      'writeBuckets',
+      'deleteBuckets',
+      'listFiles',
+      'readFiles',
+      'shareFiles',
+      'writeFiles',
+      'deleteFiles'
+    ]
+
+    response = b2_command(:b2_create_key,
+      body: {
+        accountId: b2_account_id,
+        keyName: name,
+        capabilities: capabilities,
+        bucketId: bucket_id,
+        namePrefix: name_prefix
+      }
+    )
+  end
+
+  # call b2_list_keys
+  def list_keys
+    response = b2_command(:b2_list_keys,
+      body: {
+        accountId: b2_account_id,
+        maxKeyCount: 1000
+      }
+    )
+
+    if response.status > 400
+      raise Fog::Errors::Error, "Failed get_object, status = #{response.status} #{response.body}"
+    end
+
+    response
+  end
+
   def _get_object_version_ids(bucket_name, file_name)
     response = b2_command(:b2_list_file_versions,
       body: {
@@ -335,7 +381,7 @@ class Fog::Storage::Backblaze::Real
   def _get_bucket_id!(bucket_name)
     bucket_id = _get_bucket_id(bucket_name)
     unless bucket_id
-      raise Fog::Errors::NotFound, "Can not find bucket #{bucket_name}"
+      raise Fog::Errors::NotFound, "Can not find bucket \"#{bucket_name}\""
     end
 
     return bucket_id
@@ -365,9 +411,19 @@ class Fog::Storage::Backblaze::Real
       return cached
     end
 
+    auth_string = if @options[:b2_account_id] && @options[:b2_account_token]
+      "#{@options[:b2_account_id]}:#{@options[:b2_account_token]}"
+    elsif @options[:b2_key_id] && @options[:b2_key_token]
+      "#{@options[:b2_key_id]}:#{@options[:b2_key_token]}"
+    else
+      raise Fog::Errors::Error, "B2 credentials are required, "\
+                                "please use b2_account_id and b2_account_token or "\
+                                "b2_key_id and b2_key_token"
+    end
+
     @auth_response = json_req(:get, "https://api.backblazeb2.com/b2api/v1/b2_authorize_account",
       headers: {
-        "Authorization" => "Basic " + Base64.strict_encode64("#{@options[:b2_account_id]}:#{@options[:b2_account_token]}")
+        "Authorization" => "Basic " + Base64.strict_encode64(auth_string)
       },
       persistent: false
     )
@@ -400,7 +456,11 @@ class Fog::Storage::Backblaze::Real
   def json_req(method, url, options = {})
     start_time = Time.now.to_f
     logger.info("Req #{method.to_s.upcase} #{url}")
-    logger.debug(options.to_s)
+    if options[:body] && options[:body].size > 300
+      logger.debug(options.merge(body: "-- Body #{options[:body].size} bytes --").to_s)
+    else
+      logger.debug(options.to_s)
+    end
 
     if !options.has_key?(:persistent) || options[:persistent] == true
       @connections ||= {}
@@ -413,14 +473,20 @@ class Fog::Storage::Backblaze::Real
     end
 
     http_response.extend(Fog::Backblaze::JSONResponse)
-    http_response.assign_json_body! if http_response.josn_response?
+    if http_response.josn_response? && http_response.body.size > 0
+      http_response.assign_json_body!
+    end
 
     http_response
   ensure
     status = http_response && http_response.status
-    logger.info("Done #{method.to_s.upcase} #{url} = #{status} (#{(Time.now.to_f - start_time).round(3)} sec)")
-    logger.debug("Response Headers: #{http_response.headers}") if http_response
-    logger.debug("Response Body: #{http_response.body}") if http_response
+    logger.info("    Done #{method.to_s.upcase} #{url} = #{status} (#{(Time.now.to_f - start_time).round(3)} sec)")
+    if http_response
+      logger.debug("    Headers: #{http_response.headers}")
+      if method != :head && http_response.headers['Content-Type'].to_s !~ %r{^image/}
+        logger.debug("    Body: #{http_response.body}")
+      end
+    end
   end
 
   def reset_token_cache
@@ -430,4 +496,13 @@ class Fog::Storage::Backblaze::Real
   def _esc_file(file_name)
     CGI.escape(file_name).gsub('%2F', '/')
   end
+
+  # return @options[:b2_account_id] or call b2_authorize_account when using application key
+  def b2_account_id
+    return @options[:b2_account_id] if @options[:b2_account_id]
+
+    auth = auth_response
+    p auth
+    auth['accountId']
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-backblaze
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Pavel Evstigneev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-19 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -40,12 +40,14 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- examples/directory_model.rb
 - examples/example.rb
 - fog-backblaze.gemspec
 - lib/fog/backblaze.rb