コミット: 5705bd43fa99d835e4e4452b4925ec69d1dc48f6 - nvc_serv (git)

Voice data server for navigation voice changer app.

コミットメタ情報

• リビジョン: 5705bd43fa99d835e4e4452b4925ec69d1dc48f6 (tree)
• 日時: 2016-09-29 22:58:18
• 作者: HMML <hmml3939@gmai...>
• コミッター: HMML

ログメッセージ

Tune upload error handling, update paperclip.

変更サマリ

• modified: Gemfile
• modified: Gemfile.lock
• modified: app/controllers/navi_voices_controller.rb
• modified: app/models/navi_voice.rb
• modified: app/views/layouts/_messages.html.haml
• modified: app/views/layouts/_navigation.html.haml
• modified: app/views/navi_voices/_form.html.haml
• modified: config/locales/en.yml
• modified: config/locales/ja.yml

差分

--- a/Gemfile
+++ b/Gemfile
@@ -59,7 +59,7 @@ gem 'client_side_validations'
 gem 'client_side_validations-simple_form'
 gem 'responders'
 gem 'rspec-rails', group: [:development, :test]
-gem 'paperclip', '3.5.0'
+gem 'paperclip'
 gem 'rubyzip', '< 1.0.0', require: 'zip/zip'
 gem 'rails_admin'
 group :develpment do

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -121,6 +121,7 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
+    mimemagic (0.3.2)
     minitest (5.9.1)
     multi_json (1.12.1)
     mysql2 (0.4.4)
@@ -130,11 +131,12 @@ GEM
     net-ssh (3.2.0)
     nokogiri (1.6.8)
       pkg-config (~> 1.1.7)
-    paperclip (3.5.0)
-      activemodel (>= 3.0.0)
-      activesupport (>= 3.0.0)
-      cocaine (~> 0.5.0)
+    paperclip (5.1.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
+      cocaine (~> 0.5.5)
       mime-types
+      mimemagic (~> 0.3.0)
     pkg-config (1.1.7)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
@@ -271,7 +273,7 @@ DEPENDENCIES
   jquery-rails
   kaminari
   mysql2
-  paperclip (= 3.5.0)
+  paperclip
   quiet_assets
   rails (= 4.2.7.1)
   rails-i18n

--- a/app/controllers/navi_voices_controller.rb
+++ b/app/controllers/navi_voices_controller.rb
@@ -56,6 +56,7 @@ class NaviVoicesController < ApplicationController
       logger.info "Delete NaviVoice ##{@navi_voice.id}, from #{request.remote_ip})"
       @navi_voice.destroy
     else
+      flash[:error] = t 'delete_key_is_not_matched'
       @navi_voice.errors[:delete_key] << 'is not matched.'
       logger.info "Delete denied: Key validation failed for ##{@navi_voice.id}, from #{request.remote_ip}"
     end

--- a/app/models/navi_voice.rb
+++ b/app/models/navi_voice.rb
@@ -12,7 +12,9 @@ class NaviVoice < ActiveRecord::Base
   attr_accessor :raw_delete_key
   attr_accessor :tos_agree
 
-  validates_attachment :archive, presence: true, size: {less_than: 5120.kilobytes}
+  validates_attachment :archive, presence: true,
+    size: {less_than: 5120.kilobytes},
+    content_type: { content_type: %w(application/zip) }
   validates :archive, voice_archive: { on: :create }
   validates :title, presence: true, length: {maximum: 80}
   validates :description, length: {maximum: 280}

--- a/app/views/layouts/_messages.html.haml
+++ b/app/views/layouts/_messages.html.haml
@@ -1,5 +1,5 @@
 - flash.each do |name, msg|
   - if msg.is_a?(String)
-    %div{:class => "alert alert-#{name == :notice ? "success" : "danger"}"}
+    %div{:class => "alert alert-#{name.to_s == 'notice' ? "success" : "danger"}"}
       %a.close{"data-dismiss" => "alert"} ×
       = content_tag :div, msg, :id => "flash_#{name}"

--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -17,5 +17,5 @@
         = link_to t('navi.news'), news_index_path
     - if @headline
       %p.navbar-text.pull-right.headline
-        %span.glyphicon.glyphicon-exclamation-sign
+        %span.icon-exclamation-sign  
         = link_to "#{@headline.created_at.strftime('%m/%d')} #{@headline.title}", @headline, class: 'navbar-link'

--- a/app/views/navi_voices/_form.html.haml
+++ b/app/views/navi_voices/_form.html.haml
@@ -17,3 +17,8 @@
     = f.input :tos_agree, as: :boolean
   = next_arrow
   = f.button :submit, class: 'btn btn-primary btn-lg btn-block', id: 'btn-nv-submit'
+
+:coffee
+  $('#new_navi_voice').on 'submit', ->
+    $('#btn-nv-submit').val('#{t "uploading_wait"}').attr('disabled', 'disabled')
+    return true

--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -57,3 +57,5 @@ en:
     err_normalize: Failed on rate/channel normalization
 
   site_title: NaviVoiceChanger
+  delete_key_is_not_matched: Delete key is not matched.
+  uploading_wait: Uploading, please wait...
\ No newline at end of file

--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -77,3 +77,5 @@ ja:
     err_normalize: サンプルレート/チャネル数の変更に失敗しました
 
   site_title: ナビボイスチェンジャー
+  delete_key_is_not_matched: 削除キーが違います
+  uploading_wait: アップロード中です...
\ No newline at end of file