Xwitter 0.3.0.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4e6bcb2959064f032dbe69ce723dac00ce897d23ed51c786c094981414b3ed6
-  data.tar.gz: 1dc433bc78c1d995df2068e830c42324f25747c4333f439e32f4011788850acc
+  metadata.gz: abdbb05a5cd81884154473636023b5040e1bb2a9803f451da0267b011178e82f
+  data.tar.gz: 8d6fb1088756eae4ca6a3b3e7fdfa59a90ee18a0212db47365466f325def55a2
 SHA512:
-  metadata.gz: 3d9dd7529af133847d773bdd7608fe092d938524c0bd8cbd75d25582f11c054e29563a99572ba64c0bacf2c696ced2da47555dac2d6d4b30c178fff91c3a72c9
-  data.tar.gz: 0e52ca5e37dd9551378c74158d5311ff480ce65241ff413e0e967998b701d1adcb7a99f945df3dbc6b6fbd88ccf723c550af1a328017c20819d4510ef708c649
+  metadata.gz: 45cf24ac6a2985ff2701fc823f64dda317547f1e6e093623785aefdf55c3541160845a1a399c8c1de924728ce4cbbd73632c958880363bb87695ce13ac977a8d
+  data.tar.gz: 0d92263a775c8151a6d4ea39fc4a2e3e170a35cf34992aa3f1a534b9c8c33b061d82e21ebe7a124cce3255b8d050c5264dd8cf0c9da5b05f9b83046d392b051f

data/Gemfile

@@ -13,6 +13,7 @@ gem 'sass-rails', '~> 5.0'
 gem 'webpacker', '~> 3.5'
 gem 'react-rails'
 gem 'ridgepole'
+gem "aws-sdk-s3", require: false
 
 gem 'uglifier', '>= 1.3.0'
 gem 'mini_racer', platforms: :ruby

data/Gemfile.lock

@@ -43,6 +43,21 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
+    aws-eventstream (1.0.1)
+    aws-partitions (1.96.0)
+    aws-sdk-core (3.22.1)
+      aws-eventstream (~> 1.0)
+      aws-partitions (~> 1.0)
+      aws-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.6.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-s3 (1.17.0)
+      aws-sdk-core (~> 3, >= 3.21.2)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.0)
+    aws-sigv4 (1.0.3)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
@@ -82,6 +97,7 @@ GEM
     jbuilder (2.8.0)
       activesupport (>= 4.2.0)
       multi_json (>= 1.2)
+    jmespath (1.4.0)
     libv8 (6.7.288.46.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -217,6 +233,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  aws-sdk-s3
   bcrypt (~> 3.1.7)
   bootsnap (>= 1.1.0)
   byebug

data/Installation.md

@@ -0,0 +1,25 @@
+# yarn
+
+Need node, npm, and yarn.
+
+# Postgresql (production)
+
+# Ridgepole
+
+```
+$ ridgepole -c config/database.yml --apply
+```
+
+## Heroku
+
+```
+$ heroku run 'bundle exec ridgepole -c config/database.yml -E production -f Schemafile --apply'
+```
+
+# ImageMagick
+
+## Heroku (stack heroku-16)
+
+```
+$ heroku buildpacks:add https://github.com/ello/heroku-buildpack-imagemagick
+```

data/Procfile

@@ -0,0 +1 @@
+web: bin/rails server -p $PORT -e $RAILS_ENV

data/Schemafile

@@ -32,6 +32,15 @@ create_table "messages", force: :cascade do |t|
 end
 add_foreign_key "messages", "users"
 
+create_table "user_subscribe_topics", force: :cascade do |t|
+  t.bigint "user_id", null: false
+  t.string "topic",   null: false
+  t.index ["user_id", "topic"], unique: true
+  t.index ["topic"]
+  t.datetime "created_at", null: false
+end
+add_foreign_key "user_subscribe_topics", "users"
+
 create_table "message_topics", force: :cascade, id: false do |t|
   t.string   "topic",      null: false
   t.bigint   "message_id", null: false

data/app/assets/stylesheets/application.scss

@@ -14,3 +14,10 @@
  *= require_self
  */
 html, body { height: 100%; }
+
+nav.left-nav {
+  width: 40px;
+  //height: 100%;
+  //float: left;
+  position: fixed;
+}

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

@@ -15,6 +15,12 @@ body.theme-dark {
 body.theme-leaf {
   color: #162727;
   a { color: #20c728; }
+  .btn.btn-primary,
+  .btn.btn-success,
+  .btn.btn-warning,
+  .btn.btn-danger,
+  .btn.btn-dark,
+  .btn.btn-secondary, { color: #fff; }
   h1 {
     color: #384b54;
   }

data/app/controllers/subscriptions_controller.rb

@@ -0,0 +1,36 @@
+class SubscriptionsController < ApplicationController
+  # GET /subscriptions
+  # GET /subscriptions.json
+  def index
+    @subscriptions = UserSubscribeTopic.where(user: current_user)
+    @subscription  = UserSubscribeTopic.new(topic: topic)
+  end
+
+  # POST /subscriptions
+  # POST /subscriptions.json
+  def create
+    respond_to do |format|
+      if UserSubscribeTopic.create(topic: topic, user: current_user)
+        format.html { redirect_to '/subscriptions', notice: "You are subscribe #{topic}." }
+      else
+        format.html { render :index }
+      end
+    end
+  end
+
+  # DELETE /subscriptions/:topic
+  # DELETE /subscriptions/:topic.json
+  def destroy
+    UserSubscribeTopic.find_by(topic: params[:id], user: current_user).destroy
+    respond_to do |format|
+      format.html { redirect_to '/subscriptions', notice: "You are unsbscribe #{topic}" }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+
+  def topic
+    params[:user_subscribe_topic][:topic] if params[:user_subscribe_topic]
+  end
+end

data/app/controllers/topics_controller.rb

@@ -1,7 +1,35 @@
 class TopicsController < ApplicationController
-  # GET /users/1
-  # GET /users/1.json
+  # GET /topic/:name
+  # GET /topic/:name.json
   def show
-    @messages = Message.topic_of(params[:id])
+    @messages = Message.topic_of(topic)
+  end
+
+  # POST /topic/:name/subscribe
+  # POST /topic/:name/subscribe.json
+  def subscribe
+    respond_to do |format|
+      if UserSubscribeTopic.create(topic: topic, user: current_user)
+        format.html { redirect_to topic_path(topic), notice: "You are subscribe it." }
+      else
+        format.html { render :index }
+      end
+    end
+  end
+
+  # DELETE /topic/:name/subscribe
+  # DELETE /topic/:name/subscribe.json
+  def unsubscribe
+    UserSubscribeTopic.find_by(topic: params[:id], user: current_user).destroy
+    respond_to do |format|
+      format.html { redirect_to topic_path(topic), notice: "You are unsubscribe it." }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+
+  def topic
+    params[:id]
   end
 end

data/app/models/user.rb

@@ -8,6 +8,7 @@ class User < ApplicationRecord
   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"
+  has_many :subscribe_topics, class_name: 'UserSubscribeTopic'
 
   has_one_attached :profile_image
 
@@ -16,4 +17,8 @@ class User < ApplicationRecord
   def follow?(user)
     observe_users.include?(user)
   end
+
+  def subscribe_topic?(topic)
+    subscribe_topics.where(topic: topic).exists?
+  end
 end

data/app/models/user_subscribe_topic.rb

@@ -0,0 +1,4 @@
+class UserSubscribeTopic < ApplicationRecord
+  belongs_to :user
+  validates :topic, uniqueness: { scope: :user_id }
+end

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

@@ -18,9 +18,20 @@ html
   body(class="theme-#{current_user.try(:theme)}")
     .navbar
       div
-        = link_to '/', root_path, class: 'btn'
+        = link_to '', root_path, class: 'btn oi oi-home'
         - if @user.try(:persisted?)
           = link_to '@' + @user.name, '/' + @user.name, class: 'btn'
+    - if user_signed_in?
+      nav.left-nav
+        .navbar
+          = link_to '', '/' + current_user.name, class: 'btn oi oi-person'
+        .navbar
+          = link_to '', '/subscriptions', class: 'btn oi oi-folder'
+        .navbar
+          = link_to '', destroy_user_session_path, class: 'btn oi oi-power-standby',
+            method: :delete, data: { confirm: "Are you sure logout from 'Xwitter' ?" }
+        .navbar
+          = link_to '', root_path, class: 'btn oi oi-wrench'
 
     .container
       = yield

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

@@ -21,4 +21,5 @@
   .field
     = f.label :theme
     = f.select :theme, %w[dark leaf], include_blank: 'default'
-  .actions = f.submit
+  .actions
+    = f.submit class: 'btn btn-primary'

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

@@ -0,0 +1,16 @@
+h1 Your subscriptions
+ul
+  - @subscriptions.each do |subscription|
+    li
+      = link_to subscription.topic, topic_path(subscription.topic)
+      |  
+      = link_to 'Remove', subscription_path(subscription.topic), class: 'btn btn-sm btn-dark',
+        data: { confirm: "Are you sure remove '#{subscription.topic}' subscription?" }, method: :delete
+
+h3 New subscribe
+= form_for @subscription, url: '/subscriptions' do |f|
+  = f.label :topic, 'Name'
+  br
+  = f.text_field :topic
+  |  
+  = f.submit 'Follow topic', class: 'btn btn-success'

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

@@ -1,2 +1,9 @@
-h1 Topic #{params[:id]}
+- topic = params[:id]
+h1
+  | Topic #{topic} 
+  - if current_user.subscribe_topic?(topic)
+    = link_to 'Remove subscription', subscribe_topic_path(topic), method: :delete, class: 'btn btn-warning'
+  - else
+    = link_to 'Follow it', subscribe_topic_path(topic), method: :post, class: 'btn btn-success'
+
 = render 'messages/index', messages: @messages

data/config/environments/production.rb

@@ -41,7 +41,7 @@ Rails.application.configure do
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Store uploaded files on the local file system (see config/storage.yml for options)
-  config.active_storage.service = :local
+  config.active_storage.service = :amazon
 
   # Mount Action Cable outside main process or domain
   # config.action_cable.mount_path = nil

data/config/routes.rb

@@ -1,7 +1,13 @@
 Rails.application.routes.draw do
   resource :profile
   resources :messages
-  resources :topics, path: 'topic'
+  resources :subscriptions
+  resources :topics, path: 'topic' do
+    member do
+      post :subscribe
+      delete :subscribe, to: 'topics#unsubscribe'
+    end
+  end
   devise_for :users
   root 'messages#index'
   get ':username', to: 'profiles#show'

data/config/storage.yml

@@ -6,13 +6,12 @@ local:
   service: Disk
   root: <%= Rails.root.join("storage") %>
 
-# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
-# amazon:
-#   service: S3
-#   access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
-#   secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
-#   region: us-east-1
-#   bucket: your_own_bucket
+amazon:
+  service: S3
+  access_key_id: <%= ENV['BUCKETEER_AWS_ACCESS_KEY_ID'] %>
+  secret_access_key: <%= ENV['BUCKETEER_AWS_SECRET_ACCESS_KEY'] %>
+  region: <%= ENV['BUCKETEER_AWS_REGION'] %>
+  bucket: <%= ENV['BUCKETEER_BUCKET_NAME'] %>
 
 # Remember not to checkin your GCS keyfile to a repository
 # google:

data/lib/Xwitter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Xwitter
 version: !ruby/object:Gem::Version
-  version: 0.3.0.1
+  version: 0.4.0
 platform: ruby
 authors:
 - myun2
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-18 00:00:00.000000000 Z
+date: 2018-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,7 +51,9 @@ files:
 - ".ruby-version"
 - Gemfile
 - Gemfile.lock
+- Installation.md
 - LICENSE.txt
+- Procfile
 - README.md
 - Rakefile
 - Schemafile
@@ -74,6 +76,7 @@ files:
 - app/controllers/follows_controller.rb
 - app/controllers/messages_controller.rb
 - app/controllers/profiles_controller.rb
+- app/controllers/subscriptions_controller.rb
 - app/controllers/topics_controller.rb
 - app/helpers/application_helper.rb
 - app/helpers/messages_helper.rb
@@ -92,6 +95,7 @@ files:
 - app/models/message_topic.rb
 - app/models/observe.rb
 - app/models/user.rb
+- app/models/user_subscribe_topic.rb
 - app/views/follows/followed.html.slim
 - app/views/follows/index.html.slim
 - app/views/layouts/application.html.slim
@@ -113,6 +117,7 @@ files:
 - app/views/profiles/edit.html.slim
 - app/views/profiles/show.html.slim
 - app/views/profiles/show.json.jbuilder
+- app/views/subscriptions/index.html.slim
 - app/views/topics/show.html.slim
 - app/views/users/confirmations/new.html.erb
 - app/views/users/mailer/confirmation_instructions.html.erb