Change users to client namespace.

piotrmurach · piotrmurach · commit dd9ad1000cc9 · 2014-04-19T22:23:14.000+01:00
diff --git a/features/github_api.feature b/features/github_api.feature
@@ -47,7 +47,7 @@ Feature: Github API components
   Scenario: Accessing users API
     Given I have github instance
     When  I fetch "users"
-    Then  I will have access to "Github::Users" API
+    Then  I will have access to "Github::Client::Users" API
 
   Scenario: Accessing activity API
     Given I have github instance
diff --git a/features/users.feature b/features/users.feature
@@ -1,7 +1,7 @@
 Feature: Users API
 
   Background:
-    Given I have "Github::Users" instance
+    Given I have "Github::Client::Users" instance
 
   Scenario: List all users
 
diff --git a/features/users/emails.feature b/features/users/emails.feature
@@ -5,7 +5,7 @@ Feature: Accessing Users Emails API
   Should return the expected results depending on passed parameters
 
   Background:
-    Given I have "Github::Users::Emails" instance
+    Given I have "Github::Client::Users::Emails" instance
 
   Scenario: Lists all emails for the authenticated user
 
diff --git a/features/users/keys.feature b/features/users/keys.feature
@@ -5,7 +5,7 @@ Feature: Accessing Users Keys API
   Should return the expected results depending on passed parameters
 
   Background:
-    Given I have "Github::Users::Keys" instance
+    Given I have "Github::Client::Users::Keys" instance
 
   Scenario: Lists all public keys for a user
 
diff --git a/lib/github_api/client.rb b/lib/github_api/client.rb
@@ -13,15 +13,15 @@ class Client < API
       'issues',
       'markdown',
       'meta',
-      'orgs'
+      'orgs',
+      'users'
 
     require_all 'github_api',
       'pull_requests',
       'repos',
       'say',
       'scopes',
-      'search',
-      'users'
+      'search'
 
     # Serving up the ‘social’ in Social Coding™, the Activity APIs
     # provide access to notifications, subscriptions, and timelines.
@@ -68,8 +68,6 @@ class Client < API
 
     # Many of the resources on the users API provide a shortcut for getting
     # information about the currently authenticated user.
-    #
-    namespace :users, root: true
-
+    namespace :users
   end # Client
 end # Github
diff --git a/lib/github_api/client/users.rb b/lib/github_api/client/users.rb
@@ -1,10 +1,9 @@
 # encoding: utf-8
 
 module Github
-  class Users < API
-
+  class Client::Users < API
     # Load all the modules after initializing Repos to avoid superclass mismatch
-    require_all 'github_api/users',
+    require_all 'github_api/client/users',
       'emails',
       'followers',
       'keys'
diff --git a/lib/github_api/client/users/emails.rb b/lib/github_api/client/users/emails.rb
@@ -2,7 +2,7 @@
 require 'cgi'
 
 module Github
-  class Users::Emails < API
+  class Client::Users::Emails < API
 
     # List email addresses for the authenticated user
     #
diff --git a/lib/github_api/client/users/followers.rb b/lib/github_api/client/users/followers.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module Github
-  class Users::Followers < API
+  class Client::Users::Followers < API
 
     # List a user's followers
     #
diff --git a/lib/github_api/client/users/keys.rb b/lib/github_api/client/users/keys.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module Github
-  class Users::Keys < API
+  class Client::Users::Keys < API
 
     VALID_KEY_PARAM_NAMES = %w[ title key ].freeze
 
diff --git a/spec/github/client/users/emails/add_spec.rb b/spec/github/client/users/emails/add_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Users::Emails, '#add' do
+describe Github::Client::Users::Emails, '#add' do
   let(:email) { "octocat@github.com" }
   let(:request_path) { "/user/emails" }
 
diff --git a/spec/github/client/users/emails/delete_spec.rb b/spec/github/client/users/emails/delete_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Users::Emails, '#list' do
+describe Github::Client::Users::Emails, '#list' do
   let(:email) { "octocat@github.com" }
   let(:request_path) { "/user/emails" }
 
diff --git a/spec/github/client/users/emails/list_spec.rb b/spec/github/client/users/emails/list_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Users::Emails, '#list' do
+describe Github::Client::Users::Emails, '#list' do
   let(:email) { "octocat@github.com" }
   let(:request_path) { "/user/emails" }
 
diff --git a/spec/github/client/users/followers/follow_spec.rb b/spec/github/client/users/followers/follow_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Users::Followers, '#follow' do
+describe Github::Client::Users::Followers, '#follow' do
   let(:request_path) { "/user/following/#{user}" }
   let(:user)   { 'peter-murach' }
   let(:body) { '[]' }
diff --git a/spec/github/client/users/followers/following_spec.rb b/spec/github/client/users/followers/following_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Users::Followers, '#following' do
+describe Github::Client::Users::Followers, '#following' do
   let(:user)   { 'peter-murach' }
   let(:request_path) { "/users/#{user}/following" }
 
diff --git a/spec/github/client/users/followers/is_following_spec.rb b/spec/github/client/users/followers/is_following_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Users::Followers, '#following?' do
+describe Github::Client::Users::Followers, '#following?' do
   let(:request_path) { "/user/following/#{user}" }
   let(:user)   { 'peter-murach' }
   let(:body) { '[]' }
diff --git a/spec/github/client/users/followers/list_spec.rb b/spec/github/client/users/followers/list_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Users::Followers, '#list' do
+describe Github::Client::Users::Followers, '#list' do
   let(:user)   { 'peter-murach' }
   let(:request_path) { "/users/#{user}/followers" }
 
diff --git a/spec/github/client/users/followers/unfollow_spec.rb b/spec/github/client/users/followers/unfollow_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Users::Followers, '#unfollow' do
+describe Github::Client::Users::Followers, '#unfollow' do
   let(:request_path) { "/user/following/#{user}" }
   let(:user)   { 'peter-murach' }
   let(:body) { '[]' }
diff --git a/spec/github/client/users/get_spec.rb b/spec/github/client/users/get_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Users, '#get' do
+describe Github::Client::Users, '#get' do
   let(:user) { 'peter-murach' }
   let(:request_path) { "/users/#{user}" }
 
diff --git a/spec/github/client/users/keys/create_spec.rb b/spec/github/client/users/keys/create_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Users::Keys, '#create' do
+describe Github::Client::Users::Keys, '#create' do
   let(:request_path) { "/user/keys" }
 
   before {
diff --git a/spec/github/client/users/keys/delete_spec.rb b/spec/github/client/users/keys/delete_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Users::Keys, '#delete' do
+describe Github::Client::Users::Keys, '#delete' do
   let(:key_id) { 1 }
   let(:request_path) { "/user/keys/#{key_id}" }
 
diff --git a/spec/github/client/users/keys/get_spec.rb b/spec/github/client/users/keys/get_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Users::Keys, '#get' do
+describe Github::Client::Users::Keys, '#get' do
   let(:key_id) { 1 }
   let(:request_path) { "/user/keys/#{key_id}" }
 
diff --git a/spec/github/client/users/keys/list_spec.rb b/spec/github/client/users/keys/list_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Users::Keys, '#list' do
+describe Github::Client::Users::Keys, '#list' do
   let(:key_id) { 1 }
 
   before {
@@ -74,5 +74,4 @@
       yielded.should == result
     end
   end
-
 end # list
diff --git a/spec/github/client/users/keys/update_spec.rb b/spec/github/client/users/keys/update_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Users::Keys, '#update' do
+describe Github::Client::Users::Keys, '#update' do
   let(:key_id) { 1 }
   let(:request_path) { "/user/keys/#{key_id}" }
 
diff --git a/spec/github/client/users/list_spec.rb b/spec/github/client/users/list_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Users, '#list' do
+describe Github::Client::Users, '#list' do
   let(:request_path) { "/users" }
 
   before {
diff --git a/spec/github/client/users/update_spec.rb b/spec/github/client/users/update_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Users, '#update' do
+describe Github::Client::Users, '#update' do
   let(:key_id) { 1 }
   let(:request_path) { "/user" }
 
diff --git a/spec/github/client_spec.rb b/spec/github/client_spec.rb
@@ -29,5 +29,5 @@
 
   it { expect(client.repos).to be_a Github::Repos }
 
-  it { expect(client.users).to be_a Github::Users }
+  it { expect(client.users).to be_a Github::Client::Users }
 end
diff --git a/spec/integration/users_spec.rb b/spec/integration/users_spec.rb
@@ -2,15 +2,15 @@
 
 require 'spec_helper'
 
-describe Github::Users, 'integration' do
+describe Github::Client::Users, 'integration' do
 
   after { reset_authentication_for subject }
 
   it_should_behave_like 'api interface'
 
-  its(:emails)    { should be_a Github::Users::Emails }
+  its(:emails)    { should be_a Github::Client::Users::Emails }
 
-  its(:followers) { should be_a Github::Users::Followers }
+  its(:followers) { should be_a Github::Client::Users::Followers }
 
-  its(:keys)      { should be_a Github::Users::Keys }
+  its(:keys)      { should be_a Github::Client::Users::Keys }
 end

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`require 'cgi'`
`3`	`3`
`4`	`4`	`module Github`
`5`		`- class Users::Emails < API`
	`5`	`+ class Client::Users::Emails < API`
`6`	`6`
`7`	`7`	`# List email addresses for the authenticated user`
`8`	`8`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`# encoding: utf-8`
`2`	`2`
`3`	`3`	`module Github`
`4`		`- class Users::Followers < API`
	`4`	`+ class Client::Users::Followers < API`
`5`	`5`
`6`	`6`	`# List a user's followers`
`7`	`7`	`#`