justimmo_client 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 862c14b5638385085dd28a49b7516615bad161cb
-  data.tar.gz: f9a71e5c7282b4e935faa15afc6f4756d7842d1d
+  metadata.gz: 3e15b372bb14b581f41d8d71b5f9886c7c8240c3
+  data.tar.gz: f31c58d987586ce4c2cef6aee84b8cf84a0ebd3f
 SHA512:
-  metadata.gz: 87d97beb7c5aff8c95bdb2e85c4726e7586e22c85665cdd9dcd9d18dd2e6a701af4180d261b88a6e180d13de80be2bb04517bdcefe7cdf57227915b708bd8f1f
-  data.tar.gz: d443e4e059747c07a2266ea72087fa2691d2e6c3b854e158f82c3441a664ae240fade67435444019b013a9776ed7e6018bd03d8cf2cb7c919b6fe633d683b0b9
+  metadata.gz: 9d5ac18de60aa2c2c498c79a8fedacf7a801f273df5ce89be60ef78e9b10246c37f460970f8f3188a0d554b06134105782461fcc2f08177d631739fb5dabadaa
+  data.tar.gz: 93ae8c831522281f4db7e7e7cfcc6c586a4377bab9fad325626992ab5f7a7d1983dd0801d2993cfc0a402a695606d943cdaf4cdce4c9004234457a7208f94d81

data/.gitignore

@@ -15,3 +15,4 @@
 coverage
 
 *.gem
+/.ruby-version

data/.gitlab-ci.yml

@@ -53,7 +53,7 @@ pages:
       - public
     expire_in: 30 days
   only:
-    - master
+    - master@exacting/justimmo_client
 
 deploy:rubygems:
   stage: deploy
@@ -64,4 +64,4 @@ deploy:rubygems:
   script:
     - dpl --provider=rubygems --api-key=$RUBYGEMS_API_KEY
   only:
-    - tags
+    - tags@exacting/justimmo_client

data/lib/justimmo_client/api/v1/requests/justimmo_request.rb

@@ -23,21 +23,23 @@ module JustimmoClient::V1
       }
 
       with_retries do
-        with_error_handler do
+        with_request_error_handler do
           log.debug("Requesting #{uri} with params #{options[:params]}")
+          RestClient.proxy = JustimmoClient::Config.proxy
+          log.debug("Using proxy: #{RestClient.proxy}") if RestClient.proxy
           response = RestClient.get(uri, options)
           response.body
         end
       end
     end
 
-    def with_error_handler
+    def with_request_error_handler
       yield
     rescue RestClient::Unauthorized
       log.error("Authentication failed, check your configuration.")
       raise JustimmoClient::AuthenticationFailed
-    rescue RestClient::BadRequest, RestClient::NotFound, RestClient::InternalServerError => e
-      raise JustimmoClient::RetrievalFailed, e.message
+    rescue RestClient::Exception, SocketError, Errno::ECONNREFUSED => e
+      raise JustimmoClient::RetrievalFailed, e
     end
 
     def with_retries

data/lib/justimmo_client/core/caching.rb

@@ -27,7 +27,7 @@ module JustimmoClient
 
       def default_cache
         cache = JustimmoClient::Config.cache || NullCache.new
-        log.info("Using default cache #{cache.class}")
+        log.debug("Using default cache #{cache.class}")
         cache
       end
     end

data/lib/justimmo_client/core/config.rb

@@ -16,29 +16,33 @@ module JustimmoClient
     config_accessor(:base_url) { "api.justimmo.at/rest" }
     config_accessor(:secure) { true }
     config_accessor(:api_ver) { 1 }
-    config_accessor(:username)
-    config_accessor(:password)
+    config_accessor(:username) { ENV.fetch("JUSTIMMO_USERNAME", nil) }
+    config_accessor(:password) { ENV.fetch("JUSTIMMO_PASSWORD", nil) }
     config_accessor(:credentials)
     config_accessor(:debug) { false }
     config_accessor(:cache) { nil }
     config_accessor(:request_retries) { 3 }
+    config_accessor(:proxy) { ENV.fetch("JUSTIMMO_PROXY", nil) }
 
     class << self
       def configure
         super
         self.credentials = Base64.urlsafe_encode64("#{username}:#{password}")
-        validate
+        validate_api_version
       end
 
-      def validate
+      def validate_credentials
         missing = REQUIRED.select { |r| @_config[r].nil? }
         raise JustimmoClient::MissingConfiguration, missing unless missing.empty?
+      end
 
+      def validate_api_version
         supported_ver = SUPPORTED_API_VERSIONS.include?(api_ver)
         raise JustimmoClient::UnsupportedAPIVersion, api_ver unless supported_ver
       end
 
       def url
+        validate_credentials
         "#{secure ? 'https' : 'http'}://#{base_url}/v#{api_ver}"
       end
     end

data/lib/justimmo_client/errors.rb

@@ -19,36 +19,36 @@ module JustimmoClient::Errors
 
   # Raised when retrieval from the API fails.
   class RetrievalFailed < JustimmoError
-    def initialize(message)
-      super("Failed to get data from the API: #{message}")
+    def initialize(exception)
+      super "Failed to get data from the API:\n#{exception.class}: #{exception}"
     end
   end
 
   # Raised when the option parser rejects an option
   class InvalidOption < OptionParserError
     def initialize(key)
-      super("Option '#{key}' not supported")
+      super "Option '#{key}' not supported"
     end
   end
 
   # Raised when the option parser rejects a value
   class InvalidValue < OptionParserError
     def initialize(value)
-      super("'#{value}' is not in the list of accepted values")
+      super "'#{value}' is not in the list of accepted values"
     end
   end
 
   # Raised when an unsupported API version is set.
   class UnsupportedAPIVersion < ConfigurationError
     def initialize(version)
-      super("API Version #{version} not supported")
+      super "API Version #{version} not supported"
     end
   end
 
   # Raised on missing required configuration options.
   class MissingConfiguration < ConfigurationError
     def initialize(missing)
-      super("Required configuration missing: #{missing}")
+      super "Required configuration missing: #{missing}"
     end
   end
 end

data/lib/justimmo_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JustimmoClient
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: justimmo_client
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Patrick Auernig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -175,7 +175,6 @@ files:
 - ".gitlab-ci.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
 - Gemfile
 - LICENSE
 - README.md

data/.ruby-version

@@ -1 +0,0 @@
-2.3.3