Allow public url

Author: treagod

shard.yml

@@ -6,7 +6,7 @@ dependencies:
     github: martenframework/marten
   awscr-s3:
     github: taylorfinnell/awscr-s3
-    version: ~> 0.9.0
+    branch: master # TODO: Change to next version after endpoint is added
 
 development_dependencies:
   sqlite3:

spec/marten_s3/store_spec.cr

@@ -149,9 +149,61 @@ describe MartenS3::Store do
     end
 
     describe "#url" do
-      it "returns a URL constructed from the base URL" do
-        storage.url("css/app.css").should contain "awscr-s3-test-"
-        storage.url("css/app.css").should contain "css/app.css"
+      it "returns a private URL constructed from the base URL" do
+        uri = URI.parse(storage.url("css/app.css"))
+
+        uri.host.should eq URI.parse(ENV.fetch("S3_ENDPOINT", "http://127.0.0.1:9000")).host
+
+        uri.path.should contain "#{bucket_name}/css/app.css"
+
+        query = uri.query.not_nil!
+
+        query_params = URI::Params.parse(query)
+        query_params.has_key?("X-Amz-Algorithm").should be_true
+        query_params.has_key?("X-Amz-Credential").should be_true
+        query_params.has_key?("X-Amz-Date").should be_true
+        query_params["X-Amz-Expires"].should eq "86400"
+        query_params.has_key?("X-Amz-SignedHeaders").should be_true
+        query_params.has_key?("X-Amz-Signature").should be_true
+      end
+
+      it "returns a path-style public URL when `use_public_url` is true and `force_path_style` is enabled" do
+        storage = MartenS3::Store.new(
+          region: "unused",
+          bucket: bucket_name,
+          access_key: ENV.fetch("S3_KEY", "admin"),
+          secret_key: ENV.fetch("S3_SECRET", "password"),
+          endpoint: ENV.fetch("S3_ENDPOINT", "http://127.0.0.1:9000"),
+          force_path_style: true,
+          use_public_url: true,
+        )
+        uri = URI.parse(storage.url("css/app.css"))
+
+        uri.host.should eq URI.parse(ENV.fetch("S3_ENDPOINT", "http://127.0.0.1:9000")).host
+
+        uri.path.should eq "/#{bucket_name}/css/app.css"
+
+        uri.query.should be_nil
+      end
+
+      it "returns a virtual-host–style public URL when `use_public_url` is true and `force_path_style` is disabled" do
+        storage = MartenS3::Store.new(
+          region: "unused",
+          bucket: bucket_name,
+          access_key: ENV.fetch("S3_KEY", "admin"),
+          secret_key: ENV.fetch("S3_SECRET", "password"),
+          endpoint: ENV.fetch("S3_ENDPOINT", "http://127.0.0.1:9000"),
+          use_public_url: true,
+        )
+        uri = URI.parse(storage.url("css/app.css"))
+
+        test_host = URI.parse(ENV.fetch("S3_ENDPOINT", "http://127.0.0.1:9000")).host
+
+        uri.host.should eq "#{bucket_name}.#{test_host}"
+
+        uri.path.should eq "/css/app.css"
+
+        uri.query.should be_nil
       end
     end
 

src/marten_s3/store.cr

@@ -10,6 +10,7 @@ module MartenS3
       @endpoint : String? = nil,
       @force_path_style : Bool = false,
       @expires_in = 86_400,
+      @use_public_url : Bool = false,
     )
       @client = Awscr::S3::Client.new(
         @region,
@@ -72,19 +73,34 @@ module MartenS3
     end
 
     def url(filepath : String) : String
-      generate_presigned_url(filepath)
+      filepath = URI.encode_path(filepath)
+
+      if @use_public_url
+        public_url(filepath)
+      else
+        generate_presigned_url(filepath)
+      end
     end
 
     private def public_url(filepath)
-      File.join(@endpoint.not_nil!, @bucket, URI.encode_path(filepath))
+      if @force_path_style
+        uri = @client.endpoint.dup
+        uri.path = "/#{@bucket}/#{filepath}"
+      else
+        uri = @client.endpoint.dup
+        uri.host = "#{@bucket}.#{@client.endpoint.host}"
+        uri.path = "/#{filepath}"
+      end
+
+      uri.to_s
     end
 
     private def generate_presigned_url(filepath : String)
       options = Awscr::S3::Presigned::Url::Options.new(
         aws_access_key: @access_key,
         aws_secret_key: @secret_key,
-        region: @region,
-        endpoint: @endpoint,
+        region: @client.region,
+        endpoint: @client.endpoint.to_s,
         bucket: @bucket,
         force_path_style: @force_path_style,
         object: filepath,