robinboening-fleximage 1.0.4 → 1.0.6

data/CHANGELOG.rdoc

@@ -1,6 +1,6 @@
 == fleximage 1.0.2 12-14-2009
 
-* Don't prepend RAILS_ROOT to absolute image directory path
+* Don't prepend Rails.root to absolute image directory path
 * Added support for an "image_format" magic database column
 * Fixed an issue with saving temp images in Windows
 * Fixed a temp image vulnerability with directory traversal

data/README.rdoc

@@ -1,257 +1,36 @@
-== Installation
-
-Gem: (Recommended)
-  
-  gem install fleximage
-  
-  # in config/environment.rb
-  config.gem 'fleximage'
-
-Plugin:
-  
-  ./script/plugin install git://github.com/Squeegy/fleximage.git
-
-
-= Fleximage
-
-== Overview
-
-Fleximage is a Rails plugin that tries to make image uploading and rendering super easy.
-
-There are 2 pieces involved in making Rails image handling easy.
-
-=== 1. Image Uploads
-
-In this post Rails 2, resource-driven world, Fleximage believes that images should belong directly to a record.  So you simply tell your model class to act as Fleximage, and your model effortlessly gains the ability to handle file uploads.
-
-* Your model gains the ability to interface directly with a +file_field+ form, allowing uploads with zero extra controller or model code.
-* Accept uploads from a web address, pulling in the image from the internet and saving it locally.
-* Image presence validation with customizable form field error messages.
-* Image format validation that will not allow the file to be uploaded unless RMagick can parse it into useable image data.
-* Image pre-processing to keep uploaded images under a certain size, or other on-upload image processing tasks.
-
-
-=== 2. Image Rendering
-
-The other half of the problem comes from the need to send the uploaded images back to the web browser.  Most of the time, you need to display the image in different sizes or formats in different places on your site.  For example, a product image in a store may need a square thumbnail image, a medium image for its focus page, and a large image for an "enlarge this photo" popup.
-
-Fleximage uses a simple templating engine that allows you to re-render images exactly how you need them.  Using the same "master image," many images can be rendered from the same source.  You can even go beyond resizing; there is support for image overlays, text drawing, drop shadows, borders and more.  The rendering engine is flexible and extensible to whatever your dynamic image needs are.
-
-* Renderer implemented as template engine, which fits in perfectly with Rails 2 RESTful style format-sensitive views.
-* Does not need to have everything resized on upload allowing your site layout the change later on, and all images will re-render themselves just right with your new rendering templates.
-* Support for special effects like text, image or logo overlays, borders and shadows.
-* Extensible by adding image operator classes which allow for reusable snippets of direct RMagick code.
-* Requires absolutely zero controller code.
-
-
-= Getting Started
-
-== 1. Installation
-
-Gem: (Recommended)
-  
-  gem install fleximage
-  
-  # in config/environment.rb
-  config.gem 'fleximage'
-
-Plugin:
-  
-  ./script/plugin install git://github.com/Squeegy/fleximage.git
-
-
-== 2. Activating your model
-
-You need to let your model know it should be Fleximage-friendly.  Lets say you have a model for photos.
-  
-  # app/models/photo.rb
-  class Photo < ActiveRecord::Base
-    acts_as_fleximage :image_directory => 'public/images/uploaded_photos'
-  end
-
-The :+image_directory+ option tells the plugin where to store your master images.  This value is relative to your application root, and doesn't need to be in your public directory if you don't want it to be.  This is where the source images will be that all your templates start with.
-
-There are many other options for your model.  Refer to the <tt>Fleximage::Model::ClassMethods</tt> class in the +rdoc+ for more information on these.
-
-
-== 3. The upload form
-
-Your users need a way to upload their images into your site.  Here is how we might render a form to create a photo record.
-  
-  # app/views/photos/new.html.erb
-  
-  <% form_for @photo, :html => { :multipart => true } do |f| %>
-    <p>
-      <b>Name</b><br />
-      <%= f.text_field :name %>
-    </p>
-
-    <p>
-      <b>Author</b><br />
-      <%= f.text_field :author %>
-    </p>
-
-    <p>
-      <b>Upload Image</b><br />
-      <%= f.file_field :image_file %><br />
-      or URL: <%= f.text_field :image_file_url %>
-    </p>
-
-    <p>
-      <%= f.submit "Create" %>
-    </p>
-  <% end %>
-  
-*NOTE*: The ":html => { :multipart => true }" is *VERY* *IMPORTANT*.  Without this snippet your browser will not send binary data to the server.  If things aren't working, check to make sure you have this in your form declaration.
-
-The relevant bit of our form code is:
-
-  <p>
-    <b>Upload Image</b><br />
-    <%= f.file_field :image_file %><br />
-    or URL: <%= f.text_field :image_file_url %>
-  </p>
-
-First there is a file upload field, mapping the the "image_file" attribute of our model.  When the user browses to a local file and uploads it, the model is waiting to accept an uploaded file on this attribute and will automatically open it and save it to disk for you.
-
-Right along side the upload field is a simple text field, which maps to the "image_file_url" property.  Your model also listens for assignment to this attribute to automatically fetch the contents of a URL and save it locally as the master image.
-
-You can have just one of these fields, or both.  The model will know how to do the right thing either way.
-
-When the user submits the form, all you have to do is assign the form contents to your object in standard Rails fashion, and the image is uploaded and saved for you.  Creating a new photo may look like this in your controller:
-  
-  # app/controllers/photos_controller.rb
-  def create
-    @photo = Photo.new(params[:photo])
-    if @photo.save
-      redirect_to photo_url(@photo)
-    else
-      flash[:notice] = 'Your photo did not pass validation!'
-      render :action => 'new'
+For all istructions refers to git://github.com/Squeegy/fleximage.
+I add a rails3_view.rb to manage template in rails3.
+
+#rails3_view.rb
+
+module ActionView
+  module TemplateHandlers
+    class Rails3View < TemplateHandler
+      include Compilable
+      class TemplateDidNotReturnImage < RuntimeError #:nodoc:
+      end
+
+      def compile(template)
+        <<-CODE
+        @template_format = :flexi
+        controller.response.content_type ||= Mime::JPG    
+        result = #{template.source}
+        requested_format = (params[:format] || :jpg).to_sym
+        begin
+          # Raise an error if object returned from template is not an image record
+          unless result.class.include?(Fleximage::Model::InstanceMethods)
+            raise TemplateDidNotReturnImage, ".flexi template was expected to return a model instance that acts_as_fleximage, but got an instance of instead."
+          end
+          # Figure out the proper format
+          raise 'Image must be requested with an image type format.  jpg, gif and png only are supported.' unless [:jpg, :gif, :png].include?(requested_format)
+          result.output_image(:format => requested_format)
+        rescue Exception => e
+          e
+        end
+        CODE
+      ensure
+        GC.start
+      end
     end
   end
-
-
-== 4. Linking to the generated images
-
-Rails 2 has amazing support for format driven responses.  Given a photo object, by default it would have an HTML view that describes information about that photo.  With Fleximage, the JPG or (GIF or PNG) view can be the image data itself.
-
-A photo HTML view may look like this:
-  
-  # app/views/photos/show.html.erb
-  # http://mysite.com/photos/123
-  
-  <p>
-    <%= image_tag formatted_photo_path(@photo, :jpg) %>
-  </p>
-  <p>
-    <b>Name:</b>
-    <%=h @photo.name %>
-  </p>
-  <p>
-    <b>Author:</b>
-    <%=h @photo.author %>
-  </p>
-
-That image tag uses a Rails route as its +src+.  In this case, that route corresponds to the <tt>.jpg</tt> format of the +photo+ resource, which would give us a URL like:
-
-  http://mysite.com/photos/123.jpg
-
-This is the URL where the image will be.
-
-
-== 5. Rendering the image
-
-Now it's time to actually create a template to render the image.  This happens through a special view with a .+flexi+ extension.  This view template will pull out the master image for you, and send it to the browser as binary data after your processing of it done.
-
-The filename of the template should look like this: <tt>action_name.jpg.flexi</tt>, where +action_name+ is the controller action that will render this view.  The +jpg+ tells the controller to render this view when the +jpg+ format is asked for.  The +flexi+ tells Rails to render this view with the Fleximage template engine, rather than +erb+, +builder+ or other template types.
-
-The syntax of the view is pure ruby, but to process the image the view needs to call +operate+ on the instance of your model.
-
-Here is the view to render a photo record at 320x240:
-  
-  # app/views/photos/show.jpg.flexi
-  # http://mysite.com/photos/123.jpg
-  @photo.operate do |image|
-    image.resize '320x240'
-  end
-
-Calling <tt>@photo.operate { |image| .. }</tt> prepares the model object for image processing and provides a ruby object that will allow you to perform image transformations.  This example just resizes the image to 320x240, however many other operators are included.
-
-Here is a .+flexi+ template that will do much more:
-
-  # app/views/show.jpg.flexi
-  @photo.operate do |image|
-    image.resize '640x480', :crop => true
-    image.image_overlay 'public/images/logo.png',
-      :alignment => :bottom_right,
-      :offset => '20x20'
-    image.border :size => 10, :color => 'green'
-    image.text 'I like Cheese'
-    image.unsharp_mask  
-    image.shadow
-  end
-
-This template will:
-
-* Resize the image to exactly 640x480, cropping off any extra.
-* Add a logo 20 pixels form the lower right corner
-* Add a green 10 pixel border
-* Write "I like Cheese" in the upper left corder
-* Sharpen the image
-* Add a black drop shadow on a white background
-
-For more information on image operators, open up <tt>vendor/plugins/fleximage/rdoc/index.html</tt> in your installed plugin and check out the full for details about each operator:
-
-* Fleximage::Operator::Border
-* Fleximage::Operator::Crop
-* Fleximage::Operator::ImageOverlay
-* Fleximage::Operator::Resize
-* Fleximage::Operator::Shadow
-* Fleximage::Operator::Text
-* Fleximage::Operator::Trim
-* Fleximage::Operator::UnsharpMask
-
-
-= Other Useful Information
-
-== Image output format
-
-You don't want to render JPGs?  That's fine.  Just link to the format you want (:+jpg+, :+gif+ or :+png+) and declare the your template name to match and the image will be rendered properly.  For instance, this will render a +gif+.
-
-  # app/views/photos/show.html.erb
-  <%= image_tag photo_path(@photo, :gif) %>
-  
-  # app/views/photos/show.gif.flexi
-  @photo.operate do |image|
-    @photo.resize '150x150', :crop => true
-  end
-
-The Fleximage template engine will automatically detect the format that is being asked for, and render the right type of image.
-
-== Converting/Upgrading your master image store
-
-Are you upgrading your live app to the new file store creation date based format?  Did you start out with PNG image storage, and later realize you need to store with the more space economic JPG instead?  Not problem, Fleximage provides some rake tasks to help you out.
-  
-Each conversion rake task requires that you tell it the class for which that you are changing the file store.  For example, if you want to change to the new creation date based storage structure, for the class +Photo+, you can run a rake task like this:
-
-  rake fleximage:convert:to_nested FLEXIMAGE_CLASS=Photo
-
-Or if you want to run this on your production database
-
-  rake fleximage:convert:to_nested FLEXIMAGE_CLASS=Photo RAILS_ENV=production
-
-*IMPORTANT*: These tasks manipulate the source files that make up your images.  I take no responsibility if these rake tasks delete all your images.  <b>It is highly advised you back up you master image directory before running any of these tasks on your production site.</b>
-
-Here are all the conversion tasks:
-
-* fleximage:convert:to_nested : Converts your master image store from the flat based path/to/images/123.png format to the creation date based format path/to/images/2008/11/12/123.png based format.  Use this task if you are upgrading from an older version of Fleximage.
-* fleximage:convert:to_flat : Converts your master image store from the creation date based path/to/images/2008/11/12/123.png format to the flat format path/to/images/123.png format.  Note this will leave the date based directories in place, but they will be empty and can be easily manually deleted.
-* fleximage:convert:to_jpg : Converts all your stored master images from PNG format to JPG format.  This will compress your previously lossless master images.
-* fleximage:convert:to_png : Converts all your stored master images from JPG format to PNG format.
-
-After you run any of these tasks, make sure to update your model's class accessors +use_creation_date_based_directories+ and +image_storage_format+ to reflect the state of your image store.  Otherwise, the plugin will not find you master images for rendering.
-
-------
-Copyright (c) 2008 Alex Wayne beautifulpixel.com, released under the MIT license.
-Special Thanks to Chris Vannoy for intelligent code review, suggestions and contributions to making this plugin awesome.
+end

data/Rakefile

@@ -40,7 +40,7 @@ EOF
     gem.authors = `git log --pretty=format:"%an"`.split("\n").uniq.sort
     gem.add_dependency "rmagick"
     gem.add_dependency "aws-s3"
-    gem.add_development_dependency "rails", "=2.2.2"
+    gem.add_development_dependency "rails", ">=3.0.0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.6

data/lib/fleximage/model.rb

@@ -273,7 +273,7 @@ module Fleximage
         raise 'No image directory was defined, cannot generate path' unless directory
         
         # base directory
-        directory = "#{RAILS_ROOT}/#{directory}" unless /^\// =~ directory
+        directory = "#{Rails.root}/#{directory}" unless /^\// =~ directory
         
         # specific creation date based directory suffix.
         creation = self[:created_at] || self[:created_on]
@@ -335,9 +335,11 @@ module Fleximage
       def image_file=(file)
         if self.class.image_file_exists(file)
           
+          file_path = file.is_a?( ActionDispatch::Http::UploadedFile ) ? file.tempfile.path : file.path
+
           # Create RMagick Image object from uploaded file
-          if file.path
-            @uploaded_image = Magick::Image.read(file.path).first
+          if file_path
+            @uploaded_image = Magick::Image.read(file_path).first
           else
             @uploaded_image = Magick::Image.from_blob(file.read).first
           end
@@ -381,7 +383,7 @@ module Fleximage
       def image_file_url=(file_url)
         @image_file_url = file_url
         if file_url =~ %r{^(https?|ftp)://}
-          file = open(file_url)
+          file = open(URI.parse(URI.encode(file_url)))
           
           # Force a URL based file to have an original_filename
           eval <<-CODE
@@ -421,13 +423,13 @@ module Fleximage
         self.image_file_string = Base64.decode64(data)
       end
 
-      # Sets the uploaded image to the name of a file in RAILS_ROOT/tmp that was just
+      # Sets the uploaded image to the name of a file in Rails.root/tmp that was just
       # uploaded.  Use as a hidden field in your forms to keep an uploaded image when
       # validation fails and the form needs to be redisplayed
       def image_file_temp=(file_name)
         if !@uploaded_image && file_name && file_name.present? && file_name !~ %r{\.\./}
           @image_file_temp = file_name
-          file_path = "#{RAILS_ROOT}/tmp/fleximage/#{file_name}"
+          file_path = "#{Rails.root}/tmp/fleximage/#{file_name}"
           
           @dont_save_temp = true
           if File.exists?(file_path)
@@ -470,7 +472,7 @@ module Fleximage
       #     image.resize '320x240'
       #   end
       def operate(&block)
-        returning self do
+        self.tap do
           proxy = ImageProxy.new(load_image, self)
           block.call(proxy)
           @output_image = proxy.image
@@ -663,7 +665,7 @@ module Fleximage
         def save_temp_image(file)
           file_name = file.respond_to?(:original_filename) ? file.original_filename : file.path
           @image_file_temp = Time.now.to_f.to_s.sub('.', '_')
-          path = "#{RAILS_ROOT}/tmp/fleximage"
+          path = "#{Rails.root}/tmp/fleximage"
           FileUtils.mkdir_p(path)
           File.open("#{path}/#{@image_file_temp}", 'wb') do |f|
             file.rewind
@@ -673,14 +675,14 @@ module Fleximage
         
         # Delete the temp image after its no longer needed
         def delete_temp_image
-          FileUtils.rm_rf "#{RAILS_ROOT}/tmp/fleximage/#{@image_file_temp}"
+          FileUtils.rm_rf "#{Rails.root}/tmp/fleximage/#{@image_file_temp}"
         end
         
         # Load the default image, or raise an expection
         def master_image_not_found
           # Load the default image from a path
           if self.class.default_image_path
-            @output_image = Magick::Image.read("#{RAILS_ROOT}/#{self.class.default_image_path}").first
+            @output_image = Magick::Image.read("#{Rails.root}/#{self.class.default_image_path}").first
           
           # Or create a default image
           elsif self.class.default_image

data/lib/fleximage/operator/image_overlay.rb

@@ -7,7 +7,7 @@ module Fleximage
     # 
     #   image.resize(image_overlay_path, options = {})
     # 
-    # +image_overlay_path+ is the path, relative to +RAILS_ROOT+ where the image you want superimposed
+    # +image_overlay_path+ is the path, relative to +Rails.root+ where the image you want superimposed
     # can be found.
     # 
     # Use the following keys in the +options+ hash:

data/lib/fleximage/operator/text.rb

@@ -12,7 +12,7 @@ module Fleximage
     # * antialias: true or false
     # * color: string or <tt>color(r, g, b)</tt>
     # * font_size: integer
-    # * font: path to a font file relative to +RAILS_ROOT+
+    # * font: path to a font file relative to +Rails.root+
     # * rotate: degrees as an integer
     # * shadow: <tt>{:blur => 1, :opacity => 1.0}</tt>
     # * font_weight: RMagick font weight constant or value. See: http://www.imagemagick.org/RMagick/doc/draw.html#font_weight
@@ -75,7 +75,7 @@ module Fleximage
         # assign font path with to rails root unless the path is absolute
         if options[:font]
           font = options[:font]
-          font = "#{RAILS_ROOT}/#{font}" unless font =~ %r{^(~?|[A-Za-z]:)/}
+          font = "#{Rails.root}/#{font}" unless font =~ %r{^(~?|[A-Za-z]:)/}
           text.font = font
         end
 

data/lib/fleximage/rails3_view.rb

@@ -0,0 +1,31 @@
+module ActionView
+  module TemplateHandlers
+    class Rails3View < TemplateHandler
+      include Compilable
+      class TemplateDidNotReturnImage < RuntimeError #:nodoc:
+      end
+
+      def compile(template)
+        <<-CODE
+        @template_format = :flexi
+        controller.response.content_type ||= Mime::JPG    
+        result = #{template.source}
+        requested_format = (params[:format] || :jpg).to_sym
+        begin
+          # Raise an error if object returned from template is not an image record
+          unless result.class.include?(Fleximage::Model::InstanceMethods)
+            raise TemplateDidNotReturnImage, ".flexi template was expected to return a model instance that acts_as_fleximage, but got an instance of instead."
+          end
+          # Figure out the proper format
+          raise 'Image must be requested with an image type format.  jpg, gif and png only are supported.' unless [:jpg, :gif, :png].include?(requested_format)
+          result.output_image(:format => requested_format)
+        rescue Exception => e
+          e
+        end
+        CODE
+      ensure
+        GC.start
+      end
+    end
+  end
+end

data/lib/fleximage/rmagick_image_patch.rb

@@ -1,5 +1,7 @@
+require 'RMagick'
+
 class Magick::Image
   def dispose!
     destroy! if respond_to?(:destroy!)
   end
-end
+end

data/lib/fleximage/view.rb

@@ -28,14 +28,14 @@ module Fleximage
       
       # Raise an error if object returned from template is not an image record
       unless result.class.include?(Fleximage::Model::InstanceMethods)
-        raise TemplateDidNotReturnImage, 
+        raise TemplateDidNotReturnImage,
                 ".flexi template was expected to return a model instance that acts_as_fleximage, but got an instance of <#{result.class}> instead."
       end
       
       # Figure out the proper format
       requested_format = (@view.params[:format] || :jpg).to_sym
       unless [:jpg, :gif, :png].include?(requested_format)
-        raise 'Image must be requested with an image type format.  jpg, gif and png only are supported.'
+        raise 'Image must be requested with an image type format. jpg, gif and png only are supported.'
       end
       
       # Set proper content type
@@ -54,4 +54,4 @@ module Fleximage
       GC.start
     end
   end
-end
+end

data/lib/fleximage.rb

@@ -3,13 +3,7 @@ require 'base64'
 require 'digest/sha1'
 require 'aws/s3'
 
-# Load RMagick
-begin
-  require 'RMagick'
-rescue MissingSourceFile => e
-  puts %{ERROR :: FlexImage requires the RMagick gem.  http://rmagick.rubyforge.org/install-faq.html}
-  raise e
-end
+require 'RMagick' unless defined?(Magick)
 
 # Apply a few RMagick patches
 require 'fleximage/rmagick_image_patch'
@@ -27,15 +21,23 @@ end
 require 'fleximage/model'
 ActiveRecord::Base.class_eval { include Fleximage::Model }
 
+# Image Creation
+require 'fleximage/blank'
+
 # Image Proxy
 require 'fleximage/image_proxy'
 
 # Setup View
-ActionController::Base.exempt_from_layout :flexi
+#ActionController::Base.exempt_from_layout :flexi
 if defined?(ActionView::Template)
   # Rails >= 2.1
-  require 'fleximage/view'
-  ActionView::Template.register_template_handler :flexi, Fleximage::View
+  if Rails.version.to_f >= 3 
+    require 'fleximage/rails3_view'
+    ActionView::Template.register_template_handler :flexi, ActionView::TemplateHandlers::Rails3View
+  else
+    require 'fleximage/view'
+    ActionView::Template.register_template_handler :flexi, Fleximage::View
+  end
 else
   # Rails < 2.1
   require 'fleximage/legacy_view'

data/{tasks → lib/tasks}/fleximage_tasks.rake

@@ -26,8 +26,8 @@ namespace :fleximage do
         creation = obj[:created_at] || obj[:created_on]
         
         # Generate both types of file paths
-        flat_path   = "#{RAILS_ROOT}/#{model_class.image_directory}/#{obj.id}.#{model_class.image_storage_format}"
-        nested_path = "#{RAILS_ROOT}/#{model_class.image_directory}/#{creation.year}/#{creation.month}/#{creation.day}/#{obj.id}.#{model_class.image_storage_format}" 
+        flat_path   = "#{Rails.root}/#{model_class.image_directory}/#{obj.id}.#{model_class.image_storage_format}"
+        nested_path = "#{Rails.root}/#{model_class.image_directory}/#{creation.year}/#{creation.month}/#{creation.day}/#{obj.id}.#{model_class.image_storage_format}" 
         
         # Assign old path and new path based on desired directory format
         if to_format == :nested

data/{fleximage.gemspec → robinboening-fleximage.gemspec}

@@ -4,16 +4,16 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{fleximage}
-  s.version = "1.0.4"
+  s.name = %q{robinboening-fleximage}
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Ahmed Adam}, %q{Alex Wayne}, %q{Andrew White}, %q{JJ Buckley}, %q{Jason Lee}, %q{Joshua Abbott}, %q{Koji Ando}, %q{Kouhei Sutou}, %q{Lasse Jansen}, %q{Loïc Guitaut}, %q{Martin Vielsmaier}, %q{Robin Böning}, %q{Squeegy}, %q{Vannoy}, %q{ralph}]
+  s.authors = ["Ahmed Adam", "Alex Wayne", "Andrew White", "Duccio", "Heiner Wohner", "JJ Buckley", "Jason Lee", "Joshua Abbott", "Koji Ando", "Kouhei Sutou", "Lasse Jansen", "Lo\303\257c Guitaut", "Martin Vielsmaier", "Robin B\303\266ning", "Squeegy", "Thomas von Deyen", "Vannoy", "Wolfgang Klinger", "Wolfgang K\303\266lbl", "josei", "ralph"]
   s.date = %q{2011-05-29}
   s.description = %q{Fleximage is a Rails plugin that tries to make image uploading and rendering
 super easy.
 }
-  s.email = %q{ruby@beautifulpixel.com}
+  s.email = %q{robin.boening@nethosting4you.de}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -24,7 +24,6 @@ super easy.
     "Rakefile",
     "VERSION",
     "autotest.rb",
-    "fleximage.gemspec",
     "init.rb",
     "lib/dsl_accessor.rb",
     "lib/fleximage.rb",
@@ -44,9 +43,11 @@ super easy.
     "lib/fleximage/operator/text.rb",
     "lib/fleximage/operator/trim.rb",
     "lib/fleximage/operator/unsharp_mask.rb",
+    "lib/fleximage/rails3_view.rb",
     "lib/fleximage/rmagick_image_patch.rb",
     "lib/fleximage/view.rb",
-    "tasks/fleximage_tasks.rake",
+    "lib/tasks/fleximage_tasks.rake",
+    "robinboening-fleximage.gemspec",
     "test/fixtures/100x1.jpg",
     "test/fixtures/100x100.jpg",
     "test/fixtures/1x1.jpg",
@@ -153,9 +154,9 @@ super easy.
     "test/unit/temp_image_test.rb",
     "test/unit/use_creation_date_based_directories_option_test.rb"
   ]
-  s.homepage = %q{http://github.com/Squeegy/fleximage}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.4}
+  s.homepage = %q{http://github.com/robinboening/fleximage}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{Rails plugin for uploading images as resources, with support for resizing, text stamping, and other special effects.}
 
   if s.respond_to? :specification_version then
@@ -164,16 +165,16 @@ super easy.
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rmagick>, [">= 0"])
       s.add_runtime_dependency(%q<aws-s3>, [">= 0"])
-      s.add_development_dependency(%q<rails>, ["= 2.2.2"])
+      s.add_development_dependency(%q<rails>, [">= 3.0.0"])
     else
       s.add_dependency(%q<rmagick>, [">= 0"])
       s.add_dependency(%q<aws-s3>, [">= 0"])
-      s.add_dependency(%q<rails>, ["= 2.2.2"])
+      s.add_dependency(%q<rails>, [">= 3.0.0"])
     end
   else
     s.add_dependency(%q<rmagick>, [">= 0"])
     s.add_dependency(%q<aws-s3>, [">= 0"])
-    s.add_dependency(%q<rails>, ["= 2.2.2"])
+    s.add_dependency(%q<rails>, [">= 3.0.0"])
   end
 end
 

data/test/rails_root/config/boot.rb

@@ -1,7 +1,7 @@
 # Don't change this file!
 # Configure your app in config/environment.rb and config/environments/*.rb
 
-RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
+Rails.root = "#{File.dirname(__FILE__)}/.." unless defined?(Rails.root)
 
 module Rails
   class << self
@@ -21,7 +21,7 @@ module Rails
     end
 
     def vendor_rails?
-      File.exist?("#{RAILS_ROOT}/vendor/rails")
+      File.exist?("#{Rails.root}/vendor/rails")
     end
 
     # FIXME : Ruby 1.9
@@ -30,7 +30,7 @@ module Rails
     end
 
     def preinitializer_path
-      "#{RAILS_ROOT}/config/preinitializer.rb"
+      "#{Rails.root}/config/preinitializer.rb"
     end
   end
 
@@ -43,7 +43,7 @@ module Rails
 
   class VendorBoot < Boot
     def load_initializer
-      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      require "#{Rails.root}/vendor/rails/railties/lib/initializer"
     end
   end
 
@@ -99,7 +99,7 @@ module Rails
 
       private
         def read_environment_rb
-          File.read("#{RAILS_ROOT}/config/environment.rb")
+          File.read("#{Rails.root}/config/environment.rb")
         end
     end
   end

data/test/rails_root/config/environment.rb

@@ -26,7 +26,7 @@ Rails::Initializer.run do |config|
   # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
 
   # Add additional load paths for your own custom dirs
-  # config.load_paths += %W( #{RAILS_ROOT}/extras )
+  # config.load_paths += %W( #{Rails.root}/extras )
 
   # Force all environments to use the same logger level
   # (by default production uses :info, the others :debug)

data/test/rails_root/config/initializers/load_translations.rb

@@ -1,4 +1,4 @@
 %w{yml rb}.each do |type|
-  I18n.load_path += Dir.glob("#{RAILS_ROOT}/app/locales/**/*.#{type}")
+  I18n.load_path += Dir.glob("#{Rails.root}/app/locales/**/*.#{type}")
 end
 I18n.default_locale = 'en'

data/test/rails_root/public/dispatch.cgi

@@ -1,6 +1,6 @@
 #!/usr/local/bin/ruby
 
-require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
+require File.dirname(__FILE__) + "/../config/environment" unless defined?(Rails.root)
 
 # If you're using RubyGems and mod_ruby, this require should be changed to an absolute path one, like:
 # "/usr/local/lib/ruby/gems/1.8/gems/rails-0.8.0/lib/dispatcher" -- otherwise performance is severely impaired

data/test/rails_root/public/dispatch.fcgi

@@ -4,7 +4,7 @@
 # exceptions which forced the FastCGI instance to exit, great for debugging)
 # and the number of requests to process before running garbage collection.
 #
-# By default, the FastCGI crash log is RAILS_ROOT/log/fastcgi.crash.log
+# By default, the FastCGI crash log is Rails.root/log/fastcgi.crash.log
 # and the GC period is nil (turned off).  A reasonable number of requests
 # could range from 10-100 depending on the memory footprint of your app.
 #

data/test/rails_root/public/dispatch.rb

@@ -1,6 +1,6 @@
 #!/usr/local/bin/ruby
 
-require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
+require File.dirname(__FILE__) + "/../config/environment" unless defined?(Rails.root)
 
 # If you're using RubyGems and mod_ruby, this require should be changed to an absolute path one, like:
 # "/usr/local/lib/ruby/gems/1.8/gems/rails-0.8.0/lib/dispatcher" -- otherwise performance is severely impaired

data/test/rails_root/vendor/plugins/fleximage/init.rb

@@ -1,2 +1,2 @@
-init_path = "#{RAILS_ROOT}/../../init.rb"
+init_path = "#{Rails.root}/../../init.rb"
 silence_warnings { eval(IO.read(init_path), binding, init_path) }

data/test/test_helper.rb

@@ -7,7 +7,7 @@ require 'test_help'
 silence_warnings { RAILS_ENV = ENV['RAILS_ENV'] }
  
 # Run the migrations
-ActiveRecord::Migrator.migrate("#{RAILS_ROOT}/db/migrate")
+ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
  
 # Setup the fixtures path
 Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"
@@ -38,28 +38,28 @@ class Test::Unit::TestCase #:nodoc:
   def files(name)
     case name
     when :photo
-      MockFile.new("#{RAILS_ROOT}/../fixtures/photo.jpg")
+      MockFile.new("#{Rails.root}/../fixtures/photo.jpg")
       
     when :not_a_photo
-      MockFile.new("#{RAILS_ROOT}/../fixtures/not_a_photo.xml")
+      MockFile.new("#{Rails.root}/../fixtures/not_a_photo.xml")
     
     when :web_photo
       'http://www.google.com/intl/en_ALL/images/logo.gif'
     
     when :cmyk
-      MockFile.new("#{RAILS_ROOT}/../fixtures/cmyk.jpg")
+      MockFile.new("#{Rails.root}/../fixtures/cmyk.jpg")
     
     when :i100x100
-      MockFile.new("#{RAILS_ROOT}/../fixtures/100x100.jpg")
+      MockFile.new("#{Rails.root}/../fixtures/100x100.jpg")
       
     when :i1x100
-      MockFile.new("#{RAILS_ROOT}/../fixtures/1x100.jpg")
+      MockFile.new("#{Rails.root}/../fixtures/1x100.jpg")
       
     when :i100x1
-      MockFile.new("#{RAILS_ROOT}/../fixtures/100x1.jpg")
+      MockFile.new("#{Rails.root}/../fixtures/100x1.jpg")
       
     when :i1x1
-      MockFile.new("#{RAILS_ROOT}/../fixtures/1x1.jpg")
+      MockFile.new("#{Rails.root}/../fixtures/1x1.jpg")
     
     end
   end

data/test/unit/basic_model_test.rb

@@ -3,18 +3,18 @@ require File.dirname(__FILE__) + '/../../test/test_helper'
 class FleximageBasicModelTest < Test::Unit::TestCase
   def test_should_have_correct_file_path_with_creation_date_based_storage
     p = PhotoBare.create(:image_file => files(:photo))    
-    assert_equal "#{RAILS_ROOT}/public/uploads/#{Time.now.year}/#{Time.now.month}/#{Time.now.day}/#{p.id}.png", p.file_path
+    assert_equal "#{Rails.root}/public/uploads/#{Time.now.year}/#{Time.now.month}/#{Time.now.day}/#{p.id}.png", p.file_path
   end
   
   def test_should_have_correct_directory_path_with_creation_date_based_storage
     p = PhotoBare.create(:image_file => files(:photo))
-    assert_equal "#{RAILS_ROOT}/public/uploads/#{Time.now.year}/#{Time.now.month}/#{Time.now.day}", p.directory_path
+    assert_equal "#{Rails.root}/public/uploads/#{Time.now.year}/#{Time.now.month}/#{Time.now.day}", p.directory_path
   end
   
   def test_should_have_correct_file_path_without_creation_date_based_storage
     PhotoBare.use_creation_date_based_directories = false
     p = PhotoBare.create(:image_file => files(:photo))
-    assert_equal "#{RAILS_ROOT}/public/uploads/#{p.id}.png", p.file_path
+    assert_equal "#{Rails.root}/public/uploads/#{p.id}.png", p.file_path
   ensure
     PhotoBare.use_creation_date_based_directories = true
   end
@@ -22,7 +22,7 @@ class FleximageBasicModelTest < Test::Unit::TestCase
   def test_should_have_correct_directory_path_without_creation_date_based_storage
     PhotoBare.use_creation_date_based_directories = false
     p = PhotoBare.create(:image_file => files(:photo))
-    assert_equal "#{RAILS_ROOT}/public/uploads", p.directory_path
+    assert_equal "#{Rails.root}/public/uploads", p.directory_path
   ensure
     PhotoBare.use_creation_date_based_directories = true
   end

data/test/unit/temp_image_test.rb

@@ -5,14 +5,14 @@ class FleximageTempImageTest < Test::Unit::TestCase
     a1 = Avatar.new(:image_file => files(:photo))
     assert !a1.save
     assert_match /^\d+_\d+$/, a1.image_file_temp
-    assert File.exists?("#{RAILS_ROOT}/tmp/fleximage/#{a1.image_file_temp}")
+    assert File.exists?("#{Rails.root}/tmp/fleximage/#{a1.image_file_temp}")
     temp_file_path = a1.image_file_temp
     
     a2 = Avatar.new(:username => 'Alex Wayne', :image_file_temp => temp_file_path)
     
     assert a2.save
     assert File.exists?(a2.file_path)
-    assert !File.exists?("#{RAILS_ROOT}/tmp/fleximage/#{temp_file_path}")
+    assert !File.exists?("#{Rails.root}/tmp/fleximage/#{temp_file_path}")
   end
   
   def test_should_prevent_directory_traversal_attacks

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: robinboening-fleximage
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Ahmed Adam
 - Alex Wayne
 - Andrew White
+- Duccio
+- Heiner Wohner
 - JJ Buckley
 - Jason Lee
 - Joshua Abbott
@@ -23,13 +25,18 @@ authors:
 - Martin Vielsmaier
 - "Robin B\xC3\xB6ning"
 - Squeegy
+- Thomas von Deyen
 - Vannoy
+- Wolfgang Klinger
+- "Wolfgang K\xC3\xB6lbl"
+- josei
 - ralph
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-29 00:00:00 Z
+date: 2011-05-29 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rmagick
@@ -65,14 +72,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 2
-        - 2
-        - 2
-        version: 2.2.2
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :development
   version_requirements: *id003
 description: |
@@ -93,7 +100,6 @@ files:
 - Rakefile
 - VERSION
 - autotest.rb
-- fleximage.gemspec
 - init.rb
 - lib/dsl_accessor.rb
 - lib/fleximage.rb
@@ -113,9 +119,11 @@ files:
 - lib/fleximage/operator/text.rb
 - lib/fleximage/operator/trim.rb
 - lib/fleximage/operator/unsharp_mask.rb
+- lib/fleximage/rails3_view.rb
 - lib/fleximage/rmagick_image_patch.rb
 - lib/fleximage/view.rb
-- tasks/fleximage_tasks.rake
+- lib/tasks/fleximage_tasks.rake
+- robinboening-fleximage.gemspec
 - test/fixtures/100x1.jpg
 - test/fixtures/100x100.jpg
 - test/fixtures/1x1.jpg
@@ -221,6 +229,7 @@ files:
 - test/unit/require_image_option_test.rb
 - test/unit/temp_image_test.rb
 - test/unit/use_creation_date_based_directories_option_test.rb
+has_rdoc: true
 homepage: http://github.com/robinboening/fleximage
 licenses: []
 
@@ -250,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.4
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Rails plugin for uploading images as resources, with support for resizing, text stamping, and other special effects.