github_api 0.9.0 → 0.9.1

data/lib/github_api/git_data/trees.rb

@@ -34,10 +34,9 @@ module Github
     #  github = Github.new
     #  github.git_data.trees.get 'user-name', 'repo-name', 'sha', 'recursive' => true
     #
-    def get(user_name, repo_name, sha, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo, sha
-      normalize! params
+    def get(*args)
+      arguments(args, :required => [:user, :repo, :sha])
+      params = arguments.params
 
       response = if params['recursive']
         params['recursive'] = 1
@@ -79,16 +78,14 @@ module Github
     #      ...
     #    ]
     #
-    def create(user_name, repo_name, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo
-      normalize! params
-      assert_required_keys(%w[ tree ], params)
-
-      filter! VALID_TREE_PARAM_NAMES, params['tree']
-      assert_valid_values(VALID_TREE_PARAM_VALUES, params['tree'])
+    def create(*args)
+      arguments(args, :required => [:user, :repo]) do
+        assert_required %w[ tree ]
+        sift VALID_TREE_PARAM_NAMES, 'tree'
+        assert_values VALID_TREE_PARAM_VALUES, 'tree'
+      end
 
-      post_request("/repos/#{user}/#{repo}/git/trees", params)
+      post_request("/repos/#{user}/#{repo}/git/trees", arguments.params)
     end
 
   end # GitData::Trees

data/lib/github_api/gitignore.rb

@@ -14,10 +14,9 @@ module Github
     #  github.gitignore.list { |template| ... }
     #
     def list(*args)
-      params = args.extract_options!
-      normalize! params
+      arguments(args)
 
-      response = get_request("/gitignore/templates", params)
+      response = get_request("/gitignore/templates", arguments.params)
       return response unless block_given?
       response.each { |el| yield el }
     end
@@ -35,9 +34,8 @@ module Github
     #  github = Github.new
     #  github.gitignore.get "template-name", mime: 'applicatin/vnd.github.raw'
     #
-    def get(name, params={})
-      normalize! params
-      assert_presence_of name
+    def get(*args)
+      params = arguments(args, :required => [:name]).params
 
       if (mime_type = params.delete('mime'))
         options = { :raw => true, :headers => {'Accept' => mime_type} }

data/lib/github_api/issues.rb

@@ -134,8 +134,9 @@ module Github
     #    :direction => 'asc'
     #
     def list(*args)
-      params = args.extract_options!
-      normalize! params
+      params = arguments(args) do
+        assert_values VALID_ISSUE_PARAM_VALUES
+      end.params
       # filter! VALID_ISSUE_PARAM_NAMES, params
       # _merge_mime_type(:issue, params)
       # assert_valid_values(VALID_ISSUE_PARAM_VALUES, params)
@@ -159,14 +160,14 @@ module Github
 
     # List issues for a repository
     #
-    def list_repo(user_name, repo_name, params)
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo
-
-      filter! VALID_ISSUE_PARAM_NAMES, params
-      assert_valid_values(VALID_ISSUE_PARAM_VALUES, params)
+    # def list_repo(user_name, repo_name, params)
+    def list_repo(*args)
+      arguments(args, :required => [:user, :repo]) do
+        sift VALID_ISSUE_PARAM_NAMES
+        assert_values VALID_ISSUE_PARAM_VALUES
+      end
 
-      get_request("/repos/#{user}/#{repo}/issues", params)
+      get_request("/repos/#{user}/#{repo}/issues", arguments.params)
     end
     private :list_repo
 
@@ -176,14 +177,10 @@ module Github
     #  github = Github.new
     #  github.issues.get 'user-name', 'repo-name', 'issue-id'
     #
-    def get(user_name, repo_name, issue_id, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo, issue_id
+    def get(*args)
+      arguments(args, :required => [:user, :repo, :issue_id])
 
-      normalize! params
-      # _merge_mime_type(:issue, params)
-
-      get_request("/repos/#{user}/#{repo}/issues/#{issue_id}", params)
+      get_request("/repos/#{user}/#{repo}/issues/#{issue_id}", arguments.params)
     end
     alias :find :get
 
@@ -207,16 +204,13 @@ module Github
     #      "Label2"
     #    ]
     #
-    def create(user_name, repo_name, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo
-
-      normalize! params
-      # _merge_mime_type(:issue, params)
-      filter! VALID_ISSUE_PARAM_NAMES, params
-      assert_required_keys(%w[ title ], params)
+    def create(*args)
+      arguments(args, :required => [:user, :repo]) do
+        sift VALID_ISSUE_PARAM_NAMES
+        assert_required %w[ title ]
+      end
 
-      post_request("/repos/#{user}/#{repo}/issues", params)
+      post_request("/repos/#{user}/#{repo}/issues", arguments.params)
     end
 
     # Edit an issue
@@ -241,13 +235,11 @@ module Github
     #      "Label2"
     #    ]
     #
-    def edit(user_name, repo_name, issue_id, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo, issue_id
-
-      normalize! params
-      # _merge_mime_type(:issue, params)
-      filter! VALID_ISSUE_PARAM_NAMES, params
+    def edit(*args)
+      arguments(args, :required => [:user, :repo, :issue_id]) do
+        sift VALID_ISSUE_PARAM_NAMES
+      end
+      params = arguments.params
 
       patch_request("/repos/#{user}/#{repo}/issues/#{issue_id}", params)
     end

data/lib/github_api/issues/assignees.rb

@@ -11,11 +11,11 @@ module Github
     #  Github.issues.assignees.list 'user', 'repo'
     #  Github.issues.assignees.list 'user', 'repo' { |assignee| ... }
     #
-    def list(user_name, repo_name, params={})
-      assert_presence_of user_name, repo_name
-      normalize! params
+    def list(*args)
+      arguments(args, :required => [:user, :repo])
+      params = arguments.params
 
-      response = get_request("/repos/#{user_name}/#{repo_name}/assignees", params)
+      response = get_request("/repos/#{user}/#{repo}/assignees", params)
       return response unless block_given?
       response.each { |el| yield el }
     end
@@ -27,11 +27,14 @@ module Github
     #
     #  Github.issues.assignees.check 'user', 'repo', 'assignee'
     #
-    def check(user_name, repo_name, assignee, params={})
-      assert_presence_of user_name, repo_name, assignee
-      normalize! params
+    #  github = Github.new user: 'user-name', repo: 'repo-name'
+    #  github.issues.assignees.check 'assignee'
+    #
+    def check(*args)
+      arguments(args, :required => [:user, :repo, :assignee])
+      params = arguments.params
 
-      get_request("/repos/#{user_name}/#{repo_name}/assignees/#{assignee}",params)
+      get_request("/repos/#{user}/#{repo}/assignees/#{assignee}",params)
       true
     rescue Github::Error::NotFound
       false

data/lib/github_api/issues/comments.rb

@@ -30,10 +30,9 @@ module Github
     #  github.issues.comments.all 'user-name', 'repo-name'
     #  github.issues.comments.all 'user-name', 'repo-name' {|com| .. }
     #
-    def list(user_name, repo_name, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo
-      normalize! params
+    def list(*args)
+      arguments(args, :required => [:user, :repo])
+      params = arguments.params
 
       response = if (issue_id = params.delete('issue_id'))
         get_request("/repos/#{user}/#{repo}/issues/#{issue_id}/comments", params)
@@ -51,10 +50,9 @@ module Github
     #  github = Github.new
     #  github.issues.comments.find 'user-name', 'repo-name', 'comment-id'
     #
-    def get(user_name, repo_name, comment_id, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo, comment_id
-      normalize! params
+    def get(*args)
+      arguments(args, :required => [:user, :repo, :comment_id])
+      params = arguments.params
 
       get_request("/repos/#{user}/#{repo}/issues/comments/#{comment_id}", params)
     end
@@ -70,13 +68,12 @@ module Github
     #  github.issues.comments.create 'user-name', 'repo-name', 'issue-id',
     #     'body': 'a new comment'
     #
-    def create(user_name, repo_name, issue_id, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo, issue_id
-
-      normalize! params
-      filter! VALID_ISSUE_COMMENT_PARAM_NAME, params
-      assert_required_keys(%w[ body ], params)
+    def create(*args)
+      arguments(args, :required => [:user, :repo, :issue_id]) do
+        sift VALID_ISSUE_COMMENT_PARAM_NAME
+        assert_required %w[ body ]
+      end
+      params = arguments.params
 
       post_request("/repos/#{user}/#{repo}/issues/#{issue_id}/comments", params)
     end
@@ -91,13 +88,12 @@ module Github
     #  github.issues.comments.edit 'user-name', 'repo-name', 'comment-id',
     #     'body': 'a new comment'
     #
-    def edit(user_name, repo_name, comment_id, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo, comment_id
-
-      normalize! params
-      filter! VALID_ISSUE_COMMENT_PARAM_NAME, params
-      assert_required_keys(%w[ body ], params)
+    def edit(*args)
+      arguments(args, :required => [:user, :repo, :comment_id]) do
+        sift VALID_ISSUE_COMMENT_PARAM_NAME
+        assert_required %w[ body ]
+      end
+      params = arguments.params
 
       patch_request("/repos/#{user}/#{repo}/issues/comments/#{comment_id}", params)
     end
@@ -108,10 +104,9 @@ module Github
     #  github = Github.new
     #  github.issues.comments.delete 'user-name', 'repo-name', 'comment-id'
     #
-    def delete(user_name, repo_name, comment_id, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo, comment_id
-      normalize! params
+    def delete(*args)
+      arguments(args, :required => [:user, :repo, :comment_id])
+      params = arguments.params
 
       delete_request("/repos/#{user}/#{repo}/issues/comments/#{comment_id}", params)
     end

data/lib/github_api/issues/events.rb

@@ -15,10 +15,9 @@ module Github
     #  github = Github.new
     #  github.issues.events.list 'user-name', 'repo-name'
     #
-    def list(user_name, repo_name, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo
-      normalize! params
+    def list(*args)
+      arguments(args, :required => [:user, :repo])
+      params = arguments.params
 
       response = if (issue_id = params.delete('issue_id'))
         get_request("/repos/#{user}/#{repo}/issues/#{issue_id}/events", params)
@@ -36,12 +35,11 @@ module Github
     #  github = Github.new
     #  github.issues.events.get 'user-name', 'repo-name', 'event-id'
     #
-    def get(user_name, repo_name, event_id, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo, event_id
-      normalize! params
+    def get(*args)
+      arguments(args, :required => [:user, :repo, :event_id])
+      params = arguments.params
 
-      get_request("/repos/#{user}/#{repo}/issues/events/#{event_id}")
+      get_request("/repos/#{user}/#{repo}/issues/events/#{event_id}", params)
     end
     alias :find :get
 

data/lib/github_api/issues/labels.rb

@@ -21,13 +21,12 @@ module Github
     # List labels on an issue
     #
     # = Examples
-    #  @github = Github.new
-    #  @github.issues.labels.list 'user-name', 'repo-name', issue_id: 'issue-id'
+    #  github = Github.new
+    #  github.issues.labels.list 'user-name', 'repo-name', issue_id: 'issue-id'
     #
-    def list(user_name, repo_name, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo
-      normalize! params
+    def list(*args)
+      arguments(args, :required => [:user, :repo])
+      params = arguments.params
 
       response = if (milestone_id = params.delete('milestone_id'))
         get_request("/repos/#{user}/#{repo}/milestones/#{milestone_id}/labels", params)
@@ -47,10 +46,12 @@ module Github
     #  github = Github.new
     #  github.issues.labels.find 'user-name', 'repo-name', 'label-name'
     #
-    def get(user_name, repo_name, label_name, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo, label_name
-      normalize! params
+    #  github = Github.new user: 'user-name', repo: 'repo-name'
+    #  github.issues.labels.get label_name: 'bug'
+    #
+    def get(*args)
+      arguments(args, :required => [:user, :repo, :label_name])
+      params = arguments.params
 
       get_request("/repos/#{user}/#{repo}/labels/#{label_name}", params)
     end
@@ -66,15 +67,13 @@ module Github
     #  github = Github.new user: 'user-name', repo: 'repo-name'
     #  github.issues.labels.create name: 'API', color: 'FFFFFF'
     #
-    def create(user_name, repo_name, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo
-
-      normalize! params
-      filter! VALID_LABEL_INPUTS, params
-      assert_required_keys(VALID_LABEL_INPUTS, params)
+    def create(*args)
+      arguments(args, :required => [:user, :repo]) do
+        sift VALID_LABEL_INPUTS
+        assert_required VALID_LABEL_INPUTS
+      end
 
-      post_request("/repos/#{user}/#{repo}/labels", params)
+      post_request("/repos/#{user}/#{repo}/labels", arguments.params)
     end
 
     # Update a label
@@ -84,19 +83,17 @@ module Github
     #  <tt>:color</tt> - Required string-6 character hex code, without leading #
     #
     # = Examples
-    #  @github = Github.new
-    #  @github.issues.labels.update 'user-name', 'repo-name', 'label-name',
+    #  github = Github.new
+    #  github.issues.labels.update 'user-name', 'repo-name', 'label-name',
     #    name: 'API', color: "FFFFFF"
     #
-    def update(user_name, repo_name, label_name, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo, label_name
-
-      normalize! params
-      filter! VALID_LABEL_INPUTS, params
-      assert_required_keys(VALID_LABEL_INPUTS, params)
+    def update(*args)
+      arguments(args, :required => [:user, :repo, :label_name]) do
+        sift VALID_LABEL_INPUTS
+        assert_required VALID_LABEL_INPUTS
+      end
 
-      patch_request("/repos/#{user}/#{repo}/labels/#{label_name}", params)
+      patch_request("/repos/#{user}/#{repo}/labels/#{label_name}", arguments.params)
     end
     alias :edit :update
 
@@ -106,14 +103,10 @@ module Github
     #  github = Github.new
     #  github.issues.labels.delete 'user-name', 'repo-name', 'label-name'
     #
-    def delete(user_name, repo_name, label_name, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo
-
-      assert_presence_of label_name
-      normalize! params
+    def delete(*args)
+      arguments(args, :required => [:user, :repo, :label_name])
 
-      delete_request("/repos/#{user}/#{repo}/labels/#{label_name}", params)
+      delete_request("/repos/#{user}/#{repo}/labels/#{label_name}", arguments.params)
     end
 
     # Add labels to an issue
@@ -122,13 +115,10 @@ module Github
     #  github = Github.new
     #  github.issues.labels.add 'user-name', 'repo-name', 'issue-id', 'label1', 'label2', ...
     #
-    def add(user_name, repo_name, issue_id, *args)
-      params = args.extract_options!
-      params['data'] = args unless args.empty?
-
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo, issue_id
-      normalize! params
+    def add(*args)
+      arguments(args, :required => [:user, :repo, :issue_id])
+      params = arguments.params
+      params['data'] = arguments.remaining unless arguments.remaining.empty?
 
       post_request("/repos/#{user}/#{repo}/issues/#{issue_id}/labels", params)
     end
@@ -146,10 +136,9 @@ module Github
     #  github = Github.new
     #  github.issues.labels.remove 'user-name', 'repo-name', 'issue-id'
     #
-    def remove(user_name, repo_name, issue_id, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo, issue_id
-      normalize! params
+    def remove(*args)
+      arguments(args, :required => [:user, :repo, :issue_id])
+      params = arguments.params
 
       if (label_name = params.delete('label_name'))
         delete_request("/repos/#{user}/#{repo}/issues/#{issue_id}/labels/#{label_name}", params)
@@ -166,13 +155,10 @@ module Github
     #  github = Github.new
     #  github.issues.labels.replace 'user-name', 'repo-name', 'issue-id', 'label1', 'label2', ...
     #
-    def replace(user_name, repo_name, issue_id, *args)
-      params = args.extract_options!
-      params['data'] = args unless args.empty?
-
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo, issue_id
-      normalize! params
+    def replace(*args)
+      arguments(args, :required => [:user, :repo, :issue_id])
+      params = arguments.params
+      params['data'] = arguments.remaining unless arguments.remaining.empty?
 
       put_request("/repos/#{user}/#{repo}/issues/#{issue_id}/labels", params)
     end