Change parameter slurping for listing organizations.

piotrmurach · piotrmurach · commit b222a3a11102 · 2012-06-09T12:56:59.000+01:00
diff --git a/lib/github_api/orgs.rb b/lib/github_api/orgs.rb
@@ -34,21 +34,22 @@ def teams
     # List all public organizations for a user.
     #
     # = Examples
-    #  github = Github.new :user => 'user-name'
-    #  github.orgs.list
+    #  github = Github.new
+    #  github.orgs.list user: 'user-name'
     #
     # List public and private organizations for the authenticated user.
     #
-    #  github = Github.new :oauth_token => '..'
-    #  github.orgs.list 'github'
+    #  github = Github.new oauth_token: '..'
+    #  github.orgs.list
     #
-    def list(user_name=nil, params={})
-      _update_user_repo_params(user_name)
+    def list(*args)
+      params = args.extract_options!
       _normalize_params_keys(params)
 
-      response = if user?
-        get_request("/users/#{user}/orgs", params)
+      response = if (user_name = params.delete("user"))
+        get_request("/users/#{user_name}/orgs", params)
       else
+        # For the authenticated user
         get_request("/user/orgs", params)
       end
       return response unless block_given?
diff --git a/spec/github/orgs_spec.rb b/spec/github/orgs_spec.rb
@@ -24,29 +24,29 @@
       end
 
       it "should get the resources" do
-        github.orgs.list user
+        github.orgs.list :user => user
         a_get("/users/#{user}/orgs").should have_been_made
       end
 
       it "should return array of resources" do
-        orgs = github.orgs.list user
+        orgs = github.orgs.list :user => user
         orgs.should be_an Array
         orgs.should have(1).items
       end
 
       it "should be a mash type" do
-        orgs = github.orgs.list user
+        orgs = github.orgs.list :user => user
         orgs.first.should be_a Hashie::Mash
       end
 
       it "should get org information" do
-        orgs = github.orgs.list user
+        orgs = github.orgs.list :user => user
         orgs.first.login.should == 'github'
       end
 
       it "should yield to a block" do
-        github.orgs.should_receive(:list).with(user).and_yield('web')
-        github.orgs.list(user) { |param| 'web' }
+        github.orgs.should_receive(:list).with(:user => user).and_yield('web')
+        github.orgs.list(:user => user) { |param| 'web' }
       end
     end
 
@@ -76,7 +76,7 @@
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.orgs.list user
+          github.orgs.list :user => user
         }.to raise_error(Github::Error::NotFound)
       end
     end
