tvdeyen-fleximage 1.0.5 → 1.0.7

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.7

data/lib/fleximage.rb

@@ -53,7 +53,6 @@ require 'fleximage/aviary_controller'
 ActionController::Base.class_eval{ include Fleximage::AviaryController }
 
 # Register mime types
-Mime::Type.register_alias "image/pjpeg", :jpg # IE6 sends jpg data as "image/pjpeg".  Silly IE6.
-Mime::Type.register "image/jpeg", :jpg
+Mime::Type.register "image/jpeg", :jpg, ["image/pjpeg"], ["jpeg"]
 Mime::Type.register "image/gif", :gif
 Mime::Type.register "image/png", :png

data/lib/fleximage/model.rb

@@ -335,7 +335,8 @@ 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
+          file_path=file.path unless file.is_a? StringIO
+          file_path=file.tempfile.path  if file.is_a?( ActionDispatch::Http::UploadedFile ) 
 
           # Create RMagick Image object from uploaded file
           if file_path
@@ -663,7 +664,8 @@ module Fleximage
         
         # Save the image in the rails tmp directory
         def save_temp_image(file)
-          file_name = file.respond_to?(:original_filename) ? file.original_filename : file.path
+          file_name=file.path unless file.is_a? StringIO
+          file_name =  file.original_filename if file.respond_to?(:original_filename)  
           @image_file_temp = Time.now.to_f.to_s.sub('.', '_')
           path = "#{Rails.root}/tmp/fleximage"
           FileUtils.mkdir_p(path)

data/lib/fleximage/operator/image_overlay.rb

@@ -82,4 +82,4 @@ module Fleximage
     end
     
   end
-end
+end

data/lib/fleximage/operator/text.rb

@@ -101,4 +101,4 @@ module Fleximage
     end
     
   end
-end
+end

data/tvdeyen-fleximage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tvdeyen-fleximage}
-  s.version = "1.0.5"
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ahmed Adam", "Alex Wayne", "Andrew White", "Duccio", "Heiner Wohner", "JJ Buckley", "Jason Lee", "Joshua Abbott", "Koji Ando", "Kouhei Sutou", "Lasse Jansen", "Loïc Guitaut", "Martin Vielsmaier", "Squeegy", "Thomas von Deyen", "Vannoy", "Wolfgang Klinger", "Wolfgang Kölbl", "josei", "ralph"]
-  s.date = %q{2011-05-22}
+  s.authors = ["Ahmed Adam", "Alex Wayne", "Andrew White", "Duccio", "Fernando Kosh", "Heiner Wohner", "JJ Buckley", "Jason Lee", "Joshua Abbott", "Koji Ando", "Kouhei Sutou", "Lasse Jansen", "Lo\303\257c Guitaut", "Martin Vielsmaier", "Squeegy", "Thomas von Deyen", "Vannoy", "Wolfgang Klinger", "Wolfgang K\303\266lbl", "josei", "ralph"]
+  s.date = %q{2011-09-08}
   s.description = %q{Fleximage is a Rails plugin that tries to make image uploading and rendering
 super easy.
 }
@@ -156,7 +156,7 @@ super easy.
   ]
   s.homepage = %q{http://github.com/tvdeyen/fleximage}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.7.2}
   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

metadata

@@ -1,14 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: tvdeyen-fleximage
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
-  version: 1.0.5
+  segments: 
+  - 1
+  - 0
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Ahmed Adam
 - Alex Wayne
 - Andrew White
 - Duccio
+- Fernando Kosh
 - Heiner Wohner
 - JJ Buckley
 - Jason Lee
@@ -29,8 +35,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-22 00:00:00 +02:00
-default_executable: 
+date: 2011-09-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rmagick
@@ -40,6 +45,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -51,6 +59,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -62,6 +73,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :development
   version_requirements: *id003
@@ -212,7 +228,6 @@ files:
 - test/unit/temp_image_test.rb
 - test/unit/use_creation_date_based_directories_option_test.rb
 - tvdeyen-fleximage.gemspec
-has_rdoc: true
 homepage: http://github.com/tvdeyen/fleximage
 licenses: []
 
@@ -226,17 +241,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Rails plugin for uploading images as resources, with support for resizing, text stamping, and other special effects.