crossing 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b632249d2ce6cb691314739f99a16f452e4170db
-  data.tar.gz: 37a0ea305b4154ea7d3492c1a5b77157eaa7de44
+  metadata.gz: ea547ab9192c22203ae5940c83cc60142d219d26
+  data.tar.gz: 553d987c1b449c4f6bd92cf7ce6e3e616d400a9d
 SHA512:
-  metadata.gz: 3528ede47332f67ac5a7b94136c7f9d6c11b28b9cb26f3be45f96c61fb70d7d7320235af19f7c8877ceebaafbe82d4d55387c1e59afd4238ce4767a7af0af20e
-  data.tar.gz: 7a29c5b5e2b9438f3f04534245d80128fe9ffa83b6a8dd47046c452234526be6ae053c5472116f85b0286136072a8e8c91072d35c32b8648cf4ccbe2f215ab3f
+  metadata.gz: beb6f637721a02d7885209a2db1ce229412664ff3e5337f4fee12fadad8f684730726e796b4b27b5be35453e755b5b5e127eb1c0cd3d5d5efa39eee34cdcf2da
+  data.tar.gz: ec738d813b1cd0c45c63aa77dc88f639df2e645b0cab40a72e09f2719addd975889e345d466e87bc6ec99a572d3992d8461ca0f7f60eb035151a2ead3180878f

data/lib/crossing.rb

@@ -2,10 +2,18 @@ require 'aws-sdk'
 
 # Documentation incoming
 class Crossing
-  def initialize(s3_client)
-    raise CrossingMisconfigurationException if s3_client.nil?
-    raise CrossingMisconfigurationException unless s3_client.is_a? Aws::S3::Encryption::Client
-    @s3_client = s3_client
+  def initialize(s3_client_encrypted, s3_client_unencrypted = nil)
+    raise CrossingMisconfigurationException if s3_client_encrypted.nil?
+    raise CrossingMisconfigurationException unless s3_client_encrypted.is_a? Aws::S3::Encryption::Client
+    @s3_client_encrypted = s3_client_encrypted
+
+    if !s3_client_unencrypted.nil?
+      raise CrossingMisconfigurationException unless s3_client_unencrypted.is_a? Aws::S3::Client
+      @s3_client_unencrypted = s3_client_unencrypted
+    else
+      # create regular s3 client
+      @s3_client_unencrypted = Aws::S3::Client.new
+    end
   end
 
   def put(bucket, filename)
@@ -17,10 +25,10 @@ class Crossing
   end
 
   def put_content(bucket, filename, content)
-    @s3_client.put_object(bucket: bucket,
-                          key: File.basename(filename),
-                          body: content,
-			  tagging: "x-crossing-uploaded=true")
+    @s3_client_encrypted.put_object(bucket: bucket,
+                                    key: File.basename(filename),
+                                    body: content,
+                                    tagging: 'x-crossing-uploaded=true')
   end
 
   def get(bucket, file)
@@ -34,8 +42,21 @@ class Crossing
     File.open(file, 'wb') { |f| f.write(content) }
   end
 
+  def get_multiple(bucket, filelist)
+    filelist.each { |file| get(bucket, file) }
+  end
+
+  def put_multiple(bucket, filelist)
+    filelist.each { |file| put(bucket, file) }
+  end
+
   def get_content(bucket, file)
-    @s3_client.get_object(bucket: bucket, key: file).body.read
+    @s3_client_encrypted.get_object(bucket: bucket, key: file).body.read
+
+  # If a decryption exception occurs, warn and get the object without decryption
+  rescue Aws::S3::Encryption::Errors::DecryptionError
+    STDERR.puts "WARNING: #{file} decryption failed. Retreiving the object without encryption."
+    @s3_client_unencrypted.get_object(bucket: bucket, key: file).body.read
   end
 end
 

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: crossing
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - John Ulick
 - Jonny Sywulak
+- Keith Monihen
 - Stelligent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk