nation_builder 0.0.6 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e5da2ccce139f8e49b386b72018157e0f5d4d1a
-  data.tar.gz: 62663da2e7aecc665b36d1950a26df7949bfbc6a
+  metadata.gz: 25e0b4c18cbdd3d11d1864be214b148239174bf4
+  data.tar.gz: a2d3d92444675969ed3ac20df264bb161f1aa8f0
 SHA512:
-  metadata.gz: 801be53fd22a2e9fd90aacbc5369e6c27bec40bdd9d243f5a9d0e43f82706943c6b176caece51917908355aa97605e5bd17253ea68187e8b56488759ac162181
-  data.tar.gz: 8c1fc92e0f1df84b200e2bac16d0deceb0c592ab7508008140c87ce320520bc3372a229b9c92083947f9fe4ea69dcb1cf9a059f284c0927659017c8d8d96a60f
+  metadata.gz: 3c9ac4a580ad47ce00259b97774da67bc686aed5245eb9b9e619571cd69545cfdef53d17226567ef7cd31063cd5ad42e4b7941bd74d57be95e44490587ac5fb8
+  data.tar.gz: e194f687bf3b7fce973e7a81f8a7ce6f625f85c31e22a78eb1f6a8ef54fbfd70ac3f812b1ce501a97093cfba7f8288d4d5ca7e4902f2ac30f5f830a21c328e41

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p247
+2.3.4

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.2.4

data/Gemfile

@@ -1,14 +1,14 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-# NationBuilder puts error messages in a different location. 
+# NationBuilder puts error messages in a different location.
 gem 'oauth2', git: 'https://github.com/controlshift/oauth2.git'
 gem 'json'
+gem 'activesupport', '>3.0.0'
 
 group :development do
   gem 'webmock'
-  gem 'pry'
-  gem 'pry-debugger'
-  gem "rspec"
-  gem "bundler"
-  gem "jeweler", "~> 1.8.7"
+  gem 'byebug'
+  gem 'rspec'
+  gem 'bundler'
+  gem "juwelier"
 end

data/Gemfile.lock

@@ -1,93 +1,108 @@
 GIT
   remote: https://github.com/controlshift/oauth2.git
-  revision: 7e60e15878e503f80c8708f5c2cca5d17664fc61
+  revision: 1dbcdd2bff439cfab188220accc02b39c6bae5ba
   specs:
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    oauth2 (1.3.0)
+      faraday (>= 0.8, < 0.11)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
+      rack (>= 1.2, < 3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
-    builder (3.2.2)
-    coderay (1.0.9)
-    columnize (0.3.6)
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
-    debugger (1.6.1)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.3)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.3)
-    diff-lcs (1.2.4)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
-    jeweler (1.8.8)
+    activesupport (5.1.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.4.0)
+    builder (3.2.3)
+    byebug (9.0.6)
+    concurrent-ruby (1.0.5)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.3.0)
+    github_api (0.17.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashdiff (0.3.4)
+    hashie (3.5.6)
+    highline (1.7.8)
+    i18n (0.8.6)
+    json (2.1.0)
+    juwelier (2.4.7)
       builder
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      github_api (= 0.10.1)
-      highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      bundler
+      git
+      github_api
+      highline
+      kamelcase (~> 0)
+      nokogiri
+      psych
       rake
       rdoc
-    json (1.8.1)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    method_source (0.8.2)
-    multi_json (1.8.2)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-debugger (0.2.2)
-      debugger (~> 1.3)
-      pry (~> 0.9.10)
-    rack (1.5.2)
-    rake (10.1.0)
-    rdoc (4.0.1)
-      json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    safe_yaml (0.9.7)
-    slop (3.4.6)
-    webmock (1.13.0)
-      addressable (>= 2.2.7)
+      semver2
+    jwt (1.5.6)
+    kamelcase (0.0.1)
+      semver2 (~> 3)
+    mime-types (2.99.3)
+    mini_portile2 (2.2.0)
+    minitest (5.10.2)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    psych (2.2.4)
+    rack (2.0.3)
+    rake (12.0.0)
+    rdoc (5.1.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    safe_yaml (1.0.4)
+    semver2 (3.4.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    webmock (3.0.1)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (> 3.0.0)
   bundler
-  jeweler (~> 1.8.7)
+  byebug
   json
+  juwelier
   oauth2!
-  pry
-  pry-debugger
   rspec
   webmock
+
+BUNDLED WITH
+   1.15.2

data/README.md

@@ -12,6 +12,7 @@ client = NationBuilder.new(hostname: 'whatever.nationbuilder.com', client_id: 'i
 client.people.create('person' => {'first_name' => 'George', 'last_name' => 'Washington', 'email' => 'george@washington.com'})
 client.people.match('email' => 'george@washington.com) # either a person hash or nil. 
 client.people.list # returns people in nation
+client.tags.list # all tags.
 ```
 
 ### Contributing 

data/Rakefile

@@ -11,9 +11,9 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
   gem.name = "nation_builder"
   gem.homepage = "http://github.com/controlshift/nation_builder"
   gem.license = "MIT"
@@ -23,7 +23,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Nathan Woodhull", "Dan Schneiderman"]
   # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.13

data/lib/nation_builder/actions/create.rb

@@ -0,0 +1,10 @@
+module NationBuilder
+  module Actions
+    module Create
+      def create params
+        body = JSON.generate(params)
+        JSON.parse(client.post(base_path, body: body).response.env[:body])
+      end
+    end
+  end
+end

data/lib/nation_builder/actions/list.rb

@@ -0,0 +1,9 @@
+module NationBuilder
+  module Actions
+    module List
+      def list
+        JSON.parse(client.get(base_path).response.env[:body])
+      end
+    end
+  end
+end

data/lib/nation_builder/actions/show.rb

@@ -0,0 +1,9 @@
+module NationBuilder
+  module Actions
+    module Show
+      def show(person_id)
+        JSON.parse(client.get("#{base_path}/#{person_id}").response.env[:body])
+      end
+    end
+  end
+end

data/lib/nation_builder/actions/update.rb

@@ -0,0 +1,12 @@
+module NationBuilder
+  module Actions
+    module Update
+
+      def update id, params
+        body = JSON.generate(params)
+        JSON.parse(client.put("#{base_path}/#{id}", body: body).response.env[:body])
+      end
+
+    end
+  end
+end

data/lib/nation_builder/client.rb

@@ -1,44 +1,104 @@
 module NationBuilder
+  class RateLimitedError < StandardError
+    def initialize(oauth2_response)
+      message = "NationBuilder rate limit error. Current values:\n"
+      message << "Limit: #{oauth2_response.headers["x-ratelimit-limit"]}\n"
+      message << "Remaining: #{oauth2_response.headers["x-ratelimit-remaining"]}\n"
+      message << "Reset: #{Time.at(oauth2_response.headers["x-ratelimit-reset"].try(:to_i) || 0)}\n"
+      message << "Body: #{oauth2_response.body}"
+      super(message)
+    end
+  end
+
   class Client
-    attr_accessor :token, :client_secret, :client_id, :username, :password, :hostname
-    
+    attr_accessor :client, :token, :client_secret, :client_id, :username, :password, :hostname, :instrumentation, :logger
+
     def initialize(args = {})
       args.each do |key, value|
         self.send("#{key}=".intern, value)
       end
-      self.token = setup_client
+      if username.present? && password.present?
+        self.client = setup_client_from_password
+      elsif token.present?
+        self.client = setup_client_from_token
+      end
     end
-    
+
     def people
       NationBuilder::People.new(self)
     end
-    
+
+    def tags
+      NationBuilder::Tags.new(self)
+    end
+
     def get(path, opts={})
-      self.token.get "#{base_uri}#{path}", opts.merge(headers: headers)
+      instrumented_request(:get, path, opts)
     end
-    
+
     def post(path, opts={})
-      self.token.post "#{base_uri}#{path}", opts.merge(headers: headers)
+      instrumented_request(:post, path, opts)
     end
 
     def put(path, opts={})
-      self.token.put "#{base_uri}#{path}", opts.merge(headers: headers)
+      instrumented_request(:put, path, opts)
     end
-    
+
+    def delete(path, opts={})
+      instrumented_request(:delete, path, opts)
+    end
+
     private
-    
+
+    def instrumented_request(request_type, path, opts)
+      if self.instrumentation
+        # Normalize path to remove IDs from it
+        normalized_path = path.gsub(/\/\d+\//, '/_/')
+        stats = { path: normalized_path, request_type: request_type }
+        self.instrumentation.call(stats)
+      end
+
+      begin
+        response = self.client.send(request_type, "#{base_uri}#{path}", opts.merge(headers: headers))
+        if !logger.nil?
+          log_message = <<-MESSAGE
+NationBuilder rate limit headers for #{base_uri}:
+X-RateLimit-Limit: #{response.headers["x-ratelimit-limit"]}
+X-RateLimit-Remaining: #{response.headers['x-ratelimit-remaining']}
+X-RateLimit-Reset: #{Time.at(response.headers["x-ratelimit-reset"].try(:to_i) || 0)}
+          MESSAGE
+          logger.info(log_message)
+        end
+        response
+      rescue OAuth2::Error => e
+        if (!e.code.nil? && e.code.downcase == 'rate_limited') || (e.message =~ /rate_limited/)
+          raise RateLimitedError.new(e.response)
+        end
+
+        raise
+      end
+    end
+
+    def setup_client_from_password
+      setup_client.password.get_token(username, password)
+    end
+
+    def setup_client_from_token
+      OAuth2::AccessToken.new(setup_client, token)
+    end
+
     def setup_client
-      client = OAuth2::Client.new(client_id, client_secret, :site => "https://#{hostname}", authorize_url: "https://#{hostname}/oauth/authorize", token_url: "https://#{hostname}/oauth/token" )
-      client.password.get_token(username, password)
+      OAuth2::Client.new(client_id, client_secret, site: "https://#{hostname}", authorize_url: "https://#{hostname}/oauth/authorize", token_url: "https://#{hostname}/oauth/token" )
     end
-    
+
+
     def headers
       {
         'Content-Type' => 'application/json',
         'Accept' => 'application/json'
-      } 
+      }
     end
-    
+
     def base_uri
       "https://#{hostname}/"
     end

data/lib/nation_builder/exceptions/validation_error.rb

@@ -0,0 +1,19 @@
+module NationBuilder
+  module Exceptions
+    class ValidationError < StandardError
+      attr_accessor :message, :errors, :code
+
+      def initialize(message, errors, code)
+        self.message = message
+        self.errors = errors
+        self.code = code
+        super()
+      end
+
+      def to_s
+        "#{super()} \n message: #{message} \n code: #{code} \n errors: #{errors}"
+      end
+      
+    end
+  end
+end

data/lib/nation_builder/people.rb

@@ -1,14 +1,17 @@
 module NationBuilder
-  class People
-    attr_accessor :client
-    
-    def initialize(client)
-      self.client = client
+  class People < RemoteController
+    include NationBuilder::Actions::Show
+    include NationBuilder::Actions::List
+    include NationBuilder::Actions::Update
+    include NationBuilder::Actions::Create
+
+    def controller_name
+      'people'
     end
     
     def match(params)
       begin 
-        JSON.parse(client.get('/api/v1/people/match', params: params).response.env[:body])
+        JSON.parse(client.get("#{base_path}/match", params: params).response.env[:body])
       rescue OAuth2::Error => e
         if e.response.parsed['code'] == 'no_matches'
           return nil
@@ -17,29 +20,75 @@ module NationBuilder
         end
       end
     end
-    
-    def list
-      JSON.parse(client.get('/api/v1/people').response.env[:body])
+
+    def search(params)
+      JSON.parse(client.get("#{base_path}/search", params: params).response.env[:body])
     end
-    
-    def create params
+
+    def create_or_update params
+      person = self.match('email' => params['person']['email'])
+      if person
+        new_person = person['person'].merge(params['person'])
+        r = self.update new_person['id'], 'person' => new_person
+        {is_new: false, response: r}
+      else
+        r = self.create params
+        {is_new: true, response: r}
+      end
+    end
+
+    def match_or_add(params)
+      person = self.match('email' => params['person']['email'])
+      if person
+        r = self.add(params)
+        {is_new: false, response: r}
+      else
+        r = self.add(params)
+        {is_new: true, response: r}
+      end
+    end
+
+    def push(params)
       body = JSON.generate(params)
-      JSON.parse(client.post('/api/v1/people', body: body).response.env[:body])
+      JSON.parse(client.put("#{base_path}/push", body: body).response.env[:body])
     end
 
-    def update id, params
+    def add(params)
       body = JSON.generate(params)
-      JSON.parse(client.put("/api/v1/people/#{id}", body: body).response.env[:body])
+      begin
+        JSON.parse(client.put("#{base_path}/add", body: body).response.env[:body])
+      rescue OAuth2::Error => e
+        if e.response.parsed['code'] == 'validation_failed'
+          raise NationBuilder::Exceptions::ValidationError.new(e.response.parsed['message'], e.response.parsed['validation_errors'], e.response.parsed['code'])
+        else
+          raise e
+        end
+      end
+
     end
 
-    def create_or_update params
-      person = self.match('email' => params['person']['email'])
-      if(person)
-        new_person = person['person'].merge(params['person'])
-        self.update new_person['id'], 'person' => new_person
+    def taggings(person_id)
+      JSON.parse(client.get(taggings_path(person_id)).response.env[:body])
+    end
+
+    def add_tagging(person_id, tag)
+      body = JSON.generate({'tagging' => {'tag' => tag}})
+      JSON.parse(client.put(taggings_path(person_id), body: body).response.env[:body])
+    end
+
+    def delete_tagging(person_id, tag)
+      response = client.delete("#{taggings_path(person_id)}/#{tag}")
+      if response.response.env[:status] == 204
+        return true
       else
-        self.create params
+        return response
       end
     end
+
+    private
+
+    def taggings_path(person_id)
+      "#{base_path}/#{person_id}/taggings"
+    end
   end  
 end

data/lib/nation_builder/remote_controller.rb

@@ -0,0 +1,22 @@
+module NationBuilder
+  class RemoteController
+    attr_accessor :client
+
+    def initialize(client)
+      self.client = client
+    end
+
+    def base_uri
+      '/api/v1/'
+    end
+
+    def controller_name
+      raise 'implement me'
+    end
+
+    def base_path
+      base_uri + controller_name
+    end
+
+  end
+end

data/lib/nation_builder/tags.rb

@@ -0,0 +1,13 @@
+module NationBuilder
+  class Tags < RemoteController
+    include NationBuilder::Actions::List
+
+    def controller_name
+      'tags'
+    end
+
+    def people(tag)
+      JSON.parse(client.get(base_path + '/' + tag).response.env[:body])
+    end
+  end
+end

data/lib/nation_builder.rb

@@ -1,15 +1,36 @@
 require 'oauth2'
+require 'active_support/all'
+require 'nation_builder/exceptions/validation_error'
+require 'nation_builder/actions/show'
+require 'nation_builder/actions/list'
+require 'nation_builder/actions/update'
+require 'nation_builder/actions/create'
 require 'nation_builder/client'
+require 'nation_builder/remote_controller'
+require 'nation_builder/tags'
 require 'nation_builder/people'
 
-module NationBuilder 
+
+module NationBuilder
 
   class << self
+    #  Initializes a new NationBuilder client
+    #
+    # @param [Hash] options the options to make the request with
+    # @option options [String] :client_id client ID used for OAuth 2.0 authenticated requests
+    # @option options [String] :client_secret secret used for OAuth 2.0 authenticated requests
+    # @option options [String] :hostname NationBuilder site hostname, must not include protocol (i.e.: 'http://')
+    # @option options [String] :token OAuth2 access token used for perform authenticated calls. Not required if performing authenticated calls with :username and :password
+    # @option options [String] :username username used for getting a OAuth 2.0 access token. Not required if performing authenticated calls with :token
+    # @option options [String] :password password used for getting a OAuth 2.0 access token. Not required if performing authenticated calls with :token
+    # @option options [Proc] :instrumentation block of code to be invoked on every request to NationBuilder. Should receive a single Hash argument that includes :path and :request_type.
+    #                                         :path argument is normalized, replacing IDs with '_'
+    # @option options [Logger] :logger optional. If provided, rate limit related headers from successful responses will be logged.
     def new(options = {})
       NationBuilder::Client.new(options)
     end
-    
-    def method_missing(method, *args) 
+
+    def method_missing(method, *args)
       return super unless new.respond_to?(method)
       new.send(method, *args)
     end
@@ -18,4 +39,4 @@ module NationBuilder
       new.respond_to?(method, include_private) || super(method, include_private)
     end
   end
-end
+end

data/nation_builder.gemspec

@@ -1,18 +1,19 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: nation_builder 0.0.6 ruby lib
+# stub: nation_builder 0.0.13 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "nation_builder"
-  s.version = "0.0.6"
+  s.name = "nation_builder".freeze
+  s.version = "0.0.13"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nathan Woodhull", "Dan Schneiderman"]
-  s.date = "2013-10-28"
-  s.description = "Ruby wrapper for NationBuilder API"
-  s.email = "nathan@controlshiftlabs.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Nathan Woodhull".freeze, "Dan Schneiderman".freeze]
+  s.date = "2017-08-21"
+  s.description = "Ruby wrapper for NationBuilder API".freeze
+  s.email = "nathan@controlshiftlabs.com".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -30,8 +31,15 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/nation_builder.rb",
+    "lib/nation_builder/actions/create.rb",
+    "lib/nation_builder/actions/list.rb",
+    "lib/nation_builder/actions/show.rb",
+    "lib/nation_builder/actions/update.rb",
     "lib/nation_builder/client.rb",
+    "lib/nation_builder/exceptions/validation_error.rb",
     "lib/nation_builder/people.rb",
+    "lib/nation_builder/remote_controller.rb",
+    "lib/nation_builder/tags.rb",
     "nation_builder.gemspec",
     "spec/client_spec.rb",
     "spec/fixtures/not_found",
@@ -41,43 +49,42 @@ Gem::Specification.new do |s|
     "spec/people_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/controlshift/nation_builder"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.10"
-  s.summary = "NationBuilder API wrapper"
+  s.homepage = "http://github.com/controlshift/nation_builder".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.5.2".freeze
+  s.summary = "NationBuilder API wrapper".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<oauth2>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_development_dependency(%q<webmock>, [">= 0"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
-      s.add_development_dependency(%q<pry-debugger>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.7"])
+      s.add_runtime_dependency(%q<oauth2>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<json>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>.freeze, ["> 3.0.0"])
+      s.add_development_dependency(%q<webmock>.freeze, [">= 0"])
+      s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<oauth2>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<webmock>, [">= 0"])
-      s.add_dependency(%q<pry>, [">= 0"])
-      s.add_dependency(%q<pry-debugger>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
+      s.add_dependency(%q<oauth2>.freeze, [">= 0"])
+      s.add_dependency(%q<json>.freeze, [">= 0"])
+      s.add_dependency(%q<activesupport>.freeze, ["> 3.0.0"])
+      s.add_dependency(%q<webmock>.freeze, [">= 0"])
+      s.add_dependency(%q<byebug>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, [">= 0"])
+      s.add_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_dependency(%q<juwelier>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<oauth2>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<webmock>, [">= 0"])
-    s.add_dependency(%q<pry>, [">= 0"])
-    s.add_dependency(%q<pry-debugger>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
+    s.add_dependency(%q<oauth2>.freeze, [">= 0"])
+    s.add_dependency(%q<json>.freeze, [">= 0"])
+    s.add_dependency(%q<activesupport>.freeze, ["> 3.0.0"])
+    s.add_dependency(%q<webmock>.freeze, [">= 0"])
+    s.add_dependency(%q<byebug>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, [">= 0"])
+    s.add_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_dependency(%q<juwelier>.freeze, [">= 0"])
   end
 end
 

data/spec/client_spec.rb

@@ -1,6 +1,113 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe 'Client' do
-  specify { pending 'spec client behavior'}
+describe NationBuilder::Client do
+  shared_examples 'request' do
+    let(:client) { double }
 
-end
+    subject { NationBuilder::Client.new(hostname: 'nationbuilder.com') }
+
+    before :each do
+      expect(subject).to receive(:client).and_return(client)
+    end
+
+    context 'request path does not include ID' do
+      let(:request_path) { 'foo/bar' }
+
+      before :each do
+        expect(client).to receive(request_type).with('https://nationbuilder.com/foo/bar', hash_including(headers: subject.send(:headers)))
+      end
+
+      it 'should perform instrumented request if instrumentation set' do
+        instrumentation = double
+        expect(instrumentation).to receive(:call).with(hash_including(path: request_path, request_type: request_type))
+        expect(subject).to receive(:instrumentation).at_least(:once).and_return(instrumentation)
+
+        subject.send(request_type, request_path)
+      end
+
+      it 'should perform uninstrumented request if instrumentation not set' do
+        expect(subject).to receive(:instrumentation).and_return(nil)
+
+        subject.send(request_type, request_path)
+      end
+    end
+
+    context 'request path includes ID' do
+      let(:request_path) { 'foo/123/bar' }
+
+      before :each do
+        expect(client).to receive(request_type).with('https://nationbuilder.com/foo/123/bar', hash_including(headers: subject.send(:headers)))
+      end
+
+      it 'should perform instrumented request normalizing path' do
+        instrumentation = double
+        expect(instrumentation).to receive(:call).with(hash_including(path: 'foo/_/bar', request_type: request_type))
+        expect(subject).to receive(:instrumentation).at_least(:once).and_return(instrumentation)
+
+        subject.send(request_type, request_path)
+      end
+    end
+
+    describe 'error handling' do
+      let(:error_response) { double(parsed: nil, body: 'This is an error') }
+      let(:oauth_exception) { OAuth2::Error.new(error_response) }
+
+      before :each do
+        allow(error_response).to receive(:error=)
+        expect(client).to receive(request_type).and_raise(oauth_exception)
+      end
+
+      context 'error code is "rate_limited"' do
+        before :each do
+          expect(oauth_exception).to receive(:code).at_least(:once).and_return('rate_limited')
+        end
+
+        it 'should raise RateLimitedError' do
+          limit_reset = Time.parse('2017-01-01 12:00 +0000')
+          allow(error_response).to receive(:headers).and_return({'x-ratelimit-limit' => '100', 'x-ratelimit-remaining' => '0', 'x-ratelimit-reset' => limit_reset.to_i})
+
+          error_message = "NationBuilder rate limit error. Current values:\nLimit: 100\nRemaining: 0\nReset: #{Time.at(limit_reset.to_i)}\nBody: This is an error"
+
+          expect { subject.send(request_type, 'foo/bar') }.to raise_error NationBuilder::RateLimitedError, error_message
+        end
+
+        it 'should not fail if "x-ratelimit-reset" header not present' do
+          allow(error_response).to receive(:headers).and_return({'x-ratelimit-limit' => '100', 'x-ratelimit-remaining' => '0'})
+          error_message = "NationBuilder rate limit error. Current values:\nLimit: 100\nRemaining: 0\nReset: #{Time.at(0)}\nBody: This is an error"
+
+          expect { subject.send(request_type, 'foo/bar') }.to raise_error NationBuilder::RateLimitedError, error_message
+        end
+      end
+
+      context 'error message includes rate_limited but code is nil' do
+        before :each do
+          allow(oauth_exception).to receive(:code).and_return(nil)
+          allow(oauth_exception).to receive(:message).and_return('{"code":"rate_limited","You have been rate limited."}')
+        end
+
+        it 'should raise RateLimitedError' do
+          limit_reset = Time.parse('2017-01-01 12:00 +0000')
+          allow(error_response).to receive(:headers).and_return({'x-ratelimit-limit' => '100', 'x-ratelimit-remaining' => '0', 'x-ratelimit-reset' => limit_reset.to_i})
+
+          error_message = "NationBuilder rate limit error. Current values:\nLimit: 100\nRemaining: 0\nReset: #{Time.at(limit_reset.to_i)}\nBody: This is an error"
+
+          expect { subject.send(request_type, 'foo/bar') }.to raise_error NationBuilder::RateLimitedError, error_message
+        end
+      end
+
+      it 'should raise generic exception if code is not "rate_limited"' do
+        expect(oauth_exception).to receive(:code).at_least(:once).and_return('another_error')
+
+        expect { subject.send(request_type, 'foo/bar') }.to raise_error oauth_exception
+      end
+    end
+  end
+
+  [:get, :post, :put, :delete].each do |request|
+    describe "##{request}" do
+      it_behaves_like 'request' do
+        let(:request_type) { request }
+      end
+    end
+  end
+end

data/spec/nation_builder_spec.rb

@@ -2,9 +2,9 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe NationBuilder do
   before(:each) do  
-    NationBuilder::Client.any_instance.stub(:setup_client).and_return(true)
+    allow_any_instance_of(NationBuilder::Client).to receive(:setup_client).and_return(true)
   end
   
-  specify { subject.should respond_to :people }
-  specify { subject.new.should be_a(NationBuilder::Client)}
+  specify { expect(subject).to respond_to :people }
+  specify { expect(subject.new).to be_a(NationBuilder::Client)}
 end

data/spec/spec_helper.rb

@@ -9,10 +9,6 @@ require 'json'
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-RSpec.configure do |config|
-  config.color_enabled = true
-end
-
 
 RSpec.configure do |config|
   config.include WebMock::API

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nation_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.13
 platform: ruby
 authors:
 - Nathan Woodhull
@@ -9,120 +9,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
   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'
 - !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'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 3.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: webmock
   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: pry-debugger
+  name: byebug
   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: rspec
   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: bundler
   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: jeweler
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.7
+        version: '0'
 description: Ruby wrapper for NationBuilder API
 email: nathan@controlshiftlabs.com
 executables: []
@@ -131,11 +131,11 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".document"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -143,8 +143,15 @@ files:
 - Rakefile
 - VERSION
 - lib/nation_builder.rb
+- lib/nation_builder/actions/create.rb
+- lib/nation_builder/actions/list.rb
+- lib/nation_builder/actions/show.rb
+- lib/nation_builder/actions/update.rb
 - lib/nation_builder/client.rb
+- lib/nation_builder/exceptions/validation_error.rb
 - lib/nation_builder/people.rb
+- lib/nation_builder/remote_controller.rb
+- lib/nation_builder/tags.rb
 - nation_builder.gemspec
 - spec/client_spec.rb
 - spec/fixtures/not_found
@@ -163,17 +170,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: NationBuilder API wrapper