Merge pull request #7 from aka-nez/feature/add-not-signed-url

Add #url for objects

Author: yamax2

.rubocop.yml

@@ -18,6 +18,10 @@ Layout/LineLength:
 Style/Documentation:
   Enabled: false
 
+Style/RedundantInitialize:
+  Exclude:
+    - "lib/cloud_storage/wrappers/base.rb"
+
 RSpec/MultipleExpectations:
   Enabled: false
 

CHANGELOG.md

@@ -0,0 +1,31 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+- N/A
+
+### Changed
+- N/A
+
+### Deprecated
+- N/A
+
+### Removed
+- N/A
+
+### Fixed
+- N/A
+
+### Security
+- N/A
+
+## [0.2.0] - 2022-09-27
+
+### Added
+- Added `#url` for gsc & s3 object wrapper that returns public url

README.md

@@ -107,6 +107,13 @@ cli = CloudStorage::Client.new(
 => "http://wallarm-devtmp-ipfeeds-presigned-urls-research.s3:4569/Gemfile?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=...&X-Amz-Date=20210310T061122Z&X-Amz-Expires=10&X-Amz-SignedHeaders=host&X-Amz-Signature=..."
 ```
 
+### public url
+
+```ruby
+> cli.find('test.txt').url
+=> "https://storage.googleapis.com/some-bucket/test_1.txt"
+```
+
 ### Download
 
 ```ruby

cloud_storage.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

docker/docker-compose.yml

@@ -11,14 +11,12 @@ services:
         com.cloud_storage.ruby.version: $DOCKER_RUBY_VERSION
     environment:
       - BUNDLE_PATH=/bundle/${DOCKER_RUBY_VERSION}
-      - SSH_AUTH_SOCK=/ssh/auth/sock
       - S3_ENDPOINT=$S3_ENDPOINT
       - S3_BUCKET=$S3_BUCKET
       - GCS_ENDPOINT=$GCS_ENDPOINT
       - GCS_BUCKET=$GCS_BUCKET
     volumes:
       - ..:/app
-      - ssh-data:/ssh:ro
       - bundler-data:/bundle
     command: sh
     depends_on:
@@ -44,7 +42,3 @@ volumes:
   bundler-data:
     external:
       name: bundler_data
-
-  ssh-data:
-    external:
-      name: ssh_data

lib/cloud_storage/objects/gcs.rb

@@ -23,6 +23,10 @@ def signed_url(**opts)
         @internal.signed_url version: :v4, **opts
       end
 
+      def url
+        @internal.url
+      end
+
       alias name key
 
       def delete!

lib/cloud_storage/objects/s3.rb

@@ -17,6 +17,8 @@ def key
         @internal.key
       end
 
+      alias name key
+
       def signed_url(**opts)
         signer = Aws::S3::Presigner.new(client: @client)
 
@@ -28,7 +30,9 @@ def signed_url(**opts)
           response_content_type: opts[:content_type]
       end
 
-      alias name key
+      def url
+        @internal.public_url
+      end
 
       def delete!
         @resource.bucket(bucket_name).object(key).delete

lib/cloud_storage/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CloudStorage
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

spec/cloud_storage/objects/gcs_spec.rb

@@ -16,16 +16,24 @@
     context 'when without options' do
       subject(:url) { obj.signed_url(expires_in: 30, issuer: '[email protected]', signing_key: key) }
 
-      it { is_expected.to match(%r{\A#{ENV['GCS_ENDPOINT']}#{ENV['GCS_BUCKET']}/test_1.txt}) }
+      it { is_expected.to match(%r{\A#{ENV.fetch('GCS_ENDPOINT')}#{ENV.fetch('GCS_BUCKET')}/test_1.txt}) }
     end
 
     context 'when with some internal options' do
       subject(:url) { obj.signed_url(expires_in: 30, issuer: '[email protected]', signing_key: key, version: :v2) }
 
-      it { is_expected.to match(%r{\Ahttps://storage.googleapis.com/#{ENV['GCS_BUCKET']}/test_1.txt}) }
+      it { is_expected.to match(%r{\Ahttps://storage.googleapis.com/#{ENV.fetch('GCS_BUCKET')}/test_1.txt}) }
     end
   end
 
+  describe '#url' do
+    subject(:url) { obj.url }
+
+    after { obj.delete! }
+
+    it { is_expected.to eq('https://storage.googleapis.com/some-bucket/test_1.txt') }
+  end
+
   describe '#delete!' do
     context 'when file exists' do
       it do

spec/cloud_storage/objects/s3_spec.rb

@@ -13,10 +13,18 @@
     after { obj.delete! }
 
     it do
-      expect(url).to match(%r{\A#{ENV['S3_ENDPOINT']}/#{ENV['S3_BUCKET']}/test_1.txt})
+      expect(url).to match(%r{\A#{ENV.fetch('S3_ENDPOINT')}/#{ENV.fetch('S3_BUCKET')}/test_1.txt})
     end
   end
 
+  describe '#url' do
+    subject(:url) { obj.url }
+
+    after { obj.delete! }
+
+    it { is_expected.to eq("#{ENV.fetch('S3_ENDPOINT')}/#{ENV.fetch('S3_BUCKET')}/test_1.txt") }
+  end
+
   describe '#delete!' do
     context 'when file exists' do
       it do