clearbit 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17c24d70918fb9e7eac659630aceb2dbfef52974
-  data.tar.gz: adb5b3e585772fbbe15bda1409ed6a8b82486950
+  metadata.gz: 94181dcf96160372ef82dd215b4696aba62d39fb
+  data.tar.gz: a8752294bc5b63fe7d3a055c94429467131c9288
 SHA512:
-  metadata.gz: 3ebbf52951763bb530c2e9a448d28cfc9277cce2143035422a67e852ab7ea25012168c596d24dfa1b77a86394acf0bef5fd6c9cb0905a003cef044e779dcb9fb
-  data.tar.gz: e59b9887faf2944097ee76097868e6588b49a55b527fe3fcf724870fc459153902b8cba7bc855877e1e4562791206355e76617a9b1c40b0ba1f34dff5c23cd36
+  metadata.gz: f7085df982027dc0af97c63e483457c7f9e5287d9f580bee1108a9b2b13d999db394e31941ee0e44ecefb1f8ecdcad00066573db17728a01d645eef95d925d09
+  data.tar.gz: 8b3e2cd83dabd56cf74294cbda5f2c9d46206f0774caecd7606ce048e9c175bc6e1dbc2c90266b4e92ebff27a11bd311462af8edf95ce9f4f4100366a4dba0f4

data/README.md

@@ -6,7 +6,9 @@ A Ruby API client to [https://clearbit.com](https://clearbit.com).
 
 Add this line to your application's Gemfile:
 
-    gem 'clearbit'
+``` ruby
+gem 'clearbit'
+```
 
 And then execute:
 
@@ -20,11 +22,15 @@ Or install it yourself as:
 
 First authorize requests by setting the API key found on your [account's settings page](https://clearbit.com/keys).
 
-    Clearbit.key = ENV['CLEARBIT_KEY']
+``` ruby
+Clearbit.key = ENV['CLEARBIT_KEY']
+```
 
 Then you can lookup people by email address:
 
-    person = Clearbit::Streaming::Person[email: 'alex@alexmaccaw.com']
+``` ruby
+person = Clearbit::Streaming::Person[email: 'alex@alexmaccaw.com']
+```
 
 If the person can't be found, then `nil` will be returned.
 
@@ -34,7 +40,9 @@ See the [documentation](https://clearbit.com/docs#person-api) for more informati
 
 You can lookup company data by domain name:
 
-    company = Clearbit::Streaming::Company[domain: 'uber.com']
+``` ruby
+company = Clearbit::Streaming::Company[domain: 'uber.com']
+```
 
 If the company can't be found, then `nil` will be returned.
 

data/apihub.gemspec

@@ -20,5 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'net-http-spy'
   spec.add_dependency 'nestful', '~> 1.0.7'
 end

data/examples/person_company.rb

@@ -1,4 +1,4 @@
 require 'clearbit'
 require 'pp'
 
-pp Clearbit::PersonCompany.find(email: 'alex@alexmaccaw.com')
+pp Clearbit::PersonCompany.find(email: 'alex@alexmaccaw.com', given_name: 'Alex', family_name: 'MacCaw')

data/examples/version.rb

@@ -0,0 +1,6 @@
+require 'clearbit'
+require 'pp'
+
+Clearbit::PersonCompany.version = '2015-05-30'
+
+Clearbit::PersonCompany.find(email: 'alex@clearbit.com', webhook_url: 'http://requestb.in/18owk611')

data/lib/clearbit.rb

@@ -3,14 +3,11 @@ require 'clearbit/version'
 
 module Clearbit
   def self.api_key=(value)
-    Base.options Base.options.merge(
-      auth_type: :bearer,
-      password:  value
-    )
+    Base.key = value
   end
 
   def self.key=(value)
-    self.api_key = value
+    Base.key = value
   end
 
   autoload :Base, 'clearbit/base'
@@ -25,4 +22,4 @@ module Clearbit
   if clearbit_key = ENV['CLEARBIT_KEY']
     Clearbit.key = clearbit_key
   end
-end
+end

data/lib/clearbit/base.rb

@@ -2,5 +2,14 @@ module Clearbit
   class Base < Resource
     endpoint 'https://api.clearbit.com'
     options :format => :json
+
+    def self.version=(value)
+      add_options headers: {'API-Version' => value}
+    end
+
+    def self.key=(value)
+      add_options auth_type: :bearer,
+                  password:  value
+    end
   end
 end

data/lib/clearbit/company.rb

@@ -11,7 +11,7 @@ module Clearbit
       if old_options
         # Deprecated API
         warn '[DEPRECATION] passing multiple args to find() is deprecated'
-        values.merge!(old_options)
+        (values[:request] ||= {}).merge!(old_options)
       end
 
       options = values.delete(:request) || {}

data/lib/clearbit/mash.rb

@@ -143,12 +143,10 @@ module Clearbit
     def method_missing(method_name, *args, &blk)
       return self.[](method_name, &blk) if key?(method_name)
 
-      underscored_name = underscore(method_name.to_s)
+      camelized_name = camelize(method_name.to_s)
 
-      if key?(underscored_name)
-        warn 'camelCased property names are deprecated. ' + '
-              Please use underscored properties.'
-        return self.[](underscored_name, &blk)
+      if key?(camelized_name)
+        return self.[](camelized_name, &blk)
       end
 
       match = method_name.to_s.match(/(.*?)([?=!_]?)$/)
@@ -169,17 +167,14 @@ module Clearbit
 
     protected
 
-    def underscore(camel_cased_word)
-      word = camel_cased_word.to_s.gsub('::', '/')
-      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
-      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-      word.tr!("-", "_")
-      word.downcase!
-      word
+    def camelize(string)
+      string = string.to_s
+      string = string.sub(/^(?:(?=\b|[A-Z_])|\w)/) { $&.downcase }
+      string.gsub(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }.gsub('/', '::')
     end
 
     def convert_key(key) #:nodoc:
-      underscore(key.to_s)
+      key.to_s
     end
 
     def convert_value(val, duping=false) #:nodoc:
@@ -196,4 +191,4 @@ module Clearbit
       end
     end
   end
-end
+end

data/lib/clearbit/person.rb

@@ -11,7 +11,7 @@ module Clearbit
       if old_options
         # Deprecated API
         warn '[DEPRECATION] passing multiple args to find() is deprecated'
-        values.merge!(old_options)
+        (values[:request] ||= {}).merge!(old_options)
       end
 
       options = values.delete(:request) || {}

data/lib/clearbit/person_company.rb

@@ -11,7 +11,7 @@ module Clearbit
       if old_options
         # Deprecated API
         warn '[DEPRECATION] passing multiple args to find() is deprecated'
-        values.merge!(old_options)
+        (values[:request] ||= {}).merge!(old_options)
       end
 
       options = values.delete(:request) || {}

data/lib/clearbit/resource.rb

@@ -15,15 +15,21 @@ module Clearbit
     end
 
     def self.options(value = nil)
-      @options = value if value
-      return @options if @options
-      superclass.respond_to?(:options) ? superclass.options : {}
+      @options ||= {}
+      @options.merge!(value) if value
+
+      if superclass.respond_to?(:options)
+        Nestful::Helpers.deep_merge(superclass.options, @options)
+      else
+        @options
+      end
     end
 
     class << self
       alias_method :endpoint=, :endpoint
       alias_method :path=, :path
       alias_method :options=, :options
+      alias_method :add_options, :options
     end
 
     def self.url
@@ -67,4 +73,4 @@ module Clearbit
       id ? self.class.uri(id, *parts) : self.class.uri(*parts)
     end
   end
-end
+end

data/lib/clearbit/version.rb

@@ -1,3 +1,3 @@
 module Clearbit
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clearbit
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Alex MacCaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-http-spy
+  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: nestful
   requirement: !ruby/object:Gem::Requirement
@@ -69,6 +83,7 @@ files:
 - examples/company.rb
 - examples/person.rb
 - examples/person_company.rb
+- examples/version.rb
 - examples/watchlist.rb
 - lib/clearbit.rb
 - lib/clearbit/base.rb