lib/carrierwave/compatibility/paperclip.rb in carrierwave-0.5.1 vs lib/carrierwave/compatibility/paperclip.rb in carrierwave-0.5.2

- old
+ new

@@ -9,35 +9,35 @@ # does. If you need to override it, you can override the +paperclip_path+ method # and provide a Paperclip style path: # # class MyUploader < CarrierWave::Uploader::Base # include CarrierWave::Compatibility::Paperclip - # + # # def paperclip_path # ":rails_root/public/uploads/:id/:attachment/:style_:basename.:extension" # end # end # # --- # # This file contains code taken from Paperclip - # + # # LICENSE - # + # # The MIT License - # + # # Copyright (c) 2008 Jon Yurek and thoughtbot, inc. - # + # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: - # + # # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. - # + # # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,