-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
+ Configファイルを作成し、Controller・Viewsの冗長をなくす + テストフレームワークをMiniTestからRSpecに変更 + Rakefileの中身もConfigを読み込むように変更
- Loading branch information
Showing
20 changed files
with
413 additions
and
185 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,6 @@ | |
| /tmp | ||
|
|
||
| # Ignore bundler | ||
| /Gemfile.lock | ||
| /vendor/* | ||
|
|
||
| # Ignore DB seeds | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| --color | ||
| --warnings | ||
| --require spec_helper |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,199 @@ | ||
| GEM | ||
| remote: https://rubygems.org/ | ||
| specs: | ||
| actionmailer (4.2.3) | ||
| actionpack (= 4.2.3) | ||
| actionview (= 4.2.3) | ||
| activejob (= 4.2.3) | ||
| mail (~> 2.5, >= 2.5.4) | ||
| rails-dom-testing (~> 1.0, >= 1.0.5) | ||
| actionpack (4.2.3) | ||
| actionview (= 4.2.3) | ||
| activesupport (= 4.2.3) | ||
| rack (~> 1.6) | ||
| rack-test (~> 0.6.2) | ||
| rails-dom-testing (~> 1.0, >= 1.0.5) | ||
| rails-html-sanitizer (~> 1.0, >= 1.0.2) | ||
| actionview (4.2.3) | ||
| activesupport (= 4.2.3) | ||
| builder (~> 3.1) | ||
| erubis (~> 2.7.0) | ||
| rails-dom-testing (~> 1.0, >= 1.0.5) | ||
| rails-html-sanitizer (~> 1.0, >= 1.0.2) | ||
| activejob (4.2.3) | ||
| activesupport (= 4.2.3) | ||
| globalid (>= 0.3.0) | ||
| activemodel (4.2.3) | ||
| activesupport (= 4.2.3) | ||
| builder (~> 3.1) | ||
| activerecord (4.2.3) | ||
| activemodel (= 4.2.3) | ||
| activesupport (= 4.2.3) | ||
| arel (~> 6.0) | ||
| activesupport (4.2.3) | ||
| i18n (~> 0.7) | ||
| json (~> 1.7, >= 1.7.7) | ||
| minitest (~> 5.1) | ||
| thread_safe (~> 0.3, >= 0.3.4) | ||
| tzinfo (~> 1.1) | ||
| anemone (0.7.2) | ||
| nokogiri (>= 1.3.0) | ||
| robotex (>= 1.0.0) | ||
| arel (6.0.3) | ||
| binding_of_caller (0.7.2) | ||
| debug_inspector (>= 0.0.1) | ||
| builder (3.2.2) | ||
| byebug (8.2.2) | ||
| coffee-rails (4.1.1) | ||
| coffee-script (>= 2.2.0) | ||
| railties (>= 4.0.0, < 5.1.x) | ||
| coffee-script (2.4.1) | ||
| coffee-script-source | ||
| execjs | ||
| coffee-script-source (1.10.0) | ||
| concurrent-ruby (1.0.0) | ||
| debug_inspector (0.0.2) | ||
| diff-lcs (1.2.5) | ||
| erubis (2.7.0) | ||
| execjs (2.6.0) | ||
| globalid (0.3.6) | ||
| activesupport (>= 4.1.0) | ||
| i18n (0.7.0) | ||
| jbuilder (2.4.1) | ||
| activesupport (>= 3.0.0, < 5.1) | ||
| multi_json (~> 1.2) | ||
| jquery-rails (4.1.0) | ||
| rails-dom-testing (~> 1.0) | ||
| railties (>= 4.2.0) | ||
| thor (>= 0.14, < 2.0) | ||
| json (1.8.3) | ||
| libv8 (3.16.14.13) | ||
| loofah (2.0.3) | ||
| nokogiri (>= 1.5.9) | ||
| mail (2.6.3) | ||
| mime-types (>= 1.16, < 3) | ||
| mime-types (2.99) | ||
| mini_portile2 (2.0.0) | ||
| minitest (5.8.4) | ||
| multi_json (1.11.2) | ||
| mysql2 (0.3.20) | ||
| nokogiri (1.6.7.2) | ||
| mini_portile2 (~> 2.0.0.rc2) | ||
| rack (1.6.4) | ||
| rack-test (0.6.3) | ||
| rack (>= 1.0) | ||
| rails (4.2.3) | ||
| actionmailer (= 4.2.3) | ||
| actionpack (= 4.2.3) | ||
| actionview (= 4.2.3) | ||
| activejob (= 4.2.3) | ||
| activemodel (= 4.2.3) | ||
| activerecord (= 4.2.3) | ||
| activesupport (= 4.2.3) | ||
| bundler (>= 1.3.0, < 2.0) | ||
| railties (= 4.2.3) | ||
| sprockets-rails | ||
| rails-deprecated_sanitizer (1.0.3) | ||
| activesupport (>= 4.2.0.alpha) | ||
| rails-dom-testing (1.0.7) | ||
| activesupport (>= 4.2.0.beta, < 5.0) | ||
| nokogiri (~> 1.6.0) | ||
| rails-deprecated_sanitizer (>= 1.0.1) | ||
| rails-html-sanitizer (1.0.3) | ||
| loofah (~> 2.0) | ||
| railties (4.2.3) | ||
| actionpack (= 4.2.3) | ||
| activesupport (= 4.2.3) | ||
| rake (>= 0.8.7) | ||
| thor (>= 0.18.1, < 2.0) | ||
| rake (10.5.0) | ||
| rdoc (4.2.2) | ||
| json (~> 1.4) | ||
| ref (2.0.0) | ||
| robotex (1.0.0) | ||
| rspec-core (3.0.4) | ||
| rspec-support (~> 3.0.0) | ||
| rspec-expectations (3.0.4) | ||
| diff-lcs (>= 1.2.0, < 2.0) | ||
| rspec-support (~> 3.0.0) | ||
| rspec-mocks (3.0.4) | ||
| rspec-support (~> 3.0.0) | ||
| rspec-rails (3.0.2) | ||
| actionpack (>= 3.0) | ||
| activesupport (>= 3.0) | ||
| railties (>= 3.0) | ||
| rspec-core (~> 3.0.0) | ||
| rspec-expectations (~> 3.0.0) | ||
| rspec-mocks (~> 3.0.0) | ||
| rspec-support (~> 3.0.0) | ||
| rspec-support (3.0.4) | ||
| sass (3.4.21) | ||
| sass-rails (5.0.4) | ||
| railties (>= 4.0.0, < 5.0) | ||
| sass (~> 3.1) | ||
| sprockets (>= 2.8, < 4.0) | ||
| sprockets-rails (>= 2.0, < 4.0) | ||
| tilt (>= 1.1, < 3) | ||
| sdoc (0.4.1) | ||
| json (~> 1.7, >= 1.7.7) | ||
| rdoc (~> 4.0) | ||
| slim (3.0.6) | ||
| temple (~> 0.7.3) | ||
| tilt (>= 1.3.3, < 2.1) | ||
| slim-rails (3.0.1) | ||
| actionmailer (>= 3.1, < 5.0) | ||
| actionpack (>= 3.1, < 5.0) | ||
| activesupport (>= 3.1, < 5.0) | ||
| railties (>= 3.1, < 5.0) | ||
| slim (~> 3.0) | ||
| spring (1.6.3) | ||
| sprockets (3.5.2) | ||
| concurrent-ruby (~> 1.0) | ||
| rack (> 1, < 3) | ||
| sprockets-rails (3.0.1) | ||
| actionpack (>= 4.0) | ||
| activesupport (>= 4.0) | ||
| sprockets (>= 3.0.0) | ||
| temple (0.7.6) | ||
| therubyracer (0.12.2) | ||
| libv8 (~> 3.16.14.0) | ||
| ref | ||
| thor (0.19.1) | ||
| thread_safe (0.3.5) | ||
| tilt (2.0.2) | ||
| turbolinks (2.5.3) | ||
| coffee-rails | ||
| tzinfo (1.2.2) | ||
| thread_safe (~> 0.1) | ||
| uglifier (2.7.2) | ||
| execjs (>= 0.3.0) | ||
| json (>= 1.8.0) | ||
| web-console (2.3.0) | ||
| activemodel (>= 4.0) | ||
| binding_of_caller (>= 0.7.2) | ||
| railties (>= 4.0) | ||
| sprockets-rails (>= 2.0, < 4.0) | ||
|
|
||
| PLATFORMS | ||
| ruby | ||
|
|
||
| DEPENDENCIES | ||
| anemone | ||
| byebug | ||
| coffee-rails (~> 4.1.0) | ||
| jbuilder (~> 2.0) | ||
| jquery-rails | ||
| mysql2 (~> 0.3.20) | ||
| rails (= 4.2.3) | ||
| rspec-rails (~> 3.0.0) | ||
| sass-rails (~> 5.0) | ||
| sdoc (~> 0.4.0) | ||
| slim-rails | ||
| spring | ||
| therubyracer | ||
| turbolinks | ||
| uglifier (>= 1.3.0) | ||
| web-console (~> 2.0) | ||
|
|
||
| BUNDLED WITH | ||
| 1.11.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,9 @@ | ||
| class RankingController < ApplicationController | ||
|
|
||
| def history | ||
| @products = [] | ||
| params[:cate] ||= "all" | ||
|
|
||
| video = Video.order(view: 'desc').limit(100) | ||
| video.where!(category: params[:cate]) unless params[:cate] == "all" | ||
|
|
||
| video.each do |v| | ||
| @products += [{img: v.image, date: v.created_at.strftime('%Y年%m月%d日 %H時%M分%S秒'), comment: v.comment.to_s.gsub(/(\d)(?=(\d{3})+(?!\d))/, '\1,'), view: v.view.to_s.gsub(/(\d)(?=(\d{3})+(?!\d))/, '\1,'), title: v.title, link: v.url}] | ||
| end | ||
|
|
||
| @video = Video.order(view: 'desc').limit(100) | ||
| @video.where!(category: params[:cate]) unless params[:cate] == "all" | ||
| end | ||
|
|
||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.