etna 0.1.42 → 0.1.45

data/lib/etna/user.rb

@@ -1,11 +1,7 @@
+require_relative './permissions'
+
 module Etna
   class User
-    ROLE_NAMES = {
-      'A' => :admin,
-      'E' => :editor,
-      'V' => :viewer
-    }
-
     def initialize params, token=nil
       @name, @email, @encoded_permissions, encoded_flags, @task = params.values_at(:name, :email, :perm, :flags, :task)
 
@@ -21,19 +17,7 @@ module Etna
     end
 
     def permissions
-      @permissions ||= @encoded_permissions.split(/\;/).map do |roles|
-        role, projects = roles.split(/:/)
-
-        projects.split(/\,/).reduce([]) do |perms,project_name|
-          perms.push([
-            project_name,
-            {
-              role: ROLE_NAMES[role.upcase],
-              restricted: role == role.upcase
-            }
-          ])
-        end
-      end.inject([],:+).to_h
+      @permissions ||= Etna::Permissions.from_encoded_permissions(@encoded_permissions).to_hash
     end
 
     def has_flag?(flag)
@@ -44,12 +28,6 @@ module Etna
       permissions.keys
     end
 
-    ROLE_MATCH = {
-      admin: /[Aa]/,
-      editor: /[Ee]/,
-      viewer: /[Vv]/,
-      restricted: /[AEV]/,
-    }
     def has_any_role?(project, *roles)
       perm = permissions[project.to_s]
 
@@ -75,7 +53,7 @@ module Etna
     end
 
     def can_view? project
-      is_superviewer? || has_any_role?(project, :admin, :editor, :viewer)
+      is_superviewer? || has_any_role?(project, :admin, :editor, :viewer, :guest)
     end
 
     # superusers - administrators of the Administration group - cannot

data/lib/etna.rb

@@ -1,4 +1,7 @@
 require 'json'
+require_relative './etna/redirect'
+require_relative './etna/environment_variables'
+require_relative './etna/injection'
 require_relative './etna/ext'
 require_relative './etna/logger'
 require_relative './etna/server'
@@ -24,6 +27,7 @@ require_relative './etna/cwl'
 require_relative './etna/metrics'
 require_relative './etna/remote'
 require_relative './etna/synchronize_db'
+require_relative './etna/janus_utils'
 
 class EtnaApp
   include Etna::Application

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etna
 version: !ruby/object:Gem::Version
-  version: 0.1.42
+  version: 0.1.45
 platform: ruby
 authors:
 - Saurabh Asthana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -56,16 +56,16 @@ dependencies:
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: rollbar
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +177,8 @@ files:
 - lib/etna/clients/metis/workflows/metis_download_workflow.rb
 - lib/etna/clients/metis/workflows/metis_upload_workflow.rb
 - lib/etna/clients/metis/workflows/sync_metis_data_workflow.rb
+- lib/etna/clients/metis/workflows/walk_metis_diff_workflow.rb
+- lib/etna/clients/metis/workflows/walk_metis_workflow.rb
 - lib/etna/clients/polyphemus.rb
 - lib/etna/clients/polyphemus/client.rb
 - lib/etna/clients/polyphemus/models.rb
@@ -190,17 +192,22 @@ files:
 - lib/etna/describe_routes.rb
 - lib/etna/directed_graph.rb
 - lib/etna/environment_scoped.rb
+- lib/etna/environment_variables.rb
 - lib/etna/errors.rb
 - lib/etna/ext.rb
 - lib/etna/filesystem.rb
 - lib/etna/formatting.rb
 - lib/etna/generate_autocompletion_script.rb
 - lib/etna/hmac.rb
+- lib/etna/injection.rb
+- lib/etna/janus_utils.rb
 - lib/etna/json_serializable_struct.rb
 - lib/etna/logger.rb
 - lib/etna/metrics.rb
 - lib/etna/multipart_serializable_nested_hash.rb
 - lib/etna/parse_body.rb
+- lib/etna/permissions.rb
+- lib/etna/redirect.rb
 - lib/etna/remote.rb
 - lib/etna/route.rb
 - lib/etna/server.rb