tijuana_client 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13d0097abbdb86d6c257a1fbe08cbed627d9db50
-  data.tar.gz: b78b2a64cdccd464830d6f3ec9ed70d3357cd9a1
+  metadata.gz: 0bb1dbe9e00346de49536c7cb6e548426035d8e7
+  data.tar.gz: b4a29258b1a2c379990efbeca670a4d25624436d
 SHA512:
-  metadata.gz: 20b76d3ecb99880560ba979d6a391e4982331214fa8f276b10b9dc13c0ab61304cdfd0690139ded24387f050266a2bb89ecc7090a46014f33148d0a1570b0d78
-  data.tar.gz: a0b922b65db203e7f49886411dba1cdde897f887ef2c252b13b49479d0b59d2e0ce6573d3a192b77dd2be1a224c193cbfcf8924713b73c6c3e9ba949db430a68
+  metadata.gz: e0ff7de8a5e482d6a1ac1282d4879ef6e407ade651420f1c5835db7fa0b82a00d409bb359f734581b1338f0f0060693bf19381e97536461260fc7299749d271b
+  data.tar.gz: 873c81447a873554ed4aa30b2dbbcfce591e8c722bcd1cda2e2d964b83a875f8c0b0a90e5f887eef8b5810b6ed55b73f2f35f6374516dbec3d1cb8610aa5fa3f

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p247
+2.0.0-p645

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - "2.0.0"

data/Gemfile

@@ -8,7 +8,7 @@ group :development do
   gem "rspec"
   gem 'webmock'
   gem 'pry'
-  gem 'pry-debugger'
+  gem 'pry-byebug'
   gem "bundler"
-  gem "jeweler", "~> 1.8.4"
+  gem "jeweler", "~> 2.0.0"
 end

data/Gemfile.lock

@@ -1,98 +1,100 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    addressable (2.3.5)
-    atomic (1.1.10)
+    activesupport (4.2.3)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.3.8)
     builder (3.2.2)
-    coderay (1.0.9)
-    columnize (0.3.6)
-    crack (0.4.0)
-      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)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
-    git (1.2.5)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
+    byebug (4.0.5)
+      columnize (= 0.9.0)
+    coderay (1.1.0)
+    columnize (0.9.0)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.10.0)
+      faraday (>= 0.7.4, < 0.10)
+    git (1.2.9.1)
+    github_api (0.12.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.3)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.3)
       oauth2
-    hashie (2.0.5)
-    highline (1.6.19)
-    httpauth (0.2.0)
-    i18n (0.6.4)
-    jeweler (1.8.6)
+    hashie (3.4.2)
+    highline (1.7.2)
+    i18n (0.7.0)
+    jeweler (2.0.1)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.0)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    method_source (0.8.1)
-    minitest (4.7.5)
-    multi_json (1.7.7)
-    multi_xml (0.5.4)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    json (1.8.3)
+    jwt (1.5.1)
+    method_source (0.8.2)
+    mini_portile (0.6.2)
+    minitest (5.7.0)
+    multi_json (1.11.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       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)
+    pry-byebug (3.1.0)
+      byebug (~> 4.0)
+      pry (~> 0.10)
+    rack (1.6.4)
+    rake (10.4.2)
+    rdoc (4.2.0)
       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.2)
-    rspec-expectations (2.14.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    safe_yaml (0.9.4)
-    slop (3.4.5)
-    thread_safe (0.1.2)
-      atomic
-    tzinfo (0.3.37)
-    vertebrae (0.2.0)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    safe_yaml (1.0.4)
+    slop (3.6.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    vertebrae (0.2.11)
       activesupport
       faraday
       faraday_middleware
       hashie
-    webmock (1.13.0)
-      addressable (>= 2.2.7)
+    webmock (1.21.0)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
 
 PLATFORMS
@@ -100,9 +102,12 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
-  jeweler (~> 1.8.4)
+  jeweler (~> 2.0.0)
   pry
-  pry-debugger
+  pry-byebug
   rspec
   vertebrae
   webmock
+
+BUNDLED WITH
+   1.10.5

data/README.md

@@ -1,4 +1,6 @@
-tijuana_client_
+tijuana_client
 =========================
 
+[![Build Status](https://travis-ci.org/controlshift/tijuana_client.svg)](https://travis-ci.org/controlshift/tijuana_client)
+
 An exceptionally simple client for Getup's Tijuana

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/tijuana_client.rb

@@ -1,4 +1,5 @@
 require 'vertebrae'
+require 'tijuana_client/error_middleware'
 require 'tijuana_client/base'
 require 'tijuana_client/user'
 require 'tijuana_client/client'

data/lib/tijuana_client/client.rb

@@ -48,7 +48,7 @@ module TijuanaClient
 
         builder.use Faraday::Response::Logger if ENV['DEBUG']
 
-        builder.use Vertebrae::Response::RaiseError
+        builder.use TijuanaClient::ErrorMiddleware
         builder.adapter connection.configuration.adapter
       end
     end

data/lib/tijuana_client/error_middleware.rb

@@ -0,0 +1,24 @@
+module TijuanaClient
+  class ValidationError < ::Faraday::Error::ClientError ; end
+  class EmailValidationError < ::Faraday::Error::ClientError ; end
+
+  class ErrorMiddleware < ::Faraday::Response::RaiseError
+    def on_complete(env)
+      case env[:status]
+        when 400
+          if env.body.present?
+            response = JSON.parse(env.body)
+            if response['email'] && response['email'].include?('is invalid')
+              raise TijuanaClient::EmailValidationError, response_values(env).to_s
+            else
+              raise TijuanaClient::ValidationError, response_values(env).to_s
+            end
+          else
+           raise TijuanaClient::ValidationError, response_values(env).to_s
+          end
+        when ClientErrorStatuses
+          raise Faraday::Error::ClientError, response_values(env).to_s
+      end
+    end
+  end
+end

data/spec/client_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe TijuanaClient::Client do
-  specify { subject.should respond_to :user }
+  specify { expect(subject).to respond_to :user }
 
   describe "instantiated" do
     subject { described_class.new(options) }
@@ -9,8 +9,8 @@ describe TijuanaClient::Client do
     context 'process_basic_auth' do
       let(:options) { { :basic_auth => 'login:password' } }
       let(:config) { subject.connection.configuration  }
-      specify { config.username.should eq 'login' }
-      specify { config.password.should eq 'password' }
+      specify { expect(config.username).to eq 'login' }
+      specify { expect(config.password).to eq 'password' }
     end
 
   end

data/spec/spec_helper.rb

@@ -10,21 +10,18 @@ require 'webmock/rspec'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  config.color_enabled = true
+  config.color = true
 end
 
-
 RSpec.configure do |config|
   config.include WebMock::API
 
-
   config.before(:each) do
     WebMock.reset!
   end
   config.after(:each) do
     WebMock.reset!
   end
-
 end
 
 def stub_get(path)
@@ -40,8 +37,6 @@ def stub_tijuana_request(method, path)
   stub_request(method, "https://test.com" + prefix + path)
 end
 
-
-
 def fixture_path
   File.expand_path("../fixtures", __FILE__)
 end

data/spec/tijuana_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe TijuanaClient do
-  specify { subject.should respond_to :user }
-  specify { subject.new.should be_a(TijuanaClient::Client)}
+  specify { expect(subject).to respond_to :user }
+  specify { expect(subject.new).to be_a(TijuanaClient::Client)}
 end

data/spec/user_spec.rb

@@ -5,7 +5,7 @@ describe TijuanaClient::User do
 
   describe 'configuration' do
     it 'should propagate the host' do
-      subject.user.client.connection.configuration.host.should == 'test.com'
+      expect(subject.user.client.connection.configuration.host).to eq('test.com')
     end
   end
 
@@ -16,7 +16,7 @@ describe TijuanaClient::User do
     let(:params) { {first_name: 'Nathan'} }
 
     it 'should jsonify params' do
-       client.should_receive(:post_request).with('/foo', {'data' => JSON.generate({ first_name: 'Nathan'}) } )
+       expect(client).to receive(:post_request).with('/foo', {'data' => JSON.generate({ first_name: 'Nathan'}) } )
        client.post_json_request(path, params)
     end
   end
@@ -42,8 +42,26 @@ describe TijuanaClient::User do
     describe 'an error' do
       let(:status) { 500 }
 
+      it 'should raise' do
+        expect { subject.user.create(first_name: 'Nathan') }.to raise_exception(StandardError)
+      end
+    end
+
+    describe 'generic validation error' do
+      let(:status) { 400 }
+      let(:body) { '{"foo":["is bar"]}' }
+
+      it 'should return nil' do
+        expect { subject.user.create(first_name: 'Nathan') }.to raise_exception(TijuanaClient::ValidationError)
+      end
+    end
+
+    describe 'email validation error' do
+      let(:status) { 400 }
+      let(:body) { '{"email":["is invalid"]}' }
+
       it 'should return nil' do
-        lambda { subject.user.create(first_name: 'Nathan') }.should raise_exception
+        expect { subject.user.create(first_name: 'Nathan') }.to raise_exception(TijuanaClient::EmailValidationError)
       end
     end
   end
@@ -72,7 +90,7 @@ describe TijuanaClient::User do
       let(:status) { 401 }
 
       it "should return nil" do
-        lambda { subject.user.create(first_name: 'Nathan') }.should raise_exception
+        expect { subject.user.create(first_name: 'Nathan') }.to raise_exception(StandardError)
       end
     end
   end

data/tijuana_client.gemspec

@@ -2,15 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: tijuana_client 0.2.1 ruby lib
+# stub: tijuana_client 0.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tijuana_client"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Nathan Woodhull"]
-  s.date = "2014-02-28"
+  s.date = "2015-07-09"
   s.description = "An API client for the code that runs Getup.org.au"
   s.email = "nathan@controlshiftlabs.com"
   s.extra_rdoc_files = [
@@ -20,6 +21,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".ruby-gemset",
     ".ruby-version",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -29,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/tijuana_client.rb",
     "lib/tijuana_client/base.rb",
     "lib/tijuana_client/client.rb",
+    "lib/tijuana_client/error_middleware.rb",
     "lib/tijuana_client/user.rb",
     "spec/client_spec.rb",
     "spec/spec_helper.rb",
@@ -38,8 +41,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/controlshift/tijuana_client"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.10"
+  s.rubygems_version = "2.4.6"
   s.summary = "API client for Tijuana"
 
   if s.respond_to? :specification_version then
@@ -50,26 +52,26 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 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<pry-byebug>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0.0"])
     else
       s.add_dependency(%q<vertebrae>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
-      s.add_dependency(%q<pry-debugger>, [">= 0"])
+      s.add_dependency(%q<pry-byebug>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0.0"])
     end
   else
     s.add_dependency(%q<vertebrae>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])
-    s.add_dependency(%q<pry-debugger>, [">= 0"])
+    s.add_dependency(%q<pry-byebug>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0.0"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tijuana_client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vertebrae
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-debugger
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 2.0.0
 description: An API client for the code that runs Getup.org.au
 email: nathan@controlshiftlabs.com
 executables: []
@@ -118,6 +118,7 @@ extra_rdoc_files:
 files:
 - .ruby-gemset
 - .ruby-version
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -127,6 +128,7 @@ files:
 - lib/tijuana_client.rb
 - lib/tijuana_client/base.rb
 - lib/tijuana_client/client.rb
+- lib/tijuana_client/error_middleware.rb
 - lib/tijuana_client/user.rb
 - spec/client_spec.rb
 - spec/spec_helper.rb
@@ -153,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: API client for Tijuana