github_api 0.3.0 → 0.3.1

data/README.rdoc

@@ -12,7 +12,7 @@ Grab the gem by issuing
 
 or in your Gemfile
 
-  gem "github_api", "~> 0.2.1"
+  gem "github_api", "~> 0.3.0"
 
 == Usage
 

data/lib/github_api/authorization.rb

@@ -44,7 +44,23 @@ module Github
 
     # Check whether authentication credentials are present
     def authenticated?
-      basic_auth? || oauth_token? || (login? && password?)
+      basic_authed? || oauth_token?
+    end
+
+    # Check whether basic authentication credentials are present
+    def basic_authed?
+      basic_auth? || (login? && password?)
+    end
+
+    # Select authentication parameters
+    def authentication
+      if login? && password?
+        { :login => login, :password => password }
+      elsif basic_auth?
+        { :basic_auth => basic_auth }
+      else
+        { }
+      end
     end
 
     private

data/lib/github_api/connection.rb

@@ -36,7 +36,6 @@ module Github
     def connection(options = {}) # :nodoc:
 
       # parse(options['resource'], options['mime_type'] || mime_type) if options['mime_type']
-      debugger
 #       merged_options = if connection_options.empty?
 #         header_options.merge(options)
 #       else
@@ -57,7 +56,7 @@ module Github
           builder.use Faraday::Response::Logger
 
           builder.use Github::Request::OAuth2, oauth_token if oauth_token?
-          builder.use Github::Request::BasicAuth, login, password if login? && password?
+          builder.use Github::Request::BasicAuth, authentication if basic_authed?
 
           unless options[:raw]
             builder.use Github::Response::Mashify

data/lib/github_api/request.rb

@@ -2,7 +2,7 @@
 
 require 'base64'
 require 'addressable/uri'
-require 'set'
+require 'multi_json'
 
 module Github
   # Defines HTTP verbs
@@ -49,7 +49,7 @@ module Github
           request.url(path, params)
         when *METHODS_WITH_BODIES
           request.path = path
-          request.body = _process_params(params) unless params.empty?
+          request.body = MultiJson.encode(_process_params(params)) unless params.empty?
         end
       end
       response.body

data/lib/github_api/request/basic_auth.rb

@@ -9,7 +9,6 @@ module Github
       dependency 'base64'
 
       def call(env)
-        # puts "BASIC: #{@auth}"
         env[:request_headers].merge!('Authorization' => "Basic #{@auth}\"")
 
         @app.call env
@@ -17,8 +16,14 @@ module Github
 
       def initialize(app, *args)
         @app = app
-        login, password = args.shift, args.shift
-        @auth = Base64.encode64("#{login}:#{password}")
+        credentials = ""
+        options = args.last.is_a?(Hash) ? args.pop : {}
+        if options.has_key? :login
+          credentials = "#{options[:login]}:#{options[:password]}"
+        elsif options.has_key? :basic_auth
+          credentials = "#{options[:basic_auth]}"
+        end
+        @auth = Base64.encode64(credentials)
         @auth.gsub!("\n", "")
       end
     end # BasicAuth

data/lib/github_api/version.rb

@@ -4,7 +4,7 @@ module Github
   module VERSION
     MAJOR = 0
     MINOR = 3
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.');

data/spec/github/authorization_spec.rb

@@ -68,4 +68,32 @@ describe Github::Authorization do
     end
   end
 
+  context "authentication" do
+    it "should respond to 'authentication'" do
+      github.should respond_to :authentication
+    end
+
+    context 'basic_auth' do
+      before do
+        github = Github.new :basic_auth => 'github:pass'
+      end
+
+      it "should return hash with basic auth params" do
+        github.authentication.should be_a Hash
+        github.authentication.should have_key :basic_auth
+      end
+    end
+
+    context 'login & password' do
+      before do
+        github = Github.new :login => 'github', :password => 'pass'
+      end
+
+      it "should return hash with login & password params" do
+        github.authentication.should be_a Hash
+        github.authentication.should have_key :login
+      end
+    end
+  end # authentication
+
 end # Github::Authorization

data/spec/github/authorizations_spec.rb

@@ -3,9 +3,10 @@ require 'spec_helper'
 describe Github::Authorizations do
 
   let(:github) { Github.new }
+  let(:basic_auth) { 'login:password' }
 
   before do
-    github.basic_auth = 'login:password'
+    github.basic_auth = basic_auth
   end
 
   after do
@@ -15,7 +16,7 @@ describe Github::Authorizations do
   describe "authorizations" do
     context "resource found" do
       before do
-        stub_get("/authorizations").
+        stub_get("/authorizations", "https://#{basic_auth}@api.github.com").
           to_return(:body => fixture('auths/authorizations.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
@@ -27,7 +28,7 @@ describe Github::Authorizations do
 
       it "should get the resources" do
         github.oauth.authorizations
-        a_get("/authorizations").should have_been_made
+        a_get("/authorizations", "https://#{basic_auth}@api.github.com").should have_been_made
       end
 
       it "should return array of resources" do
@@ -54,7 +55,7 @@ describe Github::Authorizations do
 
     context "resource not found" do
       before do
-        stub_get("/authorizations").
+        stub_get("/authorizations", "https://#{basic_auth}@api.github.com").
           to_return(:body => "", :status => [404, "Not Found"])
       end
 
@@ -69,7 +70,7 @@ describe Github::Authorizations do
 
     context "resource found" do
       before do
-        stub_get("/authorizations/#{authorization_id}").
+        stub_get("/authorizations/#{authorization_id}", "https://#{basic_auth}@api.github.com").
           to_return(:body => fixture('auths/authorization.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
@@ -79,7 +80,7 @@ describe Github::Authorizations do
 
       it "should get the resource" do
         github.oauth.authorization authorization_id
-        a_get("/authorizations/#{authorization_id}").should have_been_made
+        a_get("/authorizations/#{authorization_id}", "https://#{basic_auth}@api.github.com").should have_been_made
       end
 
       it "should get authorization information" do
@@ -96,7 +97,7 @@ describe Github::Authorizations do
 
     context "resource not found" do
       before do
-        stub_get("/authorizations/#{authorization_id}").
+        stub_get("/authorizations/#{authorization_id}", "https://#{basic_auth}@api.github.com").
           to_return(:body => fixture('auths/authorization.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
@@ -119,13 +120,13 @@ describe Github::Authorizations do
       end
 
       before do
-        stub_post("/authorizations").with(inputs).
+        stub_post("/authorizations", "https://#{basic_auth}@api.github.com").with(inputs).
           to_return(:body => fixture('auths/authorization.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should create resource successfully" do
         github.oauth.create_authorization inputs
-        a_post("/authorizations").with(inputs).should have_been_made
+        a_post("/authorizations", "https://#{basic_auth}@api.github.com").with(inputs).should have_been_made
       end
 
       it "should return the resource" do
@@ -141,7 +142,7 @@ describe Github::Authorizations do
 
     context "failed to create resource" do
       before do
-        stub_post("/authorizations").with(inputs).
+        stub_post("/authorizations", "https://#{basic_auth}@api.github.com").with(inputs).
           to_return(:body => '', :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
 
       end
@@ -166,13 +167,13 @@ describe Github::Authorizations do
       end
 
       before do
-        stub_patch("/authorizations/#{authorization_id}").with(inputs).
+        stub_patch("/authorizations/#{authorization_id}", "https://#{basic_auth}@api.github.com").with(inputs).
           to_return(:body => fixture('auths/authorization.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should update resource successfully" do
         github.oauth.update_authorization authorization_id, inputs
-        a_patch("/authorizations/#{authorization_id}").with(inputs).should have_been_made
+        a_patch("/authorizations/#{authorization_id}", "https://#{basic_auth}@api.github.com").with(inputs).should have_been_made
       end
 
       it "should return the resource" do
@@ -188,7 +189,7 @@ describe Github::Authorizations do
 
     context "failed to update resource" do
       before do
-        stub_patch("/authorizations/#{authorization_id}").with(inputs).
+        stub_patch("/authorizations/#{authorization_id}", "https://#{basic_auth}@api.github.com").with(inputs).
           to_return(:body => '', :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
 
       end
@@ -213,19 +214,19 @@ describe Github::Authorizations do
       end
 
       before do
-        stub_delete("/authorizations/#{authorization_id}").
+        stub_delete("/authorizations/#{authorization_id}", "https://#{basic_auth}@api.github.com").
           to_return(:body => '', :status => 204, :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should delete resource successfully" do
         github.oauth.delete_authorization authorization_id
-        a_delete("/authorizations/#{authorization_id}").should have_been_made
+        a_delete("/authorizations/#{authorization_id}", "https://#{basic_auth}@api.github.com").should have_been_made
       end
     end
 
     context "failed to create resource" do
       before do
-        stub_delete("/authorizations/#{authorization_id}").
+        stub_delete("/authorizations/#{authorization_id}", "https://#{basic_auth}@api.github.com").
           to_return(:body => '', :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
 
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Piotr Murach
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-26 00:00:00 +00:00
+date: 2011-11-27 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency