clearbit 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d45b4f5a8d2d1d16d5acce2990114ea4128e859c
-  data.tar.gz: cc056730612d1079db10d3c05f8c9ecf375a5674
+  metadata.gz: 28a6d9763ce1327254eff1db10ba5e8e4ade8f0f
+  data.tar.gz: 62547db00a4c25143d67292d20cf872cf997a538
 SHA512:
-  metadata.gz: edd484f91784a5577e09a7aa287bb03f027d6cc695bb9517c1b7a1f391d1aebc31fcb9be9ba5e5980f81256fa1a486dd245db23e85352d9cba8a13694a61910a
-  data.tar.gz: fae4a7aa0a63a36caae474e974cc22a0798827baf3951e0e9ca3a8694587cdea898432d48328e6859127fe38ac0364b79646ee30f16db2976e2bdc38605487ec
+  metadata.gz: 9bd8dc210b57025b8d860aa095c8f5fd317c4d467ebc7c86897bb9dcfab9126d33481648b8b9252d899a488bea4f308c135bd0e9e6cf9321146c834614c7cc37
+  data.tar.gz: 2523a6eafe9c12cbd60592d5fe73c4cc71e87f245c37681f92d531059909894c4c5c7b3843be1bb14db5a016b54884f3c8186b6c17ae89832771f3849e943c84

data/README.md

@@ -72,3 +72,9 @@ post '/v1/webhooks/clearbit' do
   end
 end
 ```
+
+The global Clearbit.key can be overriden for multi-tenant apps using multiple Clearbit keys like so:
+
+```ruby
+webhook = Clearbit::Webhook.new(env, 'CLEARBIT_KEY')
+```

data/lib/clearbit.rb

@@ -21,6 +21,7 @@ module Clearbit
   autoload :Autocomplete, 'clearbit/autocomplete'
   autoload :Base, 'clearbit/base'
   autoload :Enrichment, 'clearbit/enrichment'
+  autoload :IPCompany, 'clearbit/ipcompany'
   autoload :Discovery, 'clearbit/discovery'
   autoload :Logo, 'clearbit/logo'
   autoload :Mash, 'clearbit/mash'

data/lib/clearbit/discovery.rb

@@ -33,6 +33,10 @@ module Clearbit
           search.each(&block)
         end
       end
+
+      def map(&block)
+        each.map(&block)
+      end
     end
 
     def self.search(values = {})

data/lib/clearbit/ipcompany.rb

@@ -0,0 +1,22 @@
+module Clearbit
+  class IPCompany < Base
+    endpoint 'https://ipcompany.clearbit.com'
+    path '/v1/companies'
+
+    def self.find(values)
+      if ip = values.delete(:ip)
+        response = get(uri(:ip, ip), values)
+
+      else
+        raise ArgumentError, 'Invalid values'
+      end
+
+      self.new(response)
+    rescue Nestful::ResourceNotFound
+    end
+
+    class << self
+      alias_method :[], :find
+    end
+  end
+end

data/lib/clearbit/mash.rb

@@ -136,7 +136,14 @@ module Clearbit
     # Will return true if the Mash has had a key
     # set in addition to normal respond_to? functionality.
     def respond_to?(method_name, include_private=false)
-      return true if key?(method_name) || method_name.to_s.slice(/[=?!_]\Z/)
+      camelized_name = camelize(method_name.to_s)
+
+      if key?(method_name) ||
+          key?(camelized_name) ||
+            method_name.to_s.slice(/[=?!_]\Z/)
+        return true
+      end
+
       super
     end
 

data/lib/clearbit/prospector.rb

@@ -28,11 +28,11 @@ module Clearbit
     end
 
     def email
-      email_response.email
+      self[:email] || email_response.email
     end
 
     def verified
-      email_response.verified
+      self[:verified] || email_response.verified
     end
 
     alias_method :verified?, :verified

data/lib/clearbit/risk.rb

@@ -8,11 +8,11 @@ module Clearbit
     end
 
     def self.confirmed(values = {})
-      self.new post('confirmed', values)
+      post('confirmed', values)
     end
 
     def self.flag(values = {})
-      self.new post('flag', values)
+      post('flag', values)
     end
   end
 end

data/lib/clearbit/version.rb

@@ -1,3 +1,3 @@
 module Clearbit
-  VERSION = "0.2.3"
+  VERSION = '0.2.4'
 end

data/lib/clearbit/webhook.rb

@@ -8,18 +8,25 @@ module Clearbit
       Clearbit.key!
     end
 
-    def self.valid?(request_signature, body)
+    def self.valid?(request_signature, body, key = nil)
       return false unless request_signature && body
 
-      signature = 'sha1=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), clearbit_key, body)
+      # The global Clearbit.key can be overriden for multi-tenant apps using multiple Clearbit keys
+      key = key || clearbit_key
+
+      signature = generate_signature(key, body)
       Rack::Utils.secure_compare(request_signature, signature)
     end
 
-    def self.valid!(signature, body)
-      valid?(signature, body) ? true : raise(Errors::InvalidWebhookSignature.new)
+    def self.valid!(signature, body, key = nil)
+      valid?(signature, body, key) ? true : raise(Errors::InvalidWebhookSignature.new)
+    end
+
+    def self.generate_signature(key, body)
+      'sha1=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), key, body)
     end
 
-    def initialize(env)
+    def initialize(env, key = nil)
       request = Rack::Request.new(env)
 
       request.body.rewind
@@ -27,7 +34,7 @@ module Clearbit
       signature = request.env['HTTP_X_REQUEST_SIGNATURE']
       body      = request.body.read
 
-      self.class.valid!(signature, body)
+      self.class.valid!(signature, body, key)
 
       merge!(JSON.parse(body))
     end

data/spec/lib/clearbit/webhook_spec.rb

@@ -1,46 +1,75 @@
 require 'spec_helper'
 
-describe Clearbit::Webhook do
-  before do |example|
-    Clearbit.key = 'clearbit_key'
-  end
+describe Clearbit::Webhook, 'valid!' do
+  let(:clearbit_key) { 'clearbit_key' }
+
+  context 'clearbit key set globally' do
+    before do
+      Clearbit.key = clearbit_key
+    end
+
+    context 'valid signature' do
+      it 'returns true' do
+        signature = generate_signature(clearbit_key, 'A-OK')
+
+        result = Clearbit::Webhook.valid!(signature, 'A-OK')
 
-  context 'valid signature' do
-    it 'returns true' do
-      signature = generate_signature('A-OK')
+        expect(result).to eq true
+      end
+    end
 
-      result = Clearbit::Webhook.valid!(signature, 'A-OK')
+    context 'invalid signature' do
+      it 'returns false' do
+        signature = generate_signature(clearbit_key, 'A-OK')
 
-      expect(result).to eq true
+        expect {
+          Clearbit::Webhook.valid!(signature, 'TAMPERED_WITH_BODY_BEWARE!')
+        }.to raise_error(Clearbit::Errors::InvalidWebhookSignature)
+      end
     end
   end
 
-  context 'invalid signature' do
-    it 'returns false' do
-      signature = generate_signature('A-OK')
+  context 'clearbit key set locally' do
+    context 'valid signature' do
+      it 'returns true' do
+        clearbit_key = 'clearbit_key'
+        signature = generate_signature(clearbit_key, 'A-OK')
+
+        result = Clearbit::Webhook.valid!(signature, 'A-OK', clearbit_key)
+
+        expect(result).to eq true
+      end
+    end
+
+    context 'invalid signature' do
+      it 'returns false' do
+        clearbit_key = 'clearbit_key'
+        signature = generate_signature(clearbit_key, 'A-OK')
 
-      expect {
-        Clearbit::Webhook.valid!(signature, 'TAMPERED_WITH_BODY_BEWARE!')
-      }.to raise_error(Clearbit::Errors::InvalidWebhookSignature)
+        expect {
+          Clearbit::Webhook.valid!(signature, 'TAMPERED_WITH_BODY_BEWARE!', clearbit_key)
+        }.to raise_error(Clearbit::Errors::InvalidWebhookSignature)
+      end
     end
   end
+end
 
-  context 'initialize' do
-    it 'returns a mash' do
-      request_body = JSON.dump({
-        id:   '123',
-        type: 'person',
-        body: nil,
-        status: 404
-      })
+describe Clearbit::Webhook, 'initialize' do
+  let(:clearbit_key) { 'clearbit_key' }
 
-      request_signature = generate_signature(request_body)
+  let(:env) do
+    request_body = JSON.dump(id:'123', type: 'person', body: nil, status: 404)
 
-      env = Rack::MockRequest.env_for('/webhook',
-        method: 'POST',
-        input:  request_body,
-        'HTTP_X_REQUEST_SIGNATURE' => request_signature
-      )
+    Rack::MockRequest.env_for('/webhook',
+      method: 'POST',
+      input:  request_body,
+      'HTTP_X_REQUEST_SIGNATURE' => generate_signature(clearbit_key, request_body)
+    )
+  end
+
+  context 'clearbit key set globally' do
+    it 'returns a mash' do
+      Clearbit.key = 'clearbit_key'
 
       webhook = Clearbit::Webhook.new(env)
 
@@ -48,7 +77,11 @@ describe Clearbit::Webhook do
     end
   end
 
-  def generate_signature(webhook_body)
-    'sha1=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), 'clearbit_key', webhook_body)
+  context 'clearbit key set locally' do
+    it 'returns a mash' do
+      webhook = Clearbit::Webhook.new(env, 'clearbit_key')
+
+      expect(webhook.status).to eq 404
+    end
   end
 end

data/spec/spec_helper.rb

@@ -9,3 +9,18 @@ require 'webmock/rspec'
 
 # Library
 require 'clearbit'
+
+Dir[File.expand_path('spec/support/**/*.rb')].each { |file| require file }
+
+RSpec.configure do |config|
+  config.include Spec::Support::Helpers
+  config.order = 'random'
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+
+  config.before :each do
+    Clearbit.key = nil
+  end
+end

data/spec/support/helpers.rb

@@ -0,0 +1,9 @@
+module Spec
+  module Support
+    module Helpers
+      def generate_signature(clearbit_key, webhook_body)
+        'sha1=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), clearbit_key, webhook_body)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clearbit
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Alex MacCaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,6 +151,7 @@ files:
 - lib/clearbit/enrichment/person.rb
 - lib/clearbit/enrichment/person_company.rb
 - lib/clearbit/errors/invalid_webhook_signature.rb
+- lib/clearbit/ipcompany.rb
 - lib/clearbit/logo.rb
 - lib/clearbit/mash.rb
 - lib/clearbit/pending.rb
@@ -166,6 +167,7 @@ files:
 - spec/lib/clearbit/prospector_spec.rb
 - spec/lib/clearbit/webhook_spec.rb
 - spec/spec_helper.rb
+- spec/support/helpers.rb
 homepage: https://github.com/maccman/clearbit-ruby
 licenses:
 - MIT
@@ -197,4 +199,5 @@ test_files:
 - spec/lib/clearbit/prospector_spec.rb
 - spec/lib/clearbit/webhook_spec.rb
 - spec/spec_helper.rb
+- spec/support/helpers.rb
 has_rdoc: