From 972f851dbcfdc0bce73cbdc6a57ae539b0eb44b9 Mon Sep 17 00:00:00 2001 From: yasushiito Date: Tue, 14 Jul 2015 18:04:10 +0900 Subject: [PATCH] fix: racer --- .gitignore | 5 +---- Gemfile | 13 +++++++++---- app/models/user.rb | 4 ++-- config/aws.yaml.org | 2 -- config/element.yml.org | 4 ---- config/environments/production.rb | 7 ++----- config/license.yml.org | 6 ------ config/secrets.yml | 2 ++ config/speech_balloon.yml.org | 4 ---- config/writing_format.yml.org | 1 - 10 files changed, 16 insertions(+), 32 deletions(-) delete mode 100644 config/aws.yaml.org delete mode 100644 config/element.yml.org delete mode 100644 config/license.yml.org delete mode 100644 config/speech_balloon.yml.org delete mode 100644 config/writing_format.yml.org diff --git a/.gitignore b/.gitignore index 97f72142..54b0eee4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,11 +8,8 @@ Gemfile.lock public/image/* public/assets/* config/aws.yaml +config/secrets.yml config/picture_io.yml -config/license.yml -config/speech_balloon.yml -config/writing_format.yml -config/element.yml config/profile.json config/test_layout lib/test/temp/ diff --git a/Gemfile b/Gemfile index 35c12253..e05cdeb8 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem 'rails-timeago' gem 'kaminari' gem 'sanitize' gem 'aws-s3' -gem 'aws-sdk', '< 2.0' +#gem 'aws-sdk', '< 2.0' gem 'awesome_nested_set', '~> 3.0' gem 'validates_existence' gem "validate_url" @@ -56,11 +56,16 @@ gem 'bcrypt-ruby', '~> 3.0.0' # To use debugger # gem 'ruby-debug19', :require => 'ruby-debug' +if RUBY_PLATFORM =~ /mingw/ + gem 'therubyracer', :path => '../therubyracer-0.11.0beta1-x86-mingw32' +else + gem 'libv8' + gem 'therubyracer' +end group :production do - gem 'pg' - gem 'therubyracer-heroku' - #gem 'therubyracer' + #gem 'pg' + #gem 'therubyracer-heroku' end group :mgk do diff --git a/app/models/user.rb b/app/models/user.rb index d9872caa..381006c3 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -7,7 +7,7 @@ class User < ActiveRecord::Base devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable, :omniauthable#, :confirmable - + def create_token loop do token = Devise.friendly_token @@ -18,7 +18,7 @@ class User < ActiveRecord::Base end self.save end - + def token_suitable?(token) !self.class.exists?(authentication_token: token) end diff --git a/config/aws.yaml.org b/config/aws.yaml.org deleted file mode 100644 index 869e47f9..00000000 --- a/config/aws.yaml.org +++ /dev/null @@ -1,2 +0,0 @@ -access_key_id: XXXXXXXXXXXXXXXXXXXX -secret_access_key: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/config/element.yml.org b/config/element.yml.org deleted file mode 100644 index 46f91739..00000000 --- a/config/element.yml.org +++ /dev/null @@ -1,4 +0,0 @@ - PanelPicture: panel_pictures - SpeechBalloon: speech_balloons - GroundPicture: ground_pictures - GroundColor: ground_colors diff --git a/config/environments/production.rb b/config/environments/production.rb index 3e74fdde..e2dfd127 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -65,10 +65,7 @@ config.eager_load = true config.active_record.migration_error = :page_load end require 'aws/s3' -require 'yaml' - -y = YAML.load(open(Rails.root + 'config/aws.yaml').read) AWS::S3::Base.establish_connection!( - :access_key_id => y["access_key_id"], - :secret_access_key => y["secret_access_key"] + :access_key_id => Rails.application.secrets.access_key_id, + :secret_access_key => Rails.application.secrets.secret_access_key ) diff --git a/config/license.yml.org b/config/license.yml.org deleted file mode 100644 index 1b92e14e..00000000 --- a/config/license.yml.org +++ /dev/null @@ -1,6 +0,0 @@ - pettanr_creative_commons_v30_licenses: PettanrCreativeCommonsV30Licenses - pettanr_pettan_commons_v01_licenses: PettanrPettanCommonsV01Licenses - pettanr_pettan_protected_v01_licenses: PettanrPettanProtectedV01Licenses - pettanr_pettan_public_v01_licenses: PettanrPettanPublicV01Licenses - pettanr_public_domain_v01_licenses: PettanrPublicDomainV01Licenses - pettanr_unknown_v01_licenses: PettanrUnknownV01Licenses diff --git a/config/secrets.yml b/config/secrets.yml index 19d32f83..5cc8a7e5 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -1,5 +1,7 @@ development: secret_key_base: 6809ff947425908bae66f4c4b2d9a88366d900609d88034914d5719ddf434123772c9cd26fd9d0a15fa080164c6fef77d74033a05de57f0694df0d52dad4e37a + access_key_id: aws-aid-zzzzzz + secret_access_key: aws-key-xxxxxx test: secret_key_base: 6809ff947425908bae66f4c4b2d9a88366d900609d88034914d5719ddf434123772c9cd26fd9d0a15fa080164c6fef77d74033a05de57f0694df0d52dad4e37a diff --git a/config/speech_balloon.yml.org b/config/speech_balloon.yml.org deleted file mode 100644 index bce7abe7..00000000 --- a/config/speech_balloon.yml.org +++ /dev/null @@ -1,4 +0,0 @@ - CircleSpeechBalloon: circle_speech_balloon - PlainSpeechBalloon: plain_speech_balloon - SquareSpeechBalloon: square_speech_balloon -# TestSpeechBalloon: test_speech_balloon diff --git a/config/writing_format.yml.org b/config/writing_format.yml.org deleted file mode 100644 index e61f3139..00000000 --- a/config/writing_format.yml.org +++ /dev/null @@ -1 +0,0 @@ - SimpleFormat: pettanr_simple_format -- 2.11.0