github_api 0.4.11 → 0.5.0.rc1

data/spec/github/repos/keys_spec.rb

@@ -9,30 +9,33 @@ describe Github::Repos::Keys do
 
   it { described_class::VALID_KEY_PARAM_NAMES.should_not be_nil }
 
-  describe "keys" do
+  describe "#list" do
+    it { github.repos.keys.should respond_to :all }
+
     context "resource found" do
       before do
         stub_get("/repos/#{user}/#{repo}/keys").
-          to_return(:body => fixture("repos/keys.json"), :status => 200, :headers => {})
+          to_return(:body => fixture("repos/keys.json"),
+            :status => 200, :headers => {})
       end
 
       it "should fail to get resource without username" do
-        expect { github.repos.keys }.to raise_error(ArgumentError)
+        expect { github.repos.keys.list }.to raise_error(ArgumentError)
       end
 
       it "should get the resources" do
-        github.repos.keys(user, repo)
+        github.repos.keys.list user, repo
         a_get("/repos/#{user}/#{repo}/keys").should have_been_made
       end
 
       it "should return array of resources" do
-        keys = github.repos.keys(user, repo)
+        keys = github.repos.keys.list user, repo
         keys.should be_an Array
         keys.should have(1).items
       end
 
       it "should get key information" do
-        keys = github.repos.keys(user, repo)
+        keys = github.repos.keys.list user, repo
         keys.first.title.should == 'octocat@octomac'
       end
     end
@@ -45,15 +48,17 @@ describe Github::Repos::Keys do
 
       it "should fail to retrieve resource" do
         expect {
-          github.repos.keys user, repo
+          github.repos.keys.list user, repo
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end
+  end # list
 
-  describe "get_key" do
+  describe "#get" do
     let(:key_id) { 1 }
 
+    it { github.repos.keys.should respond_to :find }
+
     context "resource found" do
       before do
         stub_get("/repos/#{user}/#{repo}/keys/#{key_id}").
@@ -62,17 +67,17 @@ describe Github::Repos::Keys do
 
       it "should fail to get resource without key" do
         expect {
-          github.repos.get_key(user, repo, nil)
+          github.repos.keys.get user, repo, nil
         }.to raise_error(ArgumentError)
       end
 
       it "should get the resource" do
-        github.repos.get_key(user, repo, key_id)
+        github.repos.keys.get user, repo, key_id
         a_get("/repos/#{user}/#{repo}/keys/#{key_id}").should have_been_made
       end
 
       it "should get key information" do
-        key = github.repos.get_key(user, repo, key_id)
+        key = github.repos.keys.get user, repo, key_id
         key.id.should == key_id
       end
     end
@@ -85,13 +90,13 @@ describe Github::Repos::Keys do
 
       it "should fail to retrieve resource" do
         expect {
-          github.repos.get_key(user, repo, key_id)
+          github.repos.keys.get user, repo, key_id
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end
+  end # get
 
-  describe "create_key" do
+  describe "#create" do
     let(:inputs) { {:title => "octocat@octomac", :key => "ssh-rsa AAA..." } }
 
     context "resource created" do
@@ -102,23 +107,23 @@ describe Github::Repos::Keys do
 
       it "should fail to create resource if 'title' input is missing" do
         expect {
-          github.repos.create_key(user, repo, :key => 'ssh-rsa AAA...')
+          github.repos.keys.create user, repo, :key => 'ssh-rsa AAA...'
         }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should fail to create resource if 'key' input is missing" do
         expect {
-          github.repos.create_key(user, repo, :title => 'octocat@octomac')
+          github.repos.keys.create user, repo, :title => 'octocat@octomac'
         }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should create the resource" do
-        github.repos.create_key(user, repo, inputs)
+        github.repos.keys.create user, repo, inputs
         a_post("/repos/#{user}/#{repo}/keys").with(inputs).should have_been_made
       end
 
       it "should get the key information back" do
-        key = github.repos.create_key(user, repo, inputs)
+        key = github.repos.keys.create user, repo, inputs
         key.title.should == 'octocat@octomac'
       end
     end
@@ -131,13 +136,13 @@ describe Github::Repos::Keys do
 
       it "should fail to retrieve resource" do
         expect {
-          github.repos.create_key(user, repo, inputs)
+          github.repos.keys.create user, repo, inputs
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end
+  end # create
 
-  describe "edit_key" do
+  describe "#edit" do
     let(:key_id) { 1 }
     let(:inputs) { {:title => "octocat@octomac", :key => "ssh-rsa AAA..." } }
 
@@ -148,12 +153,12 @@ describe Github::Repos::Keys do
       end
 
       it "should edit the resource" do
-        github.repos.edit_key(user, repo, key_id, inputs)
+        github.repos.keys.edit user, repo, key_id, inputs
         a_patch("/repos/#{user}/#{repo}/keys/#{key_id}").should have_been_made
       end
 
       it "should get the key information back" do
-        key = github.repos.edit_key(user, repo, key_id, inputs)
+        key = github.repos.keys.edit user, repo, key_id, inputs
         key.id.should == key_id
         key.title.should == 'octocat@octomac'
       end
@@ -167,34 +172,34 @@ describe Github::Repos::Keys do
 
       it "should fail to retrieve resource" do
         expect {
-          github.repos.edit_key(user, repo, key_id, inputs)
+          github.repos.keys.edit user, repo, key_id, inputs
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end
+  end # edit
 
-  describe "delete_key" do
+  describe "#delete" do
     let(:key_id) { 1 }
 
     context "resource found successfully" do
       before do
         stub_delete("/repos/#{user}/#{repo}/keys/#{key_id}").
-          to_return(:body => "", :status => 204, :headers => { :content_type => "application/json; charset=utf-8"} )
+          to_return(:body => "", :status => 204,
+            :headers => { :content_type => "application/json; charset=utf-8"} )
       end
 
       it "should fail to delete without 'user/repo' parameters" do
-        github.user, github.repo = nil, nil
-        expect { github.repos.delete_key }.to raise_error(ArgumentError)
+        expect { github.repos.keys.delete }.to raise_error(ArgumentError)
       end
 
       it "should fail to delete resource without key id" do
         expect {
-          github.repos.delete_key user, repo, nil
+          github.repos.keys.delete user, repo, nil
         }.to raise_error(ArgumentError)
       end
 
       it "should delete the resource" do
-        github.repos.delete_key(user, repo, key_id)
+        github.repos.keys.delete user, repo, key_id
         a_delete("/repos/#{user}/#{repo}/keys/#{key_id}").should have_been_made
       end
     end
@@ -206,10 +211,10 @@ describe Github::Repos::Keys do
       end
       it "should fail to find resource" do
         expect {
-          github.repos.delete_key(user, repo, key_id)
+          github.repos.keys.delete user, repo, key_id
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end
+  end # delete
 
 end # Github::Repos::Keys

data/spec/github/repos/pub_sub_hubbub_spec.rb

@@ -25,7 +25,7 @@ describe Github::Repos::PubSubHubbub do
       end
 
       it "should subscribe to hub" do
-        github.repos.subscribe topic, callback
+        github.repos.pubsubhubbub.subscribe topic, callback
         a_post("/hub?access_token=#{OAUTH_TOKEN}").with(hub_inputs).should have_been_made
       end
     end
@@ -39,7 +39,7 @@ describe Github::Repos::PubSubHubbub do
 
       it "should fail to subscribe to hub" do
         expect {
-          github.repos.subscribe topic, callback
+          github.repos.pubsubhubbub.subscribe topic, callback
         }.to raise_error(Github::Error::NotFound)
       end
     end
@@ -54,7 +54,7 @@ describe Github::Repos::PubSubHubbub do
       end
 
       it "should subscribe to hub" do
-        github.repos.unsubscribe topic, callback
+        github.repos.pubsubhubbub.unsubscribe topic, callback
         a_post("/hub?access_token=#{OAUTH_TOKEN}").with(hub_inputs).should have_been_made
       end
     end
@@ -68,7 +68,7 @@ describe Github::Repos::PubSubHubbub do
 
       it "should fail to subscribe to hub" do
         expect {
-          github.repos.unsubscribe topic, callback
+          github.repos.pubsubhubbub.unsubscribe topic, callback
         }.to raise_error(Github::Error::NotFound)
       end
     end

data/spec/github/repos/watching_spec.rb

@@ -11,38 +11,41 @@ describe Github::Repos::Watching do
 
   describe "watchers" do
     before do
-      github.oauth_token = nil
       stub_get("/repos/#{user}/#{repo}/watchers").
-        to_return(:body => fixture("repos/watchers.json"), :status => 200, :headers => {})
+        to_return(:body => fixture("repos/watchers.json"),
+                  :status => 200, :headers => {})
     end
 
     it "should fail to get resource without username" do
-      expect { github.repos.watchers }.to raise_error(ArgumentError)
+      expect {
+        github.repos.watching.watchers
+      }.to raise_error(ArgumentError)
     end
 
     it "should yield iterator if block given" do
-      github.repos.should_receive(:watchers).with(user, repo).and_yield('github')
-      github.repos.watchers(user, repo) { |param| 'github' }
+      github.repos.watching.should_receive(:watchers).
+        with(user, repo).and_yield('github')
+      github.repos.watching.watchers(user, repo) { |param| 'github' }
     end
 
     it "should get the resources" do
-      github.repos.watchers(user, repo)
+      github.repos.watching.watchers user, repo
       a_get("/repos/#{user}/#{repo}/watchers").should have_been_made
     end
 
     it "should return array of resources" do
-      watchers = github.repos.watchers(user, repo)
+      watchers = github.repos.watching.watchers user, repo
       watchers.should be_an Array
       watchers.should have(1).items
     end
 
     it "should return result of mash type" do
-      watchers = github.repos.watchers user, repo
+      watchers = github.repos.watching.watchers user, repo
       watchers.first.should be_a Hashie::Mash
     end
 
     it "should get watcher information" do
-      watchers = github.repos.watchers(user, repo)
+      watchers = github.repos.watching.watchers user, repo
       watchers.first.login.should == 'octocat'
     end
 
@@ -54,7 +57,7 @@ describe Github::Repos::Watching do
 
       it "should return 404 not found message" do
         expect {
-          github.repos.watchers(user, repo)
+          github.repos.watching.watchers user, repo
         }.to raise_error(Github::Error::NotFound)
       end
     end
@@ -62,20 +65,18 @@ describe Github::Repos::Watching do
 
   describe "#watched" do
     context "if user unauthenticated" do
-      before { github.oauth_token = nil }
-
       it "should fail to get resource without username " do
         stub_get("/user/watched").
           to_return(:body => fixture("repos/watched.json"), :status => 401, :headers => {})
         expect {
-          github.repos.watched
+          github.repos.watching.watched
         }.to raise_error(Github::Error::Unauthorized)
       end
 
       it "should get the resource with username" do
         stub_get("/users/#{user}/watched").
           to_return(:body => fixture("repos/watched.json"), :status => 200, :headers => {})
-        github.repos.watched(:user => user)
+        github.repos.watching.watched :user => user
         a_get("/users/#{user}/watched").should have_been_made
       end
     end
@@ -88,22 +89,20 @@ describe Github::Repos::Watching do
           to_return(:body => fixture("repos/watched.json"), :status => 200, :headers => {})
       end
 
-      after { github.oauth_token = nil }
-
       it "should get the resources" do
-        github.repos.watched
+        github.repos.watching.watched
         a_get("/user/watched").with(:query => {:access_token => OAUTH_TOKEN}).
           should have_been_made
       end
 
       it "should return array of resources" do
-        watched = github.repos.watched
+        watched = github.repos.watching.watched
         watched.should be_an Array
         watched.should have(1).items
       end
 
       it "should get watched information" do
-        watched = github.repos.watched
+        watched = github.repos.watching.watched
         watched.first.name.should == 'Hello-World'
         watched.first.owner.login.should == 'octocat'
       end
@@ -115,25 +114,28 @@ describe Github::Repos::Watching do
       context "this repo is being watched by the user"
         before do
           stub_get("/user/watched/#{user}/#{repo}").
-            to_return(:body => "", :status => 404, :headers => {:user_agent => github.user_agent})
+            to_return(:body => "", :status => 404,
+                      :headers => {:user_agent => github.user_agent})
         end
 
       it "should return false if resource not found" do
-        watching = github.repos.watching? user, repo
+        watching = github.repos.watching.watching? user, repo
         watching.should be_false
       end
 
       it "should return true if resoure found" do
           stub_get("/user/watched/#{user}/#{repo}").
             to_return(:body => "", :status => 200, :headers => {:user_agent => github.user_agent})
-        watching = github.repos.watching? user, repo
+        watching = github.repos.watching.watching? user, repo
         watching.should be_true
       end
     end
 
     context "without username and reponame passed" do
       it "should fail validation " do
-        expect { github.repos.watching?(nil, nil) }.to raise_error(ArgumentError)
+        expect {
+          github.repos.watching.watching?(nil, nil)
+        }.to raise_error(ArgumentError)
       end
     end
   end # watching?
@@ -148,10 +150,8 @@ describe Github::Repos::Watching do
             to_return(:body => "", :status => 204, :headers => {})
         end
 
-        after { github.oauth_token = nil }
-
         it "should successfully watch a repo" do
-          github.repos.start_watching(user, repo)
+          github.repos.watching.start_watching user, repo
           a_put("/user/watched/#{user}/#{repo}").
             with(:query => {:access_token => OAUTH_TOKEN}).
             should have_been_made
@@ -161,11 +161,10 @@ describe Github::Repos::Watching do
 
     context "user unauthenticated" do
       it "should fail" do
-        github.oauth_token = nil
         stub_put("/user/watched/#{user}/#{repo}").
           to_return(:body => "", :status => 401, :headers => {})
         expect {
-          github.repos.start_watching(user, repo)
+          github.repos.watching.start_watching user, repo
         }.to raise_error(Github::Error::Unauthorized)
       end
     end
@@ -175,26 +174,25 @@ describe Github::Repos::Watching do
     context "user authenticated" do
       context "with correct information" do
         before do
-          github.user, github.repo = nil, nil
           github.oauth_token = OAUTH_TOKEN
           stub_delete("/user/watched/#{user}/#{repo}?access_token=#{OAUTH_TOKEN}").
             to_return(:body => "", :status => 204, :headers => {})
         end
 
         it "should successfully watch a repo" do
-          github.repos.stop_watching(user, repo)
-          a_delete("/user/watched/#{user}/#{repo}?access_token=#{OAUTH_TOKEN}").should have_been_made
+          github.repos.watching.stop_watching user, repo
+          a_delete("/user/watched/#{user}/#{repo}?access_token=#{OAUTH_TOKEN}").
+            should have_been_made
         end
       end
     end
 
     context "user unauthenticated" do
       it "should fail" do
-        github.oauth_token = nil
         stub_delete("/user/watched/#{user}/#{repo}").
           to_return(:body => "", :status => 401, :headers => {})
         expect {
-          github.repos.stop_watching(user, repo)
+          github.repos.watching.stop_watching(user, repo)
         }.to raise_error(Github::Error::Unauthorized)
       end
     end

data/spec/github/repos_spec.rb

@@ -9,7 +9,18 @@ describe Github::Repos do
 
   after { reset_authentication_for github }
 
-  describe "branches" do
+  context 'access to apis' do
+    it { subject.collaborators.should be_a Github::Repos::Collaborators }
+    it { subject.commits.should be_a Github::Repos::Commits }
+    it { subject.downloads.should be_a Github::Repos::Downloads }
+    it { subject.forks.should be_a Github::Repos::Forks }
+    it { subject.hooks.should be_a Github::Repos::Hooks }
+    it { subject.keys.should be_a Github::Repos::Keys }
+    it { subject.watching.should be_a Github::Repos::Watching }
+    it { subject.pubsubhubbub.should be_a Github::Repos::PubSubHubbub }
+  end
+
+  describe "#branches" do
     context "resource found" do
       before do
         stub_get("/repos/#{user}/#{repo}/branches").
@@ -77,13 +88,13 @@ describe Github::Repos do
 
       it "should raise error when no user/repo parameters" do
         expect {
-          github.repos.contributors
+          github.repos.contributors nil, repo
         }.to raise_error(ArgumentError, /\[user\] parameter cannot be nil/)
       end
 
       it "should raise error when no repository" do
         expect {
-          github.repos.contributors user
+          github.repos.contributors user, nil
         }.to raise_error(ArgumentError, /\[repo\] parameter cannot be nil/)
       end
 
@@ -124,36 +135,35 @@ describe Github::Repos do
     end
   end # contributors
 
-  describe "create_repo" do
-    let(:inputs) { {:name => 'web', :description => "This is your first repo", :homepage => "https://github.com", :private => false, :has_issues => true, :has_wiki => true}}
+  describe "#create" do
+    let(:inputs) { {:name => 'web', :description => "This is your first repo", :homepage => "https://github.com", :public => true, :has_issues => true, :has_wiki => true}}
 
     context "resource created successfully for the authenticated user" do
       before do
         github.oauth_token = OAUTH_TOKEN
         stub_post("/user/repos?access_token=#{OAUTH_TOKEN}").with(inputs).
-          to_return(:body => fixture('repos/repo.json'), :status => 201,:headers => {:content_type => "application/json; charset=utf-8"} )
+          to_return(:body => fixture('repos/repo.json'), :status => 201,
+            :headers => {:content_type => "application/json; charset=utf-8"} )
       end
 
-      after { github.oauth_token = nil }
-
       it "should faile to create resource if 'name' inputs is missing" do
         expect {
-          github.repos.create_repo inputs.except(:name)
+          github.repos.create inputs.except(:name)
         }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should create resource" do
-        github.repos.create_repo inputs
+        github.repos.create inputs
         a_post("/user/repos?access_token=#{OAUTH_TOKEN}").with(inputs).should have_been_made
       end
 
       it "should return the resource" do
-        repository = github.repos.create_repo inputs
+        repository = github.repos.create inputs
         repository.name.should == 'Hello-World'
       end
 
       it "should return mash type" do
-        repository = github.repos.create_repo inputs
+        repository = github.repos.create inputs
         repository.should be_a Hashie::Mash
       end
     end
@@ -161,43 +171,33 @@ describe Github::Repos do
     context "resource created for the authenticated user belonging to organization" do
       let(:org) { '37signals' }
       before do
-        github.user = nil
         github.oauth_token = OAUTH_TOKEN
         stub_post("/orgs/#{org}/repos?access_token=#{OAUTH_TOKEN}").with(inputs).
           to_return(:body => fixture('repos/repo.json'), :status => 201,:headers => {:content_type => "application/json; charset=utf-8"} )
       end
 
-      after do
-        github.user, github.oauth_token = nil, nil
-      end
-
       it "should get the resource" do
-        github.repos.create_repo inputs.merge(:org => org)
+        github.repos.create inputs.merge(:org => org)
         a_post("/orgs/#{org}/repos?access_token=#{OAUTH_TOKEN}").with(inputs).should have_been_made
       end
     end
 
     context "failed to create" do
       before do
-        github.user = nil
         github.oauth_token = OAUTH_TOKEN
         stub_post("/user/repos?access_token=#{OAUTH_TOKEN}").with(inputs).
           to_return(:body => '', :status => 404,:headers => {:content_type => "application/json; charset=utf-8"} )
       end
 
-      after do
-        github.user, github.oauth_token = nil, nil
-      end
-
       it "should faile to retrieve resource" do
         expect {
-          github.repos.create_repo inputs
+          github.repos.create inputs
         }.to raise_error(Github::Error::NotFound)
       end
     end
   end
 
-  describe "edit_repo" do
+  describe "#edit" do
     let(:inputs) do
       { :name => 'web',
         :description => "This is your first repo",
@@ -210,32 +210,32 @@ describe Github::Repos do
     context "resource edited successfully" do
       before do
         stub_patch("/repos/#{user}/#{repo}").with(inputs).
-          to_return(:body => fixture("repos/repo.json"), :status => 200, :headers => { :content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture("repos/repo.json"), :status => 200,
+            :headers => { :content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to edit without 'user/repo' parameters" do
-        # github.user, github.repo = nil, nil
-        expect { github.repos.edit_repo }.to raise_error(ArgumentError)
+        expect { github.repos.edit user, nil }.to raise_error(ArgumentError)
       end
 
       it "should fail to edit resource without 'name' parameter" do
         expect{
-          github.repos.edit_hook user, repo, inputs.except(:name)
+          github.repos.edit user, repo, inputs.except(:name)
         }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should edit the resource" do
-        github.repos.edit_repo user, repo, inputs
+        github.repos.edit user, repo, inputs
         a_patch("/repos/#{user}/#{repo}").with(inputs).should have_been_made
       end
 
       it "should return resource" do
-        repository = github.repos.edit_repo user, repo, inputs
+        repository = github.repos.edit user, repo, inputs
         repository.should be_a Hashie::Mash
       end
 
       it "should be able to retrieve information" do
-        repository = github.repos.edit_repo user, repo, inputs
+        repository = github.repos.edit user, repo, inputs
         repository.name.should == 'Hello-World'
       end
     end
@@ -243,18 +243,19 @@ describe Github::Repos do
     context "failed to edit resource" do
       before do
         stub_patch("/repos/#{user}/#{repo}").with(inputs).
-          to_return(:body => fixture("repos/repo.json"), :status => 404, :headers => { :content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture("repos/repo.json"), :status => 404,
+            :headers => { :content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to find resource" do
         expect {
-          github.repos.edit_repo user, repo, inputs
+          github.repos.edit user, repo, inputs
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # edit_repo
+  end # edit
 
-  describe "get_repo" do
+  describe "#get" do
     context "resource found" do
       before do
         stub_get("/repos/#{user}/#{repo}").
@@ -262,31 +263,31 @@ describe Github::Repos do
       end
 
       it "should raise error when no user/repo parameters" do
-        github.user, github.repo = nil, nil
+        # github.user, github.repo = nil, nil
         expect {
-          github.repos.get_repo
+          github.repos.get nil, repo
         }.to raise_error(ArgumentError, /\[user\] parameter cannot be nil/)
       end
 
       it "should raise error when no repository" do
-        github.user, github.repo = nil, nil
+        # github.user, github.repo = nil, nil
         expect {
-          github.repos.get_repo user
+          github.repos.get user, nil
         }.to raise_error(ArgumentError, /\[repo\] parameter cannot be nil/)
       end
 
       it "should find resources" do
-        github.repos.get_repo user, repo
+        github.repos.get user, repo
         a_get("/repos/#{user}/#{repo}").should have_been_made
       end
 
       it "should return repository mash" do
-        repository = github.repos.get_repo user, repo
+        repository = github.repos.get user, repo
         repository.should be_a Hashie::Mash
       end
 
       it "should get repository information" do
-        repository = github.repos.get_repo user, repo
+        repository = github.repos.get user, repo
         repository.name.should == 'Hello-World'
       end
     end
@@ -294,18 +295,19 @@ describe Github::Repos do
     context "resource not found" do
       before do
         stub_get("/repos/#{user}/#{repo}").
-          to_return(:body => '', :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => '', :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to get resource" do
         expect {
-          github.repos.get_repo user, repo
+          github.repos.get user, repo
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # get_repo
+  end # get
 
-  describe "languages" do
+  describe "#languages" do
     context "resource found" do
       before do
         stub_get("/repos/#{user}/#{repo}/languages").
@@ -313,16 +315,14 @@ describe Github::Repos do
       end
 
       it "should raise error when no user/repo parameters" do
-        # github.user, github.repo = nil, nil
         expect {
-          github.repos.languages
+          github.repos.languages nil, repo
         }.to raise_error(ArgumentError, /\[user\] parameter cannot be nil/)
       end
 
       it "should raise error when no repository" do
-        # github.user, github.repo = nil, nil
         expect {
-          github.repos.languages user
+          github.repos.languages user, nil
         }.to raise_error(ArgumentError, /\[repo\] parameter cannot be nil/)
       end
 
@@ -362,46 +362,40 @@ describe Github::Repos do
     end
   end # languages
 
-  describe "repos" do
+  describe "#list" do
     context "resource found for authenticated user" do
       before do
-        # github.user = nil
         github.oauth_token = OAUTH_TOKEN
         stub_get("/user/repos?access_token=#{OAUTH_TOKEN}").
           to_return(:body => fixture('repos/repos.json'), :status => 200,:headers => {:content_type => "application/json; charset=utf-8"} )
       end
 
-      after do
-        github.oauth_token = nil
-        # github.user, github.repo = nil, nil
-      end
-
       it "fails if user is unauthenticated" do
         github.oauth_token = nil
         stub_get("/user/repos").
           to_return(:body => '', :status => 401,:headers => {:content_type => "application/json; charset=utf-8"} )
-        expect { github.repos.repos}.to raise_error(Github::Error::Unauthorized)
+        expect { github.repos.list }.to raise_error(Github::Error::Unauthorized)
       end
 
       it "should get the resources" do
-        github.repos.repos
+        github.repos.list
         a_get("/user/repos?access_token=#{OAUTH_TOKEN}").should have_been_made
       end
 
       it "should return array of resources" do
-        repositories = github.repos.repos
+        repositories = github.repos.list
         repositories.should be_an Array
         repositories.should have(1).items
       end
 
       it "should get resource information" do
-        repositories = github.repos.repos
+        repositories = github.repos.list
         repositories.first.name.should == 'Hello-World'
       end
 
       it "should yield repositories to a block" do
-        github.repos.should_receive(:repos).and_yield('octocat')
-        github.repos.repos { |repo| 'octocat' }
+        github.repos.should_receive(:list).and_yield('octocat')
+        github.repos.list { |repo| 'octocat' }
       end
     end
 
@@ -409,46 +403,43 @@ describe Github::Repos do
       let(:org) { '37signals' }
 
       before do
-        # github.user = nil
-        github.oauth_token = nil
         stub_get("/orgs/#{org}/repos").
-          to_return(:body => fixture('repos/repos.json'), :status => 200,:headers => {:content_type => "application/json; charset=utf-8"} )
+          to_return(:body => fixture('repos/repos.json'), :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"} )
       end
 
       it "should get the resources" do
-        github.repos.repos :org => org
+        github.repos.list :org => org
         a_get("/orgs/#{org}/repos").should have_been_made
       end
-
     end
 
     context "resource found for organization" do
       before do
         stub_get("/users/#{user}/repos").
-          to_return(:body => fixture('repos/repos.json'), :status => 200,:headers => {:content_type => "application/json; charset=utf-8"} )
+          to_return(:body => fixture('repos/repos.json'), :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"} )
       end
 
       it "should get the resources" do
-        github.repos.repos :user => user
+        github.repos.list :user => user
         a_get("/users/#{user}/repos").should have_been_made
       end
     end
 
     context "rosource not found for authenticated user" do
       before do
-        # github.user = nil
         github.oauth_token = OAUTH_TOKEN
         stub_get("/user/repos?access_token=#{OAUTH_TOKEN}").
-          to_return(:body => '', :status => 404,:headers => {:content_type => "application/json; charset=utf-8"} )
+          to_return(:body => '', :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"} )
       end
 
-      after { github.oauth_token = nil }
-
       it "fail to find resources" do
-        expect { github.repos.repos }.to raise_error(Github::Error::NotFound)
+        expect { github.repos.list }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # repos
+  end # list
 
   describe "tags" do
     context "resource found" do
@@ -459,13 +450,13 @@ describe Github::Repos do
 
       it "should raise error when no user/repo parameters" do
         expect {
-          github.repos.tags
+          github.repos.tags nil, repo
         }.to raise_error(ArgumentError, /\[user\] parameter cannot be nil/)
       end
 
       it "should raise error when no repository" do
         expect {
-          github.repos.tags user
+          github.repos.tags user, nil
         }.to raise_error(ArgumentError, /\[repo\] parameter cannot be nil/)
       end
 
@@ -503,9 +494,9 @@ describe Github::Repos do
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end #tags
+  end # tags
 
-  describe "teams" do
+  describe "#teams" do
     context "resource found" do
       before do
         stub_get("/repos/#{user}/#{repo}/teams").
@@ -514,13 +505,13 @@ describe Github::Repos do
 
       it "should raise error when no user/repo parameters" do
         expect {
-          github.repos.teams
+          github.repos.teams nil, repo
         }.to raise_error(ArgumentError, /\[user\] parameter cannot be nil/)
       end
 
       it "should raise error when no repository" do
         expect {
-          github.repos.teams user
+          github.repos.teams user, nil
         }.to raise_error(ArgumentError, /\[repo\] parameter cannot be nil/)
       end