moonrope-client 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 715eb9deabcf5fa5b513b07b25bd56622ee65f875e91c90e0213c5c3367af6c3
-  data.tar.gz: 2ffd7298b3c239781aab0466be505aee305e6606b393f989d6a7b2764e5653fd
+  metadata.gz: e354b83a2648af524ba82261be24f4eade87122b4bd042c2b13d81638105d505
+  data.tar.gz: 0a2fef71abb2c870938b97ce60e241fb39ef1b66990be7889a938afd0059c39d
 SHA512:
-  metadata.gz: ffbaa74e05ae1d9089c95d1abc9bd764b07df63989628d8c65c9de517860f6305216be46be8cd1798aa176827793287173c09c734f85080eda98af51e431b6c5
-  data.tar.gz: cfd048af82d5e94625b7011d9cb2e2f1e0017974110bf1aaa7c6a0be2f79d5b779878defc2a649fe0f37a7b5c6850d9f1dc825078790bb5c73c75916994720a4
+  metadata.gz: 77438b37bc152c59ecdb5a7e4325aa33688ee2f28383fc65c538d51c798e98a00c9b8013041d5a6536f89814c49945461d0fa9e101b1c1551e61703fae509474
+  data.tar.gz: 5e793e6c03c223f0bec41ea11c212edf1fe7b2d938fc392a4c3c80a9cfb293b87391353b4294f775819e8a04bc1b8dabf22924798c0d8c2cbf40fb6b4c3ea694

data/lib/moonrope_client/connection.rb

@@ -96,6 +96,7 @@ module MoonropeClient
       request.add_field 'User-Agent', self.user_agent
       headers.each { |k,v| request.add_field k, v }
       connection = Net::HTTP.new(self.host, self.port)
+      connection.open_timeout = @options[:connect_timeout] || 10
       if ssl
         connection.use_ssl = true
         connection.verify_mode = OpenSSL::SSL::VERIFY_PEER
@@ -103,12 +104,21 @@ module MoonropeClient
       result = connection.request(request)
       case result.code.to_i
       when 200 then result.body
-      when 400 then raise Error, "Bad request (400)"
-      when 403 then raise Error, "Access denied (403)"
-      when 404 then raise Error, "Page not found (404)"
-      when 500 then raise Error, "Internal server error (500)"
-      else          raise Error, "Unexpected status code #{result.code.to_i}"
+      when 400
+        raise Error.new("Bad request (400)", body: result.body)
+      when 403
+        raise Error.new("Access denied (403)", body: result.body)
+      when 404
+        raise Error.new("Page not found (404)", body: result.body)
+      when 301..309
+        raise Error.new("Redirect (#{result.code})", body: result.body, location: result['Location'])
+      when 500
+        raise Error.new("Internal server error (500)", body: result.body)
+      else
+        raise Error.new("Error (#{result.code.to_i})", body: result.body)
       end
+    rescue Net::OpenTimeout
+      raise Error.new("Connection timeout to #{self.host}:#{self.port}")
     end
 
   end

data/lib/moonrope_client/error.rb

@@ -1,4 +1,16 @@
 module MoonropeClient
   class Error < StandardError
+    def initialize(message, options = {})
+      @message = message
+      @options = options
+    end
+
+    def to_s
+      @message
+    end
+
+    def options
+      @options
+    end
   end
 end

data/lib/moonrope_client/version.rb

@@ -1,3 +1,3 @@
 module MoonropeClient
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonrope-client
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
 description: A full client library allows requests to made to Moonrope-enabled API
   endpoints.
 email:
@@ -70,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A client library for the the Moonrope API server.