fix: aws s3, asset compile

diff --git a/Gemfile b/Gemfile
index cb1e1fe..76ef083 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+gem 'specific_install'
 
 gem 'rails', '~> 4.1.0'
 gem 'devise'
@@ -11,8 +12,9 @@ gem 'underscore-rails'
 gem 'rails-timeago'
 gem 'kaminari'
 gem 'sanitize'
-#gem 'aws-s3'
-gem 'aws-sdk', '< 2.0'
+gem 'aws-s3'
+#gem 'aws-s3', :git => 'https://github.com/bartoszkopinski/aws-s3'
+#gem 'aws-sdk', '~> 2.0'
 gem 'awesome_nested_set', '~> 3.0'
 gem 'validates_existence'
 gem "validate_url"

diff --git a/app/models/provider_status.rb b/app/models/provider_status.rb
index f49a98e..e95f979 100644 (file)
--- a/app/models/provider_status.rb
+++ b/app/models/provider_status.rb
@@ -1,7 +1,7 @@
 class ProviderStatus < ActiveRecord::Base
   has_one :provider
   
-  validates :token, :format => {:with => /^[a-zA-Z0-9]+$/, :allow_blank => true}
+  validates :token, :format => {:with => /\a[a-zA-Z0-9]+\z/, :allow_blank => true}
   validates :receive_hour1, :numericality => {:allow_blank => true}
   validates :receive_hour2, :numericality => {:allow_blank => true}
 #  validates :received_at

diff --git a/app/views/user_sessions/new.html.erb b/app/views/user_sessions/new.html.erb
index 2266c47..a6cdaff 100644 (file)
--- a/app/views/user_sessions/new.html.erb
+++ b/app/views/user_sessions/new.html.erb
@@ -1,7 +1,6 @@
 <% @page_title = t('users.signin.title') %>
 <h1>
   <%= link_to h(manifest.magic_numbers['profile']['users']['caption']), root_path %>
-  <%= link_to h(manifest.magic_numbers['profile']['users']['caption']), 'll/' %>
 </h1>
 <h2>
   <%= sanitize manifest.magic_numbers['profile']['users']['description'], :tags => %w(a p img br) %>
@@ -18,7 +17,6 @@
   <li class="google">
     <%= link_to t('users.signin.google.caption'), user_omniauth_authorize_path(:google_oauth2) %>
     <%= link_to tag(:img, :src => '/images/google.png'), user_omniauth_authorize_path(:google_oauth2) %>
-    <p><%= t('users.signin.google.notice') %></p>
   </li>
 </ul>
 <div class="row_break"></div>

diff --git a/config/environments/production.rb b/config/environments/production.rb
index e2dfd12..7d4ebc2 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -64,8 +64,3 @@ config.assets.precompile += %w( *.css *.js )
 config.eager_load = true
 config.active_record.migration_error = :page_load
 end
-require 'aws/s3'
-AWS::S3::Base.establish_connection!(
-  :access_key_id => Rails.application.secrets.access_key_id, 
-  :secret_access_key => Rails.application.secrets.secret_access_key
-)

diff --git a/config/initializers/aws.rb b/config/initializers/aws.rb
new file mode 100644 (file)
index 0000000..bebe2ab
--- /dev/null
+++ b/config/initializers/aws.rb
@@ -0,0 +1,14 @@
+#Aws.config.update(
+#  region: Rails.application.secrets.aws_region, 
+#  credentials: Aws::Credentials.new(
+#    Rails.application.secrets.aws_access_key_id, 
+#    Rails.application.secrets.aws_secret_access_key
+#  )
+#)
+require 'aws/s3'
+AWS::S3::Base.establish_connection!(
+  :access_key_id => Rails.application.secrets.aws_access_key_id, 
+  :secret_access_key => Rails.application.secrets.aws_secret_access_key, 
+)
+#AWS::S3::DEFAULT_HOST = "us-east-1.amazonaws.com"
+# :s3_endpoint => "us-east-1.amazonaws.com"

diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 3f64801..e2a04ee 100644 (file)
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -4,11 +4,11 @@ Devise.setup do |config|
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
+  config.secret_key = Rails.application.secrets.devise_secret
   config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
 config.sign_out_via = :get
   config.omniauth :twitter, Rails.application.secrets.twitter_api_key, Rails.application.secrets.twitter_api_secret
   config.omniauth :google_oauth2, Rails.application.secrets.google_api_key, Rails.application.secrets.google_api_secret
-  config.secret_key = Rails.application.secrets.devise_secret
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"
 

diff --git a/db/migrate/20140329222717_fix_extend_system_data.rb b/db/migrate/20140329222717_fix_extend_system_data.rb
index 6e87e62..8582368 100644 (file)
--- a/db/migrate/20140329222717_fix_extend_system_data.rb
+++ b/db/migrate/20140329222717_fix_extend_system_data.rb
@@ -2,30 +2,31 @@ class FixExtendSystemData < ActiveRecord::Migration
   def up
     Balloon.find_each do |balloon|
       sbt = balloon.speech_balloon.speech_balloon_template
-      if balloon.speech_balloon_template_classname == 'noname'
+      if balloon.speech_balloon_template_module_name == 'noname'
         balloon.speech_balloon_template_id = sbt.id
-        balloon.speech_balloon_template_classname = sbt.classname
+        balloon.speech_balloon_template_module_name = sbt.module_name
+        p balloon
         balloon.boosts 'post'
       end
       balloon.save!
     end
     Speech.find_each do |speech|
       sbt = speech.speech_balloon.speech_balloon_template
-      if speech.speech_balloon_template_classname == 'noname'
+      if speech.speech_balloon_template_module_name == 'noname'
         speech.speech_balloon_template_id = sbt.id
-        speech.speech_balloon_template_classname = sbt.classname
+        speech.speech_balloon_template_module_name = sbt.module_name
       end
       wf =  speech.writing_format
-      if speech.writing_format_classname == 'noname'
-        speech.writing_format_classname = wf.classname
+      if speech.writing_format_module_name == 'noname'
+        speech.writing_format_module_name = wf.module_name
       end
       speech.boosts 'post'
       speech.save!
     end
     License.find_each do |license|
       lg = license.license_group
-      if license.license_group_classname == 'noname'
-        license.license_group_classname = lg.classname
+      if license.license_group_module_name == 'noname'
+        license.license_group_module_name = lg.module_name
       end
       license.boosts 'post'
       license.save!

diff --git a/db/migrate/20150330234954_gen_resource_picture_pictures.rb b/db/migrate/20150330234954_gen_resource_picture_pictures.rb
index 31e0128..93c9e50 100644 (file)
--- a/db/migrate/20150330234954_gen_resource_picture_pictures.rb
+++ b/db/migrate/20150330234954_gen_resource_picture_pictures.rb
@@ -1,7 +1,7 @@
 class GenResourcePicturePictures < ActiveRecord::Migration
   def up
     Picture.find_each do |picture|
-      resource_picture_picture = ResourcePicturePicture.where(['picture_id = ?', picture.id]}).first
+      resource_picture_picture = ResourcePicturePicture.where(['picture_id = ?', picture.id]).first
       opid = picture.original_picture ? picture.original_picture.id : nil
       rpid = picture.original_picture.resource_picture ? picture.original_picture.resource_picture.id : nil
       if resource_picture_picture

diff --git a/lib/s3_picture.rb b/lib/s3_picture.rb
index 67bb377..394821a 100644 (file)
--- a/lib/s3_picture.rb
+++ b/lib/s3_picture.rb
@@ -1,5 +1,4 @@
 require 'picture_io'
-require 'aws/s3'
 class PictureIO
   class S3Picture
     def initialize base_dir = 'pettanr'