dragonfly-s3_data_store 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aebce2788f1efd7a37bcb9f2890f381d32a3b0aa
-  data.tar.gz: a968d0553a2351d1841de6c2cb56b8392d335bf6
+  metadata.gz: 350d8e976a1a0035972b02a7f024d982abd176e4
+  data.tar.gz: 1730399277815a8dce6feb6a89ed280cea18ad90
 SHA512:
-  metadata.gz: 069c0484f3ddd0495ad2cd9f6dbcf6b96d2b80fc39ef7a6ce786e3a8b1c033d91bc021d86fbeb6faca2cbd8658beee8b1b613c6e8553f8d11c925654eb4fbba5
-  data.tar.gz: 95bb0814be7e75b3758b0900369b735bc0629bd06e2331929218f7607320a07c00c2a22a547501c500f1b68dfd17c3169b15424bd4a3a9fb700d2cd9448c2bdf
+  metadata.gz: d1708908b4b45d4fcbf5530a1056afe69921a3ef421b3482eb2efb16e921e354a29919395a16b5d347a0fbad43131cf941a90586bf031ab4c420816506a60c36
+  data.tar.gz: 84e28e6bd5f589c4f41ca2f65db364f8bdd5cc9feaeb002cb814625d6dc343d9f658376aefda1d8604d2e047b808078ee33deab946d0f0fc86da15736c17066f

data/lib/dragonfly/s3_data_store.rb

@@ -1,5 +1,6 @@
 require 'fog/aws'
 require 'dragonfly'
+require 'cgi'
 
 Dragonfly::App.register_datastore(:s3){ Dragonfly::S3DataStore }
 
@@ -135,7 +136,7 @@ module Dragonfly
     end
 
     def generate_uid(name)
-      "#{Time.now.strftime '%Y/%m/%d/%H/%M/%S'}/#{rand(1000)}/#{name.gsub(/[^\w.]+/, '_')}"
+      "#{Time.now.strftime '%Y/%m/%d/%H/%M/%S'}/#{rand(1000)}/#{name}"
     end
 
     def full_path(uid)
@@ -149,13 +150,14 @@ module Dragonfly
     def headers_to_meta(headers)
       json = headers['x-amz-meta-json']
       if json && !json.empty?
-        Serializer.json_decode(json)
+        unescape_meta_values(Serializer.json_decode(json))
       elsif marshal_data = headers['x-amz-meta-extra']
         Utils.stringify_keys(Serializer.marshal_b64_decode(marshal_data))
       end
     end
 
     def meta_to_headers(meta)
+      meta = escape_meta_values(meta)
       {'x-amz-meta-json' => Serializer.json_encode(meta)}
     end
 
@@ -170,5 +172,19 @@ module Dragonfly
       yield
     end
 
+    def escape_meta_values(meta)
+      meta.inject({}) {|hash, (key, value)|
+        hash[key] = value.is_a?(String) ? CGI.escape(value) : value
+        hash
+      }
+    end
+
+    def unescape_meta_values(meta)
+      meta.inject({}) {|hash, (key, value)|
+        hash[key] = value.is_a?(String) ? CGI.unescape(value) : value
+        hash
+      }
+    end
+
   end
 end

data/lib/dragonfly/s3_data_store/version.rb

@@ -1,5 +1,5 @@
 module Dragonfly
   class S3DataStore
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/spec/s3_data_store_spec.rb

@@ -75,7 +75,7 @@ describe Dragonfly::S3DataStore do
     it "should work ok with files with funny names" do
       content.name = "A Picture with many spaces in its name (at 20:00 pm).png"
       uid = @data_store.write(content)
-      uid.should =~ /A_Picture_with_many_spaces_in_its_name_at_20_00_pm_\.png$/
+      uid.should =~ /A Picture with many spaces in its name \(at 20:00 pm\)\.png/
       new_content.update(*@data_store.read(uid))
       new_content.data.should == 'eggheads'
     end
@@ -331,6 +331,13 @@ describe Dragonfly::S3DataStore do
       meta['some'].should == 'meta'
       meta['wo'].should == 4
     end
+
+    it "works with non ascii character" do
+      content = Dragonfly::Content.new(app, "hi", "name" => "こんにちは.txt")
+      uid = @data_store.write(content)
+      c, meta = @data_store.read(uid)
+      meta['name'].should == 'こんにちは.txt'
+    end
   end
 
   describe "fog_storage_options" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly-s3_data_store
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Data store for storing Dragonfly content (e.g. images) on S3