Xwitter 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d604abaf77a9180b5a024d4b8547822ed95d753c44725891f91d5f67bf09cc24
-  data.tar.gz: 90a4dcca82463b218fcda903e16a0f7a3a0c4716637aecdc9b5d3be5cd8a2cb1
+  metadata.gz: c9a7de9c9491bbb1ef648bb7d64cb3d596cc29803498e1d15180317a5a03a0e6
+  data.tar.gz: 6cb3d91654650cdef620521f02e643a87a62157b1912b099a9dd221fe5553568
 SHA512:
-  metadata.gz: 95783e0b3c87e8dc35b442db77887a1210e3678ed802d295701627ac257bb3d641da740f6c7f70f0571175a3cf28c160facd5e2da8197e8de6eb8e863119c087
-  data.tar.gz: 1f953cd9e5ee150bb378079fb6db297031a8fe470dbdc7fed03219dac4d9fb2e92ea0170194b7a6e9f336a1dc5636b9bc97f46ba50369b51b700ed826718c545
+  metadata.gz: 21f27e91e3672305b8b7a777e3b49bea0a20581eb7436967b9014a2c5dc9dbee99529384483f0d2b98b76cfb954010439578d7171913cfac6d47595f17852db5
+  data.tar.gz: 624365d80d73c50c9e1f159fd6474ba175a2c5559fad1d6bef6ead1a9332e5912e66b4a25d40aaf1b2c374eaa37b77b4e715be0814602ddaa818a169efc552c3

data/app/controllers/follows_controller.rb

@@ -1,13 +1,31 @@
 class FollowsController < ApplicationController
+  before_action :set_user
+
+  # GET /:username/follows
+  def index
+    @observes = @user.observe_users
+  end
+
+  # GET /:username/followed
+  def followed
+    @observes = @user.observed_users
+  end
+
   # POST /:username/follow
   def create
-    Observe.create!(from_user: current_user, to_user: User.find_by(name: params[:username]))
+    Observe.create!(from_user: current_user, to_user: @user)
     redirect_to "/" + params[:username]
   end
 
   # DELETE /:username/follow
   def destroy
-    Observe.find_by(from_user: current_user, to_user: User.find_by(name: params[:username])).destroy
+    Observe.find_by(from_user: current_user, to_user: @user).destroy
     redirect_to "/" + params[:username]
   end
+
+  private
+
+  def set_user
+    @user = User.find_by(name: params[:username])
+  end
 end

data/app/controllers/profiles_controller.rb

@@ -5,6 +5,8 @@ class ProfilesController < ApplicationController
   # GET /users/1.json
   def show
     @user = User.find_by(name: params[:username])
+    @observes = @user.observe_users
+    @observed = @user.observed_users
   end
 
   # GET /users/1/edit

data/app/models/user.rb

@@ -7,6 +7,7 @@ class User < ApplicationRecord
   has_many :observes, foreign_key: "from_user_id", class_name: "Observe"
   has_many :observe_users, through: :observes, source: "to_user"
   has_many :observed, foreign_key: "to_user_id", class_name: "Observe"
+  has_many :observed_users, through: :observed, source: "from_user"
 
   def follow?(user)
     observe_users.include?(user)

data/app/views/follows/followed.html.slim

@@ -0,0 +1,11 @@
+h2
+  = @user.screen_name
+  |  
+  small= '@' + @user.name
+
+ul
+  - @observes.each do |user|
+    li= link_to '/' + user.name
+      = user.screen_name
+      |  
+      small= '@' + user.name

data/app/views/follows/index.html.slim

@@ -0,0 +1,11 @@
+h2
+  = @user.screen_name
+  |  
+  small= '@' + @user.name
+
+ul
+  - @observes.each do |user|
+    li= link_to '/' + user.name
+      = user.screen_name
+      |  
+      small= '@' + user.name

data/app/views/profiles/show.html.slim

@@ -11,4 +11,10 @@ h2
     - else
       = link_to 'Follow', follow_path, class: 'btn btn-primary', method: :post
 
+    - if @user.follow?(current_user)
+      span.badge Followed you
+
+= link_to "Followings: #{@observes.count}", follows_path(username: @user.name), class: 'btn'
+= link_to "Followers: #{@observed.count}", followed_path(username: @user.name), class: 'btn'
+
 = render 'messages/index', messages: Message.where(user: @user)

data/config/routes.rb

@@ -4,6 +4,8 @@ Rails.application.routes.draw do
   devise_for :users
   root 'messages#index'
   get ':username', to: 'profiles#show'
+  get ':username/follows', to: 'follows#index', as: 'follows'
+  get ':username/followed', to: 'follows#followed', as: 'followed'
   post   ':username/follow', to: 'follows#create', as: 'follow'
   delete ':username/follow', to: 'follows#destroy'
 end

data/lib/Xwitter/version.rb

@@ -1,3 +1,3 @@
 module Xwitter
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Xwitter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - myun2
@@ -90,6 +90,8 @@ files:
 - app/models/message.rb
 - app/models/observe.rb
 - app/models/user.rb
+- app/views/follows/followed.html.slim
+- app/views/follows/index.html.slim
 - app/views/layouts/application.html.slim
 - app/views/layouts/mailer.html.erb
 - app/views/layouts/mailer.text.erb