etna 0.1.48 → 0.1.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aea22f69c338ad0b9b7a580ed1e5f91b4d8166c2ab129ed371f5a17b273aab80
-  data.tar.gz: fcd7e348f3620f267763a3206e8f47663a1d10ce839e00dfdecab214f78fc79a
+  metadata.gz: 2d4a9a5034898ac9abf629e6ecbf0bdc3856c2ed9a0d43afe03147b2d6ff777d
+  data.tar.gz: c4d65c138d401605aba76e1e0eff1a4e860778d982cb6a7c04d834e829fa3df2
 SHA512:
-  metadata.gz: 38ad3b89bef7df3f92370b4adaf5eed503321149ca9f33c8b20d08c0d27d7bf7deaf9511d6582943e4ed1d53aaea7fdf06520473acdab1c94ddf4996526e8f61
-  data.tar.gz: 5d60ee51a5fea1580739ac1d83827dc241ca58aa0e5446a4715872a89a5c7bdef0c4d9ef9f525713e13b932ae68a269d4acfa629fc817ee23683d0960a9f7e47
+  metadata.gz: 20505cf23f06bea3343194a4f956b7ffec44786cef9a92b5a78f48aa7793dec746aa710b8007c96f9d4d9ba5001c2e9e3464d464458873fcb4d43bed43dbee09
+  data.tar.gz: 8bc2f47aaa9daa3a211ce40ce5b3649e82d435225370533e8d34628b3c8d302a60051a68cc99a35b760a6d021df087fdd37d200c8062a933f5f10d599af9ad53

data/lib/commands.rb

@@ -250,9 +250,10 @@ class EtnaApp
       string_flags << "--log-file"
       string_flags << "--log-level"
       string_flags << "--concurrency"
+      string_flags << "--page_size"
 
 
-      def execute(project_name:, log_file:'/dev/stdout', log_level: ::Logger::INFO, concurrency: 1)
+      def execute(project_name:, log_file:'/dev/stdout', log_level: ::Logger::INFO, concurrency: 1, page_size: 20)
         logger = Etna::Logger.new(log_file, 0, 1048576)
 
         logger.level = log_level
@@ -266,6 +267,7 @@ class EtnaApp
             logger: logger,
             project_name: project_name,
             model_name: 'project', filesystem: filesystem,
+            page_size: page_size.to_i,
             concurrency: concurrency.to_i)
 
         workflow.materialize_all(project_name)

data/lib/etna/client.rb

@@ -293,9 +293,9 @@ module Etna
             status_check!(response)
             return response
           end unless block_given?
+        else
+          raise ::Etna::Error, "Could not contact server, giving up"
         end
-
-        raise ::Etna::Error, "Could not contact server, giving up" unless block_given?
       end
 
       private

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

@@ -9,10 +9,10 @@ module Etna
           :metis_client, :magma_client, :project_name,
           :model_name, :model_filters, :model_attributes_mask,
           :filesystem, :logger, :stub_files, :concurrency,
-          :record_names, keyword_init: true)
+          :page_size, :record_names, keyword_init: true)
 
         def initialize(**kwds)
-          super(**({filesystem: Etna::Filesystem.new, concurrency: 10, record_names: "all"}.update(kwds)))
+          super(**({filesystem: Etna::Filesystem.new, page_size: 20, concurrency: 10, record_names: "all"}.update(kwds)))
         end
 
         def magma_crud
@@ -34,7 +34,7 @@ module Etna
               record_names,
               model_attributes_mask: model_attributes_mask,
               model_filters: model_filters,
-              page_size: 20,
+              page_size: page_size,
           ) do |template, document|
             logger&.info("Materializing #{template.name}##{document[template.identifier]}")
             templates[template.name] = template

data/lib/etna/clients/metis/workflows/sync_metis_data_workflow.rb

@@ -81,7 +81,7 @@ module Etna
 
                 upload_timings << [chunk.length, Time.now.to_f]
                 upload_amount += chunk.length
-                remaining -= chunk.length
+                remaining -= chunk.length unless remaining.nil?
 
                 if upload_timings.length > 150
                   s, _ = upload_timings.shift

data/lib/etna/formatting.rb

@@ -3,6 +3,8 @@ module Etna
     SIZE_UNITS = %W(B KiB MiB GiB TiB).freeze
 
     def self.as_size(number)
+      return "unknown" if number.nil?
+
       if number.to_i < 1024
         exponent = 0
       else

data/lib/etna/route.rb

@@ -1,5 +1,6 @@
 require 'digest'
 require 'date'
+require 'net/http'
 require "addressable/uri"
 require_relative "./censor"
 require_relative './instrumentation'
@@ -46,7 +47,7 @@ module Etna
       if params
         PARAM_TYPES.reduce(route) do |path,pat|
           path.gsub(pat) do
-            params[$1.to_sym].split('/').map { |c| block_given? ? yield(c) : Addressable::URI.normalized_encode(c) }.join('/')
+            params[$1.to_sym].split('/').map { |c| block_given? ? yield(c) : Etna::Route.encode_path_component(c) }.join('/')
           end
         end
       else
@@ -54,6 +55,12 @@ module Etna
       end
     end
 
+    def self.encode_path_component(path_component)
+      form_encoded = URI.encode_www_form_component(path_component)
+      # Because of issues #1005, #1006, #1197
+      form_encoded.gsub('+', '%20')
+    end
+
     def path(params=nil, &block)
       self.class.path(@route, params, &block)
     end

metadata

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