has_image 0.3.0 → 0.4.0

data/test/storage_test.rb

@@ -1,15 +1,15 @@
 require 'test_helper.rb'
 
 class StorageTest < Test::Unit::TestCase
-  
+
   def setup
   end
-  
+
   def teardown
     FileUtils.rm_rf(File.dirname(__FILE__) + '/../tmp')
     @temp_file.close! if @temp_file && !@temp_file.closed?
   end
-  
+
   def default_options
     mock_class = "test"
     mock_class.stubs(:table_name).returns('tests')
@@ -17,19 +17,19 @@ class StorageTest < Test::Unit::TestCase
       :base_path => File.join(File.dirname(__FILE__), '..', 'tmp')
     )
   end
-  
+
   def test_partitioned_path
     assert_equal(["0001", "2345"], HasImage::Storage.partitioned_path("12345"))
   end
-  
+
   def test_partitioned_path_doesnt_collide_with_high_ids
     assert_not_equal HasImage::Storage.partitioned_path(867792732),
       HasImage::Storage.partitioned_path(867792731)
     # FIXME: collisions when IDs have more than 8 digits
     # assert_not_equal HasImage::Storage.partitioned_path(967792731),
-    #   HasImage::Storage.partitioned_path(967792731)  
+    #   HasImage::Storage.partitioned_path(967792731)
   end
-  
+
   def test_id_from_partitioned_path
     assert_equal 123, HasImage::Storage.id_from_partitioned_path(HasImage::Storage.partitioned_path(123))
     assert_equal 56, HasImage::Storage.id_from_partitioned_path(HasImage::Storage.partitioned_path(56))
@@ -37,44 +37,44 @@ class StorageTest < Test::Unit::TestCase
     # FIXME: for IDs with more than 8 digits partitioned path is destructive
     # assert_equal 867792731, HasImage::Storage.id_from_partitioned_path(HasImage::Storage.partitioned_path(867792731))
   end
-  
+
   def test_id_from_path_accepts_array
     assert_equal 123, HasImage::Storage.id_from_path(['0000','0123','image_something.jpg'])
   end
-  
+
   def test_id_from_path_accepts_path
     assert_equal 12345, HasImage::Storage.id_from_path('0001/2345/0123/image_something.jpg')
   end
-  
+
   def test_generated_file_name
     assert_equal("1", HasImage::Storage.generated_file_name(stub(:to_param => 1)))
   end
-  
+
   def test_path_for
     @storage = HasImage::Storage.new(default_options)
     assert_match(/\/tmp\/tests\/0000\/0001/, @storage.send(:path_for, 1))
   end
-  
+
   def test_public_path_for
     @storage = HasImage::Storage.new(default_options.merge(:base_path => '/public'))
     pic = stub(:has_image_file => "mypic", :has_image_id => 1)
     assert_equal "/tests/0000/0001/mypic_square.jpg", @storage.public_path_for(pic, :square)
   end
-  
+
   def test_public_path_for_image_with_html_special_symbols_in_name
     @storage = HasImage::Storage.new(default_options.merge(:base_path => '/public'))
     pic = stub(:has_image_file => "my+pic", :has_image_id => 1)
     assert_equal "/tests/0000/0001/my%2Bpic_square.jpg", @storage.public_path_for(pic, :square)
   end
-  
+
   def test_name_generation_takes_into_account_thumbnail_separator_constant
     old_separator = HasImage::Storage.thumbnail_separator
-    
+
     @storage = HasImage::Storage.new(default_options.merge(:thumbnails => {:schick => '22x22'}, :base_path => '/public'))
     HasImage::Storage.thumbnail_separator = '.'
     pic = stub(:has_image_file => "pic", :has_image_id => 1)
     assert_equal "/tests/0000/0001/pic.schick.jpg", @storage.public_path_for(pic, :schick)
-    
+
     HasImage::Storage.thumbnail_separator = old_separator
   end
 
@@ -89,7 +89,7 @@ class StorageTest < Test::Unit::TestCase
     real = @storage.escape_file_name_for_http("/tests/00+00/0001/mypic+square?something.jpg")
     assert_equal "/tests/00+00/0001/mypic%2Bsquare%3Fsomething.jpg", real
   end
-  
+
   def test_filename_for
     @storage = HasImage::Storage.new(default_options)
     assert_equal "test.jpg", @storage.send(:file_name_for, "test")
@@ -97,19 +97,19 @@ class StorageTest < Test::Unit::TestCase
 
   def test_set_data_from_file
     @storage = HasImage::Storage.new(default_options)
-    @file = File.new(File.dirname(__FILE__) + "/../test_rails/fixtures/image.jpg", "r")
+    @file = File.new(File.expand_path("../fixtures/image.jpg", __FILE__), "r")
     @storage.image_data = @file
     assert @storage.temp_file.size > 0
     assert_equal Zlib.crc32(@file.read), Zlib.crc32(@storage.temp_file.read)
   end
-  
+
   def test_set_data_from_tempfile
     @storage = HasImage::Storage.new(default_options)
     @storage.image_data = temp_file("image.jpg")
     assert @storage.temp_file.size > 0
     assert_equal Zlib.crc32(@storage.temp_file.read), Zlib.crc32(@temp_file.read)
   end
-  
+
   def test_install_and_remove_images
     @storage = HasImage::Storage.new(default_options.merge(:thumbnails => {
       :one => "100x100", :two => "200x200"}))
@@ -117,7 +117,7 @@ class StorageTest < Test::Unit::TestCase
     @name = @storage.install_images(stub(:has_image_id => 1))
     assert @storage.remove_images(stub(:has_image_id => 1), @name)
   end
-  
+
   def test_install_images_doesnt_automatically_generate_thumbnails_if_that_option_is_set
     @storage = HasImage::Storage.new(default_options.merge(
       :thumbnails => {:two => "200x200"},
@@ -133,32 +133,31 @@ class StorageTest < Test::Unit::TestCase
     @storage.image_data = temp_file("image.jpg")
     assert !@storage.image_too_small?
   end
-  
+
   def test_image_too_small
     @storage = HasImage::Storage.new(default_options.merge(:min_size => 1.gigabyte))
     @storage.image_data = temp_file("image.jpg")
     assert @storage.image_too_small?
   end
-  
+
   def test_image_too_big
     @storage = HasImage::Storage.new(default_options.merge(:max_size => 1.kilobyte))
-    @storage.image_data = temp_file("image.jpg")    
+    @storage.image_data = temp_file("image.jpg")
     assert @storage.image_too_big?
   end
 
   def test_image_not_too_big
     @storage = HasImage::Storage.new(default_options.merge(:max_size => 1.gigabyte))
-    @storage.image_data = temp_file("image.jpg")    
+    @storage.image_data = temp_file("image.jpg")
     assert !@storage.image_too_big?
   end
-  
+
   private
-  
+
   def temp_file(fixture)
-    file = File.new(File.dirname(__FILE__) + "/../test_rails/fixtures/#{fixture}", "r")
+    file = File.new(File.expand_path("../fixtures/#{fixture}", __FILE__), "r")
     @temp_file = Tempfile.new("test")
     @temp_file.write(file.read)
     return @temp_file
   end
-  
 end

data/test/test_helper.rb

@@ -0,0 +1,47 @@
+require 'rubygems'
+require 'bundler/setup'
+require "active_support/core_ext/kernel/reporting"
+require "active_support/core_ext/class/attribute_accessors"
+require 'test/unit'
+require 'mocha'
+require "active_record"
+require "logger"
+require "rack/test"
+
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+require "has_image"
+
+RAILS_ROOT = File.join(File.dirname(__FILE__), '..', 'tmp')
+
+ActiveRecord::Base.logger = Logger.new($stdout) if ENV["LOG"]
+ActiveRecord::Migration.verbose = false
+
+# Change the connection args as you see fit to test against different adapters.
+ActiveRecord::Base.establish_connection(
+  :adapter  => "sqlite3",
+  :database => ":memory:"
+)
+
+module ActionView
+  class Base
+  end
+end
+
+ActiveRecord::Migration.create_table :pics do |t|
+  t.string  :has_image_file
+  t.timestamps
+end
+
+ActiveRecord::Migration.create_table :complex_pics do |t|
+  t.string :filename
+  t.integer :width, :height
+  t.string :image_size
+  t.timestamps
+end
+
+HasImage.enable
+
+def fixture_file_upload(path, mime_type)
+  path = File.expand_path("../fixtures/#{path}", __FILE__)
+  Rack::Test::UploadedFile.new(path, mime_type)
+end

metadata

@@ -1,29 +1,83 @@
 --- !ruby/object:Gem::Specification 
 name: has_image
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Norman Clarke
+- "Adri\xC3\xA1n Mugnolo"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-10-22 00:00:00 -02:00
+date: 2010-09-29 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mini_magick
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        version: "2.1"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        version: "2.1"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
-    version: 
-description: HasImage is a Ruby on Rails gem/plugin that allows you to attach images to ActiveRecord models.
-email: norman@randomba.org
+        segments: 
+        - 2
+        - 1
+        version: "2.1"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+  type: :development
+  version_requirements: *id004
+description: Has_image is a Ruby on Rails gem/plugin that allows you to attach images to Active Record models.
+email: 
+- norman@njclarke.com
+- adrian@mugnolo.com
 executables: []
 
 extensions: []
@@ -31,52 +85,55 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- CHANGELOG
-- FAQ
-- MIT-LICENSE
-- README.textile
-- init.rb
-- lib/has_image.rb
 - lib/has_image/processor.rb
+- lib/has_image/railtie.rb
 - lib/has_image/storage.rb
+- lib/has_image/version.rb
 - lib/has_image/view_helpers.rb
+- lib/has_image.rb
+- Changelog.md
+- README.md
+- MIT-LICENSE
 - Rakefile
+- test/complex_pic_test.rb
+- test/fixtures/bad_image.jpg
+- test/fixtures/image.jpg
+- test/fixtures/image.png
+- test/pic_test.rb
+- test/processor_test.rb
+- test/storage_test.rb
+- test/test_helper.rb
 has_rdoc: true
-homepage: http://randomba.org
+homepage: http://github.com/norman/has_image
+licenses: []
+
 post_install_message: 
-rdoc_options: 
-- --main
-- --inline-source
-- --line-numbers
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: has-image
-rubygems_version: 1.2.0
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
-summary: Lets you attach images with thumbnails to active record models.
-test_files: 
-- test_rails/database.yml
-- test_rails/fixtures/bad_image.jpg
-- test_rails/fixtures/image.jpg
-- test_rails/fixtures/image.png
-- test_rails/pic_test.rb
-- test_rails/complex_pic_test.rb
-- test_rails/schema.rb
-- test_rails/test_helper.rb
-- test/processor_test.rb
-- test/storage_test.rb
+specification_version: 3
+summary: Lets you attach images with thumbnails to Active Record models.
+test_files: []
+

data/CHANGELOG

@@ -1,72 +0,0 @@
-2008-10-22 Gerrit Keiser and Tricycle Developments
-  * Added option to not delete images on destroy
-  * Made thumbnail name separator configurable
-  * Added height/width methods to storage
-  * Allowed regenerating only one thumbnail size
-  * Made has_image column configurable
-  * Added some compatibility with attachment_fu
-  * General refactorings and overall code improvement
-
-2008-10-22 Norman Clarke <norman@randomba.org>
-  * Documentation improvements and minor code cleanups.
-
-2008-10-09 Dima Sabanin <sdmitry@gmail.com>
-  * Fixed display of images with special symbols in the name,
-    like '2777-nipple-+-apple-napple.jpg'. + is reserved by HTTP.
-    Now escaping filenames before giving them back in #public_path()
-
-2008-09-10 Norman Clarke <norman@randomba.org>
-  * Fixed images not being converted to target format.
-  
-2008-08-29 Norman Clarke <norman@randomba.org>
-  * Fixed bad call to has_image_file
-  
-2008-08-28 Norman Clarke <norman@randomba.org>
-  * Added ability to regenerate a model's thumbnails.
-  * Changed a few methods in storage to accept the model rather than the id.
-    This makes storage more hackable as regards generating paths and file names.
-  * Added "has_image_id" method to model instance methods to facilitate
-    grouping the images under a directory structure based on a related model's
-    ids.
-  * Made the generated file name simply by the image object's id - this
-    is better adherance to the principle of least surprise.
-
-2008-08-25 Norman Clarke <norman@randomba.org>
-  * Fixed bad call to resize_to in view helper.
-
-2008-08-19 Norman Clarke <norman@randomba.org>
-  * Made storage work more correctly with tempfiles.
-  
-2008-08-18 Norman Clarke <norman@randomba.org>
-  * Fixed ability to set the path for storing image files.
-
-2008-08-1 Adrian Mugnolo <adrian@randomba.org>
-  * Improved partitioned path handling to avoid collisions when the id is
-    very high, which can happen if you use db:fixtures:load.
-
-2008-08-1 Norman Clarke <norman@randomba.org>
-  * Fixed a bug where overwriting a previous image triggered callbacks more
-    than once, causing errors.
-
-2008-07-29 Norman Clarke <norman@randomba.org>
-
-  * Downcased generated file names to avoid potential issues on
-    case-insensitive filesystems.
-  * Added "absolute path" method to model instances.
-  * Made image deletion nullify the "has_image_file" field.
-  * Added "has_image?" method to model instances.
-  * Fixed ENONENT error with record update when there are no images yet.
-  * Reverted thumbnail sorting feature - it's fast but makes terrible quality
-    thumbnails. It's just not worth it.
-
-2008-07-28 Norman Clarke <norman@randomba.org>
-
-  * Added sorted thumbnail processing. This improves thumbnail generation
-    speed by about 25% for 4.5 meg jpegs with 5 thumbnails.
-  * Fixed broken resize for non-fixed-width thumbnails.
-  * Added check for bad geometry strings.
-  * Added dependencies and Rubyforge project to gemspec, updated docs.
-
-2008-07-25 Norman Clarke <norman@randomba.org>
-
-	* First public release.