Change parameter processing for users api.

piotrmurach · piotrmurach · commit 8a0df252b2b9 · 2012-06-11T22:46:31.000+01:00
diff --git a/lib/github_api/users.rb b/lib/github_api/users.rb
@@ -44,17 +44,18 @@ def keys
     #
     # = Examples
     #  github = Github.new
-    #  github.users.get 'user-name'
+    #  github.users.get user: 'user-name'
     #
     # Get the authenticated user
     #
     # = Examples
-    #  @github = Github.new :oauth_token => '...'
-    #  @github.users.get
+    #  github = Github.new oauth_token: '...'
+    #  github.users.get
     #
-    def get(user_name=nil, params={})
+    def get(*args)
+      params = args.extract_options!
       _normalize_params_keys(params)
-      if user_name
+      if user_name = params.delete('user')
         get_request("/users/#{user_name}", params)
       else
         get_request("/user", params)
@@ -84,7 +85,8 @@ def get(user_name=nil, params={})
     #    "hireable" => true,
     #    "bio" => "There once..."
     #
-    def update(params={})
+    def update(*args)
+      params = args.extract_options!
       _normalize_params_keys(params)
       _filter_params_keys(VALID_USER_PARAMS_NAMES, params)
       patch_request("/user", params)
diff --git a/spec/github/users_spec.rb b/spec/github/users_spec.rb
@@ -18,28 +18,28 @@
       end
 
       it "should get the resources" do
-        github.users.get user
+        github.users.get :user => user
         a_get("/users/#{user}").should have_been_made
       end
 
       it "should return resource" do
-        user_resource = github.users.get user
+        user_resource = github.users.get :user => user
         user_resource.should be_a Hash
       end
 
       it "should be a mash type" do
-        user_resource = github.users.get user
+        user_resource = github.users.get :user => user
         user_resource.should be_a Hashie::Mash
       end
 
       it "should get org information" do
-        user_resource = github.users.get user
+        user_resource = github.users.get :user => user
         user_resource.login.should == 'octocat'
       end
 
       it "should yield to a block" do
-        github.users.should_receive(:get).with(user).and_yield('web')
-        github.users.get(user) { |param| 'web' }
+        github.users.should_receive(:get).with(:user => user).and_yield('web')
+        github.users.get(:user => user) { |param| 'web' }
       end
     end
 
@@ -66,7 +66,7 @@
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.users.get user
+          github.users.get :user => user
         }.to raise_error(Github::Error::NotFound)
       end
     end
