fog-k5 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c593584d55d83577e53c4cc244b74b6314544528b2377bb72d882ad4fa0e625
-  data.tar.gz: 93a88324000f99c9b9f1c232ae057f50edc652da935faed9fcb6cc3bb338a177
+  metadata.gz: e40070f77c9bd70b3000574e08cfc6d19ac6af256749778d6d84c1c7559891fd
+  data.tar.gz: 6afad60e397d964e0effdd1b4ddf7d0f738a9f35a4e4e31ec0d46eedc2e7cee2
 SHA512:
-  metadata.gz: e8d32d67418d671e22270479173fff9f8eedb125dcb487d2e8642b41c229a05b599753711dc0df2817bf0d45d4af8208fd45481a9d23116badc885c0a0d5c7dd
-  data.tar.gz: 9970618c0b35bf80e239c0f0f6f2de8a146490dd575e79c50c26190f5cbb07215aa335724abf624bf322415076501d94811187efb315bb7a0e0bd2fa48777ebc
+  metadata.gz: 7c8c576a850fd39a458a5a063113a8c207835a68f032b31ae9bf48c3321381730b6a488f749352cbc18295b9e8d39d691b2e92a8919b20e11121bd28ad9db2dd
+  data.tar.gz: c58e542bc8744ca2b8dab2965f97ab20a3e843f253c3162278fe1091b5201f8e470857915eb7bee77787bdc247e463c75286d2d5f629cb2eaa370efc96eca0cc

data/CHANGELOG.md

@@ -0,0 +1,23 @@
+# Change Log
+
+## [v0.1.1](https://github.com/blooper05/fog-k5/tree/v0.1.1) (2018-05-17)
+[Full Changelog](https://github.com/blooper05/fog-k5/compare/v0.1.0...v0.1.1)
+
+**Fixed bugs:**
+
+- Exception does not occur even if file upload fails [\#6](https://github.com/blooper05/fog-k5/issues/6)
+- File with Japanese file name can not be uploaded to Object Storage [\#3](https://github.com/blooper05/fog-k5/issues/3)
+- Redundant slashes are included in the URL [\#2](https://github.com/blooper05/fog-k5/issues/2)
+
+**Merged pull requests:**
+
+- 💚 Allow codeclimate duplication on requests [\#8](https://github.com/blooper05/fog-k5/pull/8) ([blooper05](https://github.com/blooper05))
+- 🐛 Add the expected response HTTP status codes [\#7](https://github.com/blooper05/fog-k5/pull/7) ([blooper05](https://github.com/blooper05))
+- 🐛 Add Excon::Middleware::EscapePath to middlewares param [\#5](https://github.com/blooper05/fog-k5/pull/5) ([blooper05](https://github.com/blooper05))
+- 🐛 Remove redundant slashes included in the URL [\#4](https://github.com/blooper05/fog-k5/pull/4) ([blooper05](https://github.com/blooper05))
+- Update rake requirement to ~\> 12.3 [\#1](https://github.com/blooper05/fog-k5/pull/1) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [v0.1.0](https://github.com/blooper05/fog-k5/tree/v0.1.0) (2018-05-14)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/lib/fog/k5/shared.rb

@@ -4,8 +4,8 @@ module Fog
       K5_URL_SCHEME = 'https'.freeze
       K5_URL_SUFFIX = 'cloud.global.fujitsu.com'.freeze
 
-      def build_url(url_type:)
-        region = Fog.credentials[:k5_region]
+      def build_url(url_type:, region: nil)
+        region ||= @k5_region
         "#{K5_URL_SCHEME}://#{url_type}.#{region}.#{K5_URL_SUFFIX}"
       end
 
@@ -16,16 +16,16 @@ module Fog
       private
 
       def auth_token_expired?
-        !Fog.credentials[:k5_auth_token_expires_at] ||
-          Fog.credentials[:k5_auth_token_expires_at] - 300 < Fog::Time.now
+        !@k5_auth_token_expires_at ||
+          @k5_auth_token_expires_at - 300 < Fog::Time.now
       end
 
       def refresh_auth_token
         connection = Excon.new(build_url(url_type: 'identity'))
         response   = connection.post(auth_request_params)
 
-        Fog.credentials[:k5_auth_token] = response.headers['X-Subject-Token']
-        Fog.credentials[:k5_auth_token_expires_at] = Fog::Time.parse(
+        @k5_auth_token = response.headers['X-Subject-Token']
+        @k5_auth_token_expires_at = Fog::Time.parse(
           Fog::JSON.decode(response.body)['token']['expires_at'],
         )
       end
@@ -47,16 +47,16 @@ module Fog
               password: {
                 user: {
                   domain: {
-                    name: Fog.credentials[:k5_domain_name],
+                    name: @k5_domain_name,
                   },
-                  name: Fog.credentials[:k5_user_name],
-                  password: Fog.credentials[:k5_user_password],
+                  name: @k5_user_name,
+                  password: @k5_user_password,
                 },
               },
             },
             scope: {
               project: {
-                id: Fog.credentials[:k5_project_id],
+                id: @k5_project_id,
               },
             },
           },

data/lib/fog/k5/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module K5
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.1.2'.freeze
   end
 end

data/lib/fog/storage/k5/models/file.rb

@@ -20,9 +20,10 @@ module Fog
         def public_url
           requires :directory, :key
 
-          project_id = Fog.credentials[:k5_project_id]
+          region     = service.k5_region
+          project_id = service.k5_project_id
           version    = K5_STORAGE_URL_VERSION
-          url        = build_url(url_type: K5_STORAGE_URL_TYPE)
+          url        = build_url(url_type: K5_STORAGE_URL_TYPE, region: region)
           container  = directory.key
 
           "#{url}/#{version}/AUTH_#{project_id}/#{container}/#{key}"

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

@@ -5,14 +5,10 @@ module Fog
         include Utils
         include Fog::K5::Shared
 
-        def initialize(options = {})
-          Fog.credentials[:k5_region]        = options[:k5_region]
-          Fog.credentials[:k5_project_id]    = options[:k5_project_id]
-          Fog.credentials[:k5_domain_name]   = options[:k5_domain_name]
-          Fog.credentials[:k5_user_name]     = options[:k5_user_name]
-          Fog.credentials[:k5_user_password] = options[:k5_user_password]
+        attr_reader :k5_region, :k5_project_id
 
-          refresh_auth_token_if_expired
+        def initialize(options = {})
+          refresh_credentials(options)
 
           url = build_url(url_type: K5_STORAGE_URL_TYPE)
           @connection = Fog::Core::Connection.new(url, false, params)
@@ -20,13 +16,20 @@ module Fog
 
         private
 
+        def refresh_credentials(options)
+          @k5_region        = options[:k5_region]
+          @k5_project_id    = options[:k5_project_id]
+          @k5_domain_name   = options[:k5_domain_name]
+          @k5_user_name     = options[:k5_user_name]
+          @k5_user_password = options[:k5_user_password]
+
+          refresh_auth_token_if_expired
+        end
+
         def params
-          token      = Fog.credentials[:k5_auth_token]
-          project_id = Fog.credentials[:k5_project_id]
-          version    = K5_STORAGE_URL_VERSION
           {
-            headers:     { 'X-Auth-Token' => token },
-            path_prefix: "#{version}/AUTH_#{project_id}",
+            headers:     { 'X-Auth-Token' => @k5_auth_token },
+            path_prefix: "#{K5_STORAGE_URL_VERSION}/AUTH_#{@k5_project_id}",
             query:       { format: :json },
           }
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-k5
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - blooper05
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -121,6 +121,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE