lib/github_api/activity/events.rb in github_api-0.9.0 vs lib/github_api/activity/events.rb in github_api-0.9.1

@@ -8,14 +8,14 @@
     # = Examples
     #  github = Github.new
     #  github.activity.events.public
     #  github.activity.events.public { |event| ... }
     #
-    def public(params={})
-      normalize! params
+    def public(*args)
+      arguments(args)
 
-      response = get_request("/events", params)
+      response = get_request("/events", arguments.params)
       return response unless block_given?
       response.each { |el| yield el }
     end
     alias :public_events :public
     alias :list_public :public
@@ -26,16 +26,17 @@
     # = Examples
     #  github = Github.new
     #  github.activity.events.repository 'user-name', 'repo-name'
     #  github.activity.events.repository 'user-name', 'repo-name' { |event| ... }
     #
-    def repository(user_name, repo_name, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo
-      normalize! params
+    #  github.events.repository user: 'user-name', repo: 'repo-name'
+    #  github.events.repository user: 'user-name', repo: 'repo-name' {|event| ... }
+    #
+    def repository(*args)
+      arguments(args, :required => [:user, :repo])
 
-      response = get_request("/repos/#{user}/#{repo}/events", params)
+      response = get_request("/repos/#{user}/#{repo}/events", arguments.params)
       return response unless block_given?
       response.each { |el| yield el }
     end
     alias :repos :repository
     alias :repo_events :repository
@@ -47,14 +48,16 @@
     # = Examples
     #  github = Github.new
     #  github.activity.events.issue 'user-name', 'repo-name'
     #  github.activity.events.issue 'user-name', 'repo-name' { |event| ... }
     #
-    def issue(user_name, repo_name, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo
-      normalize! params
+    #  github.events.issue user: 'user-name', repo: 'repo-name'
+    #  github.events.issue user: 'user-name', repo: 'repo-name' { |event| ... }
+    #
+    def issue(*args)
+      arguments(args, :required => [:user, :repo])
+      params = arguments.params
 
       response = get_request("/repos/#{user}/#{repo}/issues/events", params)
       return response unless block_given?
       response.each { |el| yield el }
     end
@@ -67,16 +70,17 @@
     # = Examples
     #  github = Github.new
     #  github.activity.events.network 'user-name', 'repo-name'
     #  github.activity.events.network 'user-name', 'repo-name' { |event| ... }
     #
-    def network(user_name, repo_name, params={})
-      set :user => user_name, :repo => repo_name
-      assert_presence_of user, repo
-      normalize! params
+    #  github.events.network user: 'user-name', repo: 'repo-name'
+    #  github.events.network user: 'user-name', repo: 'repo-name' { |event| ... }
+    #
+    def network(*args)
+      arguments(args, :required => [:user, :repo])
 
-      response = get_request("/networks/#{user}/#{repo}/events", params)
+      response = get_request("/networks/#{user}/#{repo}/events", arguments.params)
       return response unless block_given?
       response.each { |el| yield el }
     end
     alias :repo_network :network
     alias :repository_network :network
@@ -88,15 +92,17 @@
     # = Examples
     #  github = Github.new
     #  github.activity.events.org 'org-name'
     #  github.activity.events.org 'org-name' { |event| ... }
     #
-    def org(org_name, params={})
-      assert_presence_of org_name
-      normalize! params
+    #  github.events.org org: 'org-name'
+    #  github.events.org org: 'org-name' { |event| ... }
+    #
+    def org(*args)
+      arguments(args, :required => [:org_name])
 
-      response = get_request("/orgs/#{org_name}/events", params)
+      response = get_request("/orgs/#{org_name}/events", arguments.params)
       return response unless block_given?
       response.each { |el| yield el }
     end
     alias :organization :org
     alias :list_orgs :org
@@ -119,20 +125,20 @@
     # = Examples
     #  github = Github.new
     #  github.activity.events.received 'user-name', :public => true
     #  github.activity.events.received 'user-name', :public => true { |event| ... }
     #
-    def received(user_name, params={})
-      assert_presence_of user_name
-      normalize! params
+    def received(*args)
+      arguments(args, :required => [:user])
+      params = arguments.params
 
       public_events = if params['public']
         params.delete('public')
         '/public'
       end
 
-      response = get_request("/users/#{user_name}/received_events#{public_events}", params)
+      response = get_request("/users/#{user}/received_events#{public_events}", params)
       return response unless block_given?
       response.each { |el| yield el }
     end
     alias :user_received :received
     alias :list_user_received :received
@@ -152,20 +158,20 @@
     # = Examples
     #  github = Github.new
     #  github.activity.events.performed 'user-name', :public => true
     #  github.activity.events.performed 'user-name', :public => true { |event| ... }
     #
-    def performed(user_name, params={})
-      assert_presence_of user_name
-      normalize! params
+    def performed(*args)
+      arguments(args, :required => [:user])
+      params = arguments.params
 
       public_events = if params['public']
         params.delete('public')
         '/public'
       end
 
-      response = get_request("/users/#{user_name}/events#{public_events}", params)
+      response = get_request("/users/#{user}/events#{public_events}", params)
       return response unless block_given?
       response.each { |el| yield el }
     end
     alias :user_performed :performed
     alias :list_user_performed :performed
@@ -178,14 +184,17 @@
     # = Examples
     #  github = Github.new
     #  github.activity.events.user_org 'user-name', 'org-name'
     #  github.activity.events.user_org 'user-name', 'org-name' { |event| ... }
     #
-    def user_org(user_name, org_name, params={})
-      assert_presence_of user_name, org_name
-      normalize! params
+    #  github.events.user_org user: 'user-name', org_name: 'org-name'
+    #  github.events.user_org user: 'user-name', org_name: 'org-name' {|event| ...}
+    #
+    def user_org(*args)
+      arguments(args, :required => [:user, :org_name])
+      params = arguments.params
 
-      response = get_request("/users/#{user_name}/events/orgs/#{org_name}", params)
+      response = get_request("/users/#{user}/events/orgs/#{org_name}", params)
       return response unless block_given?
       response.each { |el| yield el }
     end
     alias :user_organization :user_org
     alias :list_user_org :user_org