github_api 0.9.0 → 0.9.1

data/lib/github_api/issues/milestones.rb

@@ -24,22 +24,20 @@ module Github
     # <tt>:direction</tt> - <tt>asc</tt>, <tt>desc</tt>, default: <tt>desc</tt>
     #
     # = Examples
-    #  github = Github.new :user => 'user-name', :repo => 'repo-name'
+    #  github = Github.new user: 'user-name', repo: 'repo-name'
     #  github.issues.milestones.list
     #
     #  or
     #
-    #  github.issues.milestones.list :state => 'open',
-    #     :sort => 'due_date',
-    #     :direction => 'asc'
+    #  github.issues.milestones.list state: 'open', sort: 'due_date',
+    #    direction: 'asc'
     #
-    def list(user_name, repo_name, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo
-
-      normalize! params
-      filter! VALID_MILESTONE_OPTIONS.keys, params
-      assert_valid_values(VALID_MILESTONE_OPTIONS, params)
+    def list(*args)
+      arguments(args, :required => [:user, :repo]) do
+        sift VALID_MILESTONE_OPTIONS.keys
+        assert_values VALID_MILESTONE_OPTIONS
+      end
+      params = arguments.params
 
       response = get_request("/repos/#{user}/#{repo}/milestones", params)
       return response unless block_given?
@@ -53,10 +51,9 @@ module Github
     #  github = Github.new
     #  github.issues.milestones.get 'user-name', 'repo-name', 'milestone-id'
     #
-    def get(user_name, repo_name, milestone_id, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo, milestone_id
-      normalize! params
+    def get(*args)
+      arguments(args, :required => [:user, :repo, :milestone_id])
+      params = arguments.params
 
       get_request("/repos/#{user}/#{repo}/milestones/#{milestone_id}", params)
     end
@@ -77,15 +74,13 @@ module Github
     #    :description => "String",
     #    :due_on => "Time"
     #
-    def create(user_name, repo_name, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo
+    def create(*args)
+      arguments(args, :required => [:user, :repo]) do
+        sift VALID_MILESTONE_INPUTS
+        assert_required %w[ title ]
+      end
 
-      normalize! params
-      filter! VALID_MILESTONE_INPUTS, params
-      assert_required_keys(%w[ title ], params)
-
-      post_request("/repos/#{user}/#{repo}/milestones", params)
+      post_request("/repos/#{user}/#{repo}/milestones", arguments.params)
     end
 
     # Update a milestone
@@ -104,12 +99,11 @@ module Github
     #    :description => "String",
     #    :due_on => "Time"
     #
-    def update(user_name, repo_name, milestone_id, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo, milestone_id
-
-      normalize! params
-      filter! VALID_MILESTONE_INPUTS, params
+    def update(*args)
+      arguments(args, :required => [:user, :repo, :milestone_id]) do
+        sift VALID_MILESTONE_INPUTS
+      end
+      params = arguments.params
 
       patch_request("/repos/#{user}/#{repo}/milestones/#{milestone_id}", params)
     end
@@ -120,10 +114,9 @@ module Github
     #  github = Github.new
     #  github.issues.milestones.delete 'user-name', 'repo-name', 'milestone-id'
     #
-    def delete(user_name, repo_name, milestone_id, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo, milestone_id
-      normalize! params
+    def delete(*args)
+      arguments(args, :required => [:user, :repo, :milestone_id])
+      params = arguments.params
 
       delete_request("/repos/#{user}/#{repo}/milestones/#{milestone_id}", params)
     end

data/lib/github_api/markdown.rb

@@ -25,11 +25,11 @@ module Github
     #    "context": "github/gollum"
     #
     def render(*args)
-      params = args.extract_options!
-      normalize! params
+      arguments(args) do
+        assert_required ['text']
+      end
 
-      assert_required_keys ['text'], params
-      post_request("markdown", params, :raw => true)
+      post_request("markdown", arguments.params, :raw => true)
     end
 
 
@@ -47,8 +47,7 @@ module Github
     #    "mime": "text/plain",
     #
     def render_raw(*args)
-      params = args.extract_options!
-      normalize! params
+      params = arguments(args).params
       mime_type, params['data'] = params['mime'], args.shift
 
       post_request("markdown/raw", params, :raw => true,

data/lib/github_api/meta.rb

@@ -9,10 +9,10 @@ module Github
     #
     #   Github.meta.get
     #
-    def get(params={})
-      normalize! params
+    def get(*args)
+      arguments(*args)
 
-      get_request("/meta", params)
+      get_request("/meta", arguments.params)
     end
 
   end # Meta

data/lib/github_api/orgs.rb

@@ -38,8 +38,7 @@ module Github
     #  github.orgs.list
     #
     def list(*args)
-      params = args.extract_options!
-      normalize! params
+      params = arguments(args).params
 
       response = if (user_name = params.delete("user"))
         get_request("/users/#{user_name}/orgs", params)
@@ -58,10 +57,10 @@ module Github
     #  github = Github.new
     #  github.orgs.get 'github'
     #
-    def get(org_name, params={})
-      assert_presence_of org_name
-      normalize! params
-      get_request("/orgs/#{org_name}", params)
+    def get(*args)
+      arguments(args, :required => [:org_name])
+
+      get_request("/orgs/#{org_name}", arguments.params)
     end
     alias :find :get
 
@@ -84,12 +83,12 @@ module Github
     #    "location": "San Francisco",
     #    "name": "github"
     #
-    def edit(org_name, params={})
-      assert_presence_of org_name
-      normalize! params
-      filter! VALID_ORG_PARAM_NAMES, params
+    def edit(*args)
+      arguments(args, :required => [:org_name]) do
+        sift VALID_ORG_PARAM_NAMES
+      end
 
-      patch_request("/orgs/#{org_name}", params)
+      patch_request("/orgs/#{org_name}", arguments.params)
     end
 
   end # Orgs

data/lib/github_api/orgs/members.rb

@@ -24,9 +24,8 @@ module Github
     #  github.orgs.members.list 'org-name', :public => true
     #  github.orgs.members.list 'org-name', :public => true { |memb| ... }
     #
-    def list(org_name, params={})
-      assert_presence_of org_name
-      normalize! params
+    def list(*args)
+      params = arguments(args, :required => [:org_name]).params
 
       response = if params.delete('public')
         get_request("/orgs/#{org_name}/public_members", params)
@@ -50,14 +49,13 @@ module Github
     #  github = Github.new
     #  github.orgs.members.member? 'org-name', 'member-name', :public => true
     #
-    def member?(org_name, member_name, params={})
-      assert_presence_of org_name, member_name
-      normalize! params
+    def member?(*args)
+      params = arguments(args, :required => [:org_name, :user]).params
 
       response = if params.delete('public')
-        get_request("/orgs/#{org_name}/public_members/#{member_name}", params)
+        get_request("/orgs/#{org_name}/public_members/#{user}", params)
       else
-        get_request("/orgs/#{org_name}/members/#{member_name}", params)
+        get_request("/orgs/#{org_name}/members/#{user}", params)
       end
       response.status == 204
     rescue Github::Error::NotFound
@@ -72,10 +70,10 @@ module Github
     #  github = Github.new
     #  github.orgs.members.remove 'org-name', 'member-name'
     #
-    def delete(org_name, member_name, params={})
-      assert_presence_of org_name, member_name
-      normalize! params
-      delete_request("/orgs/#{org_name}/members/#{member_name}", params)
+    def delete(*args)
+      arguments(args, :required => [:org_name, :user])
+
+      delete_request("/orgs/#{org_name}/members/#{user}", arguments.params)
     end
     alias :remove :delete
 
@@ -85,10 +83,10 @@ module Github
     #  github = Github.new :oauth_token => '...'
     #  github.orgs.members.publicize 'org-name', 'member-name'
     #
-    def publicize(org_name, member_name, params={})
-      assert_presence_of org_name, member_name
-      normalize! params
-      put_request("/orgs/#{org_name}/public_members/#{member_name}", params)
+    def publicize(*args)
+      arguments(args, :required => [:org_name, :user])
+
+      put_request("/orgs/#{org_name}/public_members/#{user}", arguments.params)
     end
     alias :make_public :publicize
     alias :publicize_membership :publicize
@@ -99,10 +97,10 @@ module Github
     #  github = Github.new :oauth_token => '...'
     #  github.orgs.members.conceal 'org-name', 'member-name'
     #
-    def conceal(org_name, member_name, params={})
-      assert_presence_of org_name, member_name
-      normalize! params
-      delete_request("/orgs/#{org_name}/public_members/#{member_name}", params)
+    def conceal(*args)
+      arguments(args, :required => [:org_name, :user])
+
+      delete_request("/orgs/#{org_name}/public_members/#{user}", arguments.params)
     end
     alias :conceal_membership :conceal
 

data/lib/github_api/orgs/teams.rb

@@ -17,11 +17,10 @@ module Github
     #  github = Github.new :oauth_token => '...'
     #  github.orgs.teams.list 'org-name'
     #
-    def list(org_name, params={})
-      assert_presence_of org_name
-      normalize! params
+    def list(*args)
+      arguments(args, :required => [:org_name])
 
-      response = get_request("/orgs/#{org_name}/teams", params)
+      response = get_request("/orgs/#{org_name}/teams", arguments.params)
       return response unless block_given?
       response.each { |el| yield el }
     end
@@ -33,11 +32,10 @@ module Github
     #  github = Github.new :oauth_token => '...'
     #  github.orgs.teams.get 'team-id'
     #
-    def get(team_id, params={})
-      assert_presence_of team_id
-      normalize! params
+    def get(*args)
+      arguments(args, :required => [:team_id])
 
-      get_request("/teams/#{team_id}", params)
+      get_request("/teams/#{team_id}", arguments.params)
     end
     alias :find :get
 
@@ -61,14 +59,14 @@ module Github
     #      "github/dotfiles"
     #     ]
     #
-    def create(org_name, params={})
-      assert_presence_of org_name
-      normalize! params
-      filter! VALID_TEAM_PARAM_NAMES, params
-      assert_valid_values(VALID_TEAM_PARAM_VALUES, params)
-      assert_required_keys(%w[ name ], params)
+    def create(*args)
+      arguments(args, :required => [:org_name]) do
+        sift VALID_TEAM_PARAM_NAMES
+        assert_values VALID_TEAM_PARAM_VALUES
+        assert_required %w[name]
+      end
 
-      post_request("/orgs/#{org_name}/teams", params)
+      post_request("/orgs/#{org_name}/teams", arguments.params)
     end
 
     # Edit a team
@@ -87,14 +85,14 @@ module Github
     #    "name" => "new team name",
     #    "permission" => "push"
     #
-    def edit(team_id, params={})
-      assert_presence_of team_id
-      normalize! params
-      filter! VALID_TEAM_PARAM_NAMES, params
-      assert_valid_values(VALID_TEAM_PARAM_VALUES, params)
-      assert_required_keys(%w[ name ], params)
+    def edit(*args)
+      arguments(args, :required => [:team_id]) do
+        sift VALID_TEAM_PARAM_NAMES
+        assert_values VALID_TEAM_PARAM_VALUES
+        assert_required %w[name]
+      end
 
-      patch_request("/teams/#{team_id}", params)
+      patch_request("/teams/#{team_id}", arguments.params)
     end
 
     # Delete a team
@@ -104,10 +102,10 @@ module Github
     #  github = Github.new :oauth_token => '...'
     #  github.orgs.teams.delete 'team-id'
     #
-    def delete(team_id, params={})
-      assert_presence_of team_id
-      normalize! params
-      delete_request("/teams/#{team_id}", params)
+    def delete(*args)
+      arguments(args, :required => [:team_id])
+
+      delete_request("/teams/#{team_id}", arguments.params)
     end
     alias :remove :delete
 
@@ -119,11 +117,10 @@ module Github
     #  github.orgs.teams.list_members 'team-id'
     #  github.orgs.teams.list_members 'team-id' { |member| ... }
     #
-    def list_members(team_id, params={})
-      assert_presence_of team_id
-      normalize! params
+    def list_members(*args)
+      arguments(args, :required => [:team_id])
 
-      response = get_request("/teams/#{team_id}/members", params)
+      response = get_request("/teams/#{team_id}/members", arguments.params)
       return response unless block_given?
       response.each { |el| yield el }
     end
@@ -135,10 +132,10 @@ module Github
     #  github = Github.new :oauth_token => '...'
     #  github.orgs.teams.team_member? 'team-id', 'user-name'
     #
-    def team_member?(team_id, user_name, params={})
-      assert_presence_of team_id, user_name
-      normalize! params
-      response = get_request("/teams/#{team_id}/members/#{user_name}", params)
+    def team_member?(*args)
+      arguments(args, :required => [:team_id, :user])
+
+      response = get_request("/teams/#{team_id}/members/#{user}", arguments.params)
       response.status == 204
     rescue Github::Error::NotFound
       false
@@ -151,10 +148,10 @@ module Github
     #  github = Github.new :oauth_token => '...'
     #  github.orgs.teams.add_member 'team-id', 'user-name'
     #
-    def add_member(team_id, user_name, params={})
-      assert_presence_of team_id, user_name
-      normalize! params
-      put_request("/teams/#{team_id}/members/#{user_name}", params)
+    def add_member(*args)
+      arguments(args, :required => [:team_id, :user])
+
+      put_request("/teams/#{team_id}/members/#{user}", arguments.params)
     end
     alias :add_team_member :add_member
 
@@ -169,10 +166,10 @@ module Github
     #  github = Github.new :oauth_token => '...'
     #  github.orgs.teams.remove_member 'team-id', 'user-name'
     #
-    def remove_member(team_id, user_name, params={})
-      assert_presence_of team_id, user_name
-      normalize! params
-      delete_request("/teams/#{team_id}/members/#{user_name}", params)
+    def remove_member(*args)
+      arguments(args, :required => [:team_id, :user])
+
+      delete_request("/teams/#{team_id}/members/#{user}", arguments.params)
     end
     alias :remove_team_member :remove_member
 
@@ -182,11 +179,10 @@ module Github
     #  github = Github.new :oauth_token => '...'
     #  github.orgs.teams.list_repos 'team-id'
     #
-    def list_repos(team_id, params={})
-      assert_presence_of team_id
-      normalize! params
+    def list_repos(*args)
+      arguments(args, :required => [:team_id])
 
-      response = get_request("/teams/#{team_id}/repos", params)
+      response = get_request("/teams/#{team_id}/repos", arguments.params)
       return response unless block_given?
       response.each { |el| yield el }
     end
@@ -198,10 +194,10 @@ module Github
     #  github = Github.new :oauth_token => '...'
     #  github.orgs.teams.team_repo? 'team-id', 'user-name', 'repo-name'
     #
-    def team_repo?(team_id, user_name, repo_name, params={})
-      assert_presence_of team_id, user_name, repo_name
-      normalize! params
-      response = get_request("/teams/#{team_id}/repos/#{user_name}/#{repo_name}", params)
+    def team_repo?(*args)
+      arguments(args, :required => [:team_id, :user, :repo])
+
+      response = get_request("/teams/#{team_id}/repos/#{user}/#{repo}", arguments.params)
       response.status == 204
     rescue Github::Error::NotFound
       false
@@ -219,10 +215,10 @@ module Github
     #  github = Github.new :oauth_token => '...'
     #  github.orgs.teams.add_repo 'team-id', 'user-name', 'repo-name'
     #
-    def add_repo(team_id, user_name, repo_name, params={})
-      assert_presence_of team_id, user_name, repo_name
-      normalize! params
-      put_request("/teams/#{team_id}/repos/#{user_name}/#{repo_name}", params)
+    def add_repo(*args)
+      arguments(args, :required => [:team_id, :user, :repo])
+
+      put_request("/teams/#{team_id}/repos/#{user}/#{repo}", arguments.params)
     end
     alias :add_repository :add_repo
 
@@ -236,10 +232,10 @@ module Github
     #  github = Github.new :oauth_token => '...'
     #  github.orgs.teams.remove_repo 'team-id', 'user-name', 'repo-name'
     #
-    def remove_repo(team_id, user_name, repo_name, params={})
-      assert_presence_of team_id, user_name, repo_name
-      normalize! params
-      delete_request("/teams/#{team_id}/repos/#{user_name}/#{repo_name}", params)
+    def remove_repo(*args)
+      arguments(args, :required => [:team_id, :user, :repo])
+
+      delete_request("/teams/#{team_id}/repos/#{user}/#{repo}", arguments.params)
     end
     alias :remove_repository :remove_repo