github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflict issue with the new linecache gem + clean carrierwave local patch

Browse Source
This commit is contained in:
did 2011-06-12 16:29:59 +02:00
parent de217b74b7
commit adfcbb6658
4 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile
View File

@ -21,7 +21,8 @@ gem 'formtastic', '~> 1.2.3'
gem 'inherited_resources', '~> 1.1.2' gem 'inherited_resources', '~> 1.1.2'
gem 'rmagick', '2.12.2' gem 'rmagick', '2.12.2'
gem 'locomotive_carrierwave', '0.5.4.beta1' gem 'locomotive_carrierwave', '0.5.4.beta2'
# gem 'locomotive_carrierwave', :path => '../gems/carrierwave_did'
gem 'custom_fields', '1.0.0.beta.17' gem 'custom_fields', '1.0.0.beta.17'
gem 'fog', '0.8.2' gem 'fog', '0.8.2'
@ -44,12 +45,11 @@ group :development do
end end
group :test, :development do group :test, :development do
gem 'linecache', '0.43', :platforms => :mri_18
gem 'ruby-debug', :platforms => :mri_18 gem 'ruby-debug', :platforms => :mri_18
gem 'ruby-debug19', :platforms => :mri_19 gem 'ruby-debug19', :platforms => :mri_19
gem 'bushido_stub', :git => 'git://github.com/did/bushido_stub.git' gem 'bushido_stub', :git => 'git://github.com/did/bushido_stub.git'
# :path => '../gems/bushido_stub'
# gem 'bushido'
end end
group :production do group :production do

9
Gemfile.lock
View File

@ -65,7 +65,7 @@ GEM
bson (1.3.1) bson (1.3.1)
bson_ext (1.3.1) bson_ext (1.3.1)
builder (2.1.2) builder (2.1.2)
bushido (0.0.17) bushido (0.0.21)
highline (>= 1.6.1) highline (>= 1.6.1)
json (>= 1.4.6) json (>= 1.4.6)
rest-client (>= 1.6.1) rest-client (>= 1.6.1)
@ -81,7 +81,7 @@ GEM
celerity (0.8.9) celerity (0.8.9)
childprocess (0.1.9) childprocess (0.1.9)
ffi (~> 1.0.6) ffi (~> 1.0.6)
columnize (0.3.2) columnize (0.3.3)
configuration (1.2.0) configuration (1.2.0)
crack (0.1.8) crack (0.1.8)
cucumber (0.8.5) cucumber (0.8.5)
@ -158,7 +158,7 @@ GEM
linecache (0.43) linecache (0.43)
linecache19 (0.5.12) linecache19 (0.5.12)
ruby_core_source (>= 0.1.4) ruby_core_source (>= 0.1.4)
locomotive_carrierwave (0.5.4.beta1) locomotive_carrierwave (0.5.4.beta2)
activesupport (~> 3.0) activesupport (~> 3.0)
locomotive_jammit-s3 (0.5.4.4) locomotive_jammit-s3 (0.5.4.4)
jammit (>= 0.5.4) jammit (>= 0.5.4)
@ -296,7 +296,8 @@ DEPENDENCIES
httparty (>= 0.6.1) httparty (>= 0.6.1)
inherited_resources (~> 1.1.2) inherited_resources (~> 1.1.2)
launchy launchy
locomotive_carrierwave (= 0.5.4.beta1) linecache (= 0.43)
locomotive_carrierwave (= 0.5.4.beta2)
locomotive_jammit-s3 locomotive_jammit-s3
locomotive_liquid (= 2.2.2) locomotive_liquid (= 2.2.2)
locomotive_mongoid_acts_as_tree (= 0.1.5.7) locomotive_mongoid_acts_as_tree (= 0.1.5.7)

2
README.textile
View File

@ -19,7 +19,7 @@ h2. Gems
Here is a short list of main gems used in the application. Here is a short list of main gems used in the application.
* Rails 3.0.7 * Rails 3.0.8
* Mongoid 2.0.2 (with MongoDB 1.6) * Mongoid 2.0.2 (with MongoDB 1.6)
* Liquid * Liquid
* Devise * Devise

24
lib/locomotive/carrierwave/patches.rb
View File

@ -32,27 +32,3 @@ module CarrierWave
end end
end end
module CarrierWave
module Mongoid
def validates_integrity_of(*attrs)
options = attrs.last.is_a?(Hash) ? attrs.last : {}
validates_each(*attrs) do |record, attr, value|
if record.send("#{attr}_integrity_error")
message = options[:message] || I18n.t('carrierwave.errors.integrity', :default => 'is not an allowed type of file.')
record.errors.add attr, message
end
end
end
def validates_processing_of(*attrs)
options = attrs.last.is_a?(Hash) ? attrs.last : {}
validates_each(*attrs) do |record, attr, value|
if record.send("#{attr}_processing_error")
message = options[:message] || I18n.t('carrierwave.errors.processing', :default => 'failed to be processed.')
record.errors.add attr, message
end
end
end
end
end