dragonfly-google_data_store 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8337101571429c4c5ec1acc90112cfc87b6966df
-  data.tar.gz: db0456da93fd94c9cbc1583fa62ef01991d1e256
+  metadata.gz: d75919d7b7789fc892325542559247c88865573b
+  data.tar.gz: 4b3739a31a44f24982d76b127e62b373d8c706ae
 SHA512:
-  metadata.gz: 14ad7713b34bddbb0f58fad2e64c6d6afcb1f402b6fa13ca111ff87a1f3bcf979514ec4ad6591b34bb2bb58e2f08dc2982699a276e7b649bb00e6413170f6345
-  data.tar.gz: '069fa9982ec35473ace079769f970eaab7fa86335948c21103590f9183a463cf50dcb0f4f14a423bf22d30dcd835ca6a41dc2f74d5d76dce48996d3d95b00eef'
+  metadata.gz: 1fb64ee97bd38e947c0e29894972abc4bb3aa9710809b94301199992bb213949d0c20c71f3bdbbc7e09c84995531daf7e8e50a4bda01898ad984537f7ce9cbec
+  data.tar.gz: 583f9fba8873961a29db743630e6b09a4067ac22b1f2e5682ede5981054bd13351fad955e3bf5bf7bd2ae766d50f4e7bc4c5cdb4764b6c4b3c0f928d18e713d8

data/README.md

@@ -32,7 +32,8 @@ Dragonfly.app.configure do
   datastore :google,
             project: 'project-id-here',
             bucket: 'bucket-name-here',
-            keyfile: 'path/to/your/key/file.json'
+            keyfile: 'path/to/your/key/file.json',
+            root_path: 'root/path'
 end
 ```
 
@@ -50,4 +51,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/dragonfly/google_data_store.rb

@@ -4,12 +4,13 @@ require 'google/cloud/storage'
 
 module Dragonfly
   class GoogleDataStore
-    attr_reader :project, :keyfile, :bucket_name
+    attr_reader :project, :keyfile, :bucket_name, :root_path
 
     def initialize(opts)
       @project = opts[:project]
       @keyfile = opts[:keyfile]
       @bucket_name = opts[:bucket]
+      @root_path = opts[:root_path]
     end
 
     def write(object, opts = {})
@@ -17,26 +18,34 @@ module Dragonfly
 
       uid = opts[:path] || Dragonfly::GoogleDataStore.generate_uid
 
-      bucket.create_file object.tempfile.path, uid, metadata: object.meta
+      bucket.create_file(
+        object.tempfile.path,
+        full_path(uid),
+        metadata: object.meta,
+        content_type: object.mime_type
+      )
 
       uid
     end
 
     def read(uid)
-      file = bucket.file uid
+      file = bucket.file full_path(uid)
+
+      metadata = file.metadata.dup
+      metadata['name'] ||= File.basename(file.name)
+
       content = file.download
       content.rewind
-      [
-        content.read,
-        file.metadata,
-      ]
-    rescue
+
+      [content.read, metadata]
+    rescue StandardError
       nil
     end
 
     def destroy(uid)
-      bucket.file(uid).delete
-    rescue
+      file = bucket.file full_path(uid)
+      file.delete
+    rescue StandardError
       nil
     end
 
@@ -46,6 +55,10 @@ module Dragonfly
 
     private
 
+    def full_path(uid)
+      File.join *[root_path, uid].compact
+    end
+
     def bucket
       @bucket ||= storage.bucket(bucket_name)
     end

data/lib/dragonfly/google_data_store/version.rb

@@ -1,5 +1,5 @@
 module Dragonfly
   class GoogleDataStore
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly-google_data_store
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Raffael Schmid
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: A data store for dragonfly using google cloud