sr-rolando/contactorama
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Temporarily get rid of the RMagick gem in order to update to critical rails version 3.2.11 @railshosting.de.

Browse source
This commit is contained in:
Señor Rolando 2013-01-11 22:55:01 +01:00
parent 9a92f9d177
commit 5aa3d25d8c
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -23,7 +23,7 @@ gem 'cancan', '1.6.5'
gem 'capistrano', '2.5.21' gem 'capistrano', '2.5.21'
# For avatar images: https://github.com/jnicklas/carrierwave # For avatar images: https://github.com/jnicklas/carrierwave
gem 'rmagick', '2.9.2' # gem 'rmagick', '2.9.2'
gem 'carrierwave', '0.6.2' gem 'carrierwave', '0.6.2'
# Specify this directly in order to use version we also have @production site. Otherwise, 'rdoc' pulls newest version in. # Specify this directly in order to use version we also have @production site. Otherwise, 'rdoc' pulls newest version in.

2
Gemfile.lock
View file

@ -138,7 +138,6 @@ GEM
rdoc (3.12) rdoc (3.12)
json (~> 1.4) json (~> 1.4)
responders (0.6.5) responders (0.6.5)
rmagick (2.9.2)
sass (3.1.19) sass (3.1.19)
sass-rails (3.2.5) sass-rails (3.2.5)
railties (~> 3.2.0) railties (~> 3.2.0)
@ -178,6 +177,5 @@ DEPENDENCIES
mail mail
mysql2 (= 0.3.11) mysql2 (= 0.3.11)
rails (= 3.2.11) rails (= 3.2.11)
rmagick (= 2.9.2)
sass-rails (= 3.2.5) sass-rails (= 3.2.5)
uglifier uglifier

3
app/models/contact.rb
View file

@ -1,4 +1,5 @@
class Contact < ActiveRecord::Base class Contact < ActiveRecord::Base
mount_uploader :avatar, AvatarUploader
attr_accessible :avatar, :remote_avatar_url attr_accessible :avatar, :remote_avatar_url
has_many :emails, :dependent => :destroy has_many :emails, :dependent => :destroy
@ -10,8 +11,6 @@ class Contact < ActiveRecord::Base
accepts_nested_attributes_for :emails, :reject_if => lambda { |a| a[:address].blank? }, :allow_destroy => true accepts_nested_attributes_for :emails, :reject_if => lambda { |a| a[:address].blank? }, :allow_destroy => true
accepts_nested_attributes_for :phones, :reject_if => lambda { |a| a[:nr].blank? }, :allow_destroy => true accepts_nested_attributes_for :phones, :reject_if => lambda { |a| a[:nr].blank? }, :allow_destroy => true
mount_uploader :avatar, AvatarUploader
def birth_date_string def birth_date_string
s = birth_day.to_s || "" s = birth_day.to_s || ""
s += "." unless birth_day.nil? s += "." unless birth_day.nil?

4
app/uploaders/avatar_uploader.rb
View file

@ -3,7 +3,9 @@
class AvatarUploader < CarrierWave::Uploader::Base class AvatarUploader < CarrierWave::Uploader::Base
# Include RMagick or MiniMagick support: # Include RMagick or MiniMagick support:
include CarrierWave::RMagick
# TMP comment out for critical update to rails 3.2.11 on railshosting.de
#include CarrierWave::RMagick
# include CarrierWave::MiniMagick # include CarrierWave::MiniMagick
# Include the Sprockets helpers for Rails 3.1+ asset pipeline compatibility: # Include the Sprockets helpers for Rails 3.1+ asset pipeline compatibility: