jaxx 0.0.15 → 0.0.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGM3Y2IyMjc4N2JlNzZjNjAzMzMyNWM3ZmRjZjc1ODM0MzFmZDVkYQ==
+    NWE4Njg1NTJkYjVlNzczODI4NDZiOWExZjRhMTQ5NDkyZjUzMWRjYQ==
   data.tar.gz: !binary |-
-    Y2JkOWVlODcxNjQ3ZDdkZjc2OTljYmZlNWYzY2I4MTU1NmViZDllOQ==
+    MDI3NWMxNWJjODg5ZDk1MWIxNjBiNTExYTViZDRhOWQ4MjFmOTM4MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjdmNTIwMmQwN2MxYmNhMTY0ZGFhM2U1OTAyZTQ0NjkzMzM0Yzg4OTRlNzBm
-    MmMwYTU5OWQ5NjM1NmE3ZjZmMDhhNjljZTZkNTUyY2UyYzFjODY5N2Y0NzYx
-    YjFlYTAyNGFhODMzYzg0OWExNTFmMGFkYjcyMjNmZGY1MTdhMGU=
+    ZjkxNmI3M2I0YTMzZWQzNDdhMjY4MzM5MzNlZmE3ZmY4NWIxODQ4MzFmNTdj
+    MWU2YjdjNGM3NmVhMmNjMjI3OGMzOTcwM2JkNjQ1NWNmZDkxNjk0NzAyMmNk
+    MDBkODExNzUzYzVkODI5YjQwZDRiNWRiOGZlN2ZiYTQ1OTY3N2I=
   data.tar.gz: !binary |-
-    YWNkNTJhOWYyMzU1ZjQ3ZjMwNzM0ZTZhNzVlNzExNTExMTY2NzY2NzYzNGFi
-    MTk2ZjRkZjRkOGMxNWM3NTM0MDVhMTI0N2NhMjI0OTg1MGZmZDU1YjBlMGVj
-    OTU2Y2I0Mzg4Zjk3MDNmYjA2MzFlNDBiMTgxNzQzNzFkMDEwMGU=
+    NWQ3ZmVmMmI4Y2FjYzJjZGVkOGQ5ZTEzOTZhN2JlNzhiYjJhZGUwOWExOTg0
+    MWE1NGQ5Yjc2NjUyZDRjZTc1YWFkN2U0NmZlMDU4YmU5MjE4NzhiMjExNGVk
+    OTgzOTJkOTZmY2MzY2UwMGEyYTVkNjQ1NWU3NDU5YjcyMmYzZGY=

data/lib/jaxx/cli.rb

@@ -31,6 +31,7 @@ module Jaxx
         o.on('-f',  '--file [FILE]')                     { |f| options['file'] = f }
         o.on('-n',  '--name [name]')                     { |f| options['filename'] = f }
         o.on('-p',  '--privacy [privacy]')               { |p| options['privacy'] = p }
+        o.on('-r',  '--retries [retries]')               { |r| options['retries'] = r }
         o.on('-h',  '--help')                            { o }
       end
     end

data/lib/jaxx/process.rb

@@ -40,7 +40,7 @@ module Jaxx
       
       ["Unable to process transaction: ", format_errors(errs)].flatten.each do |msg|
         Jaxx.logger.write msg
-      end and raise(RuntimeError) unless errs.empty?
+      end and raise(RuntimeError, errs.inspect) unless errs.empty?
 
       block.call(storage)
     end

data/lib/jaxx/upload.rb

@@ -4,11 +4,14 @@ require 'mime/types'
 module Jaxx
   class Upload
 
-    attr_reader :process
+    DEFAULT_RETRIES = 3
+
+    attr_reader :process, :retries
 
     def initialize args = {}
-      @process = Process.new(args.merge('validations' => [:privacy, :file_exists, :file_presence]))
+      @process  = Process.new(args.merge('validations' => [:privacy, :file_exists, :file_presence]))
       @filename = args['filename']
+      @retries  = args['retries'] || DEFAULT_RETRIES
     end
 
     def filename
@@ -27,18 +30,45 @@ module Jaxx
 
     def execute
       process.start do |storage|
-        directory  = storage.directories.get(process.bucket)
-        directory ||= storage.directories.create(:key => process.bucket, :public => process.public?)
+        dir, attempts = remote_directory(storage), 0
 
         files.each do |file, name|
-          raise "File process failed: #{file}:#{name}" unless directory.files.create(
-            :key          => name || file, 
-            :body         => File.read(file), 
-            :public       => process.public?,
-            :content_type => MIME::Types.type_for(file).last
-          )
+          stat, exc = false, nil
+          attempts += 1 
+
+          begin
+            stat = create_file dir, file, name
+          rescue => ex
+            exc = ex
+          end
+
+          if !stat and attempts >= self.retries
+            raise("File process failed: #{file}:#{name} : #{exc.message rescue nil}") 
+          elsif !stat
+            redo
+          end
+
+          attempts = 0
         end
       end
+
+    end
+
+    private
+
+    def remote_directory storage 
+      dir = storage.directories.get(process.bucket)
+      dir ||= storage.directories.create(:key => process.bucket, :public => process.public?)
+      dir
+    end
+
+    def create_file dir, file, name
+      dir.files.create(
+        :key          => name || file, 
+        :body         => File.read(file), 
+        :public       => process.public?,
+        :content_type => MIME::Types.type_for(file).last
+      ) 
     end
 
   end

data/lib/jaxx/version.rb

@@ -1,3 +1,3 @@
 module Jaxx
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/spec/lib/jaxx/upload_spec.rb

@@ -1,25 +1,19 @@
 require 'spec_helper'
+require 'fog/aws/models/storage/directories'
 
 module Jaxx
   describe Upload do
 
     describe "#process" do
-      let(:args) { ({ 'access_key' => 'foo', 'access_secret' => 'bar', 'file' => File.expand_path('bar.txt', __FILE__), 'bucket' => 'temp' }) }
+      let(:args) { ({ 
+        'access_key'    => 'foo', 
+        'access_secret' => 'bar', 
+        'file'          => File.expand_path('../bar.txt', __FILE__), 
+        'bucket'        => 'temp' 
+      }) }
 
       subject { described_class.new(args) }
 
-      before :each do
-        Fog.mock!
-      end
-
-      it "sends file to storage" do
-        File.stub(:exist?).with(args['file']).and_return(true)
-        File.should_receive(:read).with(args['file']).and_return("")
-        File.should_receive(:basename).with(args['file']).and_return('bar.txt')
-
-        subject.execute
-      end
-
       it "defaults filename to original filename" do
         subject.filename.should eq('bar.txt')
       end
@@ -28,7 +22,37 @@ module Jaxx
         args['filename'] = 'foo.txt'
         subject.filename.should eq('foo.txt')
       end
-    end
 
+      describe "sending files" do
+        let(:files) { double('files', merge_attributes: {}, load: {}) }
+
+        before :each do 
+          Fog.mock!
+          File.stub(:exist?).with(args['file']).and_return(true)
+          File.stub(:basename).with(args['file']).and_return('bar.txt')
+          Fog::Storage::AWS::Directory.any_instance.stub(:files).and_return(files)
+          File.stub(:read).with(args['file']).any_number_of_times.and_return("")
+        end
+
+        it "to storage" do
+          files.should_receive(:create).and_return(true)
+
+          subject.execute
+        end
+        
+        it "with retries" do
+          files.should_receive(:create).exactly(subject.retries).times.and_return(false)
+
+          -> { subject.execute }.should raise_error(RuntimeError)
+        end
+
+        it "with failed create" do
+          files.should_receive(:create).exactly(subject.retries).times.and_raise(RuntimeError)
+
+          -> { subject.execute }.should raise_error(RuntimeError)
+        end
+
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jaxx
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Marc Watts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog