gnip_api 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03b14ac2afa5946ca2801970eaa521fa0763664d
-  data.tar.gz: 01b6f881f339617348e818c71a1a747abf46e99d
+  metadata.gz: ab4d673ead43c52c3bb125dcd7bd2a5927e578c8
+  data.tar.gz: a0b428bc819c7f56a7b114966e29ca16c6fa45b2
 SHA512:
-  metadata.gz: bd9eb46fa645ea6e13b9b54f4eb36ceeb4f740fb3c2234a75fcb6cdeaebb6323fa8a822ea56d729d67206d57513e7a7f0d7d4f0162c1732b9c59de83d5e25ca9
-  data.tar.gz: 8b68c3d84b54e42ab2533b423ed58dbfc0e4c586d8466ad40311c0a85e48d24eaad131ecf290275d603b9546d743474d10bb785b42d4b4657f4889c9425053b1
+  metadata.gz: 98cdb218678d65ce2b92e120f100f5d6512aa3f42a108b86bc4683046b4be22c89ec1fd67673523bc6269f2dcb4aba1cfbe73760bfaf10e6bfce20f9e5e79184
+  data.tar.gz: a759e42169fd8655a30aac8529be5801f7ed56b5a0890cd2a06f0a1009d76a96c1ed92bceda4468287b2d5496b6fcac46ab2829b92b5b39b9e5e5e55aaac3325

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2.5
+ruby-2.2.10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gnip_api (1.2.3)
+    gnip_api (1.2.4)
       addressable
       httparty
       yajl-ruby
@@ -74,4 +74,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   1.16.0
+   1.16.3

data/lib/gnip_api/errors.rb

@@ -15,6 +15,7 @@ module GnipApi
 
     module Adapter
       class RequestError < StandardError; end
+      class InvalidInput < StandardError; end
 
       class RateLimitError < StandardError
         def initialize msg='Exceded rate limits'

data/lib/gnip_api/response.rb

@@ -27,11 +27,20 @@ module GnipApi
     def error_message
       if @body && !@body.empty?
         parsed = GnipApi::JsonParser.new.parse(@body)
-        message = parsed['error']['message']
-        message += " - TID: #{parsed['error']['transactionId']}" if parsed['error']['transactionId']
-        return message
+        if rules_summary? parsed
+          created = parsed["summary"]["created"]
+          failed = parsed["summary"]["not_created"]
+          timstamp = parsed["sent"]
+          log_rule_failures(parsed)
+          return "Invalid rules: created #{created}, failed #{failed} verify and try again"
+        elsif generic_error? parsed
+          message = parsed['error']['message']
+          message += " - TID: #{parsed['error']['transactionId']}" if parsed['error']['transactionId']
+          return message
+        else
+          return "Unknown error"
+        end
       end
-      return nil
     end
 
     def check_for_errors!
@@ -49,9 +58,28 @@ module GnipApi
         GnipApi.logger.debug "Request payload -> #{request.payload.inspect}"
         raise GnipApi::Errors::Adapter::GnipSoftwareError.new error_message if status == 503
         raise GnipApi::Errors::Adapter::RateLimitError.new error_message if status == 429
+        raise GnipApi::Errors::Adapter::InvalidInput.new(error_message) if status == 422
         raise GnipApi::Errors::Adapter::RequestError.new("Status #{status} #{error_message}")
       end
     end
 
+    private
+    def log_rule_failures data
+      message = "Invalid rules (422):\n"
+      data["detail"].each do |rule|
+        message += "Rule: #{rule['value']}\n"
+        message += "Reason: #{rule['message']}\n\n"
+      end
+      GnipApi.logger.error message
+    end
+
+    def rules_summary? data
+      data.keys.include? "summary"
+    end
+
+    def generic_error? data
+      data.keys.include? "error"
+    end
+
   end
 end

data/lib/gnip_api/version.rb

@@ -1,3 +1,3 @@
 module GnipApi
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/spec/gnip_api/response_spec.rb

@@ -8,6 +8,27 @@ describe GnipApi::Response do
   end
 
   describe '#error_message' do
+    context 'when 422 for rules' do
+      let(:request) { GnipApi::Response.new(GnipApi::Request.new, 422, "{\"summary\":{\"created\":0,\"not_created\":1},\"detail\":[{\"rule\":{\"value\":\"keyword\",\"tag\":\"123\"},\"created\":false,\"message\":\"some message\"}],\"sent\":\"2018-07-26T15:25:33.483Z\"}", {}) }
+      it "parses body errors and returns minimal info" do
+        expect(request.error_message).to eq("Invalid rules: created 0, failed 1 verify and try again")
+      end
+    end
+
+    context 'when 422 for everything else' do
+      let(:request) { GnipApi::Response.new(GnipApi::Request.new, 422, "{\"error\":{\"message\":\"Generic error\",\"sent\":\"2018-02-06T16:35:03+00:00\",\"transactionId\":\"000ea40b00c3da1e\"}}", {}) }
+      it "parses body errors and returns message" do
+        expect(request.error_message).to eq("Generic error - TID: 000ea40b00c3da1e")
+      end
+    end
+
+    context 'when 422 with nothing' do
+      let(:request) { GnipApi::Response.new(GnipApi::Request.new, 422, "{\"asd\":\"asd\"}", {}) }
+      it "returns unknown" do
+        expect(request.error_message).to eq("Unknown error")
+      end
+    end
+
     context 'when 429' do
       let(:request) { GnipApi::Response.new(GnipApi::Request.new, 429, "{\"error\":{\"message\":\"Exceeded rate limit\",\"sent\":\"2018-02-06T16:35:03+00:00\",\"transactionId\":\"000ea40b00c3da1e\"}}", {}) }
       it 'parses the body and returns message' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnip_api
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Rayko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler