Xwitter 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b50b28b796dfc085d711e55972d4ab8715581551eb7f208b04c15026bf11ea1
-  data.tar.gz: 0760f874e11fe179e2f5c31c82bbeaaec3a8f5f77b878e7d16221f4787a02abc
+  metadata.gz: d604abaf77a9180b5a024d4b8547822ed95d753c44725891f91d5f67bf09cc24
+  data.tar.gz: 90a4dcca82463b218fcda903e16a0f7a3a0c4716637aecdc9b5d3be5cd8a2cb1
 SHA512:
-  metadata.gz: 5f9a0454aff54100bee78332684a25d6f08502cfec69fc14b5d15389722643b78cc2fde41c0aeaaf72cdb09644b4fca255680f92133830e11d41f7a087360fe1
-  data.tar.gz: c5c7b9e9d60941451702e55618d10a5b78d503d0d975ff550a7373ae3b1b6f27180d5547bca50b1d8cb0a54e3762d4176ad274f71874e75e44693861ca349e18
+  metadata.gz: 95783e0b3c87e8dc35b442db77887a1210e3678ed802d295701627ac257bb3d641da740f6c7f70f0571175a3cf28c160facd5e2da8197e8de6eb8e863119c087
+  data.tar.gz: 1f953cd9e5ee150bb378079fb6db297031a8fe470dbdc7fed03219dac4d9fb2e92ea0170194b7a6e9f336a1dc5636b9bc97f46ba50369b51b700ed826718c545

data/Schemafile

@@ -1,23 +1,34 @@
 # Export Schema
-create_table :users do |t|
-  t.string   :email, null: false
-  t.string   :name
-  t.string   :screen_name
-  t.string   :encrypted_password, null: false
-  t.string   :reset_password_token
-  t.boolean  :public, null: false, default: true
-  t.datetime :reset_password_sent_at
-  t.datetime :remember_created_at
+create_table "users" do |t|
+  t.string   "email", null: false
+  t.string   "name"
+  t.string   "screen_name"
+  t.string   "encrypted_password", null: false
+  t.string   "reset_password_token"
+  t.boolean  "public", null: false, default: true
+  t.datetime "reset_password_sent_at"
+  t.datetime "remember_created_at"
   t.timestamps null: false
   t.index ["name"], unique: true
 end
 
+create_table "observes", force: :cascade do |t|
+  t.bigint "from_user_id", null: false
+  t.bigint "to_user_id", null: false
+  t.timestamps null: false
+  t.index ["from_user_id", "to_user_id"], unique: true
+  t.index ["to_user_id", "from_user_id"], unique: true
+end
+add_foreign_key "observes", "users", column: "from_user_id"
+add_foreign_key "observes", "users", column: "to_user_id", name: "observe_to_user_fk"
+
 create_table "messages", force: :cascade do |t|
   t.bigint   "user_id",    null: false
   t.text     "text",       null: false
   t.datetime "created_at", null: false
   t.index ["user_id"]
 end
+add_foreign_key "messages", "users"
 
 create_table "likes", force: :cascade do |t|
   t.bigint   "user_id", null: false
@@ -33,7 +44,6 @@ create_table "shares", force: :cascade do |t|
   t.index ["user_id", "message_id"], unique: true
 end
 
-add_foreign_key "messages", "users"
 add_foreign_key "likes",  "users"
 add_foreign_key "likes",  "messages"
 add_foreign_key "shares", "users"

data/app/controllers/follows_controller.rb

@@ -0,0 +1,13 @@
+class FollowsController < ApplicationController
+  # POST /:username/follow
+  def create
+    Observe.create!(from_user: current_user, to_user: User.find_by(name: params[:username]))
+    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
+    redirect_to "/" + params[:username]
+  end
+end

data/app/controllers/messages_controller.rb

@@ -8,7 +8,13 @@ class MessagesController < ApplicationController
       redirect_to edit_profile_url
       return
     end
-    @messages = Message.all
+
+    if user_signed_in?
+      user_ids = current_user.observe_users.pluck(:id) + [current_user.id]
+      @messages = Message.where(user_id: user_ids)
+    else
+      @messages = Message.all
+    end
   end
 
   # GET /messages/1

data/app/models/observe.rb

@@ -0,0 +1,4 @@
+class Observe < ApplicationRecord
+  belongs_to :from_user, class_name: 'User'
+  belongs_to :to_user, class_name: 'User'
+end

data/app/models/user.rb

@@ -3,4 +3,12 @@ class User < ApplicationRecord
   # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :validatable
+
+  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"
+
+  def follow?(user)
+    observe_users.include?(user)
+  end
 end

data/app/views/messages/_index.html.slim

@@ -1,4 +1,4 @@
-- messages.each do |message|
+- messages.order("created_at DESC").each do |message|
   div
     p
       = message.user.screen_name

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

@@ -6,15 +6,4 @@ h1
     = link_to 'Sign in', new_user_session_path, class: 'btn btn-primary'
     = link_to 'Sign up', new_user_registration_path, class: 'btn btn-default'
 
-- @messages.each do |message|
-  div
-    p
-      = message.user.screen_name
-      |  
-      = link_to '@' + message.user.name, '/' + message.user.name
-
-    p= message.text
-    p= l message.created_at
-    - if user_signed_in? && message.user == current_user
-      .oi.oi-trash
-      = link_to 'Destroy', message, data: { confirm: 'Are you sure?' }, method: :delete
+= render 'index', messages: @messages

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

@@ -2,7 +2,13 @@ h2
   = @user.screen_name
   |  
   small= '@' + @user.name
-  - if @user == current_user
-    = link_to 'Edit', edit_profile_path, class: 'btn'
+  - if user_signed_in?
+    |  
+    - if @user == current_user
+      = link_to 'Edit', edit_profile_path, class: 'btn'
+    - elsif current_user.follow?(@user)
+      = link_to 'Unfollow', follow_path, class: 'btn btn-warning', method: :delete
+    - else
+      = link_to 'Follow', follow_path, class: 'btn btn-primary', method: :post
 
 = render 'messages/index', messages: Message.where(user: @user)

data/config/routes.rb

@@ -4,4 +4,6 @@ Rails.application.routes.draw do
   devise_for :users
   root 'messages#index'
   get ':username', to: 'profiles#show'
+  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.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Xwitter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - myun2
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-10 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - app/channels/application_cable/connection.rb
 - app/controllers/application_controller.rb
 - app/controllers/concerns/.keep
+- app/controllers/follows_controller.rb
 - app/controllers/messages_controller.rb
 - app/controllers/profiles_controller.rb
 - app/helpers/application_helper.rb
@@ -87,6 +88,7 @@ files:
 - app/models/application_record.rb
 - app/models/concerns/.keep
 - app/models/message.rb
+- app/models/observe.rb
 - app/models/user.rb
 - app/views/layouts/application.html.slim
 - app/views/layouts/mailer.html.erb