rail-locator-api 1.0.17 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ecb5cb1204014eceb1b9078581d3087cc654bac09651346ad9400e565cb59b7
-  data.tar.gz: 903f53daec2bf659b6275e570157697a2eef5d8ae7dfe0cd225514137a248392
+  metadata.gz: 0a40601fc87134ba69f0409934667e771432a08c62928b0ba2097d8a8bb8407b
+  data.tar.gz: afac1cbc06cc1f251759ea16b2a98081d523bc6f9f3c96a5b999acd02b264205
 SHA512:
-  metadata.gz: 133889e2f13630c3db16f2acad96df608b8deb4c6596ca5a5e353648b017d0e22b006b6c17764d0af7d7f44fd70287b4eeb6a00378d277032978b9fd53eb1272
-  data.tar.gz: 3207f49bb24d1dabd2a74e421c8909b3186e94153dc300ce18aecbf724167f50218f025445a06e0dda8cb32047d3af285b37e175bc963cdd0e392ee4e08d6c04
+  metadata.gz: 247cad136e02ebbf243315cd1b7ba0ba23a9b56aac25539ba5bccd9d17002c3b57aad72ad66f5464f5baf3c490102419d1251595d1291f624dd08a343e6c2c6c
+  data.tar.gz: a462fba2edf6a68175fd670e08302c89d995ba6d61991366cf024db1a0ed02ca7c9a2c3e053e902b967b1aa02e1e164a7a5eee8771307783f9c6f757cab638f5

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

@@ -1,5 +1,6 @@
 defaults: &defaults
   API_ENDPOINT: "https://rail-scan.com"
+  UNION_ENDPOINT: "http://192.168.88.38:8000"
 
   API_AUTH_METHOD: "api_key"
   API_KEY: "***"
@@ -14,6 +15,7 @@ defaults: &defaults
   KEYCLOAK_REDIRECT_URI: "http://yousite.ru/callback"
 production:
   <<: *defaults
+  UNION_ENDPOINT: "http://192.168.1.88:3500"
 development:
   <<: *defaults
 test:

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

@@ -122,6 +122,10 @@ module RailLocatorApi
       @request_builder.api_endpoint
     end
 
+    def union_endpoint
+      @request_builder.union_endpoint
+    end
+
     def timeout
       @request_builder.timeout
     end
@@ -253,7 +257,7 @@ module RailLocatorApi
     def validate_api_key
       case self.api_auth_method
       when :api_key
-        unless self.api_key && self.api_endpoint
+        unless self.api_key# && self.api_endpoint
           raise RailLocatorApi::RailLocatorApiError, "You must set an api_key prior to making a call #{self.api_key} #{self.api_endpoint}"
         end
       when :base64
@@ -274,6 +278,8 @@ module RailLocatorApi
       url = case @request_builder.path_parts.first
             when "lk"
               lk_api_url
+            when "notify"
+              notify_api_url
             when "app"
               app_api_url
             when "union"
@@ -298,7 +304,11 @@ module RailLocatorApi
     end
 
     def union_api_url
-      "http://192.168.88.38:8000/api/v1.0/"
+      "#{RailLocatorApi.union_endpoint}/api/v1.0/"
+    end
+
+    def notify_api_url
+      "http://192.168.1.153:3003"
     end
   end
 end

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

@@ -1,6 +1,7 @@
 module RailLocatorApi
   class Request
-    attr_accessor :access_token, :refresh_token, :api_user_id, :api_key, :api_user_email, :api_user_password, :api_auth_method, :api_endpoint,
+    attr_accessor :access_token, :refresh_token, :api_user_id, :api_key, :api_user_email, :api_user_password,
+                  :api_auth_method, :api_endpoint, :union_endpoint,
                   :timeout, :open_timeout, :proxy, :ssl_options, :faraday_adapter, :symbolize_keys, :debug, :debug_options,
                   :without_ratelimit, :is_allow_access_to_coordinates, :logger, :test, :language
 
@@ -11,7 +12,7 @@ module RailLocatorApi
     DEFAULT_LANGUAGE = :ru
 
     def initialize(access_token: nil, refresh_token: nil, api_user_id: nil, api_key: nil, api_user_email: nil, api_user_password: nil,
-                   api_endpoint: nil, api_auth_method: nil, timeout: nil, open_timeout: nil, proxy: nil, ssl_options: nil,
+                   api_endpoint: nil, union_endpoint: nil, api_auth_method: nil, timeout: nil, open_timeout: nil, proxy: nil, ssl_options: nil,
                    faraday_adapter: nil, symbolize_keys: false, debug: false,
                    debug_options: { headers: true, bodies: false, errors: false, log_level: :info },
                    without_ratelimit: false, is_allow_access_to_coordinates: false,
@@ -35,8 +36,12 @@ module RailLocatorApi
 
       @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?
+      @union_endpoint = union_endpoint || self.class.union_endpoint
+      @union_endpoint = RailLocatorApi::union_endpoint if @union_endpoint.nil?
+
       @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
@@ -130,7 +135,7 @@ module RailLocatorApi
 
     class << self
       attr_accessor :access_token, :refresh_token, :api_user_id, :api_key, :api_user_email, :api_user_password, :api_auth_method,
-                    :timeout, :open_timeout, :api_endpoint, :proxy, :ssl_options, :faraday_adapter, :symbolize_keys,
+                    :timeout, :open_timeout, :api_endpoint, :union_endpoint, :proxy, :ssl_options, :faraday_adapter, :symbolize_keys,
                     :debug, :debug_options, :without_ratelimit, :is_allow_access_to_coordinates, :logger, :test, :language
 
       def method_missing(sym, *args, &block)
@@ -138,7 +143,7 @@ module RailLocatorApi
             api_user_id: self.api_user_id,
             api_key: self.api_key,
             api_user_email: self.api_user_email, api_user_password: self.api_user_password,
-            api_auth_method: self.api_auth_method, api_endpoint: self.api_endpoint,
+            api_auth_method: self.api_auth_method, api_endpoint: self.api_endpoint, union_endpoint: self.union_endpoint,
             timeout: self.timeout, open_timeout: self.open_timeout, faraday_adapter: self.faraday_adapter,
             symbolize_keys: self.symbolize_keys, debug: self.debug, debug_options: self.debug_options,
             without_ratelimit: self.without_ratelimit,

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

@@ -1,3 +1,3 @@
 module RailLocatorApi
-  VERSION = "1.0.17"
+  VERSION = "1.0.19"
 end

metadata

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