what3words 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22479c5ad9842970d932052a565ee1b4bfd98c14a05d279297d6ba964d95a902
-  data.tar.gz: bb498f8b643e541acfb83f1925ec9d30e67df710994561cad2629cc73e2b7230
+  metadata.gz: f248d7e71dde2539d4ff68361b8560a14d751f708f94dfa8764fbe7d049204c2
+  data.tar.gz: 60bc224aa58cfc974cb13398bfe350183f08c7e1b6975ed8358285a165bcf342
 SHA512:
-  metadata.gz: 2ea16a0b86a7f4348b9c07661365f4bc58197b78f969e0b834686d4b117cd826978e76f20f802a1091d4b95c6ecf06979613d97b8ae9d81c85d6096d03521857
-  data.tar.gz: 206f017da8d6ffa7d1b323479b948552cc830ee523e4781309f4a47b2eed25b271bfeeed824fc3600d663d7a53f8dbf4673f694baf25e130b492909b73199bb6
+  metadata.gz: 88a70bb9e8776928983187642b612cccde290e09605d23ad9e56d448cc75fa980f53fbb97bf9a69b9785ce293a35fe07a789842279110a17532210e7a3010ca6
+  data.tar.gz: 737b661041690c70ee27dc19a9f7e5096f6440577ca36a0a618d97459e183d411019d85a18608c5ca2f71af73a91bc7cc966a1fe88261b67522de246c02f79d2

data/README.md

@@ -15,7 +15,7 @@ The library is available through [RubyGems](https://rubygems.org/gems/what3words
 You can simply add this line to your application's Gemfile:
 
 ```
-    gem 'what3words', '~> 3.2'
+    gem 'what3words', '~> 3.3'
 ```
 
 And then execute:
@@ -438,6 +438,7 @@ Anyone and everyone is welcome to contribute.
 
 # Revision History
 
+* `v3.3.0`  12/08/24 - Update error message to handle c2c calls and dependencies
 * `v3.2.0`  17/07/24 - Update regex patterns
 * `v3.1.0`  16/07/24 - Update tests and code to host the regex functions
 * `v3.0.0`  12/05/22 - Update endpoints and tests to API v3, added HTTP headers

data/lib/what3words/api.rb

@@ -9,7 +9,8 @@ module What3Words
   # What3Words v3 API wrapper
   class API
     class Error < RuntimeError; end
-    class ResponseError < Error; end
+    # class ResponseError < Error; end
+    class ResponseError < StandardError; end
     class WordError < Error; end
 
     REGEX_3_WORD_ADDRESS = /^\/*(?:[^0-9`~!@#$%^&*()+\-_=\[\{\]}\\|'<>.,?\/\";:£§º©®\s]{1,}[.｡。･・︒។։။۔።।][^0-9`~!@#$%^&*()+\-_=\[\{\]}\\|'<>.,?\/\";:£§º©®\s]{1,}[.｡。･・︒។։။۔።।][^0-9`~!@#$%^&*()+\-_=\[\{\]}\\|'<>.,?\/\";:£§º©®\s]{1,}|[<.,>?\/\";:£§º©®\s]+[.｡。･・︒។։။۔።।][^0-9`~!@#$%^&*()+\-_=\[\{\]}\\|'<>.,?\/\";:£§º©®\s]+|[^0-9`~!@#$%^&*()+\-_=\[\{\]}\\|'<>.,?\/\";:£§º©®\s]+([\u0020\u00A0][^0-9`~!@#$%^&*()+\-_=\[\{\]}\\|'<>.,?\/\";:£§º©®\s]+){1,3}[.｡。･・︒។։။۔።।][^0-9`~!@#$%^&*()+\-_=\[\{\]}\\|'<>.,?\/\";:£§º©®\s]+([\u0020\u00A0][^0-9`~!@#$%^&*()+\-_=\[\{\]}\\|'<>.,?\/\";:£§º©®\s]+){1,3}[.｡。･・︒។։။۔።।][^0-9`~!@#$%^&*()+\-_=\[\{\]}\\|'<>.,?\/\";:£§º©®\s]+([\u0020\u00A0][^0-9`~!@#$%^&*()+\-_=\[\{\]}\\|'<>.,?\/\";:£§º©®\s]+){1,3})$/u.freeze
@@ -177,17 +178,34 @@ module What3Words
       response = RestClient.get(endpoint(endpoint_name), params: params, headers: headers)
       parsed_response = JSON.parse(response.body)
 
-      raise ResponseError, "#{parsed_response['code']}: #{parsed_response['message']}" if parsed_response['error'].to_s.strip != ''
+      if parsed_response['error']
+        error_code = parsed_response['error']['code']
+        error_message = parsed_response['error']['message']
+        raise ResponseError, "#{error_code}: #{error_message}"
+      end
 
       deep_symbolize_keys(parsed_response)
     rescue RestClient::ExceptionWithResponse => e
       handle_rest_client_error(e)
+    rescue RestClient::Exception => e
+      raise ResponseError, "RestClient error: #{e.message}"
     end
 
     def handle_rest_client_error(error)
-      parsed_response = JSON.parse(error.response)
-      raise ResponseError, "#{parsed_response['code']}: #{parsed_response['message']}" if parsed_response['error']
-      raise error
+      response = error.response
+      begin
+        parsed_response = JSON.parse(response.body)
+      rescue JSON::ParserError
+        raise ResponseError, "Invalid JSON response: #{response}"
+      end
+
+      if parsed_response['error']
+        error_code = parsed_response['error']['code']
+        error_message = parsed_response['error']['message']
+        raise ResponseError, "#{error_code}: #{error_message}"
+      else
+        raise ResponseError, "Unknown error: #{response}"
+      end
     end
 
     def get_words_string(words)

data/lib/what3words/version.rb

@@ -2,5 +2,5 @@
 
 # What3Words v3 API wrapper
 module What3Words
-  VERSION = '3.2.0' unless defined?(::What3Words::VERSION)
+  VERSION = '3.3.0' unless defined?(::What3Words::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: what3words
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - what3words
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: 0.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: 0.49.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement