ansible_tower_client 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2b438274799e4bc69b5f9ce2be050c74034276a
-  data.tar.gz: b072f2691bad73e981d524aedb6cb99cc324a8f4
+  metadata.gz: 6943f87588512d9df4e5c0de28f5d4ce00f589c6
+  data.tar.gz: 633d9521bdaf669184f7598c12c374b58da329ff
 SHA512:
-  metadata.gz: c8232e3ed966adec4df39287144cba67a5a4d05519c4ee513ea04f9f7e68c3fcf24c2bcd8a5889796d87d1d0115480e5206ac15e7593a22982b84a4089e56f35
-  data.tar.gz: c628f635fed2035683b8ed1fccd428544d7f939a422ae02d84e09c71d61d5e2e5e57be1b0ea6d3018cf0f23893c91172e3e2cd2cc852875a6244fe9df832af7a
+  metadata.gz: 3025629f8bce8e4e3f58ced59d792ccd1bcb5544538e6d9dce87264e213223a96f2e912b7460424a505b58b2333c7bd476e115e6932aebe45ab1007efc7ee5d1
+  data.tar.gz: 93482e4dc818fa62bdc6d230055d14d574f80b2770cc43af492702083de31d737ee4ca5af9beefc0c9b01be92fedb30287a49e52a66a7babaa63106fe67a5cad

data/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.8.0] - 2017-02-23
+### Added
+- Expose the raw hash of the object [(#74)](https://github.com/ansible/ansible_tower_client_ruby/pull/74)
+
+### Fixed
+- Override RAW attributes [(#75)](https://github.com/ansible/ansible_tower_client_ruby/pull/75)
+- Inherit all errors from StandardError [(#76)](https://github.com/ansible/ansible_tower_client_ruby/pull/76)
+- Fix error logging after changing error response classes [(#72)](https://github.com/ansible/ansible_tower_client_ruby/pull/72)
+
+
 ## [0.7.0] - 2017-02-17
 ### Changed
 - Rescue Faraday errors and re-brand them as AnsibleTowerClient Errors [(#71)](https://github.com/ansible/ansible_tower_client_ruby/pull/71)

data/lib/ansible_tower_client/api.rb

@@ -83,13 +83,7 @@ module AnsibleTowerClient
     rescue Faraday::SSLError => err
       raise AnsibleTowerClient::SSLError, err
     rescue Faraday::ClientError => err
-      raise if err.response.nil?
-      response = err.response
-      logger.debug { "#{self.class.name} #{err.class.name} #{response.pretty_inspect}" }
-      message   = JSON.parse(response[:body])['detail'] rescue nil
-      message ||= DEFAULT_ERROR_MSG
-      logger.error("#{self.class.name} #{err.class.name} #{message}")
-      raise AnsibleTowerClient::ConnectionError, message
+      raise AnsibleTowerClient::ConnectionError, err
     end
 
     def respond_to_missing?(method, _include_private = false)

data/lib/ansible_tower_client/base_model.rb

@@ -1,6 +1,6 @@
 module AnsibleTowerClient
   class BaseModel < HashModel
-    attr_reader :api
+    attr_reader :api, :raw_hash
 
     def self.base_class
       superclass == AnsibleTowerClient::BaseModel ? self : superclass.base_class
@@ -35,7 +35,7 @@ module AnsibleTowerClient
     def initialize(api, json_or_hash)
       @api = api
 
-      raw_hash = json_or_hash.kind_of?(Hash) ? json_or_hash : JSON.parse(json_or_hash)
+      @raw_hash = json_or_hash.kind_of?(Hash) ? json_or_hash : JSON.parse(json_or_hash)
       self.class.send(:id_attr, *raw_hash['related'].keys) if raw_hash.key?('related')
 
       super(raw_hash)
@@ -82,7 +82,11 @@ module AnsibleTowerClient
     def update_attributes!(attributes)
       @api.patch(url, attributes.to_json)
       attributes.each do |method_name, value|
-        send("#{method_name}=", value)
+        if override_raw_attributes[method_name]
+          send("#{override_raw_attributes[method_name]}=", value)
+        else
+          send("#{method_name}=", value)
+        end
       end
       true
     end
@@ -145,6 +149,10 @@ module AnsibleTowerClient
       false
     end
 
+    def override_raw_attributes
+      {}
+    end
+
     def hashify(attribute)
       YAML.safe_load(send(attribute))
     end

data/lib/ansible_tower_client/base_models/job_template.rb

@@ -21,5 +21,9 @@ module AnsibleTowerClient
     def extra_vars_hash
       extra_vars.empty? ? {} : hashify(:extra_vars)
     end
+
+    def override_raw_attributes
+      { :credential => :credential_id, :inventory => :inventory_id, :project => :project_id }
+    end
   end
 end

data/lib/ansible_tower_client/exception.rb

@@ -1,5 +1,5 @@
 module AnsibleTowerClient
-  class Error         < Exception; end
+  class Error         < StandardError; end
   class ClientError   < Error; end
   class NoMethodError < Error; end
 

data/lib/ansible_tower_client/middleware/raise_tower_error.rb

@@ -1,9 +1,16 @@
 module AnsibleTowerClient
   module Middleware
     class RaiseTowerError < Faraday::Response::Middleware
+      include Logging
       CLIENT_ERROR_STATUSES = 400...600
 
       def on_complete(env)
+        return unless CLIENT_ERROR_STATUSES.include?(env[:status])
+        logger.debug { "#{self.class.name} Raw Response:\n#{env.pretty_inspect}" }
+        message   = JSON.parse(env.body).pretty_inspect rescue nil
+        message ||= env.body
+        logger.error("#{self.class.name} Response Body:\n#{message}")
+
         case env[:status]
         when 402
           raise AnsibleTowerClient::UnlicensedFeatureError
@@ -12,7 +19,7 @@ module AnsibleTowerClient
         when 407
           # mimic the behavior that we get with proxy requests with HTTPS
           raise AnsibleTowerClient::ConnectionError, %(407 "Proxy Authentication Required ")
-        when CLIENT_ERROR_STATUSES
+        else
           raise AnsibleTowerClient::ClientError, env.body
         end
       end

data/lib/ansible_tower_client/version.rb

@@ -1,3 +1,3 @@
 module AnsibleTowerClient
-  VERSION = "0.7.0".freeze
+  VERSION = "0.8.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ansible_tower_client
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Brandon Dunne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport