etna 0.1.27 → 0.1.28

data/lib/etna/directed_graph.rb

@@ -18,6 +18,27 @@ class DirectedGraph
     parents[parent] = parent_parents
   end
 
+  def paths_from(root)
+    [].tap do |result|
+      parents_of_map = descendants(root)
+      seen = Set.new
+
+      parents_of_map.to_a.sort_by { |k, parents| [-parents.length, k] }.each do |k, parents|
+        unless seen.include?(k)
+          if @children[k].keys.empty?
+            result << parents + [k]
+          else
+            @children[k].keys.dup.sort.each do |c|
+              result << parents + [k, c]
+            end
+          end
+        end
+
+        parents.each { |p| seen.add(p) }
+      end
+    end
+  end
+
   def descendants(parent)
     seen = Set.new
 

data/lib/etna/filesystem.rb

@@ -230,6 +230,8 @@ module Etna
       end
 
       def with_writeable(dest, opts = 'w', size_hint: nil, &block)
+        raise "#{self.class.name} requires size_hint in with_writeable" if size_hint.nil?
+
         super do |io|
           io.write("File: #{::File.basename(dest)}\n")
           io.write("Size: #{size_hint}\n")

data/lib/etna/generate_autocompletion_script.rb

@@ -29,10 +29,12 @@ module Etna
       write %Q(elif [[ -z "$(echo $all_flag_completion_names | xargs)" ]]; then)
       write "return"
       write %Q(elif [[ "$all_flag_completion_names" =~ $1\\  ]]; then)
+      write %Q(if ! [[ "$multi_flags" =~ $1\\  ]]; then)
       write %Q(all_flag_completion_names="${all_flag_completion_names//$1\\ /}")
+      write 'fi'
       write 'a=$1'
       write 'shift'
-      write %Q(if [[ "$string_flag_completion_names" =~ $a\\  ]]; then)
+      write %Q(if [[ "$arg_flag_completion_names" =~ $a\\  ]]; then)
       write 'if [[ "$#" == "1" ]];  then'
       write %Q(a="${a//--/}")
       write %Q(a="${a//-/_}")
@@ -58,12 +60,14 @@ module Etna
 
     def enable_flags(flags_container)
       boolean_flags = flags_container.boolean_flags
-      string_flags = flags_container.string_flags
-      flags = boolean_flags + string_flags
+      multi_flags = flags_container.multi_flags
+      arg_flags = flags_container.string_flags + multi_flags
+      flags = boolean_flags + arg_flags
       write %Q(all_flag_completion_names="$all_flag_completion_names #{flags.join(' ')} ")
-      write %Q(string_flag_completion_names="$string_flag_completion_names #{string_flags.join(' ')} ")
+      write %Q(arg_flag_completion_names="$arg_flag_completion_names #{arg_flags.join(' ')} ")
+      write %Q(multi_flags="$multi_flags #{multi_flags.join(' ')} ")
 
-      string_flags.each do |flag|
+      arg_flags.each do |flag|
         write %Q(declare _completions_for_#{flag_as_parameter(flag)}="#{completions_for(flag_as_parameter(flag)).join(' ')}")
       end
     end
@@ -107,7 +111,8 @@ function _#{name}_completions() {
 
 function _#{name}_inner_completions() {
   local all_flag_completion_names=''
-  local string_flag_completion_names=''
+  local arg_flag_completion_names=''
+  local multi_flags=''
   local all_completion_names=''
   local i=''
   local a=''

data/lib/etna/route.rb

@@ -9,6 +9,7 @@ module Etna
       @name = route_name(options)
       @route = route.gsub(/\A(?=[^\/])/, '/')
       @block = block
+      @match_ext = options[:match_ext]
     end
 
     def to_hash
@@ -72,9 +73,7 @@ module Etna
         user = request.env['etna.user']
 
         params = request.env['rack.request.params'].map do |key,value|
-          value = value.to_s
-          value = value[0..500] + "..." + value[-100..-1] if value.length > 600
-          [ key, value ]
+          [ key, redact(key, value) ]
         end.to_h
 
         logger.warn("User #{user ? user.email : :unknown} calling #{controller}##{action} with params #{params}")
@@ -94,6 +93,39 @@ module Etna
 
     private
 
+    def application
+      @application ||= Etna::Application.instance
+    end
+
+    def compact(value)
+      value = value.to_s
+      value = value[0..500] + "..." + value[-100..-1] if value.length > 600
+      value
+    end
+
+    def redact_keys
+      @redact_keys ||= application.config(:log_redact_keys).split(",").map do |key|
+        key.to_sym
+      end
+    end
+
+    def redact(key, value)
+      # From configuration, redact any values for the supplied key values, so they
+      #   don't appear in the logs.
+      return compact(value) unless application.config(:log_redact_keys)
+
+      if value.is_a?(Hash)
+        redacted_value = value.map do |value_key, value_value|
+          [ value_key, redact(value_key, value_value) ]
+        end.to_h
+        return redacted_value
+      elsif redact_keys.include?(key)
+        return "*"
+      end
+
+      return compact(value)
+    end
+
     def authorized?(request)
       # If there is no @auth requirement, they are ok - this doesn't preclude
       # them being rejected in the controller response
@@ -145,13 +177,21 @@ module Etna
       )
     end
 
+    def separator_free_match
+      if @match_ext
+        '(?<\1>[^\/\?]+)'
+      else
+        '(?<\1>[^\.\/\?]+)'
+      end
+    end
+
     def route_regexp
       @route_regexp ||=
         Regexp.new(
           '\A' +
           @route.
             # any :params match separator-free strings
-            gsub(NAMED_PARAM, '(?<\1>[^\.\/\?]+)').
+            gsub(NAMED_PARAM, separator_free_match).
             # any *params match arbitrary strings
             gsub(GLOB_PARAM, '(?<\1>.+)').
             # ignore any trailing slashes in the route

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etna
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors:
 - Saurabh Asthana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -107,6 +107,7 @@ files:
 - lib/etna/clients/magma/client.rb
 - lib/etna/clients/magma/formatting.rb
 - lib/etna/clients/magma/formatting/models_csv.rb
+- lib/etna/clients/magma/formatting/models_odm_xml.rb
 - lib/etna/clients/magma/models.rb
 - lib/etna/clients/magma/workflows.rb
 - lib/etna/clients/magma/workflows/add_project_models_workflow.rb
@@ -139,6 +140,7 @@ files:
 - lib/etna/controller.rb
 - lib/etna/cross_origin.rb
 - lib/etna/csvs.rb
+- lib/etna/cwl.rb
 - lib/etna/describe_routes.rb
 - lib/etna/directed_graph.rb
 - lib/etna/environment_scoped.rb