{"action":"created","comment":{"url":"https://api.github.com/repos/framgia/fels_65/pulls/comments/33556216","id":33556216,"diff_hunk":"@@ -30,22 +39,67 @@ def User.new_token\n     SecureRandom.urlsafe_base64\n   end\n \n+  def authenticated?(attribute, token)\n+    digest = send(\"#{attribute}_digest\")\n+    return false if digest.nil?\n+    BCrypt::Password.new(digest).is_password? token\n+  end\n+\n   def remember\n     self.remember_token = User.new_token\n-    update_attribute(:remember_digest, User.digest(remember_token))\n+    update_attributes :remember_digest, User.digest(remember_token)\n   end\n \n   def forget\n-    update_attribute(:remember_digest, nil)\n+    update_attributes :remember_token, nil\n+  end\n+\n+  def follow other_user\n+    active_relationships.create followed_id: other_user.id\n   end\n \n-  def authenticated? remember_token\n-    return false if remember_digest.nil?\n-    BCrypt::Password.new(remember_digest).is_password?(remember_token)\n+  def unfollow other_user\n+    active_relationships.find_by(followed_id: other_user.id).destroy\n   end\n-  \n+\n+  def following? other_user\n+    following.include? other_user\n+  end\n+\n+  def activate\n+    update_attributes :activated, true\n+    update_attributes :activated_at, Time.zone.now\n+  end\n+\n+  def password_reset_expired?\n+    reset_at < Settings.reset_pass_expered_in_hour.hours.ago\n+  end\n+\n+  def send_password_reset_email\n+    UserMailer.password_reset(self).deliver_now\n+  end\n+\n+  def create_reset_digest\n+    self.reset_token = User.new_token\n+    update_attributes :reset_digest, User.digest(reset_token)\n+    update_attributes :reset_at, Time.zone.now","path":"app/models/user.rb","position":100,"original_position":100,"commit_id":"9ffc701d455cc76edc95724a41cdd3e4a68e7f8b","original_commit_id":"9ffc701d455cc76edc95724a41cdd3e4a68e7f8b","user":{"login":"dieunb","id":2122175,"avatar_url":"https://avatars.githubusercontent.com/u/2122175?v=3","gravatar_id":"","url":"https://api.github.com/users/dieunb","html_url":"https://github.com/dieunb","followers_url":"https://api.github.com/users/dieunb/followers","following_url":"https://api.github.com/users/dieunb/following{/other_user}","gists_url":"https://api.github.com/users/dieunb/gists{/gist_id}","starred_url":"https://api.github.com/users/dieunb/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dieunb/subscriptions","organizations_url":"https://api.github.com/users/dieunb/orgs","repos_url":"https://api.github.com/users/dieunb/repos","events_url":"https://api.github.com/users/dieunb/events{/privacy}","received_events_url":"https://api.github.com/users/dieunb/received_events","type":"User","site_admin":false},"body":"merge 2 lines code to one line","created_at":"2015-06-30T09:41:29Z","updated_at":"2015-06-30T09:41:29Z","html_url":"https://github.com/framgia/fels_65/pull/8#discussion_r33556216","pull_request_url":"https://api.github.com/repos/framgia/fels_65/pulls/8","_links":{"self":{"href":"https://api.github.com/repos/framgia/fels_65/pulls/comments/33556216"},"html":{"href":"https://github.com/framgia/fels_65/pull/8#discussion_r33556216"},"pull_request":{"href":"https://api.github.com/repos/framgia/fels_65/pulls/8"}}},"pull_request":{"url":"https://api.github.com/repos/framgia/fels_65/pulls/8","id":38849554,"html_url":"https://github.com/framgia/fels_65/pull/8","diff_url":"https://github.com/framgia/fels_65/pull/8.diff","patch_url":"https://github.com/framgia/fels_65/pull/8.patch","issue_url":"https://api.github.com/repos/framgia/fels_65/issues/8","number":8,"state":"open","locked":false,"title":"Signup and update account","user":{"login":"nhs3108","id":10093701,"avatar_url":"https://avatars.githubusercontent.com/u/10093701?v=3","gravatar_id":"","url":"https://api.github.com/users/nhs3108","html_url":"https://github.com/nhs3108","followers_url":"https://api.github.com/users/nhs3108/followers","following_url":"https://api.github.com/users/nhs3108/following{/other_user}","gists_url":"https://api.github.com/users/nhs3108/gists{/gist_id}","starred_url":"https://api.github.com/users/nhs3108/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nhs3108/subscriptions","organizations_url":"https://api.github.com/users/nhs3108/orgs","repos_url":"https://api.github.com/users/nhs3108/repos","events_url":"https://api.github.com/users/nhs3108/events{/privacy}","received_events_url":"https://api.github.com/users/nhs3108/received_events","type":"User","site_admin":false},"body":"","created_at":"2015-06-30T07:31:05Z","updated_at":"2015-06-30T09:41:29Z","closed_at":null,"merged_at":null,"merge_commit_sha":"5d4bf82ae1bb02a32a6ca3169f2f44f58c28aa76","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/framgia/fels_65/pulls/8/commits","review_comments_url":"https://api.github.com/repos/framgia/fels_65/pulls/8/comments","review_comment_url":"https://api.github.com/repos/framgia/fels_65/pulls/comments{/number}","comments_url":"https://api.github.com/repos/framgia/fels_65/issues/8/comments","statuses_url":"https://api.github.com/repos/framgia/fels_65/statuses/9ffc701d455cc76edc95724a41cdd3e4a68e7f8b","head":{"label":"nhs3108:signup_and_change_profile","ref":"signup_and_change_profile","sha":"9ffc701d455cc76edc95724a41cdd3e4a68e7f8b","user":{"login":"nhs3108","id":10093701,"avatar_url":"https://avatars.githubusercontent.com/u/10093701?v=3","gravatar_id":"","url":"https://api.github.com/users/nhs3108","html_url":"https://github.com/nhs3108","followers_url":"https://api.github.com/users/nhs3108/followers","following_url":"https://api.github.com/users/nhs3108/following{/other_user}","gists_url":"https://api.github.com/users/nhs3108/gists{/gist_id}","starred_url":"https://api.github.com/users/nhs3108/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nhs3108/subscriptions","organizations_url":"https://api.github.com/users/nhs3108/orgs","repos_url":"https://api.github.com/users/nhs3108/repos","events_url":"https://api.github.com/users/nhs3108/events{/privacy}","received_events_url":"https://api.github.com/users/nhs3108/received_events","type":"User","site_admin":false},"repo":{"id":38027765,"name":"fels_65","full_name":"nhs3108/fels_65","owner":{"login":"nhs3108","id":10093701,"avatar_url":"https://avatars.githubusercontent.com/u/10093701?v=3","gravatar_id":"","url":"https://api.github.com/users/nhs3108","html_url":"https://github.com/nhs3108","followers_url":"https://api.github.com/users/nhs3108/followers","following_url":"https://api.github.com/users/nhs3108/following{/other_user}","gists_url":"https://api.github.com/users/nhs3108/gists{/gist_id}","starred_url":"https://api.github.com/users/nhs3108/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nhs3108/subscriptions","organizations_url":"https://api.github.com/users/nhs3108/orgs","repos_url":"https://api.github.com/users/nhs3108/repos","events_url":"https://api.github.com/users/nhs3108/events{/privacy}","received_events_url":"https://api.github.com/users/nhs3108/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/nhs3108/fels_65","description":"Framgia E-Learning System (training)","fork":true,"url":"https://api.github.com/repos/nhs3108/fels_65","forks_url":"https://api.github.com/repos/nhs3108/fels_65/forks","keys_url":"https://api.github.com/repos/nhs3108/fels_65/keys{/key_id}","collaborators_url":"https://api.github.com/repos/nhs3108/fels_65/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/nhs3108/fels_65/teams","hooks_url":"https://api.github.com/repos/nhs3108/fels_65/hooks","issue_events_url":"https://api.github.com/repos/nhs3108/fels_65/issues/events{/number}","events_url":"https://api.github.com/repos/nhs3108/fels_65/events","assignees_url":"https://api.github.com/repos/nhs3108/fels_65/assignees{/user}","branches_url":"https://api.github.com/repos/nhs3108/fels_65/branches{/branch}","tags_url":"https://api.github.com/repos/nhs3108/fels_65/tags","blobs_url":"https://api.github.com/repos/nhs3108/fels_65/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/nhs3108/fels_65/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/nhs3108/fels_65/git/refs{/sha}","trees_url":"https://api.github.com/repos/nhs3108/fels_65/git/trees{/sha}","statuses_url":"https://api.github.com/repos/nhs3108/fels_65/statuses/{sha}","languages_url":"https://api.github.com/repos/nhs3108/fels_65/languages","stargazers_url":"https://api.github.com/repos/nhs3108/fels_65/stargazers","contributors_url":"https://api.github.com/repos/nhs3108/fels_65/contributors","subscribers_url":"https://api.github.com/repos/nhs3108/fels_65/subscribers","subscription_url":"https://api.github.com/repos/nhs3108/fels_65/subscription","commits_url":"https://api.github.com/repos/nhs3108/fels_65/commits{/sha}","git_commits_url":"https://api.github.com/repos/nhs3108/fels_65/git/commits{/sha}","comments_url":"https://api.github.com/repos/nhs3108/fels_65/comments{/number}","issue_comment_url":"https://api.github.com/repos/nhs3108/fels_65/issues/comments{/number}","contents_url":"https://api.github.com/repos/nhs3108/fels_65/contents/{+path}","compare_url":"https://api.github.com/repos/nhs3108/fels_65/compare/{base}...{head}","merges_url":"https://api.github.com/repos/nhs3108/fels_65/merges","archive_url":"https://api.github.com/repos/nhs3108/fels_65/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/nhs3108/fels_65/downloads","issues_url":"https://api.github.com/repos/nhs3108/fels_65/issues{/number}","pulls_url":"https://api.github.com/repos/nhs3108/fels_65/pulls{/number}","milestones_url":"https://api.github.com/repos/nhs3108/fels_65/milestones{/number}","notifications_url":"https://api.github.com/repos/nhs3108/fels_65/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/nhs3108/fels_65/labels{/name}","releases_url":"https://api.github.com/repos/nhs3108/fels_65/releases{/id}","created_at":"2015-06-25T04:27:11Z","updated_at":"2015-06-25T02:12:17Z","pushed_at":"2015-06-30T09:05:44Z","git_url":"git://github.com/nhs3108/fels_65.git","ssh_url":"git@github.com:nhs3108/fels_65.git","clone_url":"https://github.com/nhs3108/fels_65.git","svn_url":"https://github.com/nhs3108/fels_65","homepage":null,"size":251,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"framgia:develop","ref":"develop","sha":"f42486b6cf0d278dfe9ca1939179b61efc0404ea","user":{"login":"framgia","id":2322183,"avatar_url":"https://avatars.githubusercontent.com/u/2322183?v=3","gravatar_id":"","url":"https://api.github.com/users/framgia","html_url":"https://github.com/framgia","followers_url":"https://api.github.com/users/framgia/followers","following_url":"https://api.github.com/users/framgia/following{/other_user}","gists_url":"https://api.github.com/users/framgia/gists{/gist_id}","starred_url":"https://api.github.com/users/framgia/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/framgia/subscriptions","organizations_url":"https://api.github.com/users/framgia/orgs","repos_url":"https://api.github.com/users/framgia/repos","events_url":"https://api.github.com/users/framgia/events{/privacy}","received_events_url":"https://api.github.com/users/framgia/received_events","type":"Organization","site_admin":false},"repo":{"id":38022545,"name":"fels_65","full_name":"framgia/fels_65","owner":{"login":"framgia","id":2322183,"avatar_url":"https://avatars.githubusercontent.com/u/2322183?v=3","gravatar_id":"","url":"https://api.github.com/users/framgia","html_url":"https://github.com/framgia","followers_url":"https://api.github.com/users/framgia/followers","following_url":"https://api.github.com/users/framgia/following{/other_user}","gists_url":"https://api.github.com/users/framgia/gists{/gist_id}","starred_url":"https://api.github.com/users/framgia/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/framgia/subscriptions","organizations_url":"https://api.github.com/users/framgia/orgs","repos_url":"https://api.github.com/users/framgia/repos","events_url":"https://api.github.com/users/framgia/events{/privacy}","received_events_url":"https://api.github.com/users/framgia/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/framgia/fels_65","description":"Framgia E-Learning System (training)","fork":false,"url":"https://api.github.com/repos/framgia/fels_65","forks_url":"https://api.github.com/repos/framgia/fels_65/forks","keys_url":"https://api.github.com/repos/framgia/fels_65/keys{/key_id}","collaborators_url":"https://api.github.com/repos/framgia/fels_65/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/framgia/fels_65/teams","hooks_url":"https://api.github.com/repos/framgia/fels_65/hooks","issue_events_url":"https://api.github.com/repos/framgia/fels_65/issues/events{/number}","events_url":"https://api.github.com/repos/framgia/fels_65/events","assignees_url":"https://api.github.com/repos/framgia/fels_65/assignees{/user}","branches_url":"https://api.github.com/repos/framgia/fels_65/branches{/branch}","tags_url":"https://api.github.com/repos/framgia/fels_65/tags","blobs_url":"https://api.github.com/repos/framgia/fels_65/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/framgia/fels_65/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/framgia/fels_65/git/refs{/sha}","trees_url":"https://api.github.com/repos/framgia/fels_65/git/trees{/sha}","statuses_url":"https://api.github.com/repos/framgia/fels_65/statuses/{sha}","languages_url":"https://api.github.com/repos/framgia/fels_65/languages","stargazers_url":"https://api.github.com/repos/framgia/fels_65/stargazers","contributors_url":"https://api.github.com/repos/framgia/fels_65/contributors","subscribers_url":"https://api.github.com/repos/framgia/fels_65/subscribers","subscription_url":"https://api.github.com/repos/framgia/fels_65/subscription","commits_url":"https://api.github.com/repos/framgia/fels_65/commits{/sha}","git_commits_url":"https://api.github.com/repos/framgia/fels_65/git/commits{/sha}","comments_url":"https://api.github.com/repos/framgia/fels_65/comments{/number}","issue_comment_url":"https://api.github.com/repos/framgia/fels_65/issues/comments{/number}","contents_url":"https://api.github.com/repos/framgia/fels_65/contents/{+path}","compare_url":"https://api.github.com/repos/framgia/fels_65/compare/{base}...{head}","merges_url":"https://api.github.com/repos/framgia/fels_65/merges","archive_url":"https://api.github.com/repos/framgia/fels_65/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/framgia/fels_65/downloads","issues_url":"https://api.github.com/repos/framgia/fels_65/issues{/number}","pulls_url":"https://api.github.com/repos/framgia/fels_65/pulls{/number}","milestones_url":"https://api.github.com/repos/framgia/fels_65/milestones{/number}","notifications_url":"https://api.github.com/repos/framgia/fels_65/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/framgia/fels_65/labels{/name}","releases_url":"https://api.github.com/repos/framgia/fels_65/releases{/id}","created_at":"2015-06-25T02:12:17Z","updated_at":"2015-06-25T02:12:17Z","pushed_at":"2015-06-30T09:41:26Z","git_url":"git://github.com/framgia/fels_65.git","ssh_url":"git@github.com:framgia/fels_65.git","clone_url":"https://github.com/framgia/fels_65.git","svn_url":"https://github.com/framgia/fels_65","homepage":null,"size":2366,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":2,"mirror_url":null,"open_issues_count":3,"forks":2,"open_issues":3,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/framgia/fels_65/pulls/8"},"html":{"href":"https://github.com/framgia/fels_65/pull/8"},"issue":{"href":"https://api.github.com/repos/framgia/fels_65/issues/8"},"comments":{"href":"https://api.github.com/repos/framgia/fels_65/issues/8/comments"},"review_comments":{"href":"https://api.github.com/repos/framgia/fels_65/pulls/8/comments"},"review_comment":{"href":"https://api.github.com/repos/framgia/fels_65/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/framgia/fels_65/pulls/8/commits"},"statuses":{"href":"https://api.github.com/repos/framgia/fels_65/statuses/9ffc701d455cc76edc95724a41cdd3e4a68e7f8b"}}}}