rail-locator-api 0.1.24 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 290c5d8b74fbc188890e90edae5bc52673ebd73663839f24077f947faf531c54
-  data.tar.gz: eb9419b7a0be176f397c2b6277b5e2e9d803ee3955086d5c906a137c57d32875
+  metadata.gz: 010b8eebc008a19fb48adfe1ec30c3319b0617ae0d16a0dfa97e9c39260d0869
+  data.tar.gz: 47f584ea0d3f67d553d82975bd0f84b4768ae78cc2ed45629a7a6964407463ea
 SHA512:
-  metadata.gz: dc3072113e79d02dcb84e6c58c39c8e4a8f80d42fc644df8b39bad886fa9ae79eca9cb6d531ae835d7218d5a4ece3f7348aec08e43d7b1370cdc32bf5b3f32fa
-  data.tar.gz: b675718f4cee3bbe363e9f65eb018e513e480a9ff406843403e0b8e4892b1a7c5eb86943d54f4dcff1e46bdeccea8785d82f35ff31b4295b03e9776292b17893
+  metadata.gz: 68770511d3498591f8c630f5149da2cf97f27b97e2ab32bbd80e0c2f06e9fe26b31e96368b7c57efd7d3dbdb6dd7d1d59820aab29a9054aa0f7923374ad48c10
+  data.tar.gz: 5b7ef346980f0ebc01b7df58cc62c00c590744828595683f8f2ead25a69c321413f4a7a5fbbac3811468cb58e33af2a486b93cce5df397540ab42b519a00ff1c

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

@@ -8,7 +8,7 @@ RailLocatorApi.setup do |config|
       config::register k.underscore.to_sym, v
     end
 
-    config::Request.api_key ||= ENV['API_KEY']
+    #config::Request.api_key ||= ENV['API_KEY']
 
     config::Request.api_user_email ||= ENV['API_USER_EMAIL']
     config::Request.api_user_password ||= ENV['API_USER_PASSWORD']

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
@@ -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,16 +20,21 @@ 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'] || ""
       @api_endpoint = api_endpoint || self.class.api_endpoint
       @api_endpoint = RailLocatorApi::api_endpoint if @api_endpoint.nil?
-      @api_auth_method = api_auth_method || DEFAULT_AUTH_METHOD
+      @api_auth_method = api_auth_method || RailLocatorApi::api_auth_method || DEFAULT_AUTH_METHOD
       @timeout = timeout || self.class.timeout || DEFAULT_TIMEOUT
       @open_timeout = open_timeout || self.class.open_timeout || DEFAULT_OPEN_TIMEOUT
       @proxy = proxy || self.class.proxy || ENV['RAIL_LOCATOR_API_PROXY']
@@ -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.24"
+  VERSION = "0.1.32"
 end

metadata

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