From 4d2809d40bfbff66f82e9b1e056c0868922d1f8f Mon Sep 17 00:00:00 2001 From: chris2tof Date: Fri, 13 Jan 2012 12:35:46 +0800 Subject: [PATCH] Update carrierwave #{column}_identifier must be used to get the name of the file --- Gemfile | 5 +++-- Gemfile.lock | 24 +++++++++++------------- config/initializers/carrierwave.rb | 6 +++--- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index 6fd6eaa1..3ff28976 100644 --- a/Gemfile +++ b/Gemfile @@ -3,14 +3,15 @@ gem 'rails' gem 'yajl-ruby', :require => 'yajl' gem 'bson_ext' -gem 'carrierwave', '0.5.4' +gem 'carrierwave' +gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid' gem 'ckeditor' gem 'devise' gem 'mini_magick' gem 'rubyzip' gem 'sinatra' gem 'execjs' -gem 'mongoid', :git => 'git://github.com/mongoid/mongoid.git', :ref => '7a915395db50e2bc6071a503a11530e644879e49' +gem 'mongoid' gem 'rake' gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 14d92fe0..27a3d794 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: git://github.com/mongoid/mongoid.git - revision: 7a915395db50e2bc6071a503a11530e644879e49 - ref: 7a915395db50e2bc6071a503a11530e644879e49 - specs: - mongoid (2.4.0) - activemodel (~> 3.1) - mongo (~> 1.3) - tzinfo (~> 0.3.22) - GEM remote: http://rubygems.org/ specs: @@ -46,8 +36,11 @@ GEM bson_ext (1.5.2) bson (= 1.5.2) builder (3.0.0) - carrierwave (0.5.4) + carrierwave (0.5.8) activesupport (~> 3.0) + carrierwave-mongoid (0.1.3) + carrierwave (>= 0.5.6) + mongoid (~> 2.1) chronic (0.6.6) ckeditor (3.6.3) mime-types (~> 1.16) @@ -96,6 +89,10 @@ GEM subexec (~> 0.1.0) mongo (1.5.2) bson (= 1.5.2) + mongoid (2.4.0) + activemodel (~> 3.1) + mongo (~> 1.3) + tzinfo (~> 0.3.22) multi_json (1.0.4) orm_adapter (0.0.5) polyglot (0.3.3) @@ -192,7 +189,8 @@ PLATFORMS DEPENDENCIES bson_ext - carrierwave (= 0.5.4) + carrierwave + carrierwave-mongoid ckeditor coffee-rails database_cleaner @@ -203,7 +201,7 @@ DEPENDENCIES factory_girl_rails jquery-rails mini_magick - mongoid! + mongoid radius rails rake diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index 1c7f73c1..2c46dd11 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -1,5 +1,3 @@ -require 'carrierwave/orm/mongoid' - begin db_config = YAML::load(File.read(File.join(Rails.root, "/config/mongoid.yml"))) rescue @@ -12,4 +10,6 @@ CarrierWave.configure do |config| config.grid_fs_port = db_config[Rails.env]['port'] config.storage = :grid_fs config.grid_fs_access_url = "/gridfs" -end \ No newline at end of file +end + +CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/