file_worker 0.2.0 → 0.3.0

data/bin/file_worker

@@ -3,6 +3,7 @@
 require 'file_worker'
 
 scanner = FileWorker::Cli.build_scanner
+scanner.worker_class = FileWorker::S3UploadWorker
 
 scanner.on_error do |file_name, exception|
   $stderr.puts("Failed to process #{file_name}")

data/lib/file_worker/s3_upload_worker.rb

@@ -1,34 +1,20 @@
-require "fog"
+require "right_aws"
 
 module FileWorker
   class S3UploadWorker
     def initialize(file_name, options)
       @file_name   = file_name
       @bucket_name = ENV.fetch("S3_BUCKET")
-      @aws_key_id  = ENV.fetch("AWS_ACCESS_KEY_ID")
-      @aws_secret  = ENV.fetch("AWS_SECRET_ACCESS_KEY")
     end
 
     def process
-      bucket.files.create(
-        :key    => File.basename(@file_name),
-        :body   => File.open(@file_name),
-        :public => false
-      )
+      s3.put(@bucket_name, File.basename(@file_name), File.open(@file_name))
     end
 
     private
 
-    def connection
-      @connection ||= Fog::Storage.new(
-        :provider              => "AWS",
-        :aws_access_key_id     => @aws_key_id,
-        :aws_secret_access_key => @aws_secret
-      )
-    end
-
-    def bucket
-      connection.directories.get(@bucket_name)
+    def s3
+      @s3 ||= RightAws::S3Interface.new
     end
   end
 end

data/lib/file_worker/version.rb

@@ -1,3 +1,3 @@
 module FileWorker
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/s3_upload_worker_test.rb

@@ -23,11 +23,10 @@ describe "an s3 upload worker" do
         file   = stub()
         File.expects(:open).with(@file_name).returns(file)
 
-        files  = stub()
-        bucket = stub(:files => files)
-        files.expects(:create).with(:key => File.basename(@file_name), :body => file, :public => false)
+        s3 = stub('s3')
+        s3.expects(:put).with('files', File.basename(@file_name), file)
 
-        @worker.expects(:bucket).returns(bucket)
+        @worker.expects(:s3).returns(s3)
         @worker.process
       end
     end

metadata

@@ -2,7 +2,7 @@
 name: file_worker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
   - Mick Staugaard
@@ -68,14 +68,14 @@ dependencies:
     type: :runtime
     version_requirements: *id005
   - !ruby/object:Gem::Dependency 
-    name: fog
+    name: right_aws
     prerelease: false
     requirement: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - ~>
           - !ruby/object:Gem::Version 
-            version: "0"
+            version: "3.0"
     type: :runtime
     version_requirements: *id006
 description: If you have files that you some how need to process, file_worker is your friend.