fog-backblaze 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5decfdf565507b6f9426990d2a6b4a7d5df99d1f
-  data.tar.gz: e5b109b24fbf90c10644d890a31358e236991822
+SHA256:
+  metadata.gz: a78389a8f10d5fbb3db2898d5b8e5753a83efff4a0597298ab6d025e84890bcd
+  data.tar.gz: 6b810bccc7ab401b8ef658f18a4e2217f436ed2f0228e3efa4215bf4039c74b2
 SHA512:
-  metadata.gz: 01cb22086898cbbc02f5daedcfb13f8315210f43769bf04c0b82f29d71804bfcd3a35c44ffe90a56f93db8861af201356c1bbe3bd04e12a4876a0a13b5dace55
-  data.tar.gz: 6898b75ab5cb46e06ede150d7b0e0b707e64d05378602279ef62b647c02c59fa49f361a27ee11b66876a14bf3e30bbed14437103372983537a5123a4fd7d7774
+  metadata.gz: 73d97139b00707f5445c235201310377132dc7243732679e325b8a0b8e92be938fad44eedb0a9db1b99c147b390aaea258158b90c7453249ac2ba4177c421c1b
+  data.tar.gz: f84b8deeb28d28810cef58344fad698765fd2280e48786b09549995e1b7e6d2eb0c5cb940ed30514a3b0c3c54f2fb1a39bddfa7aad4d8f7d8475406d383c8955

data/.travis.yml

@@ -1,6 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.0
-  - 2.5.0
-before_install: gem install bundler -v 1.15.1
+  - 2.4.5
+  - 2.5.3
+  - 2.6.1
+before_install: gem install bundler

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.3.0 2019-06-27
+==========================================================
+
+- Fixes issues with not saving a file content_type as well as bad calls for the fog methods (Thanks @dan)
+- method name typo: josn_response?->json_response? (Thanks @MatthiasWinkelmann)
+- Change Fog::Storage::Backblaze -> Fog::Backblaze::Storage
+
 0.2.0 2018-08-16
 ==========================================================
 

data/Gemfile

@@ -9,4 +9,5 @@ gemspec
 gem "bundler", ">= 1.15"
 gem "rake", "~> 12.0"
 gem "minitest", ">= 5.0"
-gem 'minitest-reporters', '1.3.2.beta2'
+gem 'minitest-reporters'
+gem 'm'

data/lib/fog/backblaze.rb

@@ -1,16 +1,13 @@
 require 'fog/core'
-require 'json'
 
 module Fog
   module Backblaze
     autoload :JSONResponse, File.expand_path("../backblaze/json_response", __FILE__)
     autoload :TokenCache, File.expand_path("../backblaze/token_cache", __FILE__)
 
+    autoload :Storage, File.expand_path("../backblaze/storage", __FILE__)
+
     extend Fog::Provider
     service(:storage, "Storage")
   end
-
-  module Storage
-    autoload :Backblaze, File.expand_path("../storage/backblaze", __FILE__)
-  end
 end

data/lib/fog/backblaze/json_response.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module Fog
   module Backblaze
     module JSONResponse
@@ -16,7 +18,7 @@ module Fog
         self.body = json
       end
 
-      def josn_response?
+      def json_response?
         headers['Content-Type'].start_with?("application/json")
       end
 

data/lib/fog/{storage/backblaze.rb → backblaze/storage.rb}

@@ -2,17 +2,17 @@ require 'json'
 require 'digest'
 require 'cgi'
 
-class Fog::Storage::Backblaze < Fog::Service
+class Fog::Backblaze::Storage < Fog::Service
   #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_path 'fog/backblaze/storage/models'
   model       :directory
   collection  :directories
   model       :file
   collection  :files
 
-  autoload :Mock, File.expand_path("../backblaze/mock", __FILE__)
-  autoload :Real, File.expand_path("../backblaze/real", __FILE__)
+  autoload :Mock, File.expand_path("../storage/mock", __FILE__)
+  autoload :Real, File.expand_path("../storage/real", __FILE__)
 end

data/lib/fog/{storage/backblaze → backblaze/storage}/mock.rb

@@ -1,4 +1,4 @@
-class Fog::Storage::Backblaze::Mock
+class Fog::Backblaze::Storage::Mock
   def self.data
     @data ||= Hash.new do |hash, key|
       hash[key] = {}

data/lib/fog/{storage/backblaze → backblaze/storage}/models/directories.rb

@@ -1,5 +1,5 @@
-class Fog::Storage::Backblaze::Directories < Fog::Collection
-  model Fog::Storage::Backblaze::Directory
+class Fog::Backblaze::Storage::Directories < Fog::Collection
+  model Fog::Backblaze::Storage::Directory
 
   def all
     data = service.list_buckets

data/lib/fog/{storage/backblaze → backblaze/storage}/models/directory.rb

@@ -1,4 +1,4 @@
-class Fog::Storage::Backblaze::Directory < Fog::Model
+class Fog::Backblaze::Storage::Directory < Fog::Model
   identity :key, aliases: %w(bucketName)
 
   attribute :bucket_id#,       aliases: 'bucketId'
@@ -56,7 +56,7 @@ class Fog::Storage::Backblaze::Directory < Fog::Model
   end
 
   def files
-    @files ||= Fog::Storage::Backblaze::Files.new(directory: self, service: service)
+    @files ||= Fog::Backblaze::Storage::Files.new(directory: self, service: service)
   end
 
   def public?

data/lib/fog/{storage/backblaze → backblaze/storage}/models/file.rb

@@ -1,8 +1,8 @@
-class Fog::Storage::Backblaze::File < Fog::Model
+class Fog::Backblaze::Storage::File < Fog::Model
 
   identity :file_name, aliases: %w{fileName key name}
 
-  attribute :content_length, aliases: 'contentLength'
+  attribute :content_length, aliases: 'contentLength', :type => :integer
   attribute :content_type, aliases: 'contentType'
   attribute :file_id, aliases: 'fileId'
   attribute :file_info, aliases: 'fileInfo'

data/lib/fog/{storage/backblaze → backblaze/storage}/models/files.rb

@@ -1,5 +1,5 @@
-class Fog::Storage::Backblaze::Files < Fog::Collection
-  model Fog::Storage::Backblaze::File
+class Fog::Backblaze::Storage::Files < Fog::Collection
+  model Fog::Backblaze::Storage::File
 
   attribute :directory
   #attribute :common_prefixes, :aliases => "CommonPrefixes"
@@ -8,7 +8,7 @@ class Fog::Storage::Backblaze::Files < Fog::Collection
   #attribute :max_results,     :aliases => ["MaxKeys", "max-keys"]
   #attribute :prefix,          :aliases => "Prefix"
 
-  model Fog::Storage::Backblaze::File
+  model Fog::Backblaze::Storage::File
 
   def all(options = {})
     requires :directory
@@ -46,7 +46,7 @@ class Fog::Storage::Backblaze::Files < Fog::Collection
   def head(file_name, options = {})
     requires :directory
     data = service.head_object(directory.key, file_name, options)
-    file_data = _headers_to_attrs(file_response)
+    file_data = _headers_to_attrs(data)
     new(file_data)
   rescue Excon::Errors::NotFound
     nil
@@ -54,11 +54,11 @@ class Fog::Storage::Backblaze::Files < Fog::Collection
 
   def _headers_to_attrs(file_response)
     {
-      fileName:        file_response.headers['x-bz-file-name'],
-      fileId:          file_response.headers['x-bz-file-id'],
-      uploadTimestamp: file_response.headers['X-Bz-Upload-Timestamp'],
-      contentType:     file_response.headers['Content-Type'],
-      contentLength:   file_response.headers['Content-Length']
+      'fileName'        => file_response.headers['x-bz-file-name'],
+      'fileId'          => file_response.headers['x-bz-file-id'],
+      'uploadTimestamp' => file_response.headers['X-Bz-Upload-Timestamp'],
+      'contentType'     => file_response.headers['Content-Type'],
+      'contentLength'   => file_response.headers['Content-Length']
     }
   end
 

data/lib/fog/{storage/backblaze → backblaze/storage}/real.rb

@@ -1,4 +1,4 @@
-class Fog::Storage::Backblaze::Real
+class Fog::Backblaze::Storage::Real
   attr_reader :token_cache, :options
 
   def initialize(options = {})
@@ -145,7 +145,7 @@ class Fog::Storage::Backblaze::Real
     }.merge(options))
   end
 
-  def head_object(bucket_name, file_path)
+  def head_object(bucket_name, file_path, options = {})
     file_url = get_object_url(bucket_name, file_path)
 
     result = b2_command(nil,
@@ -443,7 +443,7 @@ class Fog::Storage::Backblaze::Real
     options[:headers]['Authorization'] ||= auth_response['authorizationToken']
 
     if options[:body] && !options[:body].is_a?(String)
-      options[:body] = JSON.generate(options[:body])
+      options[:body] = ::JSON.generate(options[:body])
     end
 
     request_url = options.delete(:url) || "#{auth_response['apiUrl']}/b2api/v1/#{command}"
@@ -473,7 +473,7 @@ class Fog::Storage::Backblaze::Real
     end
 
     http_response.extend(Fog::Backblaze::JSONResponse)
-    if http_response.josn_response? && http_response.body.size > 0
+    if http_response.json_response? && http_response.body.size > 0
       http_response.assign_json_body!
     end
 

data/lib/fog/backblaze/token_cache.rb

@@ -22,6 +22,8 @@
 #   Fog::Storage.new(provider: 'backblaze', ..., token_cache: RedisTokenCache.new)
 #
 
+require 'json'
+
 class Fog::Backblaze::TokenCache
 
   def initialize
@@ -116,7 +118,7 @@ class Fog::Backblaze::TokenCache
 
     def save_data
       File.open(@file, 'wb') do |f|
-        f.write(JSON.pretty_generate(@data) + "\n")
+        f.write(::JSON.pretty_generate(@data) + "\n")
       end
     end
   end

data/lib/fog/backblaze/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-backblaze
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Pavel Evstigneev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -52,15 +52,15 @@ files:
 - fog-backblaze.gemspec
 - lib/fog/backblaze.rb
 - lib/fog/backblaze/json_response.rb
+- lib/fog/backblaze/storage.rb
+- lib/fog/backblaze/storage/mock.rb
+- lib/fog/backblaze/storage/models/directories.rb
+- lib/fog/backblaze/storage/models/directory.rb
+- lib/fog/backblaze/storage/models/file.rb
+- lib/fog/backblaze/storage/models/files.rb
+- lib/fog/backblaze/storage/real.rb
 - lib/fog/backblaze/token_cache.rb
 - lib/fog/backblaze/version.rb
-- lib/fog/storage/backblaze.rb
-- lib/fog/storage/backblaze/mock.rb
-- lib/fog/storage/backblaze/models/directories.rb
-- lib/fog/storage/backblaze/models/directory.rb
-- lib/fog/storage/backblaze/models/file.rb
-- lib/fog/storage/backblaze/models/files.rb
-- lib/fog/storage/backblaze/real.rb
 homepage: https://github.com/fog/fog-backblaze
 licenses: []
 metadata: {}
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Blackblade B2 stogate.