alephant-storage 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 889202b55e05eb45edf31c121184fee3e51835e6
-  data.tar.gz: 5cef1b309ecf8f3771f59f853275b792416bb898
+  metadata.gz: 8fccd9b0f5a266058512868d06792602434af812
+  data.tar.gz: 04b8c2837df0bd8513daf831a1c66b8da416650e
 SHA512:
-  metadata.gz: afe5c58169cb7f15526c21bf317670b4191c0458362f2bc4a5dbd314bce81eab2396b6e1bd57c295d2a9156d9ee306cb5d8c4ba25b0416af5a920415f805c75e
-  data.tar.gz: 72a60b743f631a82b12841992859982bdc7187e3d98896120ff4021e30dc50e0d730ef31198b183e0fd62b068ee7a2d646b26b3e968494cb7bac7b12f897a331
+  metadata.gz: 26b873e444f04b127ec94294a03598a97dc2b49388e7956b7a846deeadca1f60e65fc877f762d57ff4a24b118acc829b60782f61557dd534dc362450d7bbea16
+  data.tar.gz: d175c2e061929702060d5bcae794c502d0e510adc4f59cc16e54973a1b719fa1823cca5482a094565a2565efdeb938198524efdd32bc31aec8296f5c2dbfd963

data/lib/alephant/storage.rb

@@ -1,6 +1,7 @@
-require 'alephant/storage/version'
-require 'alephant/logger'
-require 'aws-sdk'
+require "alephant/storage/version"
+require "alephant/logger"
+require "aws-sdk"
+require "date"
 
 module Alephant
   class Storage
@@ -16,7 +17,7 @@ module Alephant
         "event"  => "StorageInitialized",
         "id"     => id,
         "path"   => path,
-        "method" => "#{self.class}#initialize",
+        "method" => "#{self.class}#initialize"
       )
     end
 
@@ -29,7 +30,7 @@ module Alephant
       )
     end
 
-    def put(id, data, content_type = 'text/plain', meta = {})
+    def put(id, data, content_type = "text/plain", meta = {})
       bucket.objects["#{path}/#{id}"].write(
         data,
         {
@@ -51,7 +52,7 @@ module Alephant
       object       = bucket.objects["#{path}/#{id}"]
       content      = object.read
       content_type = object.content_type
-      meta_data    = object.metadata.to_h
+      meta_data    = object.metadata.to_h.merge(add_custom_meta(object))
 
       logger.metric "StorageGets"
       logger.info(
@@ -69,5 +70,14 @@ module Alephant
         :meta         => meta_data
       }
     end
+
+    private
+
+    def add_custom_meta(object)
+      {
+        :head_ETag            => object.etag,
+        :"head_Last-Modified" => DateTime.parse(object.last_modified).httpdate
+      }
+    end
   end
 end

data/lib/alephant/storage/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   class Storage
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/spec/storage_spec.rb

@@ -1,5 +1,4 @@
-require 'spec_helper'
-require 'pry'
+require "spec_helper"
 
 describe Alephant::Storage do
   let(:id)   { :id }
@@ -60,7 +59,7 @@ describe Alephant::Storage do
       expect_any_instance_of(AWS::S3).to receive(:buckets).and_return({ id => s3_bucket })
       instance = subject.new(id, path)
 
-      instance.put(id, data, 'foo/bar')
+      instance.put(id, data, "foo/bar")
     end
   end
 
@@ -68,8 +67,10 @@ describe Alephant::Storage do
     it "gets bucket path/id content data" do
       s3_object_collection = double()
       expect(s3_object_collection).to receive(:read).and_return("content")
-      expect(s3_object_collection).to receive(:content_type).and_return("foo/bar")
-      expect(s3_object_collection).to receive(:metadata).and_return({ :foo => :bar})
+      expect(s3_object_collection).to receive(:content_type).and_return("foo/bar" )
+      expect(s3_object_collection).to receive(:metadata).and_return({ :foo => :bar })
+      expect(s3_object_collection).to receive(:etag).and_return("foo_123")
+      expect(s3_object_collection).to receive(:last_modified).and_return("2016-04-11 10:39:57 +0000")
 
       s3_bucket = double()
       expect(s3_bucket).to receive(:objects).and_return(
@@ -86,11 +87,14 @@ describe Alephant::Storage do
       expected_hash = {
         :content      => "content",
         :content_type => "foo/bar",
-        :meta         => { :foo => :bar }
+        :meta         => {
+          :foo                  => :bar,
+          :head_ETag            => "foo_123",
+          :"head_Last-Modified" => "Mon, 11 Apr 2016 10:39:57 GMT"
+        }
       }
 
       expect(object_hash).to eq(expected_hash)
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-storage
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - BBC News
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement