porky_lib 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccfeb1766d3d923889b807bd1356184e87854ba7f64f41529b071b6883fb7b5b
-  data.tar.gz: d8b8f6e608c44bc912f92ee92f46637edd1b767afdb95464b62b0e6bfcf86ab6
+  metadata.gz: fd1dfb255c5b91f06fe66af135ef84ef65fcb96bd02ad5150090619460bd7d86
+  data.tar.gz: 5edbf7d85795d8aaff798d486c043464199c03542c924f297559835796b9d829
 SHA512:
-  metadata.gz: d07d5063b430dc69ff2c9f9db568e858eb9a10c26a371ce26139bfa2cc3b367c8e6ee6fc54214e487b8169add837c8ff71a087c0f42707083912d1871816faad
-  data.tar.gz: 84478f5fba144f60ef7e595a57830f9c61748189c28f4fddbbcf35f2c81f5b55dbd99df8796304341970cdd98e9c811618ff9b5e6269a1eae0c7385949928a38
+  metadata.gz: bc55b6280bce9d76a9d6553e239487f14712ba535fdf83c54006e6cd27c67e8babda30e58632fbf1d76f531bc8c822b96d34a1e0a5209cf4098f436567bd951d
+  data.tar.gz: 3e428d8b741ba820b43ef1dc891dd0cd2b3ae81d9b2ba0d578705c84296ade1c4b510eb69e706c8d5869e4153884f1af2a5cd1a22fed09e226a9d694134b6035

data/.circleci/config.yml

@@ -6,7 +6,7 @@ jobs:
     environment:
       - CODECOV_TOKEN: 4d03ca51-5054-4858-87c7-b37c376ffb6a
     docker:
-      - image: circleci/ruby:2.6.3
+      - image: circleci/ruby:2.6.5
 
     steps:
       - checkout

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ruby '2.6.3'
+ruby '2.6.5'
 
 source "https://rubygems.org"
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    porky_lib (0.9.1)
+    porky_lib (0.9.2)
       aws-sdk-kms
       aws-sdk-s3
       msgpack
@@ -13,17 +13,17 @@ GEM
   specs:
     ast (2.4.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.207.0)
-    aws-sdk-core (3.65.1)
+    aws-partitions (1.228.0)
+    aws-sdk-core (3.72.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1.0)
+      aws-partitions (~> 1, >= 1.228.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.24.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
+    aws-sdk-kms (1.25.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.48.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
+    aws-sdk-s3 (1.51.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.0)
@@ -43,8 +43,8 @@ GEM
     jmespath (1.4.0)
     json (2.2.0)
     msgpack (1.3.1)
-    parallel (1.17.0)
-    parser (2.6.4.1)
+    parallel (1.18.0)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
     rainbow (3.0.0)
     rake (13.0.0)
@@ -52,24 +52,24 @@ GEM
       ffi
     rbnacl-libsodium (1.0.16)
       rbnacl (>= 3.0.1)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
     rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.3)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.75.0)
+    rubocop (0.75.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
@@ -119,7 +119,7 @@ DEPENDENCIES
   timecop
 
 RUBY VERSION
-   ruby 2.6.3p62
+   ruby 2.6.5p114
 
 BUNDLED WITH
    2.0.2

data/README.md

@@ -156,7 +156,7 @@ file_data = PorkyLib::Unencrypted::FileService.read(bucket_name, file_key)
 
 ### To Write To AWS S3
 ```ruby
-# Where file is the data to encrypt and upload to S3 (can be raw data or path to a file on disk)
+# Where file is the data to encrypt and upload to S3 (can be raw data or ruby file object)
 # bucket_name is the name of the S3 bucket to write to
 # key_id is the ID of the CMK to use to generate a data encryption key to encrypt the file data
 # options is an optional parameter for specifying optional metadata about the file
@@ -165,7 +165,7 @@ file_key = PorkyLib::FileService.write(file, bucket_name, key_id, options)
 
 ### To Write Unencrypted Files To AWS S3
 ```ruby
-# Where file is the data to upload to S3 (can be raw data or path to a file on disk)
+# Where file is the data to upload to S3 (can be raw data or ruby file object)
 # bucket_name is the name of the S3 bucket to write to
 # options is an optional parameter for specifying optional metadata about the file
 file_key = PorkyLib::Unencrypted::FileService.write(file, bucket_name, options)

data/lib/porky_lib/file_service_helper.rb

@@ -3,12 +3,16 @@
 require 'aws-sdk-s3'
 
 module PorkyLib::FileServiceHelper
-  def file_size_invalid?(file)
-    file.bytesize > max_size || (File.file?(file) && File.size(file) > max_size)
+  def file_size_invalid?(file_or_content)
+    if a_file?(file_or_content)
+      File.size(file_or_content) > max_size
+    else
+      file_or_content.bytesize > max_size
+    end
   end
 
-  def file_data(file)
-    File.file?(file) ? File.read(file) : file
+  def file_data(file_or_content)
+    a_file?(file_or_content) ? File.read(file_or_content) : file_or_content
   end
 
   def write_tempfile(file_contents, file_key)
@@ -48,4 +52,10 @@ module PorkyLib::FileServiceHelper
   def generate_file_key(options)
     options.key?(:directory) ? "#{options[:directory]}/#{SecureRandom.uuid}" : SecureRandom.uuid
   end
+
+  private
+
+  def a_file?(file_or_content)
+    !file_or_content.is_a?(String)
+  end
 end

data/lib/porky_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PorkyLib
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: porky_lib
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Greg Fletcher
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-kms