artirix_data_models 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40b6f9f87c468b62e4110b789710aa52c26733a2
-  data.tar.gz: 2a2099654a9c5b6c93d78c3ea5b1e614353ad07e
+  metadata.gz: d663a0947a081d9dbd5145eb404521db0a42b4bd
+  data.tar.gz: ed757c3c5c1676982ccbb3d093a55134eae9ad60
 SHA512:
-  metadata.gz: 287d064bc3dd3579a378de1b229ae910033c171877031a3407490b93d747cb6a75006897444bd96413accc451be836defade734d6849958fe614a5d57d255cd9
-  data.tar.gz: 33fdb76a7ae986cceeccd6d03a21558109b57c815060d208c899a72f94cc10f5c66df701570d2e16a9641f83a3a80f2c5a02a4d3ad927ccc2728ef4681bf880b
+  metadata.gz: 6bcc9f58f64f314fd09168500f6039ff829943c2cbad1adabbef34e8bbf16893d58917daeceba3aa0178da3d09f9c31b9253d1079643ba742c708330ed9e202e
+  data.tar.gz: f4777f21f1017f5edc30e898d71e4f1fe26f13cc2b2c873fdeaa76b424a126364ea417be826707af3797250acb5cc6c8c9576ab62bf55b92b64c0e5de866a629

data/README.md

@@ -270,6 +270,13 @@ end
 
 ## Changes
 
+### 0.18.0
+
+`DataGateway` connection loader now moved to `DataGateway::ConnectionLoader`, with 3 public methods:
+- `default_connection` which will give us the connection based on config in `data_gateway` group in `SimpleConfig.for(:site)`
+- `connection_by_config_key(config_key)` which will give us the connection based on config in the given group key in `SimpleConfig.for(:site)`
+- `connection(config: {}, url: nil, login: nil, password: nil, bearer_token: nil, token_hash: nil)`: It will use the elements from the given config if they are not present on the params. 
+
 ### 0.17.0
 
 `DataGateway` now has `authorization_bearer` and `authorization_token_hash` options:

data/lib/artirix_data_models/gateways/data_gateway.rb

@@ -6,7 +6,7 @@ class ArtirixDataModels::DataGateway
                  timeout: nil,
                  authorization_bearer: nil,
                  authorization_token_hash: nil)
-    @connection               = connection || DefaultConnectionLoader.default_connection
+    @connection               = connection || ConnectionLoader.default_connection
     @post_as_json             = !!post_as_json
     @authorization_bearer     = authorization_bearer
     @authorization_token_hash = authorization_token_hash
@@ -227,53 +227,44 @@ class ArtirixDataModels::DataGateway
     end
   end
 
-  module DefaultConnectionLoader
-
+  module ConnectionLoader
     class << self
-      attr_accessor :config
+      def default_connection(**others)
+        connection_by_config_key :data_gateway, **others
+      end
+
+      def connection_by_config_key(config_key, **others)
+        connection config: SimpleConfig.for(:site).send(config_key), **others
+      end
+
+      def connection(config: {}, url: nil, login: nil, password: nil, bearer_token: nil, token_hash: nil)
+        url          ||= config.try :url
+        login        ||= config.try :login
+        password     ||= config.try :password
+        bearer_token ||= config.try :bearer_token
+        token_hash   ||= config.try :token_hash
 
-      def default_connection
-        url = connection_url
+        raise InvalidConnectionError, 'no url given, nor is it present in `config.url`' unless url.present?
 
         Faraday.new(url: url, request: { params_encoder: Faraday::FlatParamsEncoder }) do |faraday|
           faraday.request :url_encoded # form-encode POST params
           faraday.response :logger # log requests to STDOUT
 
-          if basic_auth?
-            faraday.basic_auth(config.login, config.password)
-          elsif bearer_auth?
-            faraday.authorization :Bearer, config.bearer_token
-          elsif token_auth?
-            faraday.authorization :Token, config.token_hash
+          if login.present? || password.present?
+            faraday.basic_auth(login, password)
+          elsif bearer_token.present?
+            faraday.authorization :Bearer, bearer_token
+          elsif token_hash.present?
+            faraday.authorization :Token, token_hash
           end
 
           faraday.adapter Faraday.default_adapter
         end
       end
-
-      # Configuration access
-
-      def config
-        @config ||= SimpleConfig.for(:site).data_gateway
-      end
-
-      def connection_url
-        config.url
-      end
-
-      def basic_auth?
-        config.respond_to?(:login) && config.respond_to?(:password)
-      end
-
-      def bearer_auth?
-        config.respond_to?(:bearer_token) && config.bearer_token.present?
-      end
-
-      def token_auth?
-        config.respond_to?(:token_hash) && config.token_hash.present?
-      end
     end
 
+    class InvalidConnectionError < StandardError
+    end
   end
 
   class Error < StandardError

data/lib/artirix_data_models/version.rb

@@ -1,3 +1,3 @@
 module ArtirixDataModels
-  VERSION = '0.17.0'
+  VERSION = '0.18.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artirix_data_models
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Eduardo Turiño