rail-locator-api 1.0.26 → 1.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 119ca579b29cc950cd89a82d0a0234b309b0ef48e93f979c058798b270881ebf
-  data.tar.gz: d0c54d0d2d476cbf1163d256a80fc6381ecdcc7f738acc32995a976c4215876a
+  metadata.gz: 2d749526a2d09bb688c6de24159ca68aa6d0545f47577a7f390a53e85c979ad2
+  data.tar.gz: 9de1cdedec614f65f4182b140fde5bcc2c73c79113af0406b8bbdb7ee828ceee
 SHA512:
-  metadata.gz: 2da38a334259b719763e03408a72a5f6df491ff3bd9742e81a993583225295d41a7de1d969a9263c0996a67a9208b6dab99552d7a9a612b5a544514e8cd01f73
-  data.tar.gz: d7e52a45bcffaeebb0c6a65f4f8f6c897ce4158c4157e266ba9ae7eb7c94e7258438e22fc090e663aa398c1d575b817964fd8dc5fba4bacee770f8b4da039f8a
+  metadata.gz: eb986e91e3cb09f20d9675886a2ee81b1191e8cd883ed1c9e3311c0e8f97469f58e4a527c3b85cb9729b602ea156dca712252fe4d4ddb4862c1c43d4f4b196a5
+  data.tar.gz: 774accf2563eb53a36008a2b1aa0ad946ebae505928f67ce35f22e41954042becac3eb3729a47a481d87e5e77886d8be88505bfc68b47dec9bc1e316f3e651b1

data/lib/generators/rail_locator_api/install/templates/rail_locator_api.rb

@@ -2,7 +2,8 @@ require 'rail-locator-api'
 
 RailLocatorApi.setup do |config|
   if File.exist?('config/rail_locator_api.yml')
-    processed = YAML.load_file('config/rail_locator_api.yml')[Rails.env]
+    #processed = YAML.load_file('config/rail_locator_api.yml')[Rails.env]
+    processed = YAML.load('config/rail_locator_api.yml', aliases: true)[Rails.env]
 
     processed.each do |k, v|
       config::register k.underscore.to_sym, v

data/lib/rail-locator-api/api_request.rb

@@ -9,10 +9,45 @@ module RailLocatorApi
       validate_api_key
       begin
         if is_multipart?(body)
+          if self.api_auth_method == :base64
+            headers['Authorization'] =  "Basic " + Base64::encode64("#{self.api_user_email}:#{self.api_user_password}")
+          end
+          if [:keycloak].include?(self.api_auth_method)
+            unless RailLocatorApi::Request.token_alive?(RailLocatorApi::Request.access_token)
+              if RailLocatorApi::Request.token_alive?(RailLocatorApi::Request.refresh_token)
+                response = RailLocatorApi.refresh_access_token
+                RailLocatorApi::Request.access_token = response.try(:dig, "access_token")
+                RailLocatorApi::Request.refresh_token = response.try(:dig, "refresh_token")
+              else
+                error_params = { title: "UNAUTHORIZED", status_code: 401 }
+                error = RailLocatorApiError.new("Token is unavailable", error_params)
+                raise error
+              end
+            end
+            headers['Authorization'] = "Bearer #{RailLocatorApi::Request.access_token}"
+          end
+          if [:api_key].include?(self.api_auth_method)
+            request.headers['X-Api-Key'] = "#{RailLocatorApi::Request.api_key}"
+            if self.api_user_id.present?
+              request.headers['X-User-Id'] = self.api_user_id.to_s
+            end
+          end
+          headers['User-Agent'] = "RailLocatorApi/#{RailLocatorApi::VERSION} Ruby gem"
+          headers['Accept-Language'] = RailLocatorApi::Request.language.to_s
+          if @request_builder.without_ratelimit
+            headers['X-Is-Request-Without-RateLimit'] = "true"
+          end
+          if @request_builder.is_allow_access_to_coordinates
+            headers['X-Is-Allow-Access-To-Coordinates'] = "true"
+          end
           url = URI("#{self.api_url}#{format.present? ? ".#{format}": ""}")
           http = Net::HTTP.new(url.host, url.port);
-          request = Net::HTTP::Post.new(url)
+          request = Net::HTTP::Post.new(url, headers)
+          request['foo'] = bar
           request.set_form body.to_params, 'multipart/form-data'
+          if @request_builder.debug
+            p request
+          end
           http.request(request)
         else
           response = self.rest_client(format).post do |request|
@@ -363,7 +398,12 @@ end
 class Object
   def to_params(key)
     if self.is_a? ActionDispatch::Http::UploadedFile
-      [key.to_param, File.open(self.path)]
+      [key.to_param, File.open(self.path),
+         {
+          :filename => self.original_filename,
+          :content_type => self.content_type
+         }
+      ]
     elsif %w[File Tempfile StringIO].include?(self.class.name)
       self
     else

data/lib/rail-locator-api/version.rb

@@ -1,3 +1,3 @@
 module RailLocatorApi
-  VERSION = "1.0.26"
+  VERSION = "1.0.28"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rail-locator-api
 version: !ruby/object:Gem::Version
-  version: 1.0.26
+  version: 1.0.28
 platform: ruby
 authors:
 - Pavel Osetrov