activestorage-openstack 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02fce9a3d10d94819312729de194056aa869f0e444b46b795961653c8d94e79c
-  data.tar.gz: c9bb4f57f92cb8566ce975810bbe18780e5aa357e1bd99647dd9cd5fe34f257f
+  metadata.gz: 67ca4d8907ac5b47c65046317560958658f26e6ce30e4ff9d3d3c109e1b05aeb
+  data.tar.gz: 21e727fabf9deb5d6345b1fa53a8bc65d284f9a7fb63dc0c944a43e6ffca8c04
 SHA512:
-  metadata.gz: d092fc6ec2f872a2d2c134821b85866c897c294c4083402b0e7aba113472e49dccd7d290aa4460660bbb8771409474d28e67338b324e875048e9b8bfd6b14b6e
-  data.tar.gz: 76a30316abea049e86df2ca3b7f471a4fd1afb23961cb1a10bc9c7b28fe9ea00b5edf1a4147c7ced6f3875f0c9f33c8893cf58bcaf5b86b88700caf883b0908e
+  metadata.gz: eadb0cc54cecf91689d513d643d5daa8c2e1d69302d3e61a457e13956a94ff34b51ee79e113b971f1a547eca991553f532451fe99c678280cebd275f3a0b02c7
+  data.tar.gz: 43bb20617980222e0fb2c4013dc36e338b34c1403b6ede92591de9633e4afd9d76ca7431d27aec2d619a0a1a0975241aeb140e52f3513f3a75288ec5ebafda4e

data/README.md

@@ -1,18 +1,21 @@
 # ActiveStorage::Openstack
-This rails plugin wraps the OpenStack Swift provider as an Active Storage service.
+This rails plugin wraps the OpenStack Swift provider as an Active Storage service. It is now compatible with rails 6.
 
 [![Gem Version](https://badge.fury.io/rb/activestorage-openstack.svg)](https://badge.fury.io/rb/activestorage-openstack)
 [![Build Status](https://travis-ci.com/chaadow/activestorage-openstack.svg?branch=master)](https://travis-ci.com/chaadow/activestorage-openstack)
 [![Maintainability](https://api.codeclimate.com/v1/badges/4c070c101f86a579516f/maintainability)](https://codeclimate.com/github/chaadow/activestorage-openstack/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/4c070c101f86a579516f/test_coverage)](https://codeclimate.com/github/chaadow/activestorage-openstack/test_coverage)
 
-Starting from version `0.4`, this gem enforces version `0.2.2` of `fog-openstack` which introduces breaking changes to the configuration keys in `config/storage.yml`. Please read the [MIGRATING from `0.1.x` to `0.2.x`](#migrating-from-fog-openstack-01x-to-02x) section
+
+Starting from version `0.4`, this gem enforces version `>= 0.2.2` of `fog-openstack` which introduces breaking changes to the configuration keys in `config/storage.yml`. Please read the [MIGRATING from `0.1.x` to `0.2.x`](#migrating-from-fog-openstack-01x-to-02x) section
+
+**This gem currently supports `fog-openstack` version `~ 1.0`**
 
 ## Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'activestorage-openstack'
+gem 'activestorage-openstack', '1.0'
 ```
 
 And then execute:

data/lib/active_storage/openstack/version.rb

@@ -1,5 +1,5 @@
 module ActiveStorage
   module Openstack
-    VERSION = '0.5.0'
+    VERSION = '1.0.0'
   end
 end

data/lib/active_storage/service/open_stack_service.rb

@@ -11,7 +11,7 @@ module ActiveStorage
       @container = Fog::OpenStack.escape(container)
     end
 
-    def upload(key, io, checksum: nil)
+    def upload(key, io, checksum: nil, **)
       instrument :upload, key: key, checksum: checksum do
         params = { 'Content-Type' => guess_content_type(io) }
         params['ETag'] = convert_base64digest_to_hexdigest(checksum) if checksum
@@ -34,6 +34,8 @@ module ActiveStorage
           object_for(key).body
         end
       end
+    rescue Fog::OpenStack::Storage::NotFound
+      raise ActiveStorage::FileNotFoundError
     end
 
     def download_chunk(key, range)
@@ -45,9 +47,10 @@ module ActiveStorage
         end
 
         chunk_buffer.join[range]
+      rescue Fog::OpenStack::Storage::NotFound
+        raise ActiveStorage::FileNotFoundError
       end
     end
-
     def delete(key)
       instrument :delete, key: key do
         begin
@@ -82,9 +85,14 @@ module ActiveStorage
     def url(key, expires_in:, disposition:, filename:, **)
       instrument :url, key: key do |payload|
         expire_at = unix_timestamp_expires_at(expires_in)
-        generated_url = client.get_object_https_url(container, key, expire_at)
+        generated_url =
+          client.get_object_https_url(
+            container,
+            key,
+            expire_at,
+            filename: filename
+        )
         generated_url += '&inline' if disposition.to_s != 'attachment'
-        generated_url += "&filename=#{Fog::OpenStack.escape(filename.to_s)}" unless filename.nil?
         # unfortunately OpenStack Swift cannot overwrite the content type of an object via a temp url
         # so we just ignore the content_type argument here
         payload[:url] = generated_url
@@ -123,7 +131,7 @@ module ActiveStorage
                          'Content-Type' => content_type)
       true
     rescue Fog::OpenStack::Storage::NotFound
-      false
+      raise ActiveStorage::FileNotFoundError
     end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage-openstack
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Chedli Bourguiba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2019-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-openstack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -135,15 +135,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ActiveStorage wrapper for OpenStack Storage