Skip to content

Commit

Permalink
Revert "rename gh-user to gh-user-stub"
Browse files Browse the repository at this point in the history
This reverts commit 288a139.

Conflicts:
	gh-repos.el
  • Loading branch information
sigma committed Nov 27, 2013
1 parent f3171ca commit ecabbfc
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions gh-common.el
Expand Up @@ -60,14 +60,14 @@


(defmethod gh-object-read-into ((obj gh-object) data)) (defmethod gh-object-read-into ((obj gh-object) data))


(defclass gh-user-stub (gh-object) (defclass gh-user (gh-object)
((login :initarg :login) ((login :initarg :login)
(id :initarg :id) (id :initarg :id)
(gravatar-url :initarg :gravatar-url) (gravatar-url :initarg :gravatar-url)
(url :initarg :url)) (url :initarg :url))
"Github user object") "Github user object")


(defmethod gh-object-read-into ((user gh-user-stub) data) (defmethod gh-object-read-into ((user gh-user) data)
(call-next-method) (call-next-method)
(with-slots (login id gravatar-url url) (with-slots (login id gravatar-url url)
user user
Expand Down
2 changes: 1 addition & 1 deletion gh-gist.el
Expand Up @@ -73,7 +73,7 @@
(history :initarg :history :initform nil) (history :initarg :history :initform nil)
(forks :initarg :forks :initform nil) (forks :initarg :forks :initform nil)


(user-cls :allocation :class :initform gh-user-stub)) (user-cls :allocation :class :initform gh-user))
"Gist object") "Gist object")


(defmethod gh-object-read-into ((gist gh-gist-gist) data) (defmethod gh-object-read-into ((gist gh-gist-gist) data)
Expand Down
4 changes: 2 additions & 2 deletions gh-issues.el
Expand Up @@ -64,7 +64,7 @@
(created_at :initarg :created_at) (created_at :initarg :created_at)
(due_on :initarg :due_on) (due_on :initarg :due_on)


(user-cls :allocation :class :initform gh-user-stub) (user-cls :allocation :class :initform gh-user)
(milestone-cls :allocation :class :initform gh-issues-milestone)) (milestone-cls :allocation :class :initform gh-issues-milestone))
"issues request") "issues request")


Expand All @@ -85,7 +85,7 @@
(created_at :initarg :created_at) (created_at :initarg :created_at)
(due_on :initarg :due_on) (due_on :initarg :due_on)


(user-cls :allocation :class :initform gh-user-stub)) (user-cls :allocation :class :initform gh-user))
"github milestone") "github milestone")


(defmethod gh-object-read-into ((issue gh-issues-issue) data) (defmethod gh-object-read-into ((issue gh-issues-issue) data)
Expand Down
2 changes: 1 addition & 1 deletion gh-pulls.el
Expand Up @@ -100,7 +100,7 @@
(base :initarg :base :initform nil) (base :initarg :base :initform nil)


(ref-cls :allocation :class :initform gh-repos-ref) (ref-cls :allocation :class :initform gh-repos-ref)
(user-cls :allocation :class :initform gh-user-stub)) (user-cls :allocation :class :initform gh-user))
"Git pull requests API") "Git pull requests API")


(defmethod gh-object-read-into ((req gh-pulls-request) data) (defmethod gh-object-read-into ((req gh-pulls-request) data)
Expand Down
10 changes: 5 additions & 5 deletions gh-repos.el
Expand Up @@ -39,7 +39,7 @@
;;;###autoload ;;;###autoload
(defclass gh-repos-api (gh-api-v3) (defclass gh-repos-api (gh-api-v3)
((repo-cls :allocation :class :initform gh-repos-repo) ((repo-cls :allocation :class :initform gh-repos-repo)
(user-cls :allocation :class :initform gh-user-stub)) (user-cls :allocation :class :initform gh-user))
"Repos API") "Repos API")


;;;###autoload ;;;###autoload
Expand Down Expand Up @@ -90,8 +90,8 @@
(has-wiki :initarg :has-wiki) (has-wiki :initarg :has-wiki)
(has-downloads :initarg :has-downloads) (has-downloads :initarg :has-downloads)


(owner-cls :allocation :class :initform gh-user-stub) (owner-cls :allocation :class :initform gh-user)
(organisation-cls :allocation :class :initform gh-user-stub) (organisation-cls :allocation :class :initform gh-user)
(parent-cls :allocation :class :initform gh-repos-repo) (parent-cls :allocation :class :initform gh-repos-repo)
(source-cls :allocation :class :initform gh-repos-repo)) (source-cls :allocation :class :initform gh-repos-repo))
"Class for GitHub repositories") "Class for GitHub repositories")
Expand All @@ -110,7 +110,7 @@
(when (string-match "^\\([^/]+\\)/\\([^/]+\\)$" newname) (when (string-match "^\\([^/]+\\)/\\([^/]+\\)$" newname)
(setq login (match-string 1 newname) (setq login (match-string 1 newname)
name (match-string 2 newname) name (match-string 2 newname)
owner (gh-user-stub login :login login)) owner (gh-user login :login login))
(oset obj object-name name)))) (oset obj object-name name))))
obj)) obj))


Expand Down Expand Up @@ -163,7 +163,7 @@
(user :initarg :user :initform nil) (user :initarg :user :initform nil)
(repo :initarg :repo :initform nil) (repo :initarg :repo :initform nil)


(user-cls :allocation :class :initform gh-user-stub) (user-cls :allocation :class :initform gh-user)
(repo-cls :allocation :class :initform gh-repos-repo))) (repo-cls :allocation :class :initform gh-repos-repo)))


(defmethod gh-object-read-into ((r gh-repos-ref) data) (defmethod gh-object-read-into ((r gh-repos-ref) data)
Expand Down
2 changes: 1 addition & 1 deletion gh-users.el
Expand Up @@ -42,7 +42,7 @@
"Users API") "Users API")


;;;###autoload ;;;###autoload
(defclass gh-users-user (gh-user-stub) (defclass gh-users-user (gh-user)
((gravatar-id :initarg :gravatar-id) ((gravatar-id :initarg :gravatar-id)
(html-url :initarg :html-url) (html-url :initarg :html-url)
(followers-url :initarg :followers-url) (followers-url :initarg :followers-url)
Expand Down

0 comments on commit ecabbfc

Please sign in to comment.