Permalink
Browse files

Rails5(RC1)に移行 / 入手先検索のバグを修正 / viewのコードを修正 / データの誤りを修正

  • Loading branch information...
parrot-studio committed May 21, 2016
1 parent 0e39921 commit 9f3e715dc667d3191e9ea5fc28225b92bdb82c69
Showing with 730 additions and 963 deletions.
  1. +5 −5 .gitignore
  2. +17 −14 Gemfile
  3. +88 −80 Gemfile.lock
  4. +1 −1 LICENSE
  5. +1 −1 README.md
  6. +1 −1 Rakefile
  7. +3 −0 app/assets/config/manifest.js
  8. +2 −2 app/assets/javascripts/application.js
  9. +13 −0 app/assets/javascripts/cable.js
  10. 0 {test/controllers → app/assets/javascripts/channels}/.keep
  11. +3 −3 app/assets/stylesheets/application.css
  12. +5 −0 app/channels/application_cable/channel.rb
  13. +5 −0 app/channels/application_cable/connection.rb
  14. +0 −1 app/controllers/viewer_controller.rb
  15. +2 −0 app/jobs/application_job.rb
  16. +1 −1 app/models/ability.rb
  17. +3 −2 app/models/ability_effect.rb
  18. +3 −0 app/models/application_record.rb
  19. +6 −6 app/models/arcana.rb
  20. +1 −1 app/models/chain_ability.rb
  21. +3 −2 app/models/chain_ability_effect.rb
  22. +1 −1 app/models/illustrator.rb
  23. +2 −1 app/models/skill.rb
  24. +2 −1 app/models/skill_effect.rb
  25. +1 −1 app/models/voice_actor.rb
  26. +1 −1 bin/rails
  27. +17 −12 bin/setup
  28. +29 −0 bin/update
  29. +2 −1 config.ru
  30. +2 −5 config/application.rb
  31. +1 −1 config/boot.rb
  32. +10 −0 config/cable.yml
  33. +4 −0 config/changelogs.yml
  34. +3 −3 config/database.yml
  35. +1 −1 config/environment.rb
  36. +22 −12 config/environments/development.rb
  37. +26 −17 config/environments/production.rb
  38. +6 −6 config/environments/test.rb
  39. +6 −0 config/initializers/active_record_belongs_to_required_by_default.rb
  40. +6 −0 config/initializers/application_controller_renderer.rb
  41. +6 −0 config/initializers/callback_terminator.rb
  42. +2 −0 config/initializers/cookies_serializer.rb
  43. +4 −0 config/initializers/per_form_csrf_tokens.rb
  44. +4 −0 config/initializers/request_forgery_protection.rb
  45. +4 −0 config/initializers/ssl_options.rb
  46. +10 −0 config/initializers/to_time_preserves_timezone.rb
  47. +1 −1 config/initializers/wrap_parameters.rb
  48. +47 −0 config/puma.rb
  49. +3 −3 config/secrets.yml
  50. +0 −3 config/settings.yml
  51. +6 −0 config/spring.rb
  52. +2 −2 db/arcanas.csv
  53. +0 −158 db/migrate/20150714023444_create_arcanas.rb
  54. +0 −11 db/migrate/20150809082623_add_skill_columns.rb
  55. +0 −7 db/migrate/20151017014317_add_weapon_ability.rb
  56. +0 −6 db/migrate/20151206003541_add_skil2.rb
  57. +0 −12 db/migrate/20160427012608_add_third_skill.rb
  58. +174 −0 db/migrate/20160507003347_create_initial_tables.rb
  59. +0 −29 db/old/20140617063043_create_arcanas.rb
  60. +0 −6 db/old/20140708023651_add_source.rb
  61. +0 −11 db/old/20140708033428_create_voice_actors.rb
  62. +0 −6 db/old/20140708034717_add_voice_actor_id.rb
  63. +0 −10 db/old/20140708053200_create_illustrators.rb
  64. +0 −6 db/old/20140708053449_add_illustrator_id.rb
  65. +0 −6 db/old/20140708063135_add_growth_type.rb
  66. +0 −16 db/old/20140716084114_create_skills.rb
  67. +0 −6 db/old/20140717024916_add_skill_id.rb
  68. +0 −6 db/old/20140718015634_add_addition.rb
  69. +0 −13 db/old/20140725065324_add_arcana_property.rb
  70. +0 −15 db/old/20140731060340_create_abilities.rb
  71. +0 −8 db/old/20140731061610_add_ability_id.rb
  72. +0 −9 db/old/20140810145949_add_id_default.rb
  73. +0 −6 db/old/20140827021700_remove_addition.rb
  74. +0 −9 db/old/20140827082658_add_ability_effect.rb
  75. +0 −8 db/old/20140903023438_remove_hometown.rb
  76. +0 −8 db/old/20140919025005_add_subeffect.rb
  77. +0 −7 db/old/20140924073703_add_source_category.rb
  78. +0 −8 db/old/20140930045354_change_column_name.rb
  79. +0 −12 db/old/20141002023953_create_ability_effects.rb
  80. +0 −9 db/old/20141002024017_create_ability_relations.rb
  81. +0 −14 db/old/20141002053409_remove_effects_in_ability.rb
  82. +0 −7 db/old/20141003020102_add_relation_index.rb
  83. +0 −10 db/old/20141003021400_create_chain_abilities.rb
  84. +0 −14 db/old/20141003021510_create_chain_ability_relations.rb
  85. +0 −6 db/old/20141005020849_add_chain_ability_id.rb
  86. +0 −12 db/old/20141006080710_create_chain_ability_effects.rb
  87. +0 −6 db/old/20141009061023_add_chain_cost.rb
  88. +0 −19 db/old/20141219044119_create_skill_effects.rb
  89. +0 −12 db/old/20141219071408_remove_skill_columns.rb
  90. +0 −6 db/old/20150207073959_add_skill_sub_effect.rb
  91. +0 −38 db/old/20150706012142_replace_ability_tables.rb
  92. +94 −103 db/schema.rb
  93. +3 −3 db/seeds.rb
  94. +18 −15 lib/arcana_importer.rb
  95. +26 −37 lib/arcana_searcher.rb
  96. +1 −5 lib/server_settings.rb
  97. +1 −1 package.json
  98. 0 test/controllers/.keep_1 → public/apple-touch-icon-precomposed.png
  99. 0 test/fixtures/.keep → public/apple-touch-icon.png
  100. +1 −1 test/controllers/viewer_controller_test.rb
  101. 0 test/fixtures/.keep_1
  102. +2 −2 test/fixtures/abilities.yml
  103. +2 −2 test/fixtures/ability_effects.yml
  104. +0 −11 test/fixtures/ability_relations.yml
  105. +2 −2 test/fixtures/arcanas.yml
  106. +2 −2 test/fixtures/chain_abilities.yml
  107. +2 −2 test/fixtures/chain_ability_effects.yml
  108. +0 −11 test/fixtures/chain_ability_relations.yml
  109. 0 test/{helpers → fixtures/files}/.keep
  110. +2 −2 test/fixtures/illustrators.yml
  111. +2 −2 test/fixtures/skill_effects.yml
  112. +2 −2 test/fixtures/skills.yml
  113. +2 −2 test/fixtures/voice_actors.yml
  114. 0 test/helpers/.keep_1
  115. 0 test/integration/.keep_1
  116. 0 test/mailers/.keep_1
  117. 0 test/models/.keep
  118. 0 test/models/.keep_1
  119. +0 −7 test/models/ability_relation_test.rb
  120. +0 −7 test/models/chain_ability_relation_test.rb
  121. 0 {test/mailers → tmp}/.keep
View
@@ -9,12 +9,12 @@
# Ignore all logfiles and tempfiles.
/log/*
+/tmp/*
!/log/.keep
-/tmp
+!/tmp/.keep
+
+# Ignore Byebug command history file.
+.byebug_history
-/vendor/assets/bower_components
-*.bowerrc
-bower.json
/vendor/bundle
node_modules
-
View
31 Gemfile
@@ -1,49 +1,52 @@
source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 4.2.0'
+gem 'rails', '>= 5.0.0.rc1', '< 5.1'
# Use mysql as the database for Active Record
-gem 'mysql2', '~> 0.3.20'
+gem 'mysql2', '>= 0.3.18', '< 0.5'
+# Use Puma as the app server
+gem 'puma', '~> 3.0'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.1.0'
-gem 'coffee-script-source', '~> 1.8.0' # see https://github.com/jashkenas/coffeescript/issues/3829
-# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+# See https://github.com/rails/execjs#readme for more supported runtimes
gem 'therubyracer', platforms: :ruby
# Use jquery as the JavaScript library
gem 'jquery-rails'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
-# bundle exec rake doc:rails generates the API under doc/api.
-gem 'sdoc', '~> 0.4.0', group: :doc
-
+# Use Redis adapter to run Action Cable in production
+# gem 'redis', '~> 3.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'
-# Use Unicorn as the app server
-gem 'unicorn'
-
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
- gem 'byebug'
-
- # Access an IRB console on exception pages or by using <%= console %> in views
- gem 'web-console', '~> 2.0'
+ gem 'byebug', platform: :mri
+end
+group :development do
+ # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
+ gem 'web-console'
+ gem 'listen', '~> 3.0.5'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
+ gem 'spring-watcher-listen', '~> 2.0.0'
gem 'i18n_generators'
gem 'rubocop'
end
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
# need for app
gem 'jquery-ui-rails'
gem 'bootstrap-sass'
View
@@ -1,73 +1,74 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.2.6)
- actionpack (= 4.2.6)
- actionview (= 4.2.6)
- activejob (= 4.2.6)
+ actioncable (5.0.0.rc1)
+ actionpack (= 5.0.0.rc1)
+ nio4r (~> 1.2)
+ websocket-driver (~> 0.6.1)
+ actionmailer (5.0.0.rc1)
+ actionpack (= 5.0.0.rc1)
+ actionview (= 5.0.0.rc1)
+ activejob (= 5.0.0.rc1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.6)
- actionview (= 4.2.6)
- activesupport (= 4.2.6)
- rack (~> 1.6)
- rack-test (~> 0.6.2)
+ actionpack (5.0.0.rc1)
+ actionview (= 5.0.0.rc1)
+ activesupport (= 5.0.0.rc1)
+ rack (~> 2.x)
+ rack-test (~> 0.6.3)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (4.2.6)
- activesupport (= 4.2.6)
+ actionview (5.0.0.rc1)
+ activesupport (= 5.0.0.rc1)
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.6)
- activesupport (= 4.2.6)
- globalid (>= 0.3.0)
- activemodel (4.2.6)
- activesupport (= 4.2.6)
- builder (~> 3.1)
- activerecord (4.2.6)
- activemodel (= 4.2.6)
- activesupport (= 4.2.6)
- arel (~> 6.0)
- activesupport (4.2.6)
+ activejob (5.0.0.rc1)
+ activesupport (= 5.0.0.rc1)
+ globalid (>= 0.3.6)
+ activemodel (5.0.0.rc1)
+ activesupport (= 5.0.0.rc1)
+ activerecord (5.0.0.rc1)
+ activemodel (= 5.0.0.rc1)
+ activesupport (= 5.0.0.rc1)
+ arel (~> 7.0)
+ activesupport (5.0.0.rc1)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
- json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
- thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- arel (6.0.3)
+ arel (7.0.0)
ast (2.2.0)
- autoprefixer-rails (6.3.6)
+ autoprefixer-rails (6.3.6.1)
execjs
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
- binding_of_caller (0.7.2)
- debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.6)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
browserify-rails (3.0.1)
railties (>= 4.0.0, < 5.0)
sprockets (>= 3.5.2)
builder (3.2.2)
- byebug (8.2.4)
+ byebug (9.0.4)
coderay (1.1.1)
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.8.0)
- concurrent-ruby (1.0.1)
+ coffee-script-source (1.10.0)
+ concurrent-ruby (1.0.2)
connection_pool (2.2.0)
debug_inspector (0.0.2)
erubis (2.7.0)
- execjs (2.6.0)
- font-awesome-sass (4.5.0)
+ execjs (2.7.0)
+ ffi (1.9.10)
+ font-awesome-sass (4.6.2)
sass (>= 3.2)
globalid (0.3.6)
activesupport (>= 4.1.0)
@@ -84,8 +85,10 @@ GEM
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
json (1.8.3)
- kgio (2.10.0)
- libv8 (3.16.14.13)
+ libv8 (3.16.14.15)
+ listen (3.0.8)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
@@ -95,12 +98,13 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0221)
mini_portile2 (2.0.0)
- minitest (5.8.4)
- multi_json (1.11.3)
- mysql2 (0.3.20)
+ minitest (5.9.0)
+ multi_json (1.12.1)
+ mysql2 (0.4.4)
+ nio4r (1.2.1)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
- parser (2.3.0.7)
+ parser (2.3.1.0)
ast (~> 2.2)
powerpack (0.1.1)
pry (0.10.3)
@@ -109,20 +113,23 @@ GEM
slop (~> 3.4)
pry-rails (0.3.4)
pry (>= 0.9.10)
- rack (1.6.4)
+ puma (3.4.0)
+ rack (2.0.0.rc1)
+ json
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.2.6)
- actionmailer (= 4.2.6)
- actionpack (= 4.2.6)
- actionview (= 4.2.6)
- activejob (= 4.2.6)
- activemodel (= 4.2.6)
- activerecord (= 4.2.6)
- activesupport (= 4.2.6)
+ rails (5.0.0.rc1)
+ actioncable (= 5.0.0.rc1)
+ actionmailer (= 5.0.0.rc1)
+ actionpack (= 5.0.0.rc1)
+ actionview (= 5.0.0.rc1)
+ activejob (= 5.0.0.rc1)
+ activemodel (= 5.0.0.rc1)
+ activerecord (= 5.0.0.rc1)
+ activesupport (= 5.0.0.rc1)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.6)
- sprockets-rails
+ railties (= 5.0.0.rc1)
+ sprockets-rails (>= 2.0.0)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
@@ -131,43 +138,44 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
- railties (4.2.6)
- actionpack (= 4.2.6)
- activesupport (= 4.2.6)
+ railties (5.0.0.rc1)
+ actionpack (= 5.0.0.rc1)
+ activesupport (= 5.0.0.rc1)
+ method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
- raindrops (0.16.0)
rake (11.1.2)
- rdoc (4.2.2)
- json (~> 1.4)
- react-rails (1.6.2)
+ rb-fsevent (0.9.7)
+ rb-inotify (0.9.7)
+ ffi (>= 0.5.0)
+ react-rails (1.7.1)
babel-transpiler (>= 0.7.0)
coffee-script-source (~> 1.8)
connection_pool
execjs
rails (>= 3.2)
tilt
ref (2.0.0)
- rubocop (0.39.0)
- parser (>= 2.3.0.7, < 3.0)
+ rubocop (0.40.0)
+ parser (>= 2.3.1.0, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
- ruby-progressbar (1.8.0)
+ ruby-progressbar (1.8.1)
sass (3.4.22)
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)
slop (3.6.0)
spring (1.7.1)
+ spring-watcher-listen (2.0.0)
+ listen (>= 2.7, < 4.0)
+ spring (~> 1.2)
sprockets (3.6.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
@@ -184,20 +192,19 @@ GEM
ref
thor (0.19.1)
thread_safe (0.3.5)
- tilt (2.0.2)
+ tilt (2.0.4)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (3.0.0)
execjs (>= 0.3.0, < 3)
- unicode-display_width (1.0.3)
- unicorn (5.1.0)
- kgio (~> 2.6)
- raindrops (~> 0.7)
- web-console (2.3.0)
- activemodel (>= 4.0)
- binding_of_caller (>= 0.7.2)
- railties (>= 4.0)
- sprockets-rails (>= 2.0, < 4.0)
+ unicode-display_width (1.0.5)
+ web-console (3.1.1)
+ activemodel (>= 4.2)
+ debug_inspector
+ railties (>= 4.2)
+ websocket-driver (0.6.4)
+ websocket-extensions (>= 0.1.0)
+ websocket-extensions (0.1.2)
PLATFORMS
ruby
@@ -207,26 +214,27 @@ DEPENDENCIES
browserify-rails
byebug
coffee-rails (~> 4.1.0)
- coffee-script-source (~> 1.8.0)
font-awesome-sass
i18n_generators
jbuilder (~> 2.0)
jquery-rails
jquery-ui-rails
- mysql2 (~> 0.3.20)
+ listen (~> 3.0.5)
+ mysql2 (>= 0.3.18, < 0.5)
pry
pry-rails
- rails (~> 4.2.0)
+ puma (~> 3.0)
+ rails (>= 5.0.0.rc1, < 5.1)
react-rails
rubocop
sass-rails (~> 5.0)
- sdoc (~> 0.4.0)
spring
+ spring-watcher-listen (~> 2.0.0)
sprockets-es6
therubyracer
+ tzinfo-data
uglifier (>= 1.3.0)
- unicorn
- web-console (~> 2.0)
+ web-console
BUNDLED WITH
- 1.11.2
+ 1.12.3
View
@@ -1,4 +1,4 @@
-Copyright (c) 2014 parrot-studio
+Copyright (c) 2014-2016 parrot-studio
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
View
@@ -9,7 +9,7 @@ Description
個人的には初めて、PCだけでなくタブレットやスマートフォンでの閲覧性も考慮しています。
- Ruby2.3
-- Rails4.2
+- Rails5.0
- React(+ Bacon.js)
- MariaDB
Oops, something went wrong.

0 comments on commit 9f3e715

Please sign in to comment.