conduit 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7095e2ddf14cea0d459266e69bbad1d13b70ffac
-  data.tar.gz: 9979ccfad3d33a3d776332bbca66fe7b12821d4c
+  metadata.gz: 20b09c6d50f86d7f24c352ab06dd360dcfdddd17
+  data.tar.gz: 6f41391c9ba5051d30b955cf5c4cded6cac9300e
 SHA512:
-  metadata.gz: 00e364f6c550713c25580d61aba432e0f2c6e7cdfbfabe1545ee0e8bee16d5d494a3c49632afab2ad1a557094df6474eb824be7d964d02b443d3ec7a103aad85
-  data.tar.gz: 1f3bda3cb4d84c2ac152fe731b5b5b069ee0b3321106c72d87c5c00bd3e00a83a21e791321d4cd1067a1cb2d69b1d8bc4bf07d08b8facb10a4134e996696c0ad
+  metadata.gz: 33d6a1955b2b84b54451cf2fcb89da5543ead8fce45e7f8d769db15a4927b367aaabf24179e91dd335fc472bcf51b49d4ccec5bb64d41e925ebc7b106b18fc6d
+  data.tar.gz: 82f101246fb38fb16b44aa4b7b3c10cd6f553958bbe85f0caee4f81e9d89281bf359fd258de73e1a133a8c573d512c73905e03c44d2c07b0cb7a457e6dd4e649

data/lib/conduit/core/action.rb

@@ -13,6 +13,7 @@
 #
 
 require 'active_support/inflector'
+require 'active_support/core_ext/object/blank'
 require 'forwardable'
 require 'ostruct'
 require 'set'
@@ -139,11 +140,36 @@ module Conduit
         # an ArgumentError listing missing attributes
         #
         def validate!(options)
+          !missing_required_keys?(options) &&
+            !required_keys_not_present?(options)
+        end
+
+        # Raises an Argument error if any required keys
+        # are not present in the options hash; otherwise
+        # returns false
+        #
+        def missing_required_keys?(options)
           missing_keys = (requirements.to_a - options.keys)
           if missing_keys.any?
             raise ArgumentError,
               "Missing keys: #{missing_keys.join(', ')}"
           end
+          false
+        end
+
+        # Raises an Argument error if any required keys
+        # are present in the options hash but have nil values;
+        # otherwise returns false
+        #
+        def required_keys_not_present?(options)
+          required_options_not_present = requirements.reject do |required_key|
+            options[required_key].present?
+          end
+          if required_options_not_present.any?
+            raise ArgumentError,
+              "Nil keys: #{required_options_not_present.join(', ')}"
+          end
+          false
         end
 
         # Returns the parser for this action

data/lib/conduit/core/connection.rb

@@ -54,6 +54,10 @@ module Conduit
           raise(Conduit::Timeout, timeout.message)
         rescue Excon::Errors::Error => error
           raise(Conduit::ConnectionError, error.message)
+        rescue SocketError => error
+          msg = 'Could not connect to the server.  Please check your internet connection.' +
+            "\n#{error.message}"
+          raise(Conduit::ConnectionError, msg)
         end
 
         private

data/lib/conduit/version.rb

@@ -1,3 +1,3 @@
 module Conduit
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end

data/spec/classes/core/action_spec.rb

@@ -40,6 +40,33 @@ shared_examples_for Conduit::Core::Action do
       end
     end
 
+    describe '.new' do
+      it 'should raise an error if any required arguments are not supplied' do
+        expect { described_class.new({}) }.to raise_error(ArgumentError)
+      end
+
+      it 'should raise an error if any required arguments are nil' do
+        options = request_attributes.inject({}) do |h, (k, _v)|
+          h.merge(k => nil)
+        end
+        expect { described_class.new(options) }.to raise_error(ArgumentError)
+      end
+
+      it 'should raise an error if any of the required arguments are blank' do
+        options = request_attributes.inject({}) do |h, (k, _v)|
+          h.merge(k => '')
+        end
+        expect { described_class.new(options) }.to raise_error(ArgumentError)
+      end
+
+      it 'should raise an error if any of the required arguments are empty' do
+        options = request_attributes.inject({}) do |h, (k, _v)|
+          h.merge(k => [])
+        end
+        expect { described_class.new(options) }.to raise_error(ArgumentError)
+      end
+    end
+
     describe '#perform' do
       before { Excon.stub({}, body: response, status: 200) }
 

data/spec/spec_helper.rb

@@ -18,7 +18,7 @@ RSpec.configure do |config|
   config.include Helper
 
   config.expect_with :rspec do |c|
-    c.syntax = :should
+    c.syntax = [:should, :expect]
   end
 
   config.before(:suite) do
@@ -29,4 +29,4 @@ RSpec.configure do |config|
 
     Conduit::Driver.load_drivers
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conduit
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Mike Kelley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport