intercom 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d926e07d26eefd26f84f84ee9396712647c22782
-  data.tar.gz: 1fcca290fa346ceb3490400a8aa1295e2bc89e93
+  metadata.gz: 93b3088910bdf34dcb9dd1566e1d926a89050da0
+  data.tar.gz: db0ef2a2587d36903eec10f0fb436aa18552e4fb
 SHA512:
-  metadata.gz: c9794f7becf939adab0d9d7c6c2c704494404a7b1af068cb15c5a450a50c0c6230dd28ff01ffd24157ac89dacaa4140d1bf0135c9df8bc800101c1c9f9ea73bb
-  data.tar.gz: af350c1a8b995fcea209a9e9c52eefd2753700664f8fc8b800e5c2539bf0a4870b2484b7c89cdb1bb6e1b175bf5d1d53f5943f77adab5800b18ab52a8ce7852d
+  metadata.gz: fb04dbf382b3151d00a28381f1e4fd2580a6063a044c6999563cfeb28d594fd81fe101b2cae585c713a54390bc0e57dcb383537021e21b4083498584e6acfe1e
+  data.tar.gz: add597f18c97052f2d21196e0a70bd75f5267010b18bf37b33f48148c22c4f58e80f61d726465bfdad65dfb36b3ab2dcf5b08f492c0a0d3b8ee3553a3932adb1

data/Gemfile

@@ -3,9 +3,6 @@ source "http://rubygems.org"
 gemspec
 
 group :development, :test do
-  gem 'fakeweb', "~> 1.3"
-#  gem 'm'
-#  gem 'pry-byebug'
   platforms :jruby do
     gem 'json-jruby'
     gem 'jruby-openssl'

data/changes.txt

@@ -1,3 +1,9 @@
+2.1.5
+  - Fix typos in error messages (thanks to @infertux)
+  - Gemfile cleanup (thanks to @Manfred)
+  - Handle 403 Forbidden errors
+  - Fix intermittant spec failure
+
 2.1.4
   - Rework hash helper extensions
 

data/lib/intercom/api_operations/find.rb

@@ -3,7 +3,7 @@ module Intercom
     module Find
       module ClassMethods
         def find(params)
-          raise BadRequestError, "#{self}#find takes a hash as it's parameter but you supplied #{params.inspect}" unless params.is_a? Hash
+          raise BadRequestError, "#{self}#find takes a hash as its parameter but you supplied #{params.inspect}" unless params.is_a? Hash
           collection_name = Utils.resource_class_to_collection_name(self)
           if params[:id]
             response = Intercom.get("/#{collection_name}/#{params[:id]}", {})

data/lib/intercom/api_operations/find_all.rb

@@ -5,7 +5,7 @@ module Intercom
     module FindAll
       module ClassMethods
         def find_all(params)
-          raise BadRequestError, "#{self}#find takes a hash as it's parameter but you supplied #{params.inspect}" unless params.is_a? Hash
+          raise BadRequestError, "#{self}#find takes a hash as its parameter but you supplied #{params.inspect}" unless params.is_a? Hash
           collection_name = Utils.resource_class_to_collection_name(self)
           finder_details = {}
           if params[:id] && !type_switched_finder?(params)

data/lib/intercom/request.rb

@@ -81,6 +81,8 @@ module Intercom
         raise Intercom::ResourceNotFound.new('Resource Not Found')
       elsif res.code.to_i.eql?(401)
         raise Intercom::AuthenticationError.new('Unauthorized')
+      elsif res.code.to_i.eql?(403)
+        raise Intercom::AuthenticationError.new('Forbidden')
       elsif res.code.to_i.eql?(500)
         raise Intercom::ServerError.new('Server Error')
       elsif res.code.to_i.eql?(502)
@@ -100,7 +102,7 @@ module Intercom
         :application_error_code => error_code
       }
       case error_code
-      when 'unauthorized'
+      when 'unauthorized', 'forbidden'
         raise Intercom::AuthenticationError.new(error_details['message'], error_context)
       when "bad_request", "missing_parameter", 'parameter_invalid'
         raise Intercom::BadRequestError.new(error_details['message'], error_context)

data/lib/intercom/version.rb

@@ -1,3 +1,3 @@
 module Intercom #:nodoc:
-  VERSION = "2.1.4"
+  VERSION = "2.1.5"
 end

data/spec/unit/intercom/traits/api_resource_spec.rb

@@ -13,7 +13,7 @@ describe Intercom::Traits::ApiResource do
      "user_count"=>1,
      "custom_attributes"=>{}}
   end
-  let(:api_resource) { Object.new.extend(Intercom::Traits::ApiResource)}
+  let(:api_resource) { DummyClass.new.extend(Intercom::Traits::ApiResource)}
 
   before(:each) { api_resource.from_response(object_json) }
 
@@ -80,4 +80,6 @@ describe Intercom::Traits::ApiResource do
     keys.each { |key| h.delete(key) }
     h
   end
+  
+  class DummyClass; end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Ben McRedmond
@@ -15,76 +15,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 'Intercom (https://www.intercom.io) is a customer relationship management
@@ -103,8 +103,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -171,12 +171,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ~>
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []