rest-ftp-daemon 0.306.0 → 0.306.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6edd22943111a9e497528ea36e6890af33f9ef47
-  data.tar.gz: caeb1289c6f8e878fe926e90d9c8b693c80f26e0
+  metadata.gz: 372111b2b2e4ff339dd45950692792e665189752
+  data.tar.gz: 951510fba629f42100adc30c231918fad393c19c
 SHA512:
-  metadata.gz: 1c4e9793292e1bd0020fd96f9f9d0770200b04aaafe4a8630833021545baa3a4b10ca1d480c52fa5cb80bfa84a1c162f48febdf4995f0cccc2a68baebd76c440
-  data.tar.gz: f269efbb1a414c0610a2bbdbaba41b641a75e1b97e84c270c1dbb1d1590b871f828d06d538a91cdd3af6ec441a3d7c9ac68ec76485063bbb214b5b2afd3da66b
+  metadata.gz: d0fb55a01ba93e20345e929c3f21191aa43de48934a243f2f007bfb6ec518f360930f543220d8071e8c1bb88932e6f89a932cde241b0abd7e85a4d2e24cf0b64
+  data.tar.gz: eba0e1863549d8de14877bc095324594e8aa217f17c6589b6fdd1763821226673782767680890a4aae6a56f8f16fa64211308ee5d26b83b97a2a4081a2e54625

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.306.0)
+    rest-ftp-daemon (0.306.1)
       api-auth
       bmc-daemon-lib (~> 0.2)
       double-bag-ftps

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

@@ -17,8 +17,8 @@ module RestFtpDaemon
 
           # Inject helpers
           scope_object = eval("self", binding)
-          scope_object.extend RestFtpDaemon::HelpViews
-          scope_object.extend RestFtpDaemon::Helpers
+          scope_object.extend RestFtpDaemon::ViewsHelper
+          scope_object.extend RestFtpDaemon::CommonHelpers
 
           # Do the rendering !
           haml_engine.render(scope_object, values)

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

@@ -6,6 +6,10 @@ module RestFtpDaemon
       include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
       ### LOGGING & HELPERS
+      helpers RestFtpDaemon::CommonHelpers
+      helpers RestFtpDaemon::ApiHelpers
+      helpers BmcDaemonLib::LoggerHelper
+
       helpers do
         def log_prefix
           ['API', nil, nil]
@@ -14,18 +18,6 @@ module RestFtpDaemon
         def logger
           Root.logger
         end
-
-        def log_request
-          if env.nil?
-            puts "HTTP_ENV_IS_NIL: #{env.inspect}"
-            return
-          end
-
-          request_method = env['REQUEST_METHOD']
-          request_path   = env['REQUEST_PATH']
-          request_uri    = env['REQUEST_URI']
-          log_info       "HTTP #{request_method} #{request_uri}", params
-        end
       end
 
       before do
@@ -33,8 +25,6 @@ module RestFtpDaemon
       end
 
       ### CLASS CONFIG
-      helpers RestFtpDaemon::HelpApis
-      helpers BmcDaemonLib::LoggerHelper
       logger BmcDaemonLib::LoggerPool.instance.get :api
       do_not_route_head!
       do_not_route_options!

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

@@ -0,0 +1,24 @@
+module RestFtpDaemon
+  module ApiHelpers
+
+    def log_request
+      if env.nil?
+        puts "HTTP_ENV_IS_NIL: #{env.inspect}"
+        return
+      end
+
+      request_method = env['REQUEST_METHOD']
+      request_path   = env['REQUEST_PATH']
+      request_uri    = env['REQUEST_URI']
+      log_info       "HTTP #{request_method} #{request_uri}", params
+    end
+
+    def get_censored_config
+      config = Conf.to_hash
+      config[:users] = Conf[:users].keys if Conf[:users]
+      config[:endpoints] = Conf[:endpoints].keys if Conf[:endpoints]
+      config
+    end
+
+  end
+end

data/lib/rest-ftp-daemon/{helpers.rb → helpers/common.rb}

@@ -1,5 +1,5 @@
 module RestFtpDaemon
-  module Helpers
+  module CommonHelpers
 
     def format_bytes number, unit="", decimals = 0
       return "Ø" if number.nil? || number.to_f.zero?

data/lib/rest-ftp-daemon/{help_views.rb → helpers/views.rb}

@@ -1,5 +1,5 @@
 module RestFtpDaemon
-  module HelpViews
+  module ViewsHelper
 
     def dashboard_job_url job
       "#{MOUNT_JOBS}/#{job.id}" if job.respond_to? :id

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

@@ -5,7 +5,7 @@ module RestFtpDaemon
   class Job
     include BmcDaemonLib::LoggerHelper
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
-    include Helpers
+    include CommonHelpers
 
     # Class constants
     FIELDS = [:source, :target, :label, :priority, :pool, :notify, :overwrite, :mkdir, :tempfile]

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

@@ -4,7 +4,7 @@ module RestFtpDaemon
   class JobQueue
     include BmcDaemonLib::LoggerHelper
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
-    include Helpers
+    include CommonHelpers
 
     # Class options
     attr_reader :logger

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

@@ -5,7 +5,7 @@ require 'rest_client'
 module RestFtpDaemon
   class Notification
     include BmcDaemonLib::LoggerHelper
-    include Helpers
+    include CommonHelpers
 
     # Class options
     attr_reader :logger
@@ -87,7 +87,7 @@ module RestFtpDaemon
       # Log reponse body
       response_lines = response.body.lines
       if response_lines.size > 1
-        human_size = Helpers.format_bytes(response.body.bytesize, "B")
+        human_size = format_bytes(response.body.bytesize, "B")
         log_info "received [#{response.code}] #{human_size} (#{response_lines.size} lines)", response_lines
       else
         log_info "received [#{response.code}] #{response.body.strip}"

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

@@ -1,6 +1,6 @@
 module RestFtpDaemon
   class Paginate
-    include Helpers
+    include CommonHelpers
 
     # Class options
     attr_writer :filter

data/lib/rest-ftp-daemon.rb

@@ -18,9 +18,9 @@ require_relative "shared/patch_haml"
 # Project's libs
 require_relative "rest-ftp-daemon/constants"
 require_relative "rest-ftp-daemon/exceptions"
-require_relative "rest-ftp-daemon/help_views"
-require_relative "rest-ftp-daemon/help_apis"
-require_relative "rest-ftp-daemon/helpers"
+require_relative "rest-ftp-daemon/helpers/common"
+require_relative "rest-ftp-daemon/helpers/views"
+require_relative "rest-ftp-daemon/helpers/api"
 require_relative "rest-ftp-daemon/metrics"
 require_relative "rest-ftp-daemon/paginate"
 require_relative "rest-ftp-daemon/uri"

data/rest-ftp-daemon.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version                    = "0.306.0"
+  spec.version                    = "0.306.1"
 
   # Project description
   spec.name                       = "rest-ftp-daemon"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.306.0
+  version: 0.306.1
 platform: ruby
 authors:
 - Bruno MEDICI
@@ -335,9 +335,9 @@ files:
 - lib/rest-ftp-daemon/constants.rb
 - lib/rest-ftp-daemon/counters.rb
 - lib/rest-ftp-daemon/exceptions.rb
-- lib/rest-ftp-daemon/help_apis.rb
-- lib/rest-ftp-daemon/help_views.rb
-- lib/rest-ftp-daemon/helpers.rb
+- lib/rest-ftp-daemon/helpers/api.rb
+- lib/rest-ftp-daemon/helpers/common.rb
+- lib/rest-ftp-daemon/helpers/views.rb
 - lib/rest-ftp-daemon/job.rb
 - lib/rest-ftp-daemon/job_queue.rb
 - lib/rest-ftp-daemon/launcher.rb

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

@@ -1,12 +0,0 @@
-module RestFtpDaemon
-  module HelpApis
-
-    def get_censored_config
-      config = Conf.to_hash
-      config[:users] = Conf[:users].keys if Conf[:users]
-      config[:endpoints] = Conf[:endpoints].keys if Conf[:endpoints]
-      config
-    end
-
-  end
-end