rest-ftp-daemon 0.243 → 0.243.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8289d36947f2e57440398bc166b4937a8d84455d
-  data.tar.gz: 9438a30f9e2bb7c6bca9e430fad8755de074c7af
+  metadata.gz: be4f56518cd3307fccc1b9796b7df3a264ce6608
+  data.tar.gz: b597f34e41e49dab0d8d5cd832c6e5e1758d7282
 SHA512:
-  metadata.gz: 76c1d06af488c24dd36fe4a8ad78ce5670040fc4c5d6be5d69837479de7051a98ad82750fff8054af7a0defdc075d728dd9ab3385a456e3be9fb9798bdbb7e7e
-  data.tar.gz: 081de80b07433233ce8d9e0462d6b3d22ce6b98d30b3db494d9385bae995a95e4277460e3823f89f367ade4ed6173db8180e416281fe8effe3df77a7d604767c
+  metadata.gz: f379228d4e395674f2d5b731c99ca7b7a6f9cef14111cc83adfe61faebeb98baf9e1b23372f5a249ad570e5b5287d20a98cf95d6a455ffaeb421bacec5ee22d9
+  data.tar.gz: 354982ca7387c5cd14c90556a267d7f9d031acf689aaf117e14a039b3ed6a9480c7b6f0109c3f8b77e636320c160fa01d7f26837fa4dfa1db4717d02ab3c4888

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.243)
+    rest-ftp-daemon (0.243.1)
       double-bag-ftps
       facter
       get_process_mem
@@ -25,7 +25,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
+    addressable (2.4.0)
     ast (2.1.0)
     astrolabe (1.3.1)
       parser (~> 2.2)

data/lib/rest-ftp-daemon/api/job_presenter.rb

@@ -15,9 +15,9 @@ module RestFtpDaemon
         expose :wid, unless: lambda { |object, _options| object.wid.nil? }
 
         # expose :error
-        expose :error_utf8, as: :error
-        expose :status_utf8, as: :status
-        expose :target_method_utf8, as: :target_method
+        expose :json_error, as: :error
+        expose :json_status, as: :status
+        expose :json_target, as: :target_method
 
         expose :queued_at
         expose :updated_at

data/lib/rest-ftp-daemon/constants.rb

@@ -1,7 +1,7 @@
 # Terrific constants
 APP_NAME = "rest-ftp-daemon"
 APP_NICK = "rftpd"
-APP_VER = "0.243"
+APP_VER = "0.243.1"
 
 # Provide default config file information
 APP_LIB = File.expand_path File.dirname(__FILE__)

data/lib/rest-ftp-daemon/job.rb

@@ -42,8 +42,8 @@ module RestFtpDaemon
       #@updated_at = nil
       @started_at = nil
       @finished_at = nil
-      # @error = nil
-      # @status = nil
+      @error = nil
+      @status = nil
       @runs = 0
       @wid = nil
 
@@ -87,7 +87,6 @@ module RestFtpDaemon
 
     def process
       # Update job's status
-      @error = nil
       log_info "Job.process"
 
       # Prepare job
@@ -122,7 +121,7 @@ module RestFtpDaemon
       # Process job
       begin
         #raise Net::FTPTempError, '451 Téléchargement avorté. Input/output error'.force_encoding("ASCII-8BIT")
-        start
+        run
 
       rescue SocketError => exception
         return oops :ended, exception, :conn_socket_error
@@ -234,18 +233,17 @@ module RestFtpDaemon
       (Time.now - @queued_at).round(2)
     end
 
-    def status_utf8
-      utf8 @status
-    end
-
-    def target_method_utf8
+    def json_target
       utf8 @target_method
     end
 
-    def error_utf8
-      utf8 @error
+    def json_error
+      utf8 @error unless @error.nil?
     end
 
+    def json_status
+      utf8 @status unless @status.nil?
+    end
 
   protected
 
@@ -442,12 +440,12 @@ module RestFtpDaemon
     end
 
     def set_error value
-      @error = utf8(value.to_s)
+      @error = value
       touch_job
     end
 
     def set_status value
-      @status = utf8(value.to_s)
+      @status = value
       touch_job
     end
 

data/lib/rest-ftp-daemon/views/dashboard_table.haml

@@ -8,7 +8,6 @@
   - trclass = DASHBOARD_JOB_STYLES[job.status]
   - runs = job.runs.to_i
 
-
   - unless job.error.nil?
     - trclass = "warning"
 
@@ -34,7 +33,7 @@
 
     %td
       %span.push-status
-        = job.status_utf8
+        = job.status
 
       - if (job.status != JOB_STATUS_FINISHED) && (source_processed < source_count)
         = " (#{source_processed}/#{source_count})"
@@ -57,7 +56,7 @@
 
       - else
         .error{title: job.get(:error_message)}
-          = Helpers.text_or_empty(job.error_utf8)
+          = Helpers.text_or_empty(job.error)
 
     %td.nobr.text-right
       = Helpers.format_bytes(job.get(:transfer_total), "B")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: '0.243'
+  version: 0.243.1
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler