kalixa_api 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ba2e88ce0dbe8fdb2d1ed4a34eb04f76f1d5ad9
-  data.tar.gz: af004ad760d7bceace9e4cc0a9b51671e042650a
+  metadata.gz: 25b61f84afd6c64cad085925094d2686af725c44
+  data.tar.gz: da10cbf933be7c1930a46db8d410d56ed8d30ec8
 SHA512:
-  metadata.gz: 4222f0ff9b9bf4aff321a25f56ac22092da1278691e93e52536fabcced72e9bde76b2fbaf24eae9adea3a8e7ead2b60552c0fd6d4395b8b9694a2fcb2eb21e3f
-  data.tar.gz: 0ad4e566eb00ff88065590a3f110a7c5a9d983dac5b39dfc8a30e2e38fcc9d1c5ebab09d2a30de1f04588895aa6cc21e5776fce1002f317969e2a736d057ecab
+  metadata.gz: ebf644cbc18a069d7a7b4049bb7840cff5d504ac919515676425c578781e1ae0c4b397fa7f164eaaae39000c2ef74b0b94633e815a32a73e5ce56d021b24960d
+  data.tar.gz: 370e55b6c1513d0ff372a6963e6e29691ad2dfbc24933cc9b8c23724065001c53da30d02bcb2ad90eb3dbd04628ffa1615eca3e2c664e9b8fe8abc2318f231cd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kalixa_api (0.1.0)
+    kalixa_api (0.1.3)
       activesupport
       faraday (~> 0.14)
       faraday_middleware

data/README.md

@@ -20,17 +20,21 @@ Or install it yourself as:
 
 ## Usage
 
-Create ENV variables for:
+Initialize the the gem by setting your username, password and api mode.
+
+Example:
+
+config/initializers/kalixa_api.rb
 
 ```ruby
 
-  ENV['KALIXA_API_USER'] # Production Api User
-  ENV['KALIXA_API_PASSWORD'] # Production Api Password
+KalixaApi.api_user ||= ENV['KALIXA_API_USER']
+KalixaApi.api_password ||= ENV['KALIXA_API_PASSWORD']
 
-  ENV['TEST_KALIXA_API_USER'] # Test Api User
-  ENV['TEST_KALIXA_API_PASSWORD'] # Test Api Password
+KalixaApi.test_api_user ||= ENV['TEST_KALIXA_API_USER']
+KalixaApi.test_api_password ||= ENV['TEST_KALIXA_API_PASSWORD']
 
-  ENV['KALIXA_API_MODE'] # If is NOT 'production' all requests will use test user / password and the test api url.
+KalixaApi.api_mode ||= (ENV['KALIXA_API_MODE'].downcase == 'production') rescue false
 
 ```
 

data/lib/kalixa_api.rb

@@ -11,14 +11,15 @@ require 'kalixa_api/v4/merchant'
 
 module KalixaApi
   class << self
-    attr_accessor :kalixa_api_user, :kalixa_api_password, :test_kalixa_api_user, :test_kalixa_api_password, :api_mode
+    attr_accessor :api_user, :api_password, :test_api_user, :test_api_password, :api_mode
   end
 
-  self.kalixa_api_user ||= ENV['KALIXA_API_USER']
-  self.kalixa_api_password ||= ENV['KALIXA_API_PASSWORD']
+  self.api_user ||= ENV['KALIXA_API_USER']
+  self.api_password ||= ENV['KALIXA_API_PASSWORD']
 
-  self.test_kalixa_api_user ||= ENV['TEST_KALIXA_API_USER']
-  self.test_kalixa_api_password ||= ENV['TEST_KALIXA_API_PASSWORD']
+  self.test_api_user ||= ENV['TEST_KALIXA_API_USER']
+  self.test_api_password ||= ENV['TEST_KALIXA_API_PASSWORD']
+
+  self.api_mode ||= (ENV['KALIXA_API_MODE'].downcase == 'production') rescue false
 
-  self.api_mode ||= (ENV['KALIXA_API_MODE'].downcase == 'production')
 end

data/lib/kalixa_api/v3/http_service.rb

@@ -2,21 +2,20 @@ module KalixaApi
   module V3
     class HttpService
 
-      attr_accessor :kalixa_api_user, :kalixa_api_password, :test_kalixa_api_user, :test_kalixa_api_password, :api_mode
-
-      def initialize(username: nil, password: nil)
-        @kalixa_api_user = kalixa_api_user || KalixaApi.kalixa_api_user
-        @kalixa_api_password = kalixa_api_password || KalixaApi.kalixa_api_password
-        @test_kalixa_api_user = test_kalixa_api_user || KalixaApi.test_kalixa_api_user
-        @test_kalixa_api_password = test_kalixa_api_password || KalixaApi.test_kalixa_api_password
+      attr_accessor :api_user, :api_password, :test_api_user, :test_api_password, :api_mode
 
+      def initialize(api_user: nil, api_password: nil, test_api_user: nil, test_api_password: nil, api_mode: nil)
+        @api_user = api_user || KalixaApi.api_user
+        @api_password = api_password || KalixaApi.api_password
+        @test_api_user = test_api_user || KalixaApi.test_api_user
+        @test_api_password = test_api_password || KalixaApi.test_api_password
         @api_mode = api_mode || KalixaApi.api_mode
       end
 
       def connection
         @connection ||= begin
           Faraday.new(:url => 'https://api.kalixa.com') do |faraday|
-            faraday.basic_auth(@kalixa_api_user , @kalixa_api_password)
+            faraday.basic_auth(@api_user , @api_password)
             faraday.adapter  Faraday.default_adapter
           end
         end
@@ -25,7 +24,7 @@ module KalixaApi
       def test_conection
         @connection ||= begin
           Faraday.new(:url => 'https://api.test.kalixa.com') do |faraday|
-            faraday.basic_auth(@test_kalixa_api_user, @test_kalixa_api_password)
+            faraday.basic_auth(@test_api_user, @test_api_password)
             faraday.adapter  Faraday.default_adapter
           end
         end
@@ -45,7 +44,6 @@ module KalixaApi
             req.body = data.to_xml(:root => xml_root)
           end
         end
-
       end
 
       def get_request(url, data, xml_root)

data/lib/kalixa_api/v4/http_service.rb

@@ -2,14 +2,13 @@ module KalixaApi
   module V4
     class HttpService
 
-      attr_accessor :kalixa_api_user, :kalixa_api_password, :test_kalixa_api_user, :test_kalixa_api_password, :api_mode
-
-      def initialize(username: nil, password: nil)
-        @kalixa_api_user = kalixa_api_user || KalixaApi.kalixa_api_user
-        @kalixa_api_password = kalixa_api_password || KalixaApi.kalixa_api_password
-        @test_kalixa_api_user = test_kalixa_api_user || KalixaApi.test_kalixa_api_user
-        @test_kalixa_api_password = test_kalixa_api_password || KalixaApi.test_kalixa_api_password
+      attr_accessor :api_user, :api_password, :test_api_user, :test_api_password, :api_mode
 
+      def initialize(api_user: nil, api_password: nil, test_api_user: nil, test_api_password: nil, api_mode: nil)
+        @api_user = api_user || KalixaApi.api_user
+        @api_password = api_password || KalixaApi.api_password
+        @test_api_user = test_api_user || KalixaApi.test_api_user
+        @test_api_password = test_api_password || KalixaApi.test_api_password
         @api_mode = api_mode || KalixaApi.api_mode
       end
 
@@ -17,7 +16,7 @@ module KalixaApi
         @connection ||= begin
           Faraday.new(:url => 'https://payments.kalixa.com') do |faraday|
             faraday.response :json, :content_type => /\bjson$/
-            faraday.basic_auth(@kalixa_api_user , @kalixa_api_password)
+            faraday.basic_auth(@api_user , @api_password)
             faraday.adapter  Faraday.default_adapter
           end
         end
@@ -27,7 +26,7 @@ module KalixaApi
         @test_connection ||= begin
           Faraday.new(:url => 'https://payments.test.kalixa.com') do |faraday|
             faraday.response :json, :content_type => /\bjson$/
-            faraday.basic_auth(@test_kalixa_api_user, @test_kalixa_api_password)
+            faraday.basic_auth(@test_api_user, @test_api_password)
             faraday.adapter  Faraday.default_adapter
           end
         end
@@ -35,13 +34,13 @@ module KalixaApi
 
       def post_request(url, data = {})
         if @api_mode
-          test_conection.post do |req|
+          connection.post do |req|
             req.url url
             req.headers['Content-Type'] = 'application/json'
             req.body = data.to_json
           end
         else
-          connection.post do |req|
+          test_conection.post do |req|
             req.url url
             req.headers['Content-Type'] = 'application/json'
             req.body = data.to_json
@@ -51,19 +50,19 @@ module KalixaApi
 
       def get_request(url, data = {})
         if @api_mode
-          test_conection.get do |req|
+          connection.get do |req|
             req.url url
             req.headers['Content-Type'] = 'application/json'
+            req.body = data.to_json
           end
         else
-          connection.get do |req|
+          test_conection.get do |req|
             req.url url
             req.headers['Content-Type'] = 'application/json'
             req.body = data.to_json
           end
         end
       end
-
     end
   end
 end

data/lib/kalixa_api/version.rb

@@ -1,3 +1,3 @@
 module KalixaApi
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kalixa_api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Eugeniu Tambur