intercom 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6976bd2a07095bf95783f7be2c63e77831c7ec9d
-  data.tar.gz: 54f2e7cd0cb0b33c8499daece9f1a113ea322ea7
+  metadata.gz: d926e07d26eefd26f84f84ee9396712647c22782
+  data.tar.gz: 1fcca290fa346ceb3490400a8aa1295e2bc89e93
 SHA512:
-  metadata.gz: 7bf7d2d7b646065cf719d56cf5df4f9503b549e466330d2013580333c3ac5ae55456c1587b2f98e55a432436b5a0b3dfb5a20adae248137db37614bd209f021b
-  data.tar.gz: df456322206c0889a328fb0308421302b3606617cfcbe4219eb13fe6f4a731eecdabc74a1c68194c940c1bf8398ae4321a8541e3684d434ad70f72e85fd77517
+  metadata.gz: c9794f7becf939adab0d9d7c6c2c704494404a7b1af068cb15c5a450a50c0c6230dd28ff01ffd24157ac89dacaa4140d1bf0135c9df8bc800101c1c9f9ea73bb
+  data.tar.gz: af350c1a8b995fcea209a9e9c52eefd2753700664f8fc8b800e5c2539bf0a4870b2484b7c89cdb1bb6e1b175bf5d1d53f5943f77adab5800b18ab52a8ce7852d

data/changes.txt

@@ -1,3 +1,6 @@
+2.1.4
+  - Rework hash helper extensions
+
 2.1.2
 - Clean up some spec warnings
 - Fix incrementing of custom data

data/lib/ext/sliceable_hash.rb

@@ -0,0 +1,12 @@
+class SliceableHash
+ 
+  def initialize(hash)
+    @hash = hash
+  end
+
+  # Return a hash that includes only the given keys.
+  def slice(*keys)
+    keys.map! { |key| @hash.convert_key(key) } if @hash.respond_to?(:convert_key, true)
+    keys.each_with_object(@hash.class.new) { |k, hash| hash[k] = @hash[k] if @hash.has_key?(k) }
+  end
+end

data/lib/intercom/api_operations/save.rb

@@ -37,7 +37,7 @@ module Intercom
       end
 
       def identity_hash
-        respond_to?(:identity_vars) ? to_hash.slice(*(identity_vars.map(&:to_s))) : {}
+        respond_to?(:identity_vars) ? SliceableHash.new(to_hash).slice(*(identity_vars.map(&:to_s))) : {}
       end
     end
   end

data/lib/intercom/collection_proxy.rb

@@ -1,5 +1,5 @@
 require "intercom/utils"
-require "ext/hash"
+require "ext/sliceable_hash"
 
 module Intercom
   class CollectionProxy

data/lib/intercom/version.rb

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

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

@@ -71,8 +71,13 @@ describe Intercom::Traits::ApiResource do
   it "an initialized ApiResource is equal to on generated from a response" do
     class ConcreteApiResource; include Intercom::Traits::ApiResource; end
     initialized_api_resource = ConcreteApiResource.new(object_json)
-    object_json.except('type').keys.each do |attribute|
+    except(object_json, 'type').keys.each do |attribute|
       assert_equal initialized_api_resource.send(attribute), api_resource.send(attribute)
     end
   end
+  
+  def except(h, *keys)
+    keys.each { |key| h.delete(key) }
+    h
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Ben McRedmond
@@ -15,76 +15,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-08-07 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
@@ -112,7 +112,7 @@ files:
 - changes.txt
 - intercom.gemspec
 - lib/data/cacert.pem
-- lib/ext/hash.rb
+- lib/ext/sliceable_hash.rb
 - lib/intercom.rb
 - lib/intercom/admin.rb
 - lib/intercom/api_operations/count.rb
@@ -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: []

data/lib/ext/hash.rb

@@ -1,18 +0,0 @@
-class Hash
-  # Return a hash that includes everything but the given keys.
-  def except(*keys)
-    dup.except!(*keys)
-  end
-
-  # Replaces the hash without the given keys.
-  def except!(*keys)
-    keys.each { |key| delete(key) }
-    self
-  end
-
-  # Return a hash that includes only the given keys.
-  def slice(*keys)
-      keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
-      keys.each_with_object(self.class.new) { |k, hash| hash[k] = self[k] if has_key?(k) }
-  end
-end