intercom 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 727e72af37a924f8b9920e277c27655c90f916a0
-  data.tar.gz: f9bd615578c582c877e1675d9eda5a4cf9078073
+  metadata.gz: 92e19ae4f118e928256eebed48e69b465fa80a4d
+  data.tar.gz: 05c7f801c10adc54045b4a7a3dc0917ba7c5e744
 SHA512:
-  metadata.gz: 5f9c2a425d1bbfc34ee3cbe250014d068afb3de78c535a9ae5990d40c688782b6f2d6eecb0aa80a604936c3d76d0a26d3187b5e185f958635774fcce19a2de30
-  data.tar.gz: 2dd0f223755491dbde191aa97835e94d7d4329455d9d26da7abe2c5afccb50a8dbbc8abb408b3132004d0efc5e4c5d4c081465bec8bed5cff6aa4b8bba72db6c
+  metadata.gz: 03316db456aeaf630a3e76421b790f9e23bfcabceb98a4a2050bf7b9491e77f77e44c4b11cde17431d2244e5a373f71f988882a1eca31feadd9064e8e9ac41a5
+  data.tar.gz: ae55431310b1bd92fa3fb5a01d1fe7b15b36d6261baf6f410e4b7daa0567f8e736519dedfacc7cdeaab327412c27655dbbe26a56e3652b91ca2c61b87f7a0c44

data/README.md

@@ -55,12 +55,12 @@ You can also pass custom data within a company:
 
     user.company = {:id => 6, :name => "Intercom", :referral_source => "Google"}
 
-#### Messages
+#### Message Threads
 
-    Intercom::Message.create(:email => "bob@example.com", :body => "Example message from bob@example.com to your application on Intercom.")
-    Intercom::Message.find(:email => "bob@example.com", :thread_id => 123)
-    Intercom::Message.find_all(:email => "bob@example.com")
-    Intercom::Message.mark_as_read(:email => "bob@example.com", :thread_id => 123)
+    Intercom::MessageThread.create(:email => "bob@example.com", :body => "Example message from bob@example.com to your application on Intercom.")
+    Intercom::MessageThread.find(:email => "bob@example.com", :thread_id => 123)
+    Intercom::MessageThread.find_all(:email => "bob@example.com")
+    Intercom::MessageThread.mark_as_read(:email => "bob@example.com", :thread_id => 123)
 
 #### Impressions
 

data/changes.txt

@@ -1,3 +1,6 @@
+0.1.16
+- Add BadGatewayError to properly report that sort of error.
+
 0.1.15
 - Fix location_data and social_profiles for ruby 2.0 change to #respond_to? method.
 

data/lib/intercom.rb

@@ -152,6 +152,10 @@ module Intercom
   class ServerError < StandardError;
   end
 
+  # Raised when we have bad gateway errors.
+  class BadGatewayError < StandardError;
+  end
+
   # Raised when we reach socket connect timeout
   class ServiceUnavailableError < StandardError;
   end

data/lib/intercom/request.rb

@@ -78,10 +78,12 @@ module Intercom
         raise Intercom::ResourceNotFound
       elsif res.code.to_i.eql?(401)
         raise Intercom::AuthenticationError
-      elsif res.code.to_i.eql?(503)
-        raise Intercom::ServiceUnavailableError
       elsif res.code.to_i.eql?(500)
         raise Intercom::ServerError
+      elsif res.code.to_i.eql?(502)
+        raise Intercom::BadGatewayError
+      elsif res.code.to_i.eql?(503)
+        raise Intercom::ServiceUnavailableError
       end
     end
 

data/lib/intercom/version.rb

@@ -1,3 +1,3 @@
 module Intercom #:nodoc:
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

data/spec/integration/intercom_api_integration_spec.rb

@@ -68,4 +68,13 @@ describe "api.intercom.io dummy data requests" do
     Intercom.endpoints = ["http://example.com", "http://api.example.com"]
     proc { Intercom::User.find(:email => "somebody@example.com")}.must_raise Intercom::ServiceUnavailableError
   end
+
+  it "should raise gateway error when the request returns a 502" do
+    FakeWeb.register_uri(:get, %r|example\.com/|, :status => ["502", "Bad Gateway"])
+    Intercom.endpoints = ["http://example.com"]
+    proc { Intercom::User.find(:email => "somebody@example.com")}.must_raise Intercom::BadGatewayError
+    Intercom.endpoints = ["http://example.com", "http://api.example.com"]
+    proc { Intercom::User.find(:email => "somebody@example.com")}.must_raise Intercom::BadGatewayError
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Ben McRedmond
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest