artirix_data_models 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0da26214f0430c9250de8d6612d9f0f6b98ad49
-  data.tar.gz: 4dfcc8eaec6f4aaec45ef8a62fbb8c07efa52d7e
+  metadata.gz: 68ae21ecebbb6e23b0e20e3cc9aed1dfbe0932ea
+  data.tar.gz: d9e1ff08adcb57dee94cea2b69cabde6483d8451
 SHA512:
-  metadata.gz: 266689d66972416d55e64c828709b90f58a71b5daa22e0c99d1b7f1174b763280fa0ab30cecc9b0e047ab1b58ba0cf9af2e1a46e5ada169f712c33bfc124cbc4
-  data.tar.gz: 23a3285b7906014c27074f08f73936bfb9dc02e50d42482cdf41ea64d19a6546aafcfb2a81c646f98ecf8796ff6f6dfe4bbc1b7de422d7deea06b8b16bc12f24
+  metadata.gz: e2adcab677b934257e58d7579a4b65ef46b97033b6b1caf8b16e86f2bbd07dd1cf7acd503c0d46488669f9d073ab7c6614694783280200976f37b29cb179d43e
+  data.tar.gz: c2f3b98d7b7d9a7c1e4eb428edc936083bb754d965a3a021a818d9a8054b87b3f8b74f16dc818c6cc42c2cfb4c3a32a70f113839413aff3e3aff13957be1409d

data/README.md

@@ -327,6 +327,10 @@ end
 
 ## Changes
 
+### 0.32.0
+
+- minor changes to allow backwards compatibility. Better mocking of gateway.
+
 ### 0.31.0
 
 - `CacheAdaptor` has a `delete` method now, which calls `cache.delete cache_key`.

data/lib/artirix_data_models/cache_service.rb

@@ -34,6 +34,7 @@ module ArtirixDataModels::CacheService
   def self.set_options_from_config(service)
     options = ArtirixDataModels.configuration.try(:cache_options)
     if options
+      options = options.to_hash if options.respond_to?(:to_hash) && !options.respond_to?(:each)
       options.each do |name, opts|
         if name.to_s == 'default_options'
           service.register_default_options opts

data/lib/artirix_data_models/spec_support/gateway_mock.rb

@@ -16,7 +16,8 @@ def given_gateway_config(connection_url = nil)
   end
 end
 
-
+# returns the result of `expect(gateway).to EXPECTATION` or `allow(gateway).to EXPECTATION`
+# yields EXPECTATION so it can be tuned, for example to add a `at_most` call to the chain
 def mock_gateway_response(response:,
                           method:,
                           path:,
@@ -26,25 +27,33 @@ def mock_gateway_response(response:,
                           authorization_bearer: nil,
                           authorization_token_hash: nil,
                           gateway: nil,
-                          headers: nil)
+                          headers: nil,
+                          expect: false,
+                          &block)
   gateway ||= ArtirixDataModels::DAORegistry.gateway
 
+  callable = block_given? ? block : ->(x) { x }
+
+  unless body.nil? || !json_body
+    body = body.kind_of?(String) ? body : body.to_json
+  end
+
   params_hash = {
-    path:                     path,
-    body:                     body,
-    json_body:                json_body,
-    timeout:                  timeout,
-    authorization_bearer:     authorization_bearer,
+    path: path,
+    body: body,
+    json_body: json_body,
+    timeout: timeout,
+    authorization_bearer: authorization_bearer,
     authorization_token_hash: authorization_token_hash,
-    headers:                  headers
+    headers: headers
   }
 
-  allow(gateway).to receive(:perform).with(method, params_hash).and_return response
+  what_to_allow = callable.call(receive(:perform).with(method, params_hash).and_return(response))
 
-  # check with body already parsed
-  unless body.nil?
-    body = body.kind_of?(String) ? body : body.to_json
-    allow(gateway).to receive(:perform).with(method, params_hash.merge(body: body)).and_return response
+  if expect
+    expect(gateway).to what_to_allow
+  else
+    allow(gateway).to what_to_allow
   end
 end
 
@@ -61,13 +70,13 @@ def mock_gateway_not_found_response(method:,
   gateway ||= ArtirixDataModels::DAORegistry.gateway
 
   params_hash = {
-    path:                     path,
-    body:                     body,
-    json_body:                json_body,
-    timeout:                  timeout,
-    authorization_bearer:     authorization_bearer,
+    path: path,
+    body: body,
+    json_body: json_body,
+    timeout: timeout,
+    authorization_bearer: authorization_bearer,
     authorization_token_hash: authorization_token_hash,
-    headers:                  headers
+    headers: headers
   }
 
   allow(gateway).to receive(:perform).with(method, params_hash).and_raise ArtirixDataModels::DataGateway::NotFound

data/lib/artirix_data_models/spec_support/shared_examples/an_artirix_data_model_dao.rb

@@ -98,7 +98,7 @@ shared_examples_for 'an ArtirixDataModel DAO' do
     end
 
     Given do
-      allow(ArtirixDataModels::DAORegistry).to receive(:model_fields).and_return(model_fields_dao)
+      allow(subject.dao_registry).to receive(:get).with(:model_fields).and_return(model_fields_dao)
     end
 
     When(:result) { subject.partial_mode_fields }

data/lib/artirix_data_models/version.rb

@@ -1,3 +1,3 @@
 module ArtirixDataModels
-  VERSION = '0.31.0'
+  VERSION = '0.32.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artirix_data_models
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Eduardo Turiño
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport