Commit: ae283adbf2622f043734a355425664789d75200c - nvc_serv (git)

Voice data server for navigation voice changer app.

Commit MetaInfo

• Révision: ae283adbf2622f043734a355425664789d75200c (tree)
• l'heure: 2013-10-26 04:57:08
• Auteur: HMML <hmml3939@gmai...>
• Commiter: HMML

Message de Log

Add news listing and headline display.

Change Summary

• modified: Gemfile
• modified: Gemfile.lock
• add: app/assets/javascripts/news.js.coffee
• add: app/assets/stylesheets/news.css.scss
• modified: app/assets/stylesheets/nvc-serv.css.scss
• modified: app/controllers/application_controller.rb
• add: app/controllers/news_controller.rb
• add: app/helpers/news_helper.rb
• add: app/models/news.rb
• modified: app/views/layouts/_navigation.html.haml
• add: app/views/news/_form.html.haml
• add: app/views/news/edit.html.haml
• add: app/views/news/index.html.haml
• add: app/views/news/index.json.jbuilder
• add: app/views/news/new.html.haml
• add: app/views/news/show.html.haml
• add: app/views/news/show.json.jbuilder
• modified: config/application.rb
• modified: config/locales/en.yml
• modified: config/locales/ja.yml
• modified: config/routes.rb
• add: db/migrate/20131025183439_create_news.rb
• modified: db/schema.rb
• add: spec/controllers/news_controller_spec.rb
• add: spec/helpers/news_helper_spec.rb
• add: spec/models/news_spec.rb
• add: spec/requests/news_spec.rb
• add: spec/routing/news_routing_spec.rb
• add: spec/views/news/edit.html.haml_spec.rb
• add: spec/views/news/index.html.haml_spec.rb
• add: spec/views/news/new.html.haml_spec.rb
• add: spec/views/news/show.html.haml_spec.rb

Modification

--- a/Gemfile
+++ b/Gemfile
@@ -45,6 +45,7 @@ end
 # Use debugger
 # gem 'debugger', group: [:development, :test]
 
+gem 'rails_autolink', '~> 1.1.5'
 gem 'anjlab-bootstrap-rails', '~> 3.0.0.3', :require => 'bootstrap-rails'
 gem 'rails-i18n'
 gem 'kaminari'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -154,6 +154,8 @@ GEM
       remotipart (~> 1.0)
       safe_yaml (~> 0.9)
       sass-rails (~> 4.0)
+    rails_autolink (1.1.5)
+      rails (> 3.1)
     railties (4.0.0)
       actionpack (= 4.0.0)
       activesupport (= 4.0.0)
@@ -237,6 +239,7 @@ DEPENDENCIES
   rails (= 4.0.0)
   rails-i18n
   rails_admin
+  rails_autolink (~> 1.1.5)
   responders
   rspec-rails
   rubyzip

--- /dev/null
+++ b/app/assets/javascripts/news.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

--- /dev/null
+++ b/app/assets/stylesheets/news.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the news controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

--- a/app/assets/stylesheets/nvc-serv.css.scss
+++ b/app/assets/stylesheets/nvc-serv.css.scss
@@ -92,4 +92,15 @@ h5 { font-size: 14px; }
 .rating-container {
   display: inline-block;
   vertical-align: top;
-}
\ No newline at end of file
+}
+
+.news-item {
+  .time { color: #999; }
+}
+
+.navbar .headline {
+  max-width: 14em;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}

--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -4,7 +4,7 @@ class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
   respond_to :html, :xml, :json
   responders :flash
-  before_action :set_locale
+  before_action :set_locale, :get_headline
 
   class ProcessError < StandardError
     def initialize(msg, status = 404)
@@ -32,6 +32,13 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def get_headline
+    @headline = Rails.cache.fetch("headline", expires_in: 600) do
+      day_after = Time.now - Rails.configuration.headline_daylimit.days
+      News.where(skip_headline: false).where('created_at > ?', day_after).first
+    end
+  end
+
   def raise_error_400(msg = "")
     raise ProcessError.new(msg, 400)
   end

--- /dev/null
+++ b/app/controllers/news_controller.rb
@@ -0,0 +1,51 @@
+class NewsController < ApplicationController
+  # GET /news
+  # GET /news.xml
+  def index
+    @news = News.page(params[:page])
+    respond_with(@news)
+  end
+
+  # GET /news/1
+  # GET /news/1.xml
+  def show
+    @news = News.find(params[:id])
+    respond_with(@news)
+  end
+
+  # GET /news/new
+  # GET /news/new.xml
+  def new
+    @news = News.new
+    respond_with(@news)
+  end
+
+  # GET /news/1/edit
+  def edit
+    @news = News.find(params[:id])
+  end
+
+  # POST /news
+  # POST /news.xml
+  def create
+    @news = News.new(params[:news])
+    flash[:notice] = 'News was successfully created.' if @news.save
+    respond_with(@news)
+  end
+
+  # PUT /news/1
+  # PUT /news/1.xml
+  def update
+    @news = News.find(params[:id])
+    flash[:notice] = 'News was successfully updated.' if @news.update(params[:news])
+    respond_with(@news)
+  end
+
+  # DELETE /news/1
+  # DELETE /news/1.xml
+  def destroy
+    @news = News.find(params[:id])
+    @news.destroy
+    respond_with(@news)
+  end
+end

--- /dev/null
+++ b/app/helpers/news_helper.rb
@@ -0,0 +1,2 @@
+module NewsHelper
+end

--- /dev/null
+++ b/app/models/news.rb
@@ -0,0 +1,3 @@
+class News < ActiveRecord::Base
+  default_scope -> { order('created_at desc') }
+end

--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -5,11 +5,17 @@
       %span.icon-bar
       %span.icon-bar
     = link_to t('navi.brand'), root_path, :class => 'navbar-brand'
-  %div.navbar-collapse.collapse#main-nav-collapse
+  .navbar-collapse.collapse#main-nav-collapse
     %ul.nav.navbar-nav
       %li{class: controller.controller_name == 'welcome' && controller.action_name == 'guide' ? 'active' : ''}
         = link_to t('navi.guide'), welcome_guide_path
       %li{class: controller.controller_name == 'navi_voices' && controller.action_name == 'index' ? 'active' : ''}
         = link_to t('navi.voice_data'), navi_voices_path
       %li{class: controller.controller_name == 'navi_voices' && controller.action_name == 'new' ? 'active' : ''}
-        = link_to t('navi.upload'), new_navi_voice_path
\ No newline at end of file
+        = link_to t('navi.upload'), new_navi_voice_path
+      %li{class: controller.controller_name == 'news' ? 'active' : ''}
+        = link_to t('navi.news'), news_index_path
+    - if @headline
+      %p.navbar-text.pull-right.headline
+        %span.glyphicon.glyphicon-exclamation-sign
+        = link_to "#{@headline.created_at.strftime('%m/%d')} #{@headline.title}", @headline, class: 'navbar-link'

--- /dev/null
+++ b/app/views/news/_form.html.haml
@@ -0,0 +1,10 @@
+= simple_form_for(@news) do |f|
+  = f.error_notification
+
+  .form-inputs
+    = f.input :title
+    = f.input :body
+    = f.input :skip_headline
+
+  .form-actions
+    = f.button :submit

--- /dev/null
+++ b/app/views/news/edit.html.haml
@@ -0,0 +1,7 @@
+%h1 Editing news
+
+= render 'form'
+
+= link_to 'Show', @news
+\|
+= link_to 'Back', news_index_path

--- /dev/null
+++ b/app/views/news/index.html.haml
@@ -0,0 +1,13 @@
+- content_for :title do
+  = t '.title'
+%h1= t '.title'
+
+- @news.each do |news|
+  .news-item.panel.panel-default
+    .panel-heading
+      .time.pull-right= news.created_at.strftime '%F %T'
+      %b= news.title
+    .panel-body
+      = auto_link simple_format news.body
+
+= paginate @news

--- /dev/null
+++ b/app/views/news/index.json.jbuilder
@@ -0,0 +1,4 @@
+json.array!(@news) do |news|
+  json.extract! news, :title, :body, :skip_headline
+  json.url news_url(news, format: :json)
+end

--- /dev/null
+++ b/app/views/news/new.html.haml
@@ -0,0 +1,5 @@
+%h1 New news
+
+= render 'form'
+
+= link_to 'Back', news_index_path

--- /dev/null
+++ b/app/views/news/show.html.haml
@@ -0,0 +1,11 @@
+- content_for :title do
+  = @news.title + ' - ' + t('navi.news')
+
+.news-item.panel.panel-default
+  .panel-heading
+    .time.pull-right= @news.created_at.strftime '%F %T'
+    %b= @news.title
+  .panel-body
+    = auto_link simple_format @news.body
+
+= link_to t('.back_to_index'), news_index_path, class: 'btn btn-default'

--- /dev/null
+++ b/app/views/news/show.json.jbuilder
@@ -0,0 +1 @@
+json.extract! @news, :title, :body, :skip_headline, :created_at, :updated_at

--- a/config/application.rb
+++ b/config/application.rb
@@ -27,5 +27,6 @@ module NvcServ
     }
     config.admin_user = nil
     config.admin_pass = nil
+    config.headline_daylimit = 7
   end
 end

--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -25,6 +25,11 @@ en:
       title: Listing Voice Data
     show:
       title: Voice Data Details
+  news:
+    index:
+      title: News
+    show:
+      back_to_index: Back to news index
   simple_form:
     hints:
       navi_voice:

--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -2,6 +2,7 @@ ja:
   activerecord:
     models:
       navi_voice: ナビ音声
+      news: お知らせ
     attributes:
       navi_voice:
         title: タイトル
@@ -22,6 +23,9 @@ ja:
         tos_agree: 以下の規約上問題ありません
         created_at: アップロード日時
         dlcount: ダウンロード回数
+      news:
+        title: タイトル
+        body: 本文
   unit:
     metric: メートル
     imperial: ヤード・ポンド
@@ -37,6 +41,11 @@ ja:
       title: 音声データ一覧
     show:
       title: 音声データの詳細
+  news:
+    index:
+      title: お知らせ一覧
+    show:
+      back_to_index: お知らせ一覧に戻る
   simple_form:
     hints:
       navi_voice:
@@ -58,5 +67,6 @@ ja:
     guide: 作成ガイド
     voice_data: 音声データ
     upload: アップロード
+    news: お知らせ
 
   site_title: ナビボイスチェンジャー
\ No newline at end of file

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -13,6 +13,7 @@ NvcServ::Application.routes.draw do
       get 'archive'
     end
   end
+  resources :news, only: [:index, :show]
 
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".

--- /dev/null
+++ b/db/migrate/20131025183439_create_news.rb
@@ -0,0 +1,12 @@
+class CreateNews < ActiveRecord::Migration
+  def change
+    create_table :news do |t|
+      t.string :title, default: '', null: false
+      t.text :body, default: ''
+      t.boolean :skip_headline, default: false, null: false
+
+      t.timestamps
+    end
+    add_index :news, :created_at
+  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: 20130802111636) do
+ActiveRecord::Schema.define(version: 20131025183439) do
 
   create_table "dl_log_entries", force: true do |t|
     t.string   "ident"
@@ -47,6 +47,16 @@ ActiveRecord::Schema.define(version: 20130802111636) do
   add_index "navi_voices", ["dlcount"], name: "index_navi_voices_on_dlcount"
   add_index "navi_voices", ["rating", "disabled"], name: "index_navi_voices_on_rating_and_disabled"
 
+  create_table "news", force: true do |t|
+    t.string   "title",         default: "",    null: false
+    t.text     "body",          default: ""
+    t.boolean  "skip_headline", default: false, null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "news", ["created_at"], name: "index_news_on_created_at"
+
   create_table "ratings", force: true do |t|
     t.string   "ident"
     t.integer  "navi_voice_id"

--- /dev/null
+++ b/spec/controllers/news_controller_spec.rb
@@ -0,0 +1,160 @@
+require 'spec_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
+
+describe NewsController do
+
+  # This should return the minimal set of attributes required to create a valid
+  # News. As you add validations to News, be sure to
+  # adjust the attributes here as well.
+  let(:valid_attributes) { { "title" => "MyString" } }
+
+  # This should return the minimal set of values that should be in the session
+  # in order to pass any filters (e.g. authentication) defined in
+  # NewsController. Be sure to keep this updated too.
+  let(:valid_session) { {} }
+
+  describe "GET index" do
+    it "assigns all news as @news" do
+      news = News.create! valid_attributes
+      get :index, {}, valid_session
+      assigns(:news).should eq([news])
+    end
+  end
+
+  describe "GET show" do
+    it "assigns the requested news as @news" do
+      news = News.create! valid_attributes
+      get :show, {:id => news.to_param}, valid_session
+      assigns(:news).should eq(news)
+    end
+  end
+
+  describe "GET new" do
+    it "assigns a new news as @news" do
+      get :new, {}, valid_session
+      assigns(:news).should be_a_new(News)
+    end
+  end
+
+  describe "GET edit" do
+    it "assigns the requested news as @news" do
+      news = News.create! valid_attributes
+      get :edit, {:id => news.to_param}, valid_session
+      assigns(:news).should eq(news)
+    end
+  end
+
+  describe "POST create" do
+    describe "with valid params" do
+      it "creates a new News" do
+        expect {
+          post :create, {:news => valid_attributes}, valid_session
+        }.to change(News, :count).by(1)
+      end
+
+      it "assigns a newly created news as @news" do
+        post :create, {:news => valid_attributes}, valid_session
+        assigns(:news).should be_a(News)
+        assigns(:news).should be_persisted
+      end
+
+      it "redirects to the created news" do
+        post :create, {:news => valid_attributes}, valid_session
+        response.should redirect_to(News.last)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns a newly created but unsaved news as @news" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        News.any_instance.stub(:save).and_return(false)
+        post :create, {:news => { "title" => "invalid value" }}, valid_session
+        assigns(:news).should be_a_new(News)
+      end
+
+      it "re-renders the 'new' template" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        News.any_instance.stub(:save).and_return(false)
+        post :create, {:news => { "title" => "invalid value" }}, valid_session
+        response.should render_template("new")
+      end
+    end
+  end
+
+  describe "PUT update" do
+    describe "with valid params" do
+      it "updates the requested news" do
+        news = News.create! valid_attributes
+        # Assuming there are no other news in the database, this
+        # specifies that the News created on the previous line
+        # receives the :update_attributes message with whatever params are
+        # submitted in the request.
+        News.any_instance.should_receive(:update).with({ "title" => "MyString" })
+        put :update, {:id => news.to_param, :news => { "title" => "MyString" }}, valid_session
+      end
+
+      it "assigns the requested news as @news" do
+        news = News.create! valid_attributes
+        put :update, {:id => news.to_param, :news => valid_attributes}, valid_session
+        assigns(:news).should eq(news)
+      end
+
+      it "redirects to the news" do
+        news = News.create! valid_attributes
+        put :update, {:id => news.to_param, :news => valid_attributes}, valid_session
+        response.should redirect_to(news)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns the news as @news" do
+        news = News.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        News.any_instance.stub(:save).and_return(false)
+        put :update, {:id => news.to_param, :news => { "title" => "invalid value" }}, valid_session
+        assigns(:news).should eq(news)
+      end
+
+      it "re-renders the 'edit' template" do
+        news = News.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        News.any_instance.stub(:save).and_return(false)
+        put :update, {:id => news.to_param, :news => { "title" => "invalid value" }}, valid_session
+        response.should render_template("edit")
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    it "destroys the requested news" do
+      news = News.create! valid_attributes
+      expect {
+        delete :destroy, {:id => news.to_param}, valid_session
+      }.to change(News, :count).by(-1)
+    end
+
+    it "redirects to the news list" do
+      news = News.create! valid_attributes
+      delete :destroy, {:id => news.to_param}, valid_session
+      response.should redirect_to(news_index_url)
+    end
+  end
+
+end

--- /dev/null
+++ b/spec/helpers/news_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the NewsHelper. For example:
+#
+# describe NewsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+describe NewsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

--- /dev/null
+++ b/spec/models/news_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe News do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

--- /dev/null
+++ b/spec/requests/news_spec.rb
@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "News" do
+  describe "GET /news" do
+    it "works! (now write some real specs)" do
+      # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
+      get news_index_path
+      response.status.should be(200)
+    end
+  end
+end

--- /dev/null
+++ b/spec/routing/news_routing_spec.rb
@@ -0,0 +1,35 @@
+require "spec_helper"
+
+describe NewsController do
+  describe "routing" do
+
+    it "routes to #index" do
+      get("/news").should route_to("news#index")
+    end
+
+    it "routes to #new" do
+      get("/news/new").should route_to("news#new")
+    end
+
+    it "routes to #show" do
+      get("/news/1").should route_to("news#show", :id => "1")
+    end
+
+    it "routes to #edit" do
+      get("/news/1/edit").should route_to("news#edit", :id => "1")
+    end
+
+    it "routes to #create" do
+      post("/news").should route_to("news#create")
+    end
+
+    it "routes to #update" do
+      put("/news/1").should route_to("news#update", :id => "1")
+    end
+
+    it "routes to #destroy" do
+      delete("/news/1").should route_to("news#destroy", :id => "1")
+    end
+
+  end
+end

--- /dev/null
+++ b/spec/views/news/edit.html.haml_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe "news/edit" do
+  before(:each) do
+    @news = assign(:news, stub_model(News,
+      :title => "MyString",
+      :body => "MyText",
+      :skip_headline => false
+    ))
+  end
+
+  it "renders the edit news form" do
+    render
+
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "form[action=?][method=?]", news_path(@news), "post" do
+      assert_select "input#news_title[name=?]", "news[title]"
+      assert_select "textarea#news_body[name=?]", "news[body]"
+      assert_select "input#news_skip_headline[name=?]", "news[skip_headline]"
+    end
+  end
+end

--- /dev/null
+++ b/spec/views/news/index.html.haml_spec.rb
@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe "news/index" do
+  before(:each) do
+    assign(:news, [
+      stub_model(News,
+        :title => "Title",
+        :body => "MyText",
+        :skip_headline => false
+      ),
+      stub_model(News,
+        :title => "Title",
+        :body => "MyText",
+        :skip_headline => false
+      )
+    ])
+  end
+
+  it "renders a list of news" do
+    render
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "tr>td", :text => "Title".to_s, :count => 2
+    assert_select "tr>td", :text => "MyText".to_s, :count => 2
+    assert_select "tr>td", :text => false.to_s, :count => 2
+  end
+end

--- /dev/null
+++ b/spec/views/news/new.html.haml_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe "news/new" do
+  before(:each) do
+    assign(:news, stub_model(News,
+      :title => "MyString",
+      :body => "MyText",
+      :skip_headline => false
+    ).as_new_record)
+  end
+
+  it "renders new news form" do
+    render
+
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "form[action=?][method=?]", news_index_path, "post" do
+      assert_select "input#news_title[name=?]", "news[title]"
+      assert_select "textarea#news_body[name=?]", "news[body]"
+      assert_select "input#news_skip_headline[name=?]", "news[skip_headline]"
+    end
+  end
+end

--- /dev/null
+++ b/spec/views/news/show.html.haml_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe "news/show" do
+  before(:each) do
+    @news = assign(:news, stub_model(News,
+      :title => "Title",
+      :body => "MyText",
+      :skip_headline => false
+    ))
+  end
+
+  it "renders attributes in <p>" do
+    render
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    rendered.should match(/Title/)
+    rendered.should match(/MyText/)
+    rendered.should match(/false/)
+  end
+end