Xwitter 0.2.2 → 0.3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c3206d5937b3dd8ace31d035f2adf449345238404988dca84161ff08e6a6c92
-  data.tar.gz: f6e28c151af151500e1a89e8e2c82d7107c44e3e9b0d621ae567e30a7f6ca505
+  metadata.gz: f4e6bcb2959064f032dbe69ce723dac00ce897d23ed51c786c094981414b3ed6
+  data.tar.gz: 1dc433bc78c1d995df2068e830c42324f25747c4333f439e32f4011788850acc
 SHA512:
-  metadata.gz: 9b2ec24637aaa2f548b36cd8f176ae49ca7bfb68615a9ea51e285dba740d694985dcd61c9f0fcb3920584e2bc19946db6c4d66282133a76c9019a729cbb5e2b5
-  data.tar.gz: 815a2749130be886714347715a2bef9c00cfe28850eb21bbc37592495273919acd9f507dbeaa4e361e42c1c52ec5e1e7f6fa444707c4ec296b230fd78e2cd7d7
+  metadata.gz: 3d9dd7529af133847d773bdd7608fe092d938524c0bd8cbd75d25582f11c054e29563a99572ba64c0bacf2c696ced2da47555dac2d6d4b30c178fff91c3a72c9
+  data.tar.gz: 0e52ca5e37dd9551378c74158d5311ff480ce65241ff413e0e967998b701d1adcb7a99f945df3dbc6b6fbd88ccf723c550af1a328017c20819d4510ef708c649

data/.gitignore

@@ -7,6 +7,7 @@
 /spec/reports/
 /tmp/
 /log/
+/storage/
 /db/migrate/
 *.sqlite3
 

data/Gemfile

@@ -5,6 +5,7 @@ ruby '2.5.1'
 
 gem 'rails', '~> 5.2.1'
 gem 'pg', require: false
+gem 'composite_primary_keys'
 
 gem 'puma', '~> 3.11'
 gem 'slim-rails'

data/Gemfile.lock

@@ -60,6 +60,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
+    composite_primary_keys (11.1.0)
+      activerecord (~> 5.2.1)
     concurrent-ruby (1.1.3)
     connection_pool (2.2.2)
     crass (1.0.4)
@@ -219,6 +221,7 @@ DEPENDENCIES
   bootsnap (>= 1.1.0)
   byebug
   coffee-rails (~> 4.2)
+  composite_primary_keys
   devise (~> 4.5.0)
   jbuilder (~> 2.5)
   listen (>= 3.0.5, < 3.2)

data/Schemafile

@@ -3,6 +3,7 @@ create_table "users" do |t|
   t.string   "email", null: false
   t.string   "name"
   t.string   "screen_name"
+  t.text     "description"
   t.string   "encrypted_password", null: false
   t.string   "reset_password_token"
   t.boolean  "public", null: false, default: true
@@ -31,6 +32,14 @@ create_table "messages", force: :cascade do |t|
 end
 add_foreign_key "messages", "users"
 
+create_table "message_topics", force: :cascade, id: false do |t|
+  t.string   "topic",      null: false
+  t.bigint   "message_id", null: false
+  t.index ["topic", "message_id"], unique: true
+  t.index ["message_id"]
+end
+add_foreign_key "message_topics", "messages"
+
 create_table "likes", force: :cascade do |t|
   t.bigint   "user_id", null: false
   t.bigint   "message_id", null: false
@@ -49,3 +58,26 @@ add_foreign_key "likes",  "users"
 add_foreign_key "likes",  "messages"
 add_foreign_key "shares", "users"
 add_foreign_key "shares", "messages"
+
+# ActiveStorage
+create_table :active_storage_blobs do |t|
+  t.string   :key,        null: false
+  t.string   :filename,   null: false
+  t.string   :content_type
+  t.text     :metadata
+  t.bigint   :byte_size,  null: false
+  t.string   :checksum,   null: false
+  t.datetime :created_at, null: false
+
+  t.index [ :key ], unique: true
+end
+
+create_table :active_storage_attachments do |t|
+  t.string     :name,     null: false
+  t.references :record,   null: false, polymorphic: true, index: false
+  t.references :blob,     null: false
+
+  t.datetime :created_at, null: false
+
+  t.index [ :record_type, :record_id, :name, :blob_id ], name: "index_active_storage_attachments_uniqueness", unique: true
+end

data/app/assets/stylesheets/themes/dark.scss

@@ -11,3 +11,30 @@ body.theme-dark {
     }
   }
 }
+
+body.theme-leaf {
+  color: #162727;
+  a { color: #20c728; }
+  h1 {
+    color: #384b54;
+  }
+  .timeline {
+    .message-item:hover {
+      background-color: #dfece7;
+    }
+  }
+}
+
+body.theme-leaf-dark {
+  background-color: #224845;
+  color: #dce6e6;
+  a { color: #20c728; }
+  h1 {
+    color: #f4f6f7;
+  }
+  .timeline {
+    .message-item:hover {
+      background-color: #365f5d;
+    }
+  }
+}

data/app/controllers/profiles_controller.rb

@@ -45,6 +45,7 @@ class ProfilesController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def user_params
-      params.require(:user).permit(:theme, :name, :screen_name)
+      params.require(:user)
+            .permit(:name, :screen_name, :description, :profile_image, :theme)
     end
 end

data/app/controllers/topics_controller.rb

@@ -0,0 +1,7 @@
+class TopicsController < ApplicationController
+  # GET /users/1
+  # GET /users/1.json
+  def show
+    @messages = Message.topic_of(params[:id])
+  end
+end

data/app/models/message.rb

@@ -1,4 +1,38 @@
 class Message < ApplicationRecord
   belongs_to :user
+  has_many :message_topics, dependent: :delete_all
   validates :text, length: { maximum: 140 }
+
+  after_save :regenerate_topics
+
+  def self.topic_of(topic)
+    Message.joins(:message_topics).where(message_topics: { topic: topic })
+  end
+
+  def split_full
+    text.split(/([ 　,.、。])/)
+  end
+
+  def split(full: true)
+    if full
+      text.split(/([ 　,.、。])/)
+    else
+      text.split(/[ 　,.、。]/)
+    end
+  end
+
+  def topics
+    split.uniq.delete_if { |word| !Message.topic?(word) }
+  end
+
+  def self.topic?(word)
+    (4..15).cover?(word.length)
+  end
+
+  def regenerate_topics
+    MessageTopic.where(message: self).delete_all
+    topics.each do |word|
+      MessageTopic.create(message: self, topic: word) if Message.topic?(word)
+    end
+  end
 end

data/app/models/message_topic.rb

@@ -0,0 +1,4 @@
+class MessageTopic < ApplicationRecord
+  self.primary_keys = [:message_id, :topic]
+  belongs_to :message
+end

data/app/models/user.rb

@@ -9,6 +9,10 @@ class User < ApplicationRecord
   has_many :observed, foreign_key: "to_user_id", class_name: "Observe"
   has_many :observed_users, through: :observed, source: "from_user"
 
+  has_one_attached :profile_image
+
+  validates :description, length: { maximum: 200 }
+
   def follow?(user)
     observe_users.include?(user)
   end

data/app/views/layouts/application.html.slim

@@ -1,7 +1,13 @@
 doctype html
 html
   head
-    title Xwitter
+    title
+      - if @message.try(:persisted?)
+        | #{@message.text} #{@message.user.screen_name} (@#{@message.user.name}) | Xwitter
+      - elsif @user
+        | Xwitter - #{@user.screen_name} (@#{@user.name})
+      - else
+        | Xwitter
     = csrf_meta_tags
     = csp_meta_tag
     = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
@@ -9,9 +15,12 @@ html
     = stylesheet_pack_tag 'application'
     = stylesheet_link_tag 'application', 'data-turbolinks-track': 'reload'
     = stylesheet_link_tag 'https://cdnjs.cloudflare.com/ajax/libs/open-iconic/1.1.1/font/css/open-iconic-bootstrap.min.css'
-  body(class="theme-#{current_user.theme.to_s}")
+  body(class="theme-#{current_user.try(:theme)}")
     .navbar
-      = link_to '/', root_path
+      div
+        = link_to '/', root_path, class: 'btn'
+        - if @user.try(:persisted?)
+          = link_to '@' + @user.name, '/' + @user.name, class: 'btn'
 
     .container
       = yield

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

@@ -1,14 +1,5 @@
 .timeline
   ul
-    - messages.order("created_at DESC").each do |message|
+    - messages.order("created_at DESC").limit(50).each do |message|
       li.message-item(onclick="Turbolinks.visit('/messages/#{message.id}')")
-        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 'messages/show', message: message

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

@@ -1,11 +1,23 @@
-div
+- detail ||= false
+- if detail
+  h1
+    = message.user.screen_name
+    |  
+    small= link_to '@' + message.user.name, '/' + message.user.name
+- else
   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
+p
+  - message.split_full.each do |word|
+    - if Message.topic? word
+      = link_to word, topic_path(word)
+    - else
+      = word
+
+p= l message.created_at
+- if !detail && user_signed_in? && message.user == current_user
+  .oi.oi-trash
+  = link_to 'Destroy', message, data: { confirm: 'Are you sure?' }, method: :delete

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

@@ -0,0 +1,17 @@
+div
+  p
+    = message.user.screen_name
+    |  
+    = link_to '@' + message.user.name, '/' + message.user.name
+
+  p
+    - message.split_full.each do |word|
+      - if Message.topic? word
+        = link_to word, topic_path(word)
+      - else
+        = word
+
+  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

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

@@ -1,10 +1,4 @@
-h1
-  = @message.user.screen_name
-  |  
-  small= link_to "@#{@message.user.name}", '/' + @message.user.name
-p= @message.text
-p= l @message.created_at
-
+= render 'show', message: @message, detail: true
 - if @message.user == current_user
   => link_to 'Edit', edit_message_path(@message)
   '|

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

@@ -12,7 +12,13 @@
   .field
     = f.label :screen_name
     = f.text_field :screen_name
+  .field
+    = f.label :description
+    = f.text_area :description
+  .field
+    = f.label :profile_image
+    = f.file_field :profile_image
   .field
     = f.label :theme
-    = f.select :theme, %w[dark], include_blank: 'default'
+    = f.select :theme, %w[dark leaf], include_blank: 'default'
   .actions = f.submit

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

@@ -1,3 +1,4 @@
+= image_tag @user.profile_image.variant(resize: "320x200") if @user.profile_image.attached?
 h2
   = @user.screen_name
   |  
@@ -14,6 +15,8 @@ h2
     - if @user.follow?(current_user)
       span.badge Followed you
 
+p= @user.description
+
 = link_to "Followings: #{@observes.count}", follows_path(username: @user.name), class: 'btn'
 = link_to "Followers: #{@observed.count}", followed_path(username: @user.name), class: 'btn'
 

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

@@ -0,0 +1,2 @@
+h1 Topic #{params[:id]}
+= render 'messages/index', messages: @messages

data/config/routes.rb

@@ -1,6 +1,7 @@
 Rails.application.routes.draw do
   resource :profile
   resources :messages
+  resources :topics, path: 'topic'
   devise_for :users
   root 'messages#index'
   get ':username', to: 'profiles#show'

data/lib/Xwitter/version.rb

@@ -1,3 +1,3 @@
 module Xwitter
-  VERSION = "0.2.2"
+  VERSION = "0.3.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Xwitter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0.1
 platform: ruby
 authors:
 - myun2
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2018-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ files:
 - app/controllers/follows_controller.rb
 - app/controllers/messages_controller.rb
 - app/controllers/profiles_controller.rb
+- app/controllers/topics_controller.rb
 - app/helpers/application_helper.rb
 - app/helpers/messages_helper.rb
 - app/helpers/users_helper.rb
@@ -88,6 +89,7 @@ files:
 - app/models/application_record.rb
 - app/models/concerns/.keep
 - app/models/message.rb
+- app/models/message_topic.rb
 - app/models/observe.rb
 - app/models/user.rb
 - app/views/follows/followed.html.slim
@@ -99,6 +101,7 @@ files:
 - app/views/messages/_index.html.slim
 - app/views/messages/_message.json.jbuilder
 - app/views/messages/_show.html.slim
+- app/views/messages/_text.html.slim
 - app/views/messages/edit.html.slim
 - app/views/messages/index.html.slim
 - app/views/messages/index.json.jbuilder
@@ -110,6 +113,7 @@ files:
 - app/views/profiles/edit.html.slim
 - app/views/profiles/show.html.slim
 - app/views/profiles/show.json.jbuilder
+- app/views/topics/show.html.slim
 - app/views/users/confirmations/new.html.erb
 - app/views/users/mailer/confirmation_instructions.html.erb
 - app/views/users/mailer/email_changed.html.erb