artirix_data_models 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a060a4fa04fce00cde5999d99498e7b15e46485
-  data.tar.gz: bc3c22509e46bd8474f4c60641d872fa1e06d882
+  metadata.gz: 46351acd75da3e9389df085d1ac1f2c0650b8170
+  data.tar.gz: dbc025033b44bafb353808a79677a0cd26f1d168
 SHA512:
-  metadata.gz: a73b7fa9d687ec9acc1b1d9b6e63a61db690c6bf0289f4ef21cca2aa597f3535cd60aa212daac6d1a00d57062187bc04ed26116e9866ed0ae2601c4f54d2ac46
-  data.tar.gz: a9280128257047ed0ba48acc5fe4c03dd5585f4dfac5a6f1667e62da99ad1cbe534346ab7aa8f9fc32a1e4803c527a8a1b649515f430048fcbde5123c6b56d9f
+  metadata.gz: 9e0688236b185df19b6b5aeec4ea71c96b3a13a00781db5e53d40961705e0ca19eb9d6451418641dfe970c2b72d9035ba9d1bddb4aa9e02c395c10158dfe4d7b
+  data.tar.gz: 6cf4baac1f99bc41780b602a1ea7f8c0ec52217d1c6b7dec026e79c9f8bd48a0d1687b5bffc9c7742b3414fd880f4e4c24d46657f5bf60fe083762df2549aac7

data/README.md

@@ -268,6 +268,18 @@ end
 
 ## Changes
 
+### 0.14.1
+- Exceptions now with `data_hash` and ability to be raised with message, options, or both.
+- Cache Adaptors now store the data hash of the NotFound exception, and a new one is built and raised when reading a cached NotFound. 
+
+```ruby
+raise ArtirixDataModels::DataGateway::NotFound, 'blah blah'
+raise ArtirixDataModels::DataGateway::NotFound, path: 'something', message: 'blah blah'
+raise ArtirixDataModels::DataGateway::NotFound.new('xxx')
+raise ArtirixDataModels::DataGateway::NotFound.new(path: 'x')
+raise ArtirixDataModels::DataGateway::NotFound.new('Something', path: 'x')
+```
+
 ### 0.14.0
 - `Model`: added static `mark_full_mode_by_default`: if called in the model definition it will make all new models full mode by default
 

data/lib/artirix_data_models/cached_action_adaptor.rb

@@ -68,7 +68,7 @@ class ArtirixDataModels::CachedActionAdaptor
     cache_result [STATUS_OK, result]
     result
   rescue ArtirixDataModels::DataGateway::NotFound => e
-    cache_result [STATUS_NOT_FOUND, e.message]
+    cache_result [STATUS_NOT_FOUND, e.data_hash]
     raise e
   end
 

data/lib/artirix_data_models/gateways/data_gateway.rb

@@ -74,7 +74,10 @@ class ArtirixDataModels::DataGateway
       end
     end
   rescue Faraday::ConnectionFailed => e
-    raise ConnectionError.new(path: path, method: method), "method: #{method}, path: #{path}, error: #{e}"
+    raise ConnectionError,
+          path:    path,
+          method:  method,
+          message: "method: #{method}, path: #{path}, error: #{e}"
   end
 
   def body_to_json(body)
@@ -100,7 +103,11 @@ class ArtirixDataModels::DataGateway
     end
 
   rescue Oj::ParseError => e
-    raise ParseError.new(path: path, method: method, response_body: result), e.message
+    raise ParseError,
+          path:          path,
+          method:        method,
+          response_body: result,
+          message:       e.message
   end
 
   #######################
@@ -119,7 +126,11 @@ class ArtirixDataModels::DataGateway
     return response.body if response.success?
 
     klass = exception_for_status(response.status)
-    raise klass.new(path: path, method: method, response_body: response.body, response_status: response.status)
+    raise klass,
+          path:            path,
+          method:          method,
+          response_body:   response.body,
+          response_status: response.status
   end
 
   def self.exception_for_status(response_status)
@@ -183,13 +194,37 @@ class ArtirixDataModels::DataGateway
   end
 
   class Error < StandardError
-    attr_reader :path, :method, :response_status, :response_body
+    attr_reader :path, :method, :response_status, :response_body, :message
+
+    alias_method :msg, :message
+
+    def initialize(*args)
+      case args.size
+      when 0
+        message = nil
+        options = {}
+      when 1
+        if args.first.kind_of? Hash
+          options = args.first
+          message = nil
+        else
+          message = args.first
+          options = {}
+        end
+      else
+        message = args[0]
+        options = args[1]
 
-    def initialize(path: nil, method: nil, response_status: nil, response_body: nil)
-      @path            = path
-      @method          = method
-      @response_status = response_status
-      @response_body   = response_body
+        if message.kind_of? Hash
+          options, message = message, options
+        end
+      end
+
+      if message.present?
+        options[:message] = message
+      end
+
+      build_from_options(options) if options.present?
     end
 
     def json_response_body
@@ -210,11 +245,37 @@ class ArtirixDataModels::DataGateway
         method:          method,
         response_status: response_status,
         response_body:   response_body,
-        message:         msg,
+        message:         message,
       }.select { |_, v| v.present? }.map { |k, v| "#{k}: #{v.inspect}" }
 
       "#{self.class}: #{parts.join ', '}"
     end
+
+    def data_hash
+      {
+        class:           self.class.to_s,
+        path:            path,
+        method:          method,
+        response_status: response_status,
+        response_body:   response_body,
+        message:         message,
+      }
+    end
+
+    # for testing
+    def matches?(other)
+      other.kind_of? self.class
+    end
+
+    private
+
+    def build_from_options(path: nil, method: nil, response_status: nil, response_body: nil, message: nil, **_other)
+      @path            = path
+      @method          = method
+      @response_status = response_status
+      @response_body   = response_body
+      @message         = message.presence || self.class.to_s
+    end
   end
 
   class ParseError < Error

data/lib/artirix_data_models/version.rb

@@ -1,3 +1,3 @@
 module ArtirixDataModels
-  VERSION = '0.14.0'
+  VERSION = '0.14.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artirix_data_models
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Eduardo Turiño
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport