mno-enterprise-core 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f86f23ee03e94efd1fe73caa8f9d167f0f7c4e26
-  data.tar.gz: 8475c78dc8b587d24699376b1b7124d56c18c79b
+  metadata.gz: 813c8e1d92349154521dc8890567c5d781cfa6c6
+  data.tar.gz: 193b99609bab56ce9e15352ca4b4bd4545785683
 SHA512:
-  metadata.gz: 82833934086d69a762e128cbff7bccc713842cbc73aa4d7177fa11d3b8385f0a1bfe2b8a5a36335b4f7c675504e7376f9d14d7e3b3fb8f7707f510c5810be608
-  data.tar.gz: 6407779f446de1b82fc3e9fb934270e762f96ec967eb916a2a044b0fcc21f4a45606365e2ba337873802ff9c6d7fb67c3a4316891d8cbf5f0c144cd8f2e1b93f
+  metadata.gz: 506c85a6be60f669dd1e757f9fc867f8bdd19824b1140434ffb2221ecbe89ff3744c2e37bb2691551d3451d71d1678e1c0a149c07a2530af7e801f2c872f53b8
+  data.tar.gz: a5e71645e53acc694ebc7fde9aa497101c449a5e35704b693c1c61c6147db6c586008652183ae574792107da2d5806431b3252ef655408a9eb9248ddaaa4d6a2

data/lib/her_extension/middleware/mnoe_raise_error.rb

@@ -0,0 +1,21 @@
+module Her
+  module Middleware
+    # This middleware will raise errors based on the response status
+    # Same as Faraday::Response::RaiseError, except it will catch specific
+    # errors codes rather than everything in 400..600
+    class MnoeRaiseError < Faraday::Response::RaiseError
+      def on_complete(env)
+        case env[:status]
+        when 407
+          # mimic the behavior that we get with proxy requests with HTTPS
+          raise Faraday::Error::ConnectionFailed,
+                %(407 "Proxy Authentication Required ")
+        when 502..504
+          raise Faraday::Error::ConnectionFailed, response_values(env)
+        when 401, 500
+          raise Faraday::Error::ClientError, response_values(env)
+        end
+      end
+    end
+  end
+end

data/lib/her_extension/model/relation.rb

@@ -26,6 +26,9 @@ module Her
       # Use filter instead of raw parameters
       def where(params = {})
         return self if !params || params.empty?
+        # If a value is an empty array, it'll be excluded when calling params.to_query, so convert it to nil instead
+        params.each { |k, v| params[k] = v.presence if v.is_a?(Array) }
+
         self.params[:filter] ||= {}
         self.params[:filter].merge!(params)
         self

data/lib/mno_enterprise/core.rb

@@ -18,6 +18,7 @@ require "her_extension/model/associations/association"
 require "her_extension/model/associations/association_proxy"
 require "her_extension/model/associations/has_many_association"
 require "her_extension/middleware/mnoe_api_v1_parse_json"
+require "her_extension/middleware/mnoe_raise_error"
 require "faraday_middleware"
 require "mno_enterprise/engine"
 
@@ -292,6 +293,9 @@ module MnoEnterprise
 
         # Adapter
         c.use Faraday::Adapter::NetHttpNoProxy
+
+        # Error Handling
+        c.use Her::Middleware::MnoeRaiseError
       end
     end
 end

data/lib/mno_enterprise/testing_support/mno_enterprise_api_test_helper.rb

@@ -124,7 +124,8 @@ module MnoEnterpriseApiTestHelper
 
         # Response
         c.use Her::Middleware::MnoeApiV1ParseJson
-      
+        c.use Her::Middleware::MnoeRaiseError
+
         # Add stubs on the test adapter
         c.use MnoeFaradayTestAdapter do |receiver|
           @_stub_list.each do |key,stub|

data/lib/mno_enterprise/version.rb

@@ -1,3 +1,3 @@
 module MnoEnterprise
-  VERSION = '3.0.3'
+  VERSION = '3.0.4'
 end

data/spec/lib/her_extension/model/relation_spec.rb

@@ -3,5 +3,19 @@ require 'rails_helper'
 module MnoEnterprise
   RSpec.describe Her::Model::Relation do
     pending "add specs for Her::Model::Relation monkey patch: #{__FILE__}"
+
+    let(:dummy_class) { Class.new { include Her::Model } }
+
+    describe '.where' do
+      it 'adds the filter to params[:filter]' do
+        rel = Her::Model::Relation.new(dummy_class).where('uid.in' => [1, 2], 'foo' => 'bar')
+        expect(rel.params[:filter]).to eq('uid.in' => [1, 2], 'foo' => 'bar')
+      end
+
+      it 'replaces empty array values with nil' do
+        rel = Her::Model::Relation.new(dummy_class).where('id.in' => [])
+        expect(rel.params[:filter]).to eq('id.in' => nil)
+      end
+    end
   end
 end

data/spec/models/mno_enterprise/base_resource_spec.rb

@@ -2,6 +2,28 @@ require 'rails_helper'
 
 module MnoEnterprise
   RSpec.describe BaseResource, type: :model do
+    describe 'Error Handling' do
+      class Test < BaseResource; end
+
+      context 'Connection Errors' do
+        ((502..504).to_a<<407).each do |code|
+          it "handles #{code} error" do
+            api_stub_for(get: "/tests/1", code: code)
+            expect { Test.find(1) }.to raise_error(Faraday::ConnectionFailed)
+          end
+        end
+      end
+
+      context 'Server Errors' do
+        [401, 500].each do |code|
+          it "handles #{code} error" do
+            api_stub_for(get: "/tests/1", code: code)
+            expect { Test.find(1) }.to raise_error(Faraday::Error::ClientError)
+          end
+        end
+      end
+    end
+
     describe '#cache_key' do
       context 'for existing record' do
         let(:user) { build(:user) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-core
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -445,6 +445,7 @@ files:
 - lib/generators/mno_enterprise/templates/scripts/upstart/app.conf
 - lib/her_extension/her_orm_adapter.rb
 - lib/her_extension/middleware/mnoe_api_v1_parse_json.rb
+- lib/her_extension/middleware/mnoe_raise_error.rb
 - lib/her_extension/model/associations/association.rb
 - lib/her_extension/model/associations/association_proxy.rb
 - lib/her_extension/model/associations/has_many_association.rb