fakes3 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35ac3fdceddeef49ddeb95137f2dbfc8a719a4e2
-  data.tar.gz: c88fa58f1a7b52b9fcbb1dae974175bed5c1c178
+  metadata.gz: 241deda826d3d91b172ce08830a500ee014d452a
+  data.tar.gz: 0fff1ebd2cd5e02f5f7ec9d5228927eef3802e2a
 SHA512:
-  metadata.gz: d9a5a1c68ee5187593a2bb3aedec7e888b6f400b6c0882a1ebb8cb4323d81ed7d29c53657833da2564fea09bb3e9732eb34f6f78cfa63e2274910ae2f128c8d8
-  data.tar.gz: 21cd19d83eed82e5b89511ad0a7b60e934c516f97295ce54b09135240f36c0523dd2927bf68765cb6ba219233c59595c0df17dbb425db84f562c215a8c3bf913
+  metadata.gz: 11825967dc25673fe37a311a7fc52e631c7c695186c9b0721b4468f6cb560ad7a22d1efbf06880759c8ae6d8cb27c900a5771820ae122a92fbc6e754c7fe5572
+  data.tar.gz: 9a5c1824a3fad9d4c59e71335e9231d7526acd7d2ce1a8415fbbf5ce6e27605ff9bdc4c4304b63e9136f3b2b88b3436d44a49d8ed06f32dfc179921cc53b92da

data/.gitignore

@@ -6,3 +6,6 @@ test_root
 
 # Don't check in RVM/rbenv files
 .ruby-version
+
+# RubyMine
+.idea

data/README.md

@@ -58,3 +58,5 @@ It is a still a TODO to get this to be just one command
 ## More Information
 
 Check out the [wiki](https://github.com/jubos/fake-s3/wiki)
+
+[![Join the chat at https://gitter.im/jubos/fake-s3](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jubos/fake-s3?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

data/lib/fakes3/file_store.rb

@@ -263,14 +263,18 @@ module FakeS3
       metadata[:content_type] = request.header["content-type"].first
       metadata[:size] = File.size(content)
       metadata[:modified_date] = File.mtime(content).utc.iso8601(SUBSECOND_PRECISION)
+      metadata[:amazon_metadata] = {}
       metadata[:custom_metadata] = {}
 
       # Add custom metadata from the request header
       request.header.each do |key, value|
-        match = /^x-amz-meta-(.*)$/.match(key)
-        if match && (match_key = match[1])
+        match = /^x-amz-([^-]+)-(.*)$/.match(key)
+        next unless match
+        if match[1].eql?('meta') && (match_key = match[2])
           metadata[:custom_metadata][match_key] = value.join(', ')
+          next
         end
+        metadata[:amazon_metadata][key.gsub(/^x-amz-/, '')] = value.join(', ')
       end
       return metadata
     end

data/lib/fakes3/version.rb

@@ -1,3 +1,3 @@
 module FakeS3
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/test/aws_sdk_commands_test.rb

@@ -28,4 +28,32 @@ class AwsSdkCommandsTest < Test::Unit::TestCase
     assert object.exists?
     assert_equal "thisisaverybigfile", object.read
   end
+
+  def test_metadata
+    file_path = './test_root/test_metadata/metaobject'
+    FileUtils.rm_rf file_path
+
+    bucket = @s3.buckets["test_metadata"]
+    object = bucket.objects["metaobject"]
+    object.write(
+      'data',
+      # this is sent as header x-amz-storage-class
+      :storage_class => 'REDUCED_REDUNDANCY',
+      # this is sent as header x-amz-meta-custom1
+      :metadata => {
+        "custom1" => "foobar"
+      }
+    )
+    assert object.exists?
+    metadata_file = YAML.load(IO.read("#{file_path}/.fakes3_metadataFFF/metadata"))
+
+    assert metadata_file.has_key?(:custom_metadata), 'Metadata file does not contain a :custom_metadata key'
+    assert metadata_file[:custom_metadata].has_key?('custom1'), ':custom_metadata does not contain field "custom1"'
+    assert_equal 'foobar', metadata_file[:custom_metadata]['custom1'], '"custom1" does not equal expected value "foobar"'
+
+    assert metadata_file.has_key?(:amazon_metadata), 'Metadata file does not contain an :amazon_metadata key'
+    assert metadata_file[:amazon_metadata].has_key?('storage-class'), ':amazon_metadata does not contain field "storage-class"'
+    assert_equal 'REDUCED_REDUNDANCY', metadata_file[:amazon_metadata]['storage-class'], '"storage-class" does not equal expected value "REDUCED_REDUNDANCY"'
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fakes3
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Curtis Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler