rail-locator-api 0.1.23 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9988790e6c871a9ed969535f78ce48c313e68154fdc8a8a3844eee6b14350535
-  data.tar.gz: 26e58f6cbf89f73a7bddd60532325a5ed6571a899031db465d79252b524cdfd7
+  metadata.gz: 33574469b6b170067b3d58342f93cb05e37e489f4fa545c509596865ab18db61
+  data.tar.gz: 28f32f1bca4499066ef8616c28a19d034ec02de3847f859fd477e7a8fb3242d5
 SHA512:
-  metadata.gz: 8ad0802d88fe40ee719a4610efe1aa8d6db485014a240dc1e724cfbb8ce69574bdf9bd56f99ac23391ffe16a210d614b0438e0a2a077865cc51ebed4dd3b9492
-  data.tar.gz: e4a92fa709070d8d2f7130e3214e34a5efe5fc43a2b9707e74a069030689947ece8eb159ce54644b5fdbea65ba4d7dd35df71a43df6d6f86dfa0eec47551bbcc
+  metadata.gz: 94ee04c1e1bfdc5571ba120ae75a4d3dd33a7193caad81de585c12bbb69e62a67bc54ed4da4628b102a1dece81bb404862bc1c0075e123dc26850c1a75f0eae8
+  data.tar.gz: b29102d243faad074bfb6f61222c6d8479553e72110d8da9332cb0976c401f178a457e858626b0042765e233c2b8c3e88c6447d8a2cc7a7677a663899a00d231

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

@@ -5,26 +5,34 @@ module RailLocatorApi
       @request_builder = builder
     end
 
-    def post(params: nil, headers: nil, suffix: nil, body: {})
+    def post(params: nil, headers: nil, format: nil, body: {})
       validate_api_key
       begin
-        response = self.rest_client(suffix).post do |request|
+        response = self.rest_client(format).post do |request|
           configure_request(request: request, params: params, headers: headers, body: body)
         end
-        parse_response(response)
+        if [nil, 'json'].include?(format)
+          parse_response(response)
+        else
+          response
+        end
       rescue => e
         handle_error(e)
       end
     end
 
-    def get(params: nil, headers: nil, body: {})
+    def get(params: nil, headers: nil, format: nil, body: {})
       validate_api_key
 
       begin
-        response = self.rest_client.get do |request|
+        response = self.rest_client(format).get do |request|
           configure_request(request: request, params: params, headers: headers, body: body)
         end
-        parse_response(response)
+        if [nil, 'json'].include?(format)
+          parse_response(response)
+        else
+          response
+        end
       rescue => e
         handle_error(e)
       end
@@ -150,10 +158,10 @@ module RailLocatorApi
         end
         request.headers['User-Agent'] = "RailLocatorApi/#{RailLocatorApi::VERSION} Ruby gem"
         if @request_builder.without_ratelimit
-          request.headers['X-Request-Without-Ratelimit'] = "true"
+          request.headers['X-Is-Request-Without-RateLimit'] = "true"
         end
         if @request_builder.is_allow_access_to_coordinates
-          request.headers['X_IS_ALLOW_ACCESS_TO_COORDINATES'] = "true"
+          request.headers['X-Is-Allow-Access-To-Coordinates'] = "true"
         end
         request.headers.merge!(headers) if headers
         request.body = MultiJson.dump(body) if body
@@ -162,8 +170,8 @@ module RailLocatorApi
       end
     end
 
-    def rest_client(suffix=nil)
-      client = Faraday.new("#{self.api_url}#{suffix.present? ? "/#{suffix}": ""}", proxy: self.proxy,
+    def rest_client(format=nil)
+      client = Faraday.new("#{self.api_url}#{format.present? ? ".#{format}": ""}", proxy: self.proxy,
                            ssl: self.ssl_options) do |faraday|
         faraday.request :gzip
         faraday.response :raise_error
@@ -213,11 +221,26 @@ module RailLocatorApi
     end
 
     def api_url
-      base_api_url + @request_builder.path
+      case @request_builder.path_parts.first
+      when "lk"
+        lk_api_url
+      when "app"
+        app_api_url
+      else
+        base_api_url
+      end + @request_builder.path
     end
 
     def base_api_url
       "#{RailLocatorApi.api_endpoint}/api/v2.0/"
     end
+
+    def lk_api_url
+      "https://rail-locator.com/"
+    end
+
+    def app_api_url
+      "http://192.168.1.129:1488/"
+    end
   end
 end

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

@@ -20,10 +20,15 @@ module RailLocatorApi
 
       @api_user_id = api_user_id
 
-      @access_token = access_token || self.class.access_token || RailLocatorApi.generate_access_token.try(:dig, "access_token")
-      @access_token = @access_token.strip if @access_token
-      @refresh_token = refresh_token  || self.class.refresh_token
-      @refresh_token = @refresh_token.strip if @refresh_token
+      if @api_key == :keycloak
+        @access_token = access_token || self.class.access_token || RailLocatorApi.generate_access_token.try(:dig, "access_token")
+        @access_token = @access_token.strip if @access_token
+        @refresh_token = refresh_token  || self.class.refresh_token
+        @refresh_token = @refresh_token.strip if @refresh_token
+      else
+        @access_token = ""
+        @refresh_token = ""
+      end
 
       @api_user_email = api_user_email || ENV['API_USER_EMAIL'] || ""
       @api_user_password = api_user_password || ENV['API_USER_PASSWORD'] || ""
@@ -62,24 +67,28 @@ module RailLocatorApi
       end
     end
 
+    def path_parts
+      @path_parts
+    end
+
     def path
       @path_parts.join('/')
     end
 
-    def create(params: nil, headers: nil, body: {})
-      APIRequest.new(builder: self).post(params: params, headers: headers, body: body)
+    def create(params: nil, headers: nil, body: {}, format: nil)
+      APIRequest.new(builder: self).post(params: params, headers: headers, body: body, format: format)
     ensure
       reset
     end
 
-    def update(params: nil, headers: nil, body: {})
-      APIRequest.new(builder: self).post(params: params, headers: headers, body: body)
+    def update(params: nil, headers: nil, body: {}, format: nil)
+      APIRequest.new(builder: self).post(params: params, headers: headers, body: body, format: format)
     ensure
       reset
     end
 
-    def retrieve(params: nil, headers: nil, body: {})
-      APIRequest.new(builder: self).get(params: params, headers: headers, body: body)
+    def retrieve(params: nil, headers: nil, body: {}, format: nil)
+      APIRequest.new(builder: self).get(params: params, headers: headers, body: body, format: format)
     ensure
       reset
     end

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

@@ -1,3 +1,3 @@
 module RailLocatorApi
-  VERSION = "0.1.23"
+  VERSION = "0.1.31"
 end

metadata

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