cprobert-s3sync 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: ba1822eb603981cf34b82d2496e16a239f3b432d
-  data.tar.gz: b4d1483f9b24e0ac741d9da04d3a84cd26128d49
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTgxNTQ0YzQ3OGFlNGMyNTkwNzM5MzIxZWExNTI1NmNhMzBkZDJmYw==
+  data.tar.gz: !binary |-
+    NTVlMzAxNGJjZGUwNGRlOWIxYTE5NWU1NzViNGI3Y2YzNmEyMDA3Ng==
 SHA512:
-  metadata.gz: a5a5e264eeb50e6fd49ce84b5323d656b9190baac88641e92f3596435becc2cc49615b811ed6c1b2f40c05416f072028b94d198bb8bc0cc2d71b3bff70f78607
-  data.tar.gz: 0e8a18876ccb5aa56ce72c5ec7c483e413a30b668dc704e1e1c6811556680d30d930e5ff2aa4a9713885a071840be188d84e6587496acdda367f4c6b52df247b
+  metadata.gz: !binary |-
+    N2E4ZmZkYWU2MzI1MzViZTQ4NTE3ZGViZWUyODk1YjIyNmFhMTczNTJhMGNk
+    OTY5NzFkM2RhY2U5OWFkNmQ5ZTNlZDg1NTU2ZmE5Njg3MGE4ZjQ5OWRjZDQy
+    ZjVhZmQxZjdhMmVhMmViZTNhODMxMzRhNzc1ZDJiMGVlYzQ5NGY=
+  data.tar.gz: !binary |-
+    Y2E5NWEwMzM3Yjk2N2FlMzQxNTM5NjRlZGVkMzhmZGU5ODhlN2E0YjViMTI3
+    NjA3YmNjZmJmODMxN2Y5ODQ3MzUxOTNlMTE2NThmODRkNDk5ODIzZmI2MjE0
+    ZDMxYmMzYzYyNzNhYzVjNzgwNmNlYWRhZGFlOWEzM2E3MjljMjY=

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "cprobert-s3sync"
-    gem.summary = %Q{Fork of s3sync to be compatible with ruby 1.9.}
+    gem.summary = %Q{Fork of s3sync to be compatible with ruby 1.9.3}
     gem.email = "cprobert@gmail.com"
     gem.homepage = "http://s3sync.net"
     gem.authors = ["cprobert"]

data/VERSION

@@ -1 +1 @@
-1.3.6
+1.3.7

data/bin/s3sync

@@ -305,16 +305,19 @@ ENDUSAGE
           # get rid of the big s3 objects asap, just save light-weight nodes and strings
           items = tItems.collect do |item|
             if item.respond_to?('key')
-              key = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.key).join
+              #key = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.key).join
+              key = item.key.encode($S3SYNC_NATIVE_CHARSET, :invalid => :replace, :undef => :replace, :replace => "-").join
               Node.new(key, item.size, item.etag, item.last_modified)
             else
-              Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.prefix).join
+              #Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", item.prefix).join
+              item.prefix.encode($S3SYNC_NATIVE_CHARSET, :invalid => :replace, :undef => :replace, :replace => "-").join
             end
           end
           nextPage = d.properties.is_truncated
           marker = (d.properties.next_marker)? d.properties.next_marker : ((d.entries.length > 0)? d.entries.last.key : '')
           # get this into native char set (because when we feed it back to s3 that's what it will expect)
-          marker = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", marker).join
+          #marker = Iconv.iconv($S3SYNC_NATIVE_CHARSET, "UTF-8", marker).join
+          marker = marker.encode($S3SYNC_NATIVE_CHARSET, :invalid => :replace, :undef => :replace, :replace => "-").join
           tItems = nil
           d = nil # get rid of this before recursing; it's big
           item = nil

data/lib/s3sync/S3encoder.rb

@@ -39,7 +39,10 @@ module S3ExtendCGI
 		
 		def S3Extend_escape(string)
 			result = string
-			result = Iconv.iconv("UTF-8", @nativeCharacterEncoding, string).join if @useUTF8InEscape 
+			
+			result = string.encode(@nativeCharacterEncoding, :invalid => :replace, :undef => :replace, :replace => "-") if @useUTF8InEscape 
+			#result = Iconv.iconv("UTF-8", @nativeCharacterEncoding, string).join if @useUTF8InEscape 
+			
 			result = S3Extend_escape_orig(result)
 			result.gsub!(/%2f/i, "/") if @exemptSlashesInEscape
 			result.gsub!("+", "%20") if @usePercent20InEscape

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cprobert-s3sync
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - cprobert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: cprobert@gmail.com
@@ -61,8 +61,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
-summary: Fork of s3sync to be compatible with ruby 1.9.
+summary: Fork of s3sync to be compatible with ruby 1.9.3
 test_files: []