add footprint

863ec620 · tady · 56fc42f3 · 863ec620 · 863ec620 · 863ec620
Commit 863ec620 authored Jul 19, 2014 by tady
13 changed files
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -8,6 +8,9 @@ class PostsController < ApplicationController
  # GET /posts/1
  # GET /posts/1.json
  def show
+    current_user.visit_post!(@post)
    @post.tags.each do |_tag|
      add_breadcrumb("##{_tag.name}", _tag.decorate.show_path)
    end

--- a/app/decorators/post_decorator.rb
+++ b/app/decorators/post_decorator.rb
@@ -27,6 +27,14 @@ class PostDecorator < Draper::Decorator
    end
  end
+  def created_date
+    model.created_at.strftime('%Y-%m-%d')
+  end
+  def updated_date
+    model.updated_at.strftime('%Y-%m-%d')
+  end
  def display_specified_date
    if model.specified_date
      model.specified_date.strftime('%Y-%m-%d')

--- a/app/models/footprint.rb
+++ b/app/models/footprint.rb
+class Footprint < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :post
+end
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -20,6 +20,7 @@ class Post < ActiveRecord::Base
  has_many :tags, through: :post_tags
  belongs_to :author, class_name: 'User'
  has_many :comments
+  has_many :footprints
  # default_scope  { where(is_draft: false).order(:updated_at => :desc) }
@@ -68,6 +69,10 @@ class Post < ActiveRecord::Base
    order(updated_at: :desc).limit(limit)
  }
+  ######################################################################
+  # Instance method
+  ######################################################################
  # generate forked post (not saved)
  def generate_fork(user)
@@ -91,4 +96,8 @@ class Post < ActiveRecord::Base
  def body_for_slideshow
    self.body.gsub(/^#/, "---\n\n#")
  end
+  def visited_user_count
+    footprints.select(:user_id).uniq.count
+  end
 end
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -38,6 +38,7 @@ class User < ActiveRecord::Base
  has_many :posts, foreign_key: 'author_id'
  has_many :comments, foreign_key: 'author_id'
  has_many :notifications
+  has_many :footprints
  ######################################################################
  # scope
@@ -80,6 +81,9 @@ class User < ActiveRecord::Base
    user
  end
+  ######################################################################
+  # instance methods
+  ######################################################################
  # check if google oauth token is expired
  def google_oauth_token_expired?
@@ -111,5 +115,8 @@ class User < ActiveRecord::Base
    notifications.create(detail_path: detail_path, body: body, is_read: false)
  end
+  # record footprint
+  def visit_post!(post)
+    footprints.create!(post: post)
+  end
 end
--- a/app/views/flow/show.html.slim
+++ b/app/views/flow/show.html.slim
@@ -27,5 +27,3 @@
          a.list-group-item data-tag-id=tag.id href=search_path(q: "##{tag.name}")
            = tag.name
            span.badge = tag.posts_count
--- a/app/views/posts/_large_item.html.slim
+++ b/app/views/posts/_large_item.html.slim
@@ -20,14 +20,15 @@ a.list-group-item.post-list.mod-hover-hidden data-post-id=post.id href=post_path
            | &nbsp;
      .col-xs-4
        small.pull-right
-          span.glyphicon.glyphicon-time
+          span.glyphicon.glyphicon-time title="読了時間"
-          span.mod-hover-hidden-item
-            | 読了時間
          | &nbsp;#{post.read_time}&nbsp;&nbsp;
-          span.glyphicon.glyphicon-comment
-          span.mod-hover-hidden-item
+          span.glyphicon.glyphicon-comment title="コメント"
-            | コメント
          | &nbsp;#{post.comments.count}&nbsp;&nbsp;
+          span.glyphicon.glyphicon-eye-open title="閲覧者数"
+          | &nbsp;#{post.visited_user_count}&nbsp;&nbsp;
    .row
      .col-xs-12
        small.text-shadow

--- a/app/views/posts/show.html.slim
+++ b/app/views/posts/show.html.slim
-= render_breadcrumbs
 .row
-  .panel.panel-default
+  .col-xs-9
-    .panel-heading
+    .panel.panel-info
-      h3.panel-title
+      .panel-heading
-        a href=post_path(@post) = @post.title
+        h3.panel-title
-    ul.list-group
+          a href=post_path(@post) = @post.title
-      li.list-group-item
+      .panel-body.viewer.github
-        - @post.tags.each do |tag|
+        = h_application_format_markdown(@post.body)
-          span.label.label-success
-            a href=tag.decorate.show_path
+  .col-xs-3
-              | ##{tag.name}
-          | &nbsp;
+    p.btn-group
-        span.label.label-info
+      a.btn.btn-primary href=edit_post_path(@post)
+        | 編集&nbsp;
+        span.glyphicon.glyphicon-pencil
+      button.btn.btn-default.dropdown-toggle data-toggle="dropdown" type="button"
+        span.caret
+        span.sr-only Toggle Dropdown
+      ul.dropdown-menu role="menu"
+        li
+          a href=slideshow_post_path(@post) target="_blank"  Slideshow
+        li
+          a.small href="https://github.com/gnab/remark" target="_blank"  What is Slideshow?
+        li.divider
+        li
+          a href=fork_post_path(@post)  Fork
+        li
+          a data-target="#myModal" data-toggle="modal" href="#"  Mail to...
+        li.divider
+        li= link_to 'Delete', post_path(@post), method: :delete, data: { confirm: 'Are you sure?' }
+    .well
+      dl
+        dt 作成者
+        dd
          a href=(search_path(q: "@#{@post.author.name}"))
-            | @#{@post.author.name}
+           | @#{@post.author.name}
-        | &nbsp;
-        span.label.label-danger
+        dt タグ
+        dd
+          - @post.tags.each do |tag|
+            span.label.label-success
+              a href=tag.decorate.show_path
+                | ##{tag.name}
+            | &nbsp;
+        dt 指定日
+        dd
          a href=(search_path(q: "date:#{@post.display_date}")) = @post.display_date
-        .btn-group.pull-right style=("margin: -7px -12px 0 0;")
-          a.btn.btn-primary href=edit_post_path(@post)
+        dt 作成日
-            span.glyphicon.glyphicon-pencil
+        dd
-          button.btn.btn-default.dropdown-toggle data-toggle="dropdown" type="button"
+          = @post.created_date
-            span.caret
-            span.sr-only Toggle Dropdown
+        dt 最終更新日
-          ul.dropdown-menu role="menu"
+        dd
-            li
+          = @post.updated_date
-              a href=slideshow_post_path(@post) target="_blank"  Slideshow
-            li
+        dt 閲覧者数
-              a.small href="https://github.com/gnab/remark" target="_blank"  What is Slideshow?
+        dd
-            li.divider
+          = @post.visited_user_count
-            li
-              a href=fork_post_path(@post)  Fork
+        dt コメント数
-            li
+        dd
-              a data-target="#myModal" data-toggle="modal" href="#"  Mail to...
+          = @post.comments.count
-            li.divider
-            li= link_to 'Delete', post_path(@post), method: :delete, data: { confirm: 'Are you sure?' }
-    .panel-body.viewer.github
-      = h_application_format_markdown(@post.body)
+.row
  .panel.panel-success
    .panel-heading
      h3.panel-title Comments

--- a/app/views/templates/show.html.slim
+++ b/app/views/templates/show.html.slim
-h1 テンプレートから作成
+/! view:templates/show
+.row
-.panel.panel-info
+  h1
-  .panel-heading
+    | Templates
-    span.glyphicon.glyphicon-info-sign
+    small - テンプレートから作成
-    | テンプレートの使い方
-  .panel-body
+  .panel.panel-info
-    ul
+    .panel-heading
-      li 「template」 というタグをつけた投稿はこのページに現れます
+      span.glyphicon.glyphicon-info-sign
-      li コピーすることで同じフォーマットの文章が簡単に書けます
+      | テンプレートの使い方
-.list-group
+    .panel-body
-  - if template_tag = Tag.find_by(name: 'template')
+      ul
-    - template_tag.posts.decorate.each do |_post|
+        li 「template」 というタグをつけた投稿はこのページに現れます
-      = render partial: 'post', locals: { post: _post }
+        li コピーすることで同じフォーマットの文章が簡単に書けます
-  - else
-    | テンプレートが存在しません
+  .list-group
+    - if template_tag = Tag.find_by(name: 'template')
+      - template_tag.posts.decorate.each do |_post|
+        = render partial: 'post', locals: { post: _post }
+    - else
+      | テンプレートが存在しません
--- a/db/migrate/20140719132802_create_footprints.rb
+++ b/db/migrate/20140719132802_create_footprints.rb
+class CreateFootprints < ActiveRecord::Migration
+  def change
+    create_table :footprints do |t|
+      t.integer :user_id, null: false
+      t.integer :post_id, null: false
+      t.timestamps
+    end
+    add_index :footprints, [:user_id, :post_id]
+    add_index :footprints, :post_id
+  end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20140501045300) do
+ActiveRecord::Schema.define(version: 20140719132802) do
  create_table "comments", force: true do |t|
    t.integer  "author_id"
@@ -24,6 +24,16 @@ ActiveRecord::Schema.define(version: 20140501045300) do
  add_index "comments", ["author_id", "updated_at"], name: "index_comments_on_author_id_and_updated_at", using: :btree
  add_index "comments", ["post_id", "updated_at"], name: "index_comments_on_post_id_and_updated_at", using: :btree
+  create_table "footprints", force: true do |t|
+    t.integer  "user_id",    null: false
+    t.integer  "post_id",    null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+  add_index "footprints", ["post_id"], name: "index_footprints_on_post_id", using: :btree
+  add_index "footprints", ["user_id", "post_id"], name: "index_footprints_on_user_id_and_post_id", using: :btree
  create_table "notifications", force: true do |t|
    t.integer  "user_id"
    t.datetime "read_at"

--- a/spec/controllers/posts_controller_spec.rb
+++ b/spec/controllers/posts_controller_spec.rb
+require 'rails_helper'
+describe PostsController, type: :controller do
+  let(:post) { FactoryGirl.create(:post) }
+  describe "GET 'show' without login" do
+    it "returns http redirect" do
+      get 'show', id: post.id
+      expect(response).to redirect_to('/')
+    end
+  end
+  describe "GET 'show' with login" do
+    let(:alice) { FactoryGirl.create(:alice) }
+    it "returns http success" do
+      sign_in FactoryGirl.create(:alice)
+      get 'show', id: post.id
+      expect(response).to be_success
+    end
+    it "returns http success" do
+      sign_in alice
+      get 'show', id: post.id
+      expect(Footprint.where(user_id: alice.id, post_id: post.id)).to exist
+    end
+  end
+end
--- a/spec/models/footprint_spec.rb
+++ b/spec/models/footprint_spec.rb
+require 'rails_helper'
+RSpec.describe Footprint, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end