github_api 0.4.11 → 0.5.0.rc1

data/spec/github/orgs_spec.rb

@@ -8,39 +8,45 @@ describe Github::Orgs do
   let(:repo) { 'github' }
   let(:org) { 'github' }
 
-  after { github.user, github.repo, github.oauth_token = nil, nil, nil }
+  after { reset_authentication_for github }
 
-  describe "orgs" do
+  context 'access to apis' do
+    it { subject.members.should be_a Github::Orgs::Members }
+    it { subject.teams.should be_a Github::Orgs::Teams }
+  end
+
+  describe "#list" do
     context "resource found for a user" do
       before do
         stub_get("/users/#{user}/orgs").
-          to_return(:body => fixture('orgs/orgs.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('orgs/orgs.json'), :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should get the resources" do
-        github.orgs.orgs user
+        github.orgs.list user
         a_get("/users/#{user}/orgs").should have_been_made
       end
 
       it "should return array of resources" do
-        orgs = github.orgs.orgs user
+        orgs = github.orgs.list user
         orgs.should be_an Array
         orgs.should have(1).items
       end
 
       it "should be a mash type" do
-        orgs = github.orgs.orgs user
+        orgs = github.orgs.list user
         orgs.first.should be_a Hashie::Mash
       end
 
       it "should get org information" do
-        orgs = github.orgs.orgs user
+        orgs = github.orgs.list user
         orgs.first.login.should == 'github'
       end
 
       it "should yield to a block" do
-        github.orgs.should_receive(:orgs).with(user).and_yield('web')
-        github.orgs.orgs(user) { |param| 'web' }
+        github.orgs.should_receive(:list).with(user).and_yield('web')
+        github.orgs.list(user) { |param| 'web' }
       end
     end
 
@@ -49,13 +55,14 @@ describe Github::Orgs do
         github.oauth_token = OAUTH_TOKEN
         stub_get("/user/orgs").
           with(:query => { :access_token => OAUTH_TOKEN }).
-          to_return(:body => fixture('orgs/orgs.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('orgs/orgs.json'), :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
-      after { github.oauth_token = nil }
+      # after { github.oauth_token = nil }
 
       it "should get the resources" do
-        github.orgs.orgs
+        github.orgs.list
         a_get("/user/orgs").with(:query => { :access_token => OAUTH_TOKEN }).
           should have_been_made
       end
@@ -69,13 +76,13 @@ describe Github::Orgs do
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.orgs.orgs user
+          github.orgs.list user
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # orgs
+  end # list
 
-  describe "org" do
+  describe "#get" do
     context "resource found" do
       before do
         stub_get("/orgs/#{org}").
@@ -83,22 +90,22 @@ describe Github::Orgs do
       end
 
       it "should fail to get resource without org name" do
-        expect { github.orgs.org }.to raise_error(ArgumentError)
+        expect { github.orgs.get }.to raise_error(ArgumentError)
       end
 
       it "should get the resource" do
-        github.orgs.org org
+        github.orgs.get org
         a_get("/orgs/#{org}").should have_been_made
       end
 
       it "should get org information" do
-        organisation = github.orgs.org org
+        organisation = github.orgs.get org
         organisation.id.should == 1
         organisation.login.should == 'github'
       end
 
       it "should return mash" do
-        organisation = github.orgs.org org
+        organisation = github.orgs.get org
         organisation.should be_a Hashie::Mash
       end
     end
@@ -106,18 +113,19 @@ describe Github::Orgs do
     context "resource not found" do
       before do
         stub_get("/orgs/#{org}").
-          to_return(:body => fixture('orgs/org.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('orgs/org.json'), :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to retrive resource" do
         expect {
-          github.orgs.org org
+          github.orgs.get org
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # org
+  end # get
 
-  describe "edit_org" do
+  describe "#edit" do
     let(:inputs) do
       { :billing_email => 'support@github.com',
         :blog => "https://github.com/blog",
@@ -130,25 +138,26 @@ describe Github::Orgs do
     context "resource edited successfully" do
       before do
         stub_patch("/orgs/#{org}").with(inputs).
-          to_return(:body => fixture("orgs/org.json"), :status => 200, :headers => { :content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture("orgs/org.json"), :status => 200,
+            :headers => { :content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to edit without 'user/repo' parameters" do
-        expect { github.orgs.edit_org }.to raise_error(ArgumentError)
+        expect { github.orgs.edit }.to raise_error(ArgumentError)
       end
 
       it "should edit the resource" do
-        github.orgs.edit_org org
+        github.orgs.edit org
         a_patch("/orgs/#{org}").with(inputs).should have_been_made
       end
 
       it "should return resource" do
-        organisation = github.orgs.edit_org org
+        organisation = github.orgs.edit org
         organisation.should be_a Hashie::Mash
       end
 
       it "should be able to retrieve information" do
-        organisation = github.orgs.edit_org org
+        organisation = github.orgs.edit org
         organisation.name.should == 'github'
       end
     end
@@ -156,15 +165,16 @@ describe Github::Orgs do
     context "failed to edit resource" do
       before do
         stub_patch("/orgs/#{org}").with(inputs).
-          to_return(:body => fixture("orgs/org.json"), :status => 404, :headers => { :content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture("orgs/org.json"), :status => 404,
+            :headers => { :content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to find resource" do
         expect {
-          github.orgs.edit_org org
+          github.orgs.edit org
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # edit_org
+  end # edit
 
 end # Github::Orgs

data/spec/github/paged_request_spec.rb

@@ -5,17 +5,19 @@ require 'spec_helper'
 describe Github::PagedRequest do
   it { described_class.constants.should include :FIRST_PAGE }
   it { described_class.constants.should include :PER_PAGE }
+  it { described_class.constants.should include :NOT_FOUND }
 
   context 'page_request' do
     let(:path) { '/repos' }
+    let(:client) { Github::Client }
 
     before do
-      Github.new
+      Github.stub(:api_client).and_return client
+      client.stub(:get_request)
     end
 
     it 'sets default per_page when only custom page passed' do
       Github.stub_chain(:api_client, :per_page).and_return nil
-      Github.stub_chain(:api_client, :get).and_return nil
       Github::PagedRequest.page_request path, {'page' => 3, 'per_page' => -1}
       Github::PagedRequest.page.should eq 3
       Github::PagedRequest.per_page.should eq 30
@@ -23,15 +25,14 @@ describe Github::PagedRequest do
 
     it 'sets default page when only custom per_page passed' do
       Github.stub_chain(:api_client, :page).and_return nil
-      Github.stub_chain(:api_client, :get).and_return nil
       Github::PagedRequest.page_request path, {'per_page' => 33, 'page' => -1}
       Github::PagedRequest.page.should eq 1
       Github::PagedRequest.per_page.should eq 33
     end
 
     it 'sends get request with passed parameters' do
-      Github.stub(:api_client).and_return Github::Client
-      Github::Client.should_receive(:get).with(path, 'page' => 2, 'per_page' => 33)
+      Github::Client.should_receive(:get_request).
+        with(path, 'page' => 2, 'per_page' => 33)
       Github::PagedRequest.page_request path, {'page' => 2, 'per_page' => 33}
     end
   end

data/spec/github/pull_requests/comments_spec.rb

@@ -11,11 +11,8 @@ describe Github::PullRequests::Comments do
 
   after { reset_authentication_for github }
 
-  describe "#comments" do
-    context 'check aliases' do
-      it { github.pull_requests.should respond_to :comments }
-      it { github.pull_requests.should respond_to :request_comments }
-    end
+  describe "#list" do
+    it { github.pull_requests.comments.should respond_to :all }
 
     context 'resource found' do
 
@@ -28,36 +25,36 @@ describe Github::PullRequests::Comments do
 
       it "throws error if comment id not provided" do
         expect {
-          github.pull_requests.comments user, repo, nil
+          github.pull_requests.comments.list user, repo, nil
         }.to raise_error(ArgumentError)
       end
 
       it "should get the resources" do
-        github.pull_requests.comments user, repo, pull_request_id
+        github.pull_requests.comments.list user, repo, pull_request_id
         a_get("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/comments").
           should have_been_made
       end
 
       it "should return array of resources" do
-        comments = github.pull_requests.comments user, repo, pull_request_id
+        comments = github.pull_requests.comments.list user, repo, pull_request_id
         comments.should be_an Array
         comments.should have(1).items
       end
 
       it "should be a mash type" do
-        comments = github.pull_requests.comments user, repo, pull_request_id
+        comments = github.pull_requests.comments.list user, repo, pull_request_id
         comments.first.should be_a Hashie::Mash
       end
 
       it "should get pull request comment information" do
-        comments = github.pull_requests.comments user, repo, pull_request_id
+        comments = github.pull_requests.comments.list user, repo, pull_request_id
         comments.first.id.should == pull_request_id
       end
 
       it "should yield to a block" do
-        github.pull_requests.should_receive(:comments).
+        github.pull_requests.comments.should_receive(:list).
           with(user, repo, pull_request_id).and_yield('web')
-        github.pull_requests.comments(user, repo, pull_request_id) {|param| 'web' }
+        github.pull_requests.comments.list(user, repo, pull_request_id) {|param| 'web' }
       end
     end
 
@@ -69,17 +66,14 @@ describe Github::PullRequests::Comments do
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.pull_requests.comments user, repo, pull_request_id
+          github.pull_requests.comments.list user, repo, pull_request_id
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # comments
+  end # list
 
-  describe "#comment" do
-    context 'check aliases' do
-      it { github.pull_requests.should respond_to :comment }
-      it { github.pull_requests.should respond_to :get_comment }
-    end
+  describe "#get" do
+    it { github.pull_requests.comments.should respond_to :find }
 
     context 'resource found' do
       before do
@@ -91,24 +85,24 @@ describe Github::PullRequests::Comments do
 
       it "should fail to get resource without comment id" do
         expect {
-          github.pull_requests.comment user, repo, nil
+          github.pull_requests.comments.get user, repo, nil
         }.to raise_error(ArgumentError)
       end
 
       it "should get the resource" do
-        github.pull_requests.comment user, repo, pull_request_id
+        github.pull_requests.comments.get user, repo, pull_request_id
         a_get("/repos/#{user}/#{repo}/pulls/comments/#{comment_id}").
           should have_been_made
       end
 
       it "should get comment information" do
-        comment = github.pull_requests.comment user, repo, comment_id
+        comment = github.pull_requests.comments.get user, repo, comment_id
         comment.id.should eq comment_id
         comment.user.login.should == 'octocat'
       end
 
       it "should return mash" do
-        comment = github.pull_requests.comment user, repo, comment_id
+        comment = github.pull_requests.comments.get user, repo, comment_id
         comment.should be_a Hashie::Mash
       end
     end
@@ -123,13 +117,13 @@ describe Github::PullRequests::Comments do
 
       it "should fail to retrive resource" do
         expect {
-          github.pull_requests.comment user, repo, comment_id
+          github.pull_requests.comments.get user, repo, comment_id
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # comment
+  end # get
 
-  describe "create_request" do
+  describe "#create" do
     let(:inputs) {
       {
         "body" => "Nice change",
@@ -150,23 +144,23 @@ describe Github::PullRequests::Comments do
 
       it 'raises error when pull_request_id is missing' do
         expect {
-          github.pull_requests user, repo, nil
+          github.pull_requests.comments.create user, repo, nil
         }.to raise_error(ArgumentError)
       end
 
       it "should create resource successfully" do
-        github.pull_requests.create_comment user, repo, pull_request_id, inputs
+        github.pull_requests.comments.create user, repo, pull_request_id, inputs
         a_post("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/comments").
           with(inputs).should have_been_made
       end
 
       it "should return the resource" do
-        pull_request = github.pull_requests.create_comment user, repo, pull_request_id, inputs
+        pull_request = github.pull_requests.comments.create user, repo, pull_request_id, inputs
         pull_request.should be_a Hashie::Mash
       end
 
       it "should get the request information" do
-        pull_request = github.pull_requests.create_comment user, repo, pull_request_id, inputs
+        pull_request = github.pull_requests.comments.create user, repo, pull_request_id, inputs
         pull_request.id.should == pull_request_id
       end
     end
@@ -181,13 +175,13 @@ describe Github::PullRequests::Comments do
 
       it "should faile to retrieve resource" do
         expect {
-          github.pull_requests.create_comment user, repo, pull_request_id, inputs
+          github.pull_requests.comments.create user, repo, pull_request_id, inputs
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # create_comment
+  end # create
 
-  describe "#edit_comment" do
+  describe "#edit" do
     let(:inputs) {
       {
         "body" => "Nice change",
@@ -205,25 +199,26 @@ describe Github::PullRequests::Comments do
       end
 
       it "should edit resource successfully" do
-        github.pull_requests.edit_comment user, repo, comment_id, inputs
+        github.pull_requests.comments.edit user, repo, comment_id, inputs
         a_patch("/repos/#{user}/#{repo}/pulls/comments/#{comment_id}").
           with(inputs).should have_been_made
       end
 
       it "should return the resource" do
-        comment = github.pull_requests.edit_comment user, repo, comment_id, inputs
+        comment = github.pull_requests.comments.edit user, repo, comment_id, inputs
         comment.should be_a Hashie::Mash
       end
 
       it "should get the comment information" do
-        comment = github.pull_requests.edit_comment user, repo, comment_id, inputs
+        comment = github.pull_requests.comments.edit user, repo, comment_id, inputs
         comment.user.login.should == 'octocat'
       end
     end
 
     context "failed to edit resource" do
       before do
-        stub_patch("/repos/#{user}/#{repo}/pulls/comments/#{comment_id}").with(inputs).
+        stub_patch("/repos/#{user}/#{repo}/pulls/comments/#{comment_id}").
+          with(inputs).
           to_return(:body => fixture('pull_requests/comment.json'),
             :status => 404,
             :headers => {:content_type => "application/json; charset=utf-8"})
@@ -231,13 +226,13 @@ describe Github::PullRequests::Comments do
 
       it "should fail to retrieve resource" do
         expect {
-          github.pull_requests.edit_comment user, repo, comment_id, inputs
+          github.pull_requests.comments.edit user, repo, comment_id, inputs
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # edit_comment
+  end # edit
 
-  context "#delete_comment" do
+  context "#delete" do
     before do
       stub_delete("/repos/#{user}/#{repo}/pulls/comments/#{comment_id}").
         to_return(:body => fixture('pull_requests/comment.json'),
@@ -247,12 +242,12 @@ describe Github::PullRequests::Comments do
 
     it 'should raise error if comment_id not present' do
       expect {
-        github.pull_requests.delete_comment user, repo, nil
+        github.pull_requests.comments.delete user, repo, nil
       }.to raise_error(ArgumentError)
     end
 
     it "should remove resource successfully" do
-      github.pull_requests.delete_comment user, repo, comment_id
+      github.pull_requests.comments.delete user, repo, comment_id
       a_delete("/repos/#{user}/#{repo}/pulls/comments/#{comment_id}").
         should have_been_made
     end
@@ -263,9 +258,9 @@ describe Github::PullRequests::Comments do
           :status => 404,
           :headers => {:content_type => "application/json; charset=utf-8"})
       expect {
-        github.pull_requests.delete_comment user, repo, comment_id
+        github.pull_requests.comments.delete user, repo, comment_id
       }.to raise_error(Github::Error::NotFound)
     end
-  end # delete_comment
+  end # delete
 
 end # Github::PullRequests::Comments