rest-ftp-daemon 0.501.0 → 0.502.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 180577d1189952b25cbcecf2a7ba1144116d2c41
-  data.tar.gz: 013a7a6dbaac918ef25e2d3607e9d7cc89efb45e
+  metadata.gz: 3b771227ebc077ba4d30cb7bcce47a2bdb0d7d14
+  data.tar.gz: aa4dc8592a04fd1b83df3157854ad3b0dc8f34e3
 SHA512:
-  metadata.gz: c0328a020bf3a3c59d649be271d92e3a2a6661ae0e654255e323c2fb5e6a3e18fbc425c48a905a8c1b84971c1251a393e51135c049d2b3192b2fa2f23307bcb7
-  data.tar.gz: 3b42ec7c4feef47bb5005b338a56f4bb45e094919d97b00f822a66987cc7f749d65ad4912a42384bf7bece3acba7dc187a68ec184b3b976ec29b6c0a1273972b
+  metadata.gz: 2d26f7e76b9ab1f527d4efa5131ec43cc91837a7c60d9fa61661136b12338b4fcbdbe672d4f3b8352e21cd23457de454285ddb04516fa7d75c7b660b8769961e
+  data.tar.gz: 4f4937aaaceb79504b2ef05f8952acf4c47327ad8e7af22520c8ef0d4e7e56143d1424755fcb0d9b0dcd0cb33bf28cc555280513c9690c9e58801832b940ac4d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.501.0)
+    rest-ftp-daemon (0.502.0)
       activesupport (~> 4.2)
       api-auth
       aws-sdk-resources (~> 2)
@@ -38,11 +38,11 @@ GEM
       public_suffix (~> 2.0, >= 2.0.2)
     api-auth (2.0.1)
     ast (2.3.0)
-    aws-sdk-core (2.6.26)
+    aws-sdk-core (2.6.27)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.26)
-      aws-sdk-core (= 2.6.26)
+    aws-sdk-resources (2.6.27)
+      aws-sdk-core (= 2.6.27)
     aws-sigv4 (1.0.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -87,7 +87,7 @@ GEM
       multi_json (>= 1.3.2)
     grape-swagger (0.25.0)
       grape (>= 0.12.0)
-    grape-swagger-entity (0.1.4)
+    grape-swagger-entity (0.1.5)
       grape-entity
       grape-swagger (>= 0.20.4)
     grape-swagger-representable (0.1.3)

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

@@ -112,30 +112,40 @@ module RestFtpDaemon
     end
 
     def location_label loc
-      # sprintf(
-      #   '<div class="transfer-type label label-%s" title="%s">%s</div>',
-      #   location_style(loc.uri),
-      #   loc.to_s,
-      #   loc.uri.class.name.split('::').last
-      #   )
-      sprintf(
-        '
-        <span class="label-group">
-          <span class="transfer-type label label-xs label-%s" title="%s">%s</span><span class="label label-simple" title="%s">%s</span>
-        </span>
-        ',
+      # Open label-group 
+      out = []
+      out << '<span class="label-group">'
+
+      # Add location style
+      out << sprintf(
+        '<span class="transfer-type label label-xs label-%s" title="%s">', 
         location_style(loc.uri),
-        loc.to_s,
-        loc.uri.class.name.split('::').last,
-        loc.tokens.first,
-        loc.tokens.first,
+        loc.uri
         )
-    end
+      out << loc.uri.class.name.split('::').last
+      out << '</span>'
+
+      # Try to match a prefix token
+      matches = /^\[([^\[]+)\](.*)/.match(loc.url)
+
+      # Add a prefix label, if matched
+      if matches
+        out <<'<span class="transfer-prefix label label-xs label-simple">'
+        out << matches[1]
+        out << '</span>'
+        text = matches[2]
+      else
+        text = loc.path
+      end
 
-    # def token_highlight path
-    #   return unless path.is_a? String
-    #   path.gsub(/\[([^\[]+)\]/, token_to_label('\1'))
-    # end
+      # Add remaining stuff
+      out << '</span>'
+      out << ' '
+      out << text
+
+      # Output all that stuff
+      return out.join()
+    end
 
     def text_or_empty text
       return "-" if text.nil? || text.empty?

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

@@ -30,7 +30,7 @@ module RestFtpDaemon
       # end   
       debug nil
 
-      @url = url
+      @url = url.clone
       debug :url, url
       @tokens = []
 

data/lib/rest-ftp-daemon/static/css/main.css

@@ -175,6 +175,7 @@ body {
   color: black;
   border: 1px solid silver;
   background-color: white;
+  
   }
 /*
 .label-group>.label:first-child:not(:last-child) {
@@ -189,6 +190,10 @@ body {
 */
 
 .transfer-type {
-  /*width: 40px;*/
+  width: 40px;
   }
 
+.transfer-prefix {
+  /*color: red;*/
+  font-family: inherit;
+}

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

@@ -33,16 +33,9 @@
 
     %td= job.label
 
-    %td
-      = location_label job.source_loc
-      = job.source_uri.path
-      =# token_highlight job.source
-
-    %td
-      = location_label job.target_loc
-      = job.target_uri.path
+    %td= location_label(job.source_loc)
 
-      =# token_highlight job.target
+    %td= location_label(job.target_loc)
 
     %td
       %span.push-status

data/rest-ftp-daemon.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.501.0
+  version: 0.502.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler