api_six_client 1.2.14 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09e5e9a5009c3f6b1a5a46911e8746e9d85442035793d9502d46fe73819eea79'
-  data.tar.gz: 85754e6a0edaef81084ece3a0a9c62b9d6e1f8e9d173e60262ce92feafe5fc91
+  metadata.gz: dd36ec4d129e75145e125183cc544adc31692f3dc24d4d03262b232d75e2040e
+  data.tar.gz: b78b1b6d2e482e2cd6fc4a524dcb4b748ed5014b508eb43ae61d110ac3c17f3f
 SHA512:
-  metadata.gz: cb39aeaae34a707768658b821fb9b5b5c1f1a43912d2232a3a4741f5f64f5affe0f9dcbcdfd74113c761d4bbacfc411b933fabd53a2217d2ae60eeba89595a0d
-  data.tar.gz: 3e7f34e77d0a9e6247ace385e55364c8912c51c9fa35634bcaef740b66d2dc07b1390ad6d827d17d42e54293f552d4ae415382cfbe20bd549377eb0add8bfff5
+  metadata.gz: 300c27ce6399958c58707ec63b08b3c0228d254a117b619e811a7bc1e7ff879216d703e48b6b1bb22aaec19b90da21c229808e3b4297700783d4d7f450d3a76e
+  data.tar.gz: 28cafdda86f08a0882c4c4cf15a08fe4be9ce4c65ab33c4bb7cbac8b828c4e66c4a16d47b534e0cc52878d9bee569ebdd37a85b2a313457193dceb4e7c686f6e

data/Gemfile.lock

@@ -1,36 +1,16 @@
 PATH
   remote: .
   specs:
-    api_six_client (1.2.14)
-      faraday (~> 1)
+    api_six_client (1.3.0)
+      faraday (~> 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    faraday (1.10.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+    faraday (2.7.6)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    multipart-post (2.3.0)
+    faraday-net_http (3.0.2)
     rake (13.0.6)
     ruby2_keywords (0.0.5)
 

data/api_six_client.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'faraday', '~> 1'
+  spec.add_dependency 'faraday', '~> 2'
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/lib/api_six_client/base.rb

@@ -7,13 +7,12 @@ module ApiSixClient
   class Base
     attr_reader :endpoint
 
-    def initialize(endpoint: nil, auth_token: nil, debug_mode: false, dm: false)
-      @endpoint = endpoint
-      @auth_token = auth_token
-      @debug_mode = debug_mode || dm
+    def initialize(endpoint: nil, auth_token: nil)
+      @endpoint = endpoint || ApiSixClient.config.endpoint
+      @auth_token = auth_token || ApiSixClient.config.auth_token
 
-      override_defaults
-      validate_config!
+      raise Errors::EndpointIsEmpty unless @endpoint
+      raise Errors::AuthTokenIsEmpty unless @auth_token
     end
 
     def post(path, params = {}, headers = {})
@@ -36,42 +35,14 @@ module ApiSixClient
       request __method__, path, params, headers
     end
 
-    protected
-
-    def deprecation_msg
-      Rails.logger.warn("#{self.class} is deprecated") if defined?(Rails)
-    end
-
-    def override_defaults
-      @endpoint ||= ApiSixClient.config.endpoint
-      @auth_token ||= ApiSixClient.config.auth_token
-    end
+    private
 
     def service_path
       self.class.name.demodulize.underscore
     end
 
-    private
-
-    def validate_config!
-      raise Errors::EndpointIsEmpty unless @endpoint
-      raise Errors::AuthTokenIsEmpty unless @auth_token
-    end
-
     def request(method, path, params = {}, headers = {})
-      deprecation_msg
-
-      response = nil
-      begin
-        response = connection.run_request(method, "#{endpoint}/#{service_path}/#{path}", params.to_json, headers)
-      rescue Faraday::Error => e
-        if defined?(Rails)
-          Rails.logger.error "Message: #{e.message}, caused by: #{self.class.name}##{path}"
-        end
-
-        raise e
-      end
-
+      response = connection.run_request(method, "#{endpoint}/#{service_path}/#{path}", params.to_json, headers)
       res = JSON.parse(response.body)
 
       return res.with_indifferent_access if res.is_a?(Hash)
@@ -90,8 +61,6 @@ module ApiSixClient
 
           faraday.request :url_encoded
           faraday.adapter :net_http
-
-          faraday.response :logger, ::Logger.new(STDOUT), bodies: true if @debug_mode
         end
     end
   end

data/lib/api_six_client/base_int.rb

@@ -2,52 +2,12 @@
 
 module ApiSixClient
   class BaseInt < Base
-    APP_OUTSIDE_K8S = %w[Grunnbok Brreg Projects]
-    SERVICES_OUTSIDE_K8S = %w[gbk_int prj_int brg_int]
-    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
-    end
-
-    def override_defaults
+    def initialize(endpoint: nil, auth_token: nil)
       @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 Rails.application.class.to_s.split('::').first.in?(APP_OUTSIDE_K8S)
-      return false if ENV['RAILS_ENV'] == 'development'
-
-      current_service.present?
-    end
-
-    private
-    def current_service
-      service_name = self.class.name.demodulize.underscore
-      return nil if service_name.in?(SERVICES_OUTSIDE_K8S)
 
-      INTRANET_MAPPING[service_name] || DEFAULT_INTRANET_MAPPING.call(service_name)
+      raise Errors::EndpointIsEmpty unless @endpoint
+      raise Errors::AuthTokenIsEmpty unless @auth_token
     end
   end
 end

data/lib/api_six_client/base_v2.rb

@@ -2,11 +2,12 @@
 
 module ApiSixClient
   class BaseV2 < Base
-    protected
-
-    def override_defaults
+    def initialize(endpoint: nil, auth_token: nil)
       @endpoint = ApiSixClient.config.endpoint_v2
       @auth_token = ApiSixClient.config.auth_token_v2
+
+      raise Errors::EndpointIsEmpty unless @endpoint
+      raise Errors::AuthTokenIsEmpty unless @auth_token
     end
   end
 end

data/lib/api_six_client/config.rb

@@ -5,7 +5,5 @@ module ApiSixClient
     attr_accessor :endpoint, :auth_token
     attr_accessor :endpoint_v2, :auth_token_v2
     attr_accessor :endpoint_int, :auth_token_int
-    attr_accessor :endpoint_v2_int, :auth_token_v2_int
-    attr_accessor :auth_token_hidden
   end
 end

data/lib/api_six_client/errors.rb

@@ -4,6 +4,5 @@ module ApiSixClient
   module Errors
     class EndpointIsEmpty < StandardError; end
     class AuthTokenIsEmpty < StandardError; end
-    class FaradayError < StandardError; end
   end
 end

data/lib/api_six_client/version.rb

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

data/lib/api_six_client.rb

@@ -5,8 +5,6 @@ require 'api_six_client/config'
 require 'api_six_client/base'
 require 'api_six_client/base_v2'
 require 'api_six_client/base_int'
-require 'api_six_client/base_hidden'
-require 'api_six_client/base_v2_int'
 require 'api_six_client/errors'
 
 module ApiSixClient
@@ -19,34 +17,20 @@ module ApiSixClient
   end
 
   class Brg < Base; end
+  class Brg_P3 < Base; end
   class Gbk < Base; end
+  class Kms < Base; end
+  class Lyr < Base; end
   class Mat < Base; end
+  class Val < Base; end
   class Prj < Base; end
+  class Prj_P3 < Base; end
   class Fin < Base; end
   class Olc < Base; end
+  class Eno < Base; end
+  class Uas < Base; end
 
-  class Kms < BaseV2; end
-  class Lyr < BaseV2; end
-  class Eno < BaseV2; end
-  class Uas < BaseV2; end
-
-  class OlcInt < BaseHidden; end
-  class AuthInt < BaseHidden; end
-
-  class PrjInt < BaseInt; end
+  class AuthInt < BaseInt; end
+  class OlcInt < BaseInt; end
   class UasInt < BaseInt; end
-  class BrgInt < BaseInt; end
-  class CadInt < BaseInt; end
-  class NtfInt < BaseInt; end
-  class MatInt < BaseInt; end
-  class FinnInt < BaseInt; end
-  class LyrInt < BaseInt; end
-  class GbkInt < BaseInt; end
-  class Val < BaseInt; end
-  class StataInt < BaseInt; end
-  class ParaInt < BaseInt; end
-  class CunaInt < BaseInt; end
-  class LegaInt < 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.2.14
+  version: 1.3.0
 platform: ruby
 authors:
 - Eugene Dobrorodnov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-20 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 description: ApiSix is a Ruby gem that provides access to various Lytics services.
 email:
 - ei.dobrorodnov@gmail.com
@@ -42,10 +42,8 @@ files:
 - bin/setup
 - lib/api_six_client.rb
 - lib/api_six_client/base.rb
-- lib/api_six_client/base_hidden.rb
 - lib/api_six_client/base_int.rb
 - lib/api_six_client/base_v2.rb
-- lib/api_six_client/base_v2_int.rb
 - lib/api_six_client/config.rb
 - lib/api_six_client/errors.rb
 - lib/api_six_client/version.rb

data/lib/api_six_client/base_hidden.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module ApiSixClient
-  class BaseHidden < Base
-    protected
-
-    def deprecation_msg
-    end
-
-    def override_defaults
-      @endpoint = ApiSixClient.config.endpoint_int
-      @auth_token = ApiSixClient.config.auth_token_hidden
-    end
-  end
-end

data/lib/api_six_client/base_v2_int.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module ApiSixClient
-  class BaseV2Int < Base
-    protected
-
-    def override_defaults
-      @endpoint = ApiSixClient.config.endpoint_v2_int
-      @auth_token = ApiSixClient.config.auth_token_v2_int
-    end
-  end
-end