shrine-fog 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9190a56cee70da72f752a7cdb9f0f499b48467bf
-  data.tar.gz: 44f829d6eb84aae145249df2fbaefb747f2df8b3
+  metadata.gz: 7b9e07ed2d525e24b90ce0fe67604e3bc70861ed
+  data.tar.gz: bd70496c2fd9f3dfa8b010c98331826ec34c20b6
 SHA512:
-  metadata.gz: 3cff6c69c740f5051afc4e723feb600fb17a7c2f1a69390bcb7ac78d4586797591f5b99dcc06c51018f91bf8e67944b5b635d00f45a40aba0a8e36d29d5b911b
-  data.tar.gz: 41d45e6eb1b5c3a0e7d69ee8696719a89c8316bb4176c06acebb7d086c75cc841f2ac00fe4030fe5141c09050ccc819e87e82f9317e91a558619ba49a5d0e157
+  metadata.gz: feb342d3a69e6398f00ae18b9992e2392bc148e1dc5843f0acb44e946961dca4554c3bb24083c92ab36bb9016de94cf97f84fcaec4e1cad4b69ed535baf45fbe
+  data.tar.gz: f3857955d172503f8477c50668a1f17f365252e19b4cbdb4dd443667ca44102f5ba46b87f1828a68a95af1981c43e49edee0ae75e74650a17d902f9e4a5a083a

data/README.md

@@ -6,7 +6,7 @@ Provides [Fog] storage for [Shrine].
 
 ```ruby
 gem "shrine-fog"
-gem "fog-xyz # Fog gem for the storage you want to use
+gem "fog-xyz" # Fog gem for the storage you want to use
 ```
 
 ## Usage
@@ -15,6 +15,7 @@ Require the appropriate Fog gem, and assign the parameters for initializing
 the storage:
 
 ```rb
+require "shrine/storage/fog"
 require "fog/google"
 
 Shrine.storages[:store] = Shrine::Storage::Fog.new(
@@ -28,6 +29,7 @@ Shrine.storages[:store] = Shrine::Storage::Fog.new(
 You can also assign a Fog storage object as the `:connection`:
 
 ```rb
+require "shrine/storage/fog"
 require "fog/google"
 
 google = Fog::Storage.new(
@@ -42,15 +44,58 @@ Shrine.storages[:store] = Shrine::Storage::Fog.new(
 )
 ```
 
-## S3 or Filesystem
+If both cache and store are a Fog storage, the uploaded file is copied to store
+instead of reuploaded.
+
+### URLs
+
+By default the shrine-fog will generate public unsigned URLs, but if you want
+to change that tell Fog not to store files publicly, you can set `:public` to
+false:
+
+```rb
+fog = Shrine::Storage::Fog.new(**fog_options)
+fog.url("image.jpg") #=> "https://my-bucket.s3-eu-west-1.amazonaws.com/image.jpg"
+
+fog = Shrine::Storage::Fog.new(public: false, **fog_options)
+fog.url("image.jpg") #=> "https://my-bucket.s3-eu-west-1.amazonaws.com/foo?X-Amz-Expires=3600&X-Amz-Date=20151217T102105Z&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIJF55TMZZY45UT6Q/20151217/eu-west-1/s3/aws4_request&X-Amz-SignedHeaders=host&X-Amz-Signature=6908d8cd85ce4469f141a36955611f26d29ae7919eb8a6cba28f9194a92d96c3"
+```
+
+The signed URLs by default expire in 1 hour, you set `:expires` to number of
+seconds you want the URL to expire:
+
+```rb
+Shrine::Storage::Fog.new(expires: 24*60*60, **fog_options) # expires in 1 day
+```
+
+### S3 or Filesystem
 
 If you want to store your files to Amazon S3 or the filesystem, you should use
 the storages that ship with Shrine (instead of [fog-aws] or [fog-local]) as
 they are much more advanced.
 
+## Running tests
+
+Tests use [fog-aws], so you'll have to create an `.env` file with appropriate
+credentials:
+
+```sh
+# .env
+S3_ACCESS_KEY_ID="..."
+S3_SECRET_ACCESS_KEY="..."
+S3_REGION="..."
+S3_BUCKET="..."
+```
+
+Afterwards you can run the tests:
+
+```sh
+$ bundle exec rake test
+```
+
 ## License
 
-[MIT](http://opensource.org/licenses/MIT).
+[MIT](http://opensource.org/licenses/MIT)
 
 [Fog]: http://fog.io/
 [Shrine]: https://github.com/janko-m/shrine

data/lib/shrine/storage/fog.rb

@@ -1,15 +1,17 @@
 require "down"
+require "uri"
 
 class Shrine
   module Storage
     class Fog
       attr_reader :connection, :directory, :prefix
 
-      def initialize(directory:, prefix: nil, public: true, connection: nil, **options)
+      def initialize(directory:, prefix: nil, public: true, expires: 3600, connection: nil, **options)
         @connection = connection || ::Fog::Storage.new(options)
         @directory = @connection.directories.new(key: directory)
         @prefix = prefix
         @public = public
+        @expires = expires
       end
 
       def upload(io, id, metadata = {})
@@ -37,11 +39,18 @@ class Shrine
       end
 
       def delete(id)
-        head(id).destroy
+        file(id).destroy
       end
 
       def url(id, **options)
-        head(id).public_url
+        signed_url = file(id).url(Time.now + @expires, **options)
+        if @public
+          uri = URI(signed_url)
+          uri.query = nil
+          uri.to_s
+        else
+          signed_url
+        end
       end
 
       def clear!(confirm = nil)
@@ -51,6 +60,10 @@ class Shrine
 
       protected
 
+      def file(id)
+        directory.files.new(key: path(id))
+      end
+
       def get(id)
         directory.files.get(path(id))
       end

data/shrine-fog.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name         = "shrine-fog"
-  gem.version      = "0.1.0"
+  gem.version      = "0.1.1"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "down", ">= 1.0.3"
 
+  gem.add_development_dependency "rake"
   gem.add_development_dependency "fog-aws"
   gem.add_development_dependency "mime-types"
   gem.add_development_dependency "dotenv"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine-fog
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-05 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement