etna 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d4c9465edd6fd280a9cd91b9c3abbc3ef08114a46e3ffb41e14a20ce612fe7f
-  data.tar.gz: bfd29114b8db331c92f79be1fe765fa6b64c7b5ee4a8543cd75f6c9fe7c38a84
+  metadata.gz: 9118a99396cf2b041083ff982fb680a5d60096802699789962d19bcf3fecf41d
+  data.tar.gz: 3145994427f0fa57bf796e68dfe4e69156eb407f144a6afe048bd17454201949
 SHA512:
-  metadata.gz: 8ea7b21a563d743cdb6f8a06f92ca15fdeb56ecb291b27ff32a555a8f863cd6ce4400fc6954ae5620a9766bbafbed861609f52309f4de3d407f117d4f9b3f1b1
-  data.tar.gz: 6a9530ee4beb8e6a6d7940c30a2a2bc7412dc4420492e650cb731eac4e5e958a4ca630a966aede4591706ae79212e3290b1a080b5fafe5549df24cc302cbc82b
+  metadata.gz: ec59fd21bcf8bb88848e0c8c628a0185226d7dd7ee1af79525a790ac2117fe2b7d44b9d3e514717e9c23233bd531c9d3c8404981892174adbeee221e62118c33
+  data.tar.gz: bf0cc8cea804bb218e7f487ea014c84e394738760dc400de1c716b780da6a668ca5f853a72acfff7a77cd979f4a90004a866cdd16cb26a008a3498c83161fd71

data/lib/etna/application.rb

@@ -91,6 +91,10 @@ module Etna::Application
     (ENV["#{self.class.name.upcase}_ENV"] || :development).to_sym
   end
 
+  def id
+    ENV["APP_NAME"] || self.class.name.snake_case.split(/::/).last
+  end
+
   def find_descendents(klass)
     ObjectSpace.each_object(Class).select do |k|
       k < klass

data/lib/etna/client.rb

@@ -17,6 +17,29 @@ module Etna
 
     attr_reader :routes
 
+    def signed_route_path(route, params)
+      path = route_path(route,params)
+
+      signatory = params.delete(:signatory)
+
+      return path unless signatory
+
+      hmac = Etna::Hmac.new(
+        signatory,
+        method: route[:method],
+        host: URI(@host).host,
+        path: path,
+        expiration: (DateTime.now + 10).iso8601,
+        id: signatory.id,
+        nonce: SecureRandom.hex,
+        headers: params.except(*route[:params].map(&:to_sym))
+      )
+
+      url_params = hmac.url_params(route[:method] == 'GET')
+
+      return url_params[:path] + '?' + url_params[:query]
+    end
+
     def route_path(route, params)
       Etna::Route.path(route[:route], params)
     end
@@ -60,14 +83,19 @@ module Etna
       @routes.each do |route|
         next unless route[:name]
         self.define_singleton_method(route[:name]) do |params = {}|
-
           missing_params = (route[:params] - params.keys.map(&:to_s))
+
           unless missing_params.empty?
             raise ArgumentError, "Missing required #{missing_params.size > 1 ?
                 'params' : 'param'} #{missing_params.join(', ')}"
           end
 
-          response = send(route[:method].downcase, route_path(route, params), params)
+          response = send(
+            route[:method].downcase,
+            signed_route_path(route, params),
+            params
+          )
+
           if block_given?
             yield response
           else

data/lib/etna/clients/magma/workflows/update_attributes_from_csv_workflow.rb

@@ -37,8 +37,7 @@ module Etna
         end
 
         def update_attributes
-          method = json_values ? :update_json : :update
-          magma_crud.update_records(method: method) do |update_request|
+          magma_crud.update_records(method: :update_json) do |update_request|
             each_revision do |model_name, record_name, revision|
               update_request.update_revision(model_name, record_name, revision)
             end
@@ -53,10 +52,18 @@ module Etna
       end
 
       class RowBase
-        def stripped_value(attribute_value)
+        def attribute_is_json?(attribute)
+          [Etna::Clients::Magma::AttributeType::FILE,
+           Etna::Clients::Magma::AttributeType::FILE_COLLECTION,
+           Etna::Clients::Magma::AttributeType::IMAGE].include?(attribute.attribute_type)
+        end
+
+        def stripped_value(attribute, attribute_value)
           attribute_value = attribute_value&.strip
 
-          if attribute_value && @workflow.json_values && attribute_value != @workflow.hole_value
+          if attribute_value &&
+             ( @workflow.json_values || attribute_is_json?(attribute) ) &&
+             attribute_value != @workflow.hole_value
             attribute_value = JSON.parse(attribute_value)
           end
           attribute_value
@@ -123,7 +130,7 @@ module Etna
                     raise "Invalid attribute #{attribute_name} for model #{model_name}."
                   end
 
-                  stripped = stripped_value(@raw[index + 1])
+                  stripped = stripped_value(attribute, @raw[index + 1])
                   unless @workflow.hole_value.nil?
                     next if stripped == @workflow.hole_value
                   end
@@ -234,7 +241,7 @@ module Etna
                 attribute_name_clean = attribute_name.strip
                 raise "Invalid attribute \"#{attribute_name_clean}\" for model #{@model_name}." unless attribute = @workflow.find_attribute(@model_name, attribute_name_clean)
 
-                attributes[attribute_name_clean] = stripped_value(@raw[attribute_name])
+                attributes[attribute_name_clean] = stripped_value(attribute, @raw[attribute_name])
               end
             end
           end

data/lib/etna/directed_graph.rb

@@ -18,6 +18,35 @@ class DirectedGraph
     parents[parent] = parent_parents
   end
 
+  def serialized_path_from(root)
+    seen = Set.new
+    [].tap do |result|
+      result << root
+      seen.add(root)
+      path_q = paths_from(root)
+
+      until path_q.empty?
+        next_path = path_q.shift
+        next if next_path.nil?
+
+        until next_path.empty?
+          next_n = next_path.shift
+          next if next_n.nil?
+          next if seen.include?(next_n)
+
+          if @parents[next_n].keys.any? { |p| !seen.include?(p) }
+            next_path.unshift(next_n)
+            path_q.push(next_path)
+            break
+          else
+            result << next_n
+            seen.add(next_n)
+          end
+        end
+      end
+    end
+  end
+
   def paths_from(root)
     [].tap do |result|
       parents_of_map = descendants(root)

data/lib/etna/hmac.rb

@@ -20,14 +20,14 @@ module Etna
     end
 
     # this returns arguments for URI::HTTP.build
-    def url_params
+    def url_params(with_headers=true)
       params = {
         signature: signature,
         expiration: @expiration,
         nonce: @nonce,
         id: @id.to_s,
         headers: @headers.keys.join(','),
-      }.merge(@headers).map do |name, value|
+      }.merge(with_headers ? @headers : {}).map do |name, value|
         [
           "X-Etna-#{ name.to_s.split(/_/).map(&:capitalize).join('-') }",
           value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etna
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
 platform: ruby
 authors:
 - Saurabh Asthana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack