dcas-ruby 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/dcas-ruby.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dcas-ruby}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["BehindLogic"]

data/lib/dcas.rb

@@ -50,34 +50,43 @@ module DCAS
     #   #submit_failed!(filename)
     # If a lock_object is supplied, the method will mark it as failed and return false instead of raising an error, in case of failure.
     def submit_payments_file!(filename, lock_object=nil)
-      shortname = filename.gsub(/.*[\\\/][^\\\/]+$/,'')
+      shortname = filename.match(/[\\\/]([^\\\/]+)$/)[1]
       if lock_object && lock_object.submit_locked?(shortname)
-        raise RuntimeError, "Submit for #{shortname} is locked!"
+        # raise RuntimeError, "Submit for #{shortname} is locked!"
+        return nil
       else
         lock_object.submit_lock!(shortname) if lock_object
         with_ftp do |ftp|
           # 1) Create the STAGING folder if it's not already there.
-          ftp.mkdir(DCAS::STAGING_BUCKET) unless ftp.nlst.include?(DCAS::STAGING_BUCKET)
-          ftp.chdir(DCAS::STAGING_BUCKET)
-          # 2) Delete the same filename from the STAGING folder if one exists.
-          ftp.delete(shortname) if ftp.nlst.include?(shortname)
-          # 3) Upload the file into the STAGING folder.
-          ftp.put(filename, shortname)
-          # 4) If we're still connected, check the file size of the file, then move it out of STAGING and mark file as completed.
-          if ftp.nlst.include?(shortname) && ftp.size(shortname) == File.size(filename)
-            ftp.rename(shortname, "../#{outgoing_bucket}/#{shortname}") unless testing || outgoing_bucket == DCAS::STAGING_BUCKET
-            lock_object.submit_finished!(shortname) if lock_object
-          else
-            if lock_object
-              lock_object.submit_failed!(shortname)
-              return false
+          begin
+            ftp.mkdir(DCAS::STAGING_BUCKET) unless ftp.nlst.include?(DCAS::STAGING_BUCKET)
+            ftp.chdir(DCAS::STAGING_BUCKET)
+            # 2) Delete the same filename from the STAGING folder if one exists.
+            ftp.delete(shortname) if ftp.nlst.include?(shortname)
+            # 3) Upload the file into the STAGING folder.
+            puts "Uploading #{filename} as #{shortname}..."
+            ftp.put(filename, shortname)
+          rescue Object
+            false
+          end && begin
+            # 4) If we're still connected, check the file size of the file, then move it out of STAGING and mark file as completed.
+            if ftp.nlst.include?(shortname) && ftp.size(shortname) == File.size(filename)
+              ftp.rename(shortname, "../#{outgoing_bucket}/#{shortname}") unless testing || outgoing_bucket == DCAS::STAGING_BUCKET
+              lock_object.submit_finished!(shortname) if lock_object
+              true
             else
-              raise RuntimeError, "FAILED uploading `#{filename}' - incomplete or unsuccessful upload. Please try again."
+              if lock_object
+                lock_object.submit_failed!(shortname)
+                false
+              else
+                raise RuntimeError, "FAILED uploading `#{filename}' - incomplete or unsuccessful upload. Please try again."
+              end
             end
+          rescue Object
+            false
           end
         end
       end
-      true
     end
 
     # Writes one batch to file and submits it to the DCAS outgoing payments bucket.
@@ -91,7 +100,7 @@ module DCAS
       File.makedirs(cache_location)
       filename = cache_location + "/" + batch.filename
       # 1) Create the file locally.
-      File.open(filename) {|f| f << batch.to_csv }
+      File.open(filename, 'w') {|f| f << batch.to_csv }
       # 2) Upload it to the DCAS outgoing payments bucket.
       submit_payments_file!(filename, lock_object)
     end
@@ -154,13 +163,19 @@ module DCAS
       # This allows all functionality to share the same connection, then log out after all work is finished.
       def with_ftp(&block)
         @inside_with_ftp = @inside_with_ftp.to_i + 1
-        if block.arity == 1
-          yield ftp_connection
-        else
-          yield
+        result = false
+        begin
+          result = if block.arity == 1
+            yield ftp_connection
+          else
+            yield
+          end
+        rescue Object
+        ensure
+          @inside_with_ftp -= 1
+          ftp_done
         end
-        @inside_with_ftp -= 1
-        ftp_done
+        result
       end
       def ftp_done
         close_ftp if @inside_with_ftp.to_i == 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dcas-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - BehindLogic