tijuana_client 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1f9f72c08ac31d5156315feb611afe9ab7b4dfb
-  data.tar.gz: ef8e20b19e777ffeff731f085fbcfe73a39396de
+  metadata.gz: 406351a1eca01ee917597abfb197a746505e7fd1
+  data.tar.gz: 2116912d9146a74d053443291b820f8f7074f6c2
 SHA512:
-  metadata.gz: 6d4b80e21984aa5aa997ba9eed1d0e1f344e01d0b9a14beac40270540d0f1f324543a57a9b241a92175d8ee088a0d1410883ba8259eddeb523c6e92006bf7b5a
-  data.tar.gz: 7aca41644f92d8608b9639b6c1561d917e908bc729b62a7b1d44b55b22d2e3ff2c462ea8d837eaef76552c52cfc9954d39286984e5845d8d595d7b60fac90d0c
+  metadata.gz: 5354d9376642e2d6c81164769404a6e472f5a22533f266aa923f7604e43652d6731a1a1d62ebb1c2a296a5c50b713fcf7206d7bdcc3e6fb79c54833951b98ffd
+  data.tar.gz: c33b56c80fed8af168a131138e626336bc909129dc33a943173cd2f96ec949c6f214ec4686fcd78f99937bfd197ee892b1eff9f165bc9b55fa33d39590d2b6cb

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'vertebrae'
+gem 'vertebrae', path: '/work/vertebrae'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,3 +1,12 @@
+PATH
+  remote: /work/vertebrae
+  specs:
+    vertebrae (0.2.0)
+      activesupport
+      faraday
+      faraday_middleware
+      hashie
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -21,8 +30,8 @@ GEM
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.2.3)
     diff-lcs (1.2.4)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     git (1.2.5)
@@ -83,14 +92,9 @@ GEM
     rspec-mocks (2.14.1)
     safe_yaml (0.9.4)
     slop (3.4.5)
-    thread_safe (0.1.0)
+    thread_safe (0.1.2)
       atomic
     tzinfo (0.3.37)
-    vertebrae (0.1.6)
-      activesupport
-      faraday
-      faraday_middleware
-      hashie
     webmock (1.13.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
@@ -104,5 +108,5 @@ DEPENDENCIES
   pry
   pry-debugger
   rspec
-  vertebrae
+  vertebrae!
   webmock

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/lib/tijuana_client/base.rb

@@ -1,60 +1,7 @@
 module TijuanaClient
-  class Base < Vertebrae::API
+  class Base < Vertebrae::Model
     def normalized_base_path
-      "/api/#{base_path}/"
+      "api/#{base_path}/"
     end
-
-    def post_json_request(path, params)
-      p = {}
-      p['data'] = params.to_json
-      post_request(path, p)
-    end
-
-    def request(method, path, params, options) # :nodoc:
-      if !::Vertebrae::Request::METHODS.include?(method)
-        raise ArgumentError, "unknown http method: #{method}"
-      end
-
-      conn = connection(options.merge(current_options))
-      path =  conn.path_prefix + '/' + path
-
-      ::Vertebrae::Base.logger.debug "EXECUTED: #{method} - #{path} with #{params} and #{options}"
-
-      conn.send(method) do |request|
-
-        case method.to_sym
-          when *(::Vertebrae::Request::METHODS - ::Vertebrae::Request::METHODS_WITH_BODIES)
-            request.body = params.delete('data') if params.has_key?('data')
-            request.url(path, params)
-          when *::Vertebrae::Request::METHODS_WITH_BODIES
-            request.path = path
-            request.body = extract_data_from_params(params) unless params.empty?
-        end
-      end
-    end
-
-    def default_middleware(options={})
-      Proc.new do |builder|
-        builder.use Faraday::Request::Multipart
-        builder.use Faraday::Request::UrlEncoded
-        builder.use Vertebrae::Request::BasicAuth, authentication if authenticated?
-
-        builder.use Faraday::Response::Logger if ENV['DEBUG']
-
-        builder.use Vertebrae::Response::RaiseError
-        builder.adapter adapter
-      end
-    end
-
-    private
-
-    def extract_data_from_params(params)
-      if params.has_key?('data') && params['data'].present?
-        return "data=#{params['data']}"
-      else
-        return params
-      end
-    end
-
   end
 end

data/lib/tijuana_client/client.rb

@@ -1,7 +1,66 @@
 module TijuanaClient
   class Client < Vertebrae::API
-    def user(options={}, &block)
-      @user ||= TijuanaClient::User.new(current_options.merge(options), &block)
+    def user
+      @user ||= TijuanaClient::User.new(client: self)
+    end
+
+    def post_json_request(path, params)
+      p = {}
+      p['data'] = params.to_json
+      post_request(path, p)
+    end
+
+    def default_options
+      {
+        user_agent: 'TijuanaClient',
+        prefix: '',
+        content_type: 'application/x-www-form-urlencoded'
+      }
+    end
+
+    def request(method, path, params, options) # :nodoc:
+      if !::Vertebrae::Request::METHODS.include?(method)
+        raise ArgumentError, "unknown http method: #{method}"
+      end
+
+      path =  connection.configuration.prefix + '/' + path
+
+      ::Vertebrae::Base.logger.debug "EXECUTED: #{method} - #{path} with #{params} and #{options}"
+
+      connection.connection.send(method) do |request|
+
+        case method.to_sym
+          when *(::Vertebrae::Request::METHODS - ::Vertebrae::Request::METHODS_WITH_BODIES)
+            request.body = params.delete('data') if params.has_key?('data')
+            request.url(path, params)
+          when *::Vertebrae::Request::METHODS_WITH_BODIES
+            request.path = path
+            request.body = extract_data_from_params(params) unless params.empty?
+        end
+      end
+    end
+
+    def setup
+      connection.stack do |builder|
+        builder.use Faraday::Request::Multipart
+        builder.use Faraday::Request::UrlEncoded
+        builder.use Vertebrae::Request::BasicAuth, connection.configuration.authentication if connection.configuration.authenticated?
+
+        builder.use Faraday::Response::Logger if ENV['DEBUG']
+
+        builder.use Vertebrae::Response::RaiseError
+        builder.adapter connection.configuration.adapter
+      end
+    end
+
+    private
+
+    def extract_data_from_params(params)
+      if params.has_key?('data') && params['data'].present?
+        return "data=#{params['data']}"
+      else
+        return params
+      end
     end
   end
 end

data/lib/tijuana_client/user.rb

@@ -5,7 +5,7 @@ module TijuanaClient
     end
 
     def create(params)
-      post_json_request(normalized_base_path, params)
+      client.post_json_request(normalized_base_path, params)
     end
   end
 end

data/lib/tijuana_client.rb

@@ -1,12 +1,10 @@
 require 'vertebrae'
-require 'tijuana_client/configuration'
 require 'tijuana_client/base'
 require 'tijuana_client/user'
 require 'tijuana_client/client'
 
 module TijuanaClient
   extend Vertebrae::Base
-  include TijuanaClient::Configuration
 
   class << self
     def new(options = {}, &block)

data/spec/client_spec.rb

@@ -8,16 +8,10 @@ describe TijuanaClient::Client do
 
     context 'process_basic_auth' do
       let(:options) { { :basic_auth => 'login:password' } }
-      its(:username) { should eq 'login' }
-      its(:password) { should eq 'password' }
-      its(:basic_auth) { should eq 'login:password' }
+      let(:config) { subject.connection.configuration  }
+      specify { config.username.should eq 'login' }
+      specify { config.password.should eq 'password' }
     end
 
-    context "process username & password" do
-      let(:options) { { :username => 'login', password: 'password' } }
-      its(:username) { should eq 'login' }
-      its(:password) { should eq 'password' }
-      its(:basic_auth) { should eq 'login:password' }
-    end
   end
 end

data/spec/spec_helper.rb

@@ -36,16 +36,10 @@ def stub_post(path)
 end
 
 def stub_tijuana_request(method, path)
-  prefix = TijuanaClient.prefix.to_s
+  prefix = TijuanaClient.new.connection.configuration.prefix.to_s
   stub_request(method, "https://test.com" + prefix + path)
 end
 
-def reset_authentication_for(object)
-  [ 'username', 'password' ].each do |item|
-    TijuanaClient.send("#{item}=", nil)
-    object.send("#{item}=", nil)
-  end
-end
 
 
 def fixture_path

data/spec/user_spec.rb

@@ -4,24 +4,25 @@ describe TijuanaClient::User do
   subject { TijuanaClient.new(host: 'test.com') }
 
   describe 'configuration' do
-    it 'should propagate the host to the page' do
-      subject.user.host.should == 'test.com'
+    it 'should propagate the host' do
+      subject.user.client.connection.configuration.host.should == 'test.com'
     end
   end
 
   describe '.post_json_request' do
-    subject { TijuanaClient::User.new({}) }
+    let(:client) { TijuanaClient::Client.new }
+    subject { TijuanaClient::User.new({client: client }) }
     let(:path) { '/foo' }
     let(:params) { {first_name: 'Nathan'} }
 
-    it "should jsonify params" do
-       subject.should_receive(:post_request).with('/foo', {'data' => JSON.generate({ first_name: 'Nathan'}) } )
-       subject.post_json_request(path, params)
+    it 'should jsonify params' do
+       client.should_receive(:post_request).with('/foo', {'data' => JSON.generate({ first_name: 'Nathan'}) } )
+       client.post_json_request(path, params)
     end
   end
 
-  describe "create" do
-    let(:body) { "" }
+  describe 'create' do
+    let(:body) { '' }
     let(:request_body) { "data=#{ JSON.generate({ first_name: 'Nathan'})}" }
     let(:request_path) { '/api/users/' }
 
@@ -30,18 +31,18 @@ describe TijuanaClient::User do
                                                                  :headers => { content_type: "application/json; charset=utf-8"})
     end
 
-    describe "success" do
+    describe 'success' do
       let(:status) { 200 }
 
-      it "should create a user" do
+      it 'should create a user' do
         subject.user.create(first_name: 'Nathan')
       end
     end
 
-    describe "an error" do
+    describe 'an error' do
       let(:status) { 500 }
 
-      it "should return nil" do
+      it 'should return nil' do
         lambda { subject.user.create(first_name: 'Nathan') }.should raise_exception
       end
     end

data/tijuana_client.gemspec

@@ -0,0 +1,74 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "tijuana_client"
+  s.version = "0.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Nathan Woodhull"]
+  s.date = "2013-07-30"
+  s.description = "An API client for the code that runs Getup.org.au"
+  s.email = "nathan@controlshiftlabs.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".ruby-gemset",
+    ".ruby-version",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/tijuana_client.rb",
+    "lib/tijuana_client/base.rb",
+    "lib/tijuana_client/client.rb",
+    "lib/tijuana_client/user.rb",
+    "spec/client_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/tijuana_spec.rb",
+    "spec/user_spec.rb",
+    "tijuana_client.gemspec"
+  ]
+  s.homepage = "http://github.com/controlshift/tijuana_client"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.0.4"
+  s.summary = "API client for Tijuana"
+
+  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<vertebrae>, [">= 0"])
+      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<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+    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<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    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<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tijuana_client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vertebrae
@@ -127,12 +127,12 @@ files:
 - lib/tijuana_client.rb
 - lib/tijuana_client/base.rb
 - lib/tijuana_client/client.rb
-- lib/tijuana_client/configuration.rb
 - lib/tijuana_client/user.rb
 - spec/client_spec.rb
 - spec/spec_helper.rb
 - spec/tijuana_spec.rb
 - spec/user_spec.rb
+- tijuana_client.gemspec
 homepage: http://github.com/controlshift/tijuana_client
 licenses:
 - MIT

data/lib/tijuana_client/configuration.rb

@@ -1,11 +0,0 @@
-module TijuanaClient
-  module Configuration
-    def self.included(mod)
-      Vertebrae::Base.configure do |config|
-        config.user_agent = 'TijuanaClient'
-        config.prefix = ''
-        config.content_type = 'application/x-www-form-urlencoded'
-      end
-    end
-  end
-end