intercom 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9496ff15812ad595a1a475e5063c4c761005a76b
-  data.tar.gz: f79db0f25ddda16aaccd0a222c4331f157a9bc5d
+  metadata.gz: 97bae6f804544dc4b64cab0d92514b8146f09ba5
+  data.tar.gz: a10b64e3f44e2c35c4d929f43a04f2c37790b5d2
 SHA512:
-  metadata.gz: 6680e040fde3ae378c499bbff89fcde30154805b5505baf959d8b4b6e655c962c5cf8fea5dc6b88aa1412a50421bc92f374b494c2cba810a8638cb186f2fb0cc
-  data.tar.gz: 9d7134dd3245c3d1233372272ebfe568f0b94ba95d3113c0d8f995fd7dc4a461d722399bd5b52fbf478e679099d080887e4b47244bdf1961f316d643e686f908
+  metadata.gz: 46e7669169fd64f577f888707ae5ce6004b51c01356be19a28988f4e3a10696361fc363f05e0983f13f9f6d58287391221d1567b242e9feb870ccab0cecc7ac5
+  data.tar.gz: 1e6cb49b7fec53b3077319cd781ce7cc2377d3f05a7022f89f09f268bd79472cfd4e2e58e6f016dfc1bef45c4234adcaa867e07aa3cffc08d02c022b47646a19

data/.travis.yml

@@ -3,3 +3,4 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0

data/README.md

@@ -19,7 +19,7 @@ This version of the gem is compatible with `Ruby 2.1`, `Ruby 2.0` & `Ruby 1.9.3`
 
 Using bundler:
 
-    gem 'intercom', "~> 2.4.2"
+    gem 'intercom', "~> 2.4.3"
 
 ## Basic Usage
 
@@ -30,6 +30,8 @@ Intercom.app_id = "my_app_id"
 Intercom.app_api_key = "my-super-crazy-api-key"
 ```
 
+You can get your `app_id` from the URL when you're logged into Intercom (it's the alphanumeric just after `/apps/`) and your API key from the API keys settings page (under your app settings in Intercom). 
+
 ### Resources
 
 Resources this API supports:
@@ -330,7 +332,7 @@ Note that models generated from webhook notifications might differ slightly from
 ### Errors
 You do not need to deal with the HTTP response from an API call directly. If there is an unsuccessful response then an error that is a subclass of Intercom:Error will be raised. If desired, you can get at the http_code of an Intercom::Error via its `http_code` method.
 
-The list of different error subclasses are listed below. As they all inherit off Intercom::Error you can choose to rescue Intercom::Error or
+The list of different error subclasses are listed below. As they all inherit off Intercom::IntercomError you can choose to rescue Intercom::IntercomError or
 else rescue the more specific error subclass.
 
 ```ruby

data/changes.txt

@@ -1,3 +1,6 @@
+2.4.3
+ - Updates to remove warning when running in Ruby 2.2.0 (thanks @pat @jwaldrip)
+
 2.4.2
  - Add nil guard around decode_body to fix potential issue.
 

data/intercom.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'mocha'
+  spec.add_development_dependency 'minitest', '~> 5.4'
+  spec.add_development_dependency 'rake', '~> 10.3'
+  spec.add_development_dependency 'mocha', '~> 1.0'
   spec.add_development_dependency "fakeweb", ["~> 1.3"]
 
-  spec.add_dependency 'json'
+  spec.add_dependency 'json', '~> 1.8'
   spec.required_ruby_version = '>= 1.9.3'
 end

data/lib/intercom/errors.rb

@@ -3,9 +3,9 @@ module Intercom
   # Base class exception from which all public Intercom exceptions will be derived
   class IntercomError < StandardError
     attr_reader :http_code, :application_error_code
-    def initialize(message, http_code = nil, application_error_code = application_error_code)
+    def initialize(message, http_code = nil, error_code = application_error_code)
       @http_code = http_code
-      @application_error_code = application_error_code
+      @application_error_code = error_code
       super(message)
     end
   end

data/lib/intercom/request.rb

@@ -84,7 +84,7 @@ module Intercom
       return parsed_body if decoded_body.nil? || decoded_body.strip.empty?
       begin
         parsed_body = JSON.parse(decoded_body)
-      rescue JSON::ParserError => e
+      rescue JSON::ParserError => _
         raise_errors_on_failure(response)
       end
       raise_application_errors_on_failure(parsed_body, response.code.to_i) if parsed_body['type'] == 'error.list'

data/lib/intercom/version.rb

@@ -1,3 +1,3 @@
 module Intercom #:nodoc:
-  VERSION = "2.4.2"
+  VERSION = "2.4.3"
 end

data/spec/spec_helper.rb

@@ -11,7 +11,6 @@ def test_user(email="bob@example.com")
     "name" => "Joe Schmoe",
     "avatar" => {"type"=>"avatar", "image_url"=>"https://graph.facebook.com/1/picture?width=24&height=24"},
     "app_id" => "the-app-id",
-    "created_at" => 1323422442,
     "custom_attributes" => {"a" => "b", "b" => 2},
     "companies" =>
      {"type"=>"company.list",

data/spec/unit/intercom/company_spec.rb

@@ -5,7 +5,7 @@ describe Intercom::Company do
   describe 'when no response raises error' do
     it 'on find' do
       Intercom.expects(:get).with("/companies", {:company_id => '4'}).returns(nil)
-      proc {company = Intercom::Company.find(:company_id => '4')}.must_raise Intercom::HttpError
+      proc {Intercom::Company.find(:company_id => '4')}.must_raise Intercom::HttpError
     end
     
     it 'on find_all' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Ben McRedmond
@@ -15,78 +15,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.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'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 description: 'Intercom (https://www.intercom.io) is a customer relationship management
   and messaging tool for web app owners. This library wraps the api provided by Intercom.
   See http://docs.intercom.io/api for more details. '
@@ -103,8 +103,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -178,17 +178,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: intercom
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the Intercom API
@@ -208,4 +208,3 @@ test_files:
 - spec/unit/intercom/traits/api_resource_spec.rb
 - spec/unit/intercom/user_spec.rb
 - spec/unit/intercom_spec.rb
-has_rdoc: