api_six_client 1.4.16 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e88afd1d5176f679edff83faae5afbf5f6948c66979c88502fdfed66f5df202
-  data.tar.gz: fb6759241f0bcfd6d9f2c8cbbfbb189a973e6d5fe3f92b4da2a720f5d00856f8
+  metadata.gz: e9db8650771e465e6729f39101d19a0e6e79544ab7f4db05cfd8580fb407795f
+  data.tar.gz: 255a98907f3d462d9a096de7df97e53cb8eb63816b24a4e384a8fc3aa478049d
 SHA512:
-  metadata.gz: 1ca5d61b16457d733628e2cbebbaddb58514b3d65232e319351633a87a511f359d1626d26bc8725d0279e12abf852b045bd6b3d5373ed45ce753cfdcae3b7e15
-  data.tar.gz: b908e85def0e685510aafdbc72d99db8d3a87833cdab3bedcc10d8ada3709e3582da9b4e164996f1cdc5953235cbe26535caeb5e2b561935184da375a7907db3
+  metadata.gz: ae91577c0f327b5f45b0fb8da7bedcb8542234dff046f6ce8f9b9ab67a12dbfb0da1201c215209e812a14b868a3d99221c2d51b4e1fbd49e897410648708303b
+  data.tar.gz: 999945912ab69b3853d24a1459af79315171f07ccda65cbe7719dbc98f2d22efc1fab4205c584918884e8e921ba722abeaa37d0e86e4f969eb64faea4db71ddd

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    api_six_client (1.4.16)
+    api_six_client (1.5.0)
       faraday (~> 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    base64 (0.2.0)
-    faraday (2.7.12)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
+    net-http (0.4.1)
+      uri
     rake (13.0.6)
-    ruby2_keywords (0.0.5)
+    uri (0.13.0)
 
 PLATFORMS
   arm64-darwin-21

data/lib/api_six_client/base.rb

@@ -47,6 +47,10 @@ module ApiSixClient
       @auth_token ||= ApiSixClient.config.auth_token
     end
 
+    def service_path
+      self.class.name.demodulize.underscore
+    end
+
     private
 
     def validate_config!
@@ -54,10 +58,6 @@ module ApiSixClient
       raise Errors::AuthTokenIsEmpty unless @auth_token
     end
 
-    def service_path
-      self.class.name.demodulize.underscore
-    end
-
     def request(method, path, params = {}, headers = {})
       deprecation_msg
 

data/lib/api_six_client/base_int.rb

@@ -2,6 +2,21 @@
 
 module ApiSixClient
   class BaseInt < Base
+    DEFAULT_INTRANET_MAPPING = ->(service_name) {
+      { k8s_service: "http://#{service_name.gsub('_int', '-api')}", api_int_path: 'api_int'}
+    }
+    INTRANET_MAPPING = {
+      'olc_int' => { k8s_service: 'http://core-web:3000', api_int_path: 'api_hiden' },
+      'cad_int' => { k8s_service: 'http://core-web:3000', api_int_path: 'api_int' },
+      'val' => { k8s_service: 'http://val:8000', api_int_path: 'api' },
+    }.freeze
+
+    def endpoint
+      return super unless intranet_connection?
+
+      current_service[:k8s_service]
+    end
+
     protected
 
     def deprecation_msg
@@ -11,5 +26,24 @@ module ApiSixClient
       @endpoint = ApiSixClient.config.endpoint_int
       @auth_token = ApiSixClient.config.auth_token_int
     end
+
+    def service_path
+      return super unless intranet_connection?
+
+      current_service[:api_int_path]
+    end
+
+    def intranet_connection?
+      return false if ENV['RAILS_ENV'] == 'development'
+
+      current_service.present?
+    end
+
+    private
+    def current_service
+      service_name = self.class.name.demodulize.underscore
+
+      INTRANET_MAPPING[service_name] || DEFAULT_INTRANET_MAPPING.call(service_name)
+    end
   end
 end

data/lib/api_six_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ApiSixClient
-  VERSION = "1.4.16"
+  VERSION = "1.5.0"
 end

data/lib/api_six_client.rb

@@ -44,6 +44,8 @@ module ApiSixClient
   class GbkInt < BaseInt; end
   class StataInt < BaseInt; end
   class Val < BaseInt; end
+  class ParaInt < BaseInt; end
+  class CunaInt < BaseInt; end
 end
 
 A6C = ApiSixClient

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_six_client
 version: !ruby/object:Gem::Version
-  version: 1.4.16
+  version: 1.5.0
 platform: ruby
 authors:
 - Eugene Dobrorodnov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-22 00:00:00.000000000 Z
+date: 2024-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday