attachment_magick 0.3.3 → 0.3.4

data/Gemfile

@@ -1,18 +1,16 @@
 source "http://rubygems.org"
 
-gem "rails", "3.0.10"
+gem "rails", "3.2.3"
 gem "capybara", ">= 1.0.1"
 gem "sqlite3-ruby", :require => "sqlite3"
 
-gem "mongoid", "~> 2.2"
-gem "bson_ext", "~> 1.4"
+gem "mongoid", "2.4.10"
+gem "bson_ext", "1.5.2"
 gem "nokogiri"
 gem "hpricot"
 gem "colorific"
-gem "ruby-debug19"
 gem "simplecov", :require => false
 gem "mime-types", ">=1.16"
 
-
 # Specify your gem's dependencies in attachment_magick.gemspec
 gemspec

data/Gemfile.lock

@@ -2,77 +2,76 @@ PATH
   remote: .
   specs:
     attachment_magick (0.3.3)
-      dragonfly (>= 0.9.5)
+      dragonfly (>= 0.9.10)
       jquery-rails (>= 0.2.7)
       marcosinger-auto_html (>= 1.3.6)
       marcosinger-css_parser (>= 1.3.0)
-      rack-cache (>= 1.0)
+      rack-cache (>= 1.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    RedCloth (4.2.8)
-    abstract (1.0.0)
-    actionmailer (3.0.10)
-      actionpack (= 3.0.10)
-      mail (~> 2.2.19)
-    actionpack (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-    activesupport (3.0.10)
-    archive-tar-minitar (0.5.2)
-    arel (2.0.10)
-    bson (1.4.1)
-    bson_ext (1.4.1)
-    builder (2.1.2)
-    capybara (1.1.1)
+    RedCloth (4.2.9)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    addressable (2.2.8)
+    arel (3.0.2)
+    bson (1.5.2)
+    bson_ext (1.5.2)
+      bson (= 1.5.2)
+    builder (3.0.0)
+    capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.2.2)
+    childprocess (0.3.2)
       ffi (~> 1.0.6)
-    colorific (1.0.1)
-      minitest (~> 2.6.2)
+    colorific (1.0.2)
+      minitest (~> 2.8.0)
       ruby-progressbar (~> 0.0.10)
-    columnize (0.3.4)
-    dragonfly (0.9.8)
+    dragonfly (0.9.12)
       rack
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    ffi (1.0.9)
-    hpricot (0.8.4)
-    i18n (0.5.0)
-    jquery-rails (1.0.16)
-      railties (~> 3.0)
+    erubis (2.7.0)
+    ffi (1.0.11)
+    hike (1.2.1)
+    hpricot (0.8.6)
+    i18n (0.6.0)
+    journey (1.0.3)
+    jquery-rails (2.0.2)
+      railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.6.1)
-    json_pure (1.6.1)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    json (1.7.3)
+    libwebsocket (0.1.3)
+      addressable
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -83,73 +82,70 @@ GEM
       rinku
       tag_helper
     marcosinger-css_parser (1.3.0)
-    mime-types (1.17.2)
-    minitest (2.6.2)
-    mongo (1.4.1)
-      bson (= 1.4.1)
-    mongoid (2.2.3)
-      activemodel (~> 3.0)
+    mime-types (1.18)
+    minitest (2.8.1)
+    mongo (1.5.2)
+      bson (= 1.5.2)
+    mongoid (2.4.10)
+      activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-    multi_json (1.0.3)
-    nokogiri (1.5.0)
-    polyglot (0.3.2)
-    rack (1.2.4)
-    rack-cache (1.1)
+    multi_json (1.3.5)
+    nokogiri (1.5.2)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.10)
-      actionmailer (= 3.0.10)
-      actionpack (= 3.0.10)
-      activerecord (= 3.0.10)
-      activeresource (= 3.0.10)
-      activesupport (= 3.0.10)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.0.10)
-    railties (3.0.10)
-      actionpack (= 3.0.10)
-      activesupport (= 3.0.10)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (~> 0.14.6)
     rake (0.9.2.2)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
-    redcarpet (1.17.2)
-    rinku (1.2.2)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
+    redcarpet (2.1.1)
+    rinku (1.5.1)
     ruby-progressbar (0.0.10)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    rubyzip (0.9.4)
-    selenium-webdriver (2.9.1)
-      childprocess (>= 0.2.1)
-      ffi (= 1.0.9)
-      json_pure
+    rubyzip (0.9.8)
+    selenium-webdriver (2.21.2)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
       rubyzip
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sqlite3 (1.3.4)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     tag_helper (0.0.3)
     thor (0.14.6)
+    tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.30)
+    tzinfo (0.3.33)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -158,14 +154,13 @@ PLATFORMS
 
 DEPENDENCIES
   attachment_magick!
-  bson_ext (~> 1.4)
+  bson_ext (= 1.5.2)
   capybara (>= 1.0.1)
   colorific
   hpricot
   mime-types (>= 1.16)
-  mongoid (~> 2.2)
+  mongoid (= 2.4.10)
   nokogiri
-  rails (= 3.0.10)
-  ruby-debug19
+  rails (= 3.2.3)
   simplecov
   sqlite3-ruby

data/README.rdoc

@@ -30,7 +30,7 @@ Create a initializer like this (config/initializers/attachment_magick_setup.rb)
       config.columns_width  = 52
       config.gutter         = 8
     # Or with our magick :)
-      config.parse_stylesheet('name_of_my_grid_file.css')
+    # config.parse_stylesheet('name_of_my_grid_file.css')
     
     config.orms = ["ActiveRecord", "Mongoid"] # Mongoid is default
     
@@ -40,16 +40,18 @@ Create a initializer like this (config/initializers/attachment_magick_setup.rb)
     end
   end
 
-* Attachment Magick is based in 960 Grid System (http://960.gs/)
+* Attachment Magick is based on 960 Grid System (http://960.gs/)
 
 Add to application.rb
 
-  config.middleware.insert 0, 'Dragonfly::Middleware', :images
-  config.middleware.insert_before 'Dragonfly::Middleware', 'Rack::Cache', {
+  config.middleware.insert 0, 'Rack::Cache', {
     :verbose     => true,
-    :metastore   => "file:#{Rails.root}/tmp/dragonfly/cache/meta",
-    :entitystore => "file:#{Rails.root}/tmp/dragonfly/cache/body"
-  }
+    :metastore   => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"),
+    :entitystore => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/body")
+  } # unless Rails.env.production?  ## uncomment this 'unless' in Rails 3.1,
+                                    ## because it already inserts Rack::Cache in production
+
+  config.middleware.insert_after 'Rack::Cache', 'Dragonfly::Middleware', :images
 
 == Getting started
 
@@ -62,7 +64,7 @@ Include AttachmentMagick Module to your model
   class Post
     include AttachmentMagick
 
-    ...
+    attachment_magick
   end
 
 Call this helpers in form views

data/app/controllers/attachment_magick/images_controller.rb

@@ -4,25 +4,29 @@ class AttachmentMagick::ImagesController < ActionController::Base
   before_filter :load_klass
 
   def create
-    @image = @klass.images.create(:photo => params[:Filedata], :source => params[:source], :file_name => params[:source] ? "" : params[:Filedata].original_filename)
+    options = {
+      :photo      => params[:Filedata],
+      :source     => params[:source],
+      :file_name  => (params[:Filedata].original_filename unless params[:source])
+    }
+
+    @image = @klass.images.create(options)
     @klass.save
 
-    if params[:data_partial].present?
-      render :partial => params[:data_partial], :collection => [@image], :as => :image
-    else
-      render :partial => AttachmentMagick.configuration.default_add_partial, :collection => [@image], :as => :image, :locals => { :size => @klass.class.style_publisher }
-    end
+    partial_options = {
+      :collection => [@image],
+      :as         => :image,
+      :partial    => AttachmentMagick.configuration.default_add_partial
+    }
+
+    partial_options.merge!({:partial => params[:data_partial]}) if params[:data_partial].present?
+    render partial_options
   end
 
   def update_sortable
-    array_ids = params[:images]
-    hash      = {}
-
-    array_ids.each_with_index do |id, index|
-      hash.merge!( {"#{index}" => {:id => "#{id}", :priority => index}} )
-    end
-
-    @klass.images_attributes = hash
+    hsh = {}
+    params[:images].each_with_index {|id, index| hsh.merge!({"#{index}" => {:id => "#{id}", :priority => index}}) }
+    @klass.images_attributes = hsh
     @klass.save
 
     render :text => "ok"
@@ -30,6 +34,7 @@ class AttachmentMagick::ImagesController < ActionController::Base
 
   def destroy
     @klass.images.find(params[:id]).destroy
+
     render :text => "ok"
   end
 

data/app/helpers/attachment_magick/attachment_magick_helper.rb

@@ -91,4 +91,10 @@ module AttachmentMagick::AttachmentMagickHelper
       <!--<![endif]-->
     </object>".html_safe
   end
-end
+  
+  def resize_video(html, x)
+    y = x.to_i * 2 / 3
+    html.gsub(/width=\"([0-9]+)\"/, "width='#{x}'").gsub(/height=\"([0-9]+)\"/, "height='#{y}'").html_safe
+  end
+    
+end

data/app/models/attachment_magick/active_record_image.rb

@@ -1,7 +1,7 @@
 module AttachmentMagick
   if AttachmentMagick.configuration.orms.include?("ActiveRecord")
     class ActiveRecordImage < ActiveRecord::Base
-      set_table_name "amagick_images"
+      self.table_name = "amagick_images"
 
       belongs_to      :imageable, :polymorphic => true
       image_accessor  :photo
@@ -30,4 +30,4 @@ module AttachmentMagick
     end
   end
   
-end
+end

data/attachment_magick.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "dragonfly",  ">= 0.9.5"
-  s.add_dependency "rack-cache", ">= 1.0"
+  s.add_dependency "dragonfly",  ">= 0.9.10"
+  s.add_dependency "rack-cache", ">= 1.1"
   s.add_dependency "jquery-rails", ">= 0.2.7"
   s.add_dependency "marcosinger-auto_html", ">= 1.3.6"
   s.add_dependency "marcosinger-css_parser", ">= 1.3.0"

data/lib/attachment_magick.rb

@@ -84,9 +84,7 @@ module AttachmentMagick
     end
   end
 
-  module InstanceMethods
-    def image_cover
-      self.images.order(:priority).first
-    end
+  def image_cover
+    self.images.order(:priority).first
   end
 end

data/lib/attachment_magick/dragonfly/init.rb

@@ -17,12 +17,12 @@ if defined? Mongoid::Document
 
   app.datastore = Dragonfly::DataStorage::MongoDataStore.new
   app.datastore.configure do |c|
-    c.host      = yaml_file['host']                 # defaults to localhost
-    c.port      = yaml_file['port']                 # defaults to mongo default (27017)
-    c.database  = yaml_file['database']             # defaults to 'dragonfly'
-    c.username  = yaml_file['username']             # only needed if mongo is running in auth mode
-    c.password  = yaml_file['password']             # only needed if mongo is running in auth mode
+    c.host      = yaml_file['host'] || yaml_file['uri'] # defaults to localhost
+    c.port      = yaml_file['port']                     # defaults to mongo default (27017)
+    c.database  = yaml_file['database']                 # defaults to 'dragonfly'
+    c.username  = yaml_file['username']                 # only needed if mongo is running in auth mode
+    c.password  = yaml_file['password']                 # only needed if mongo is running in auth mode
   end
 
   app.define_macro_on_include(Mongoid::Document, :image_accessor)
-end
+end

data/lib/attachment_magick/test/attachment_magick_test_helper.rb

@@ -1,10 +1,3 @@
-class Tempfile
-  def original_filename
-    "little_girl.jpg"
-  end
-end
-
-
 module AttachmentMagickTestHelper
   def assert_element_in(target, match)
     target = Nokogiri::HTML(target)
@@ -41,7 +34,7 @@ module AttachmentMagickTestHelper
   end
 
   def example_file
-    Tempfile.new('little_girl.jpg')
+    fixture_file_upload('little_girl.jpg', 'image/jpg')
   end
 
   def example_youtube

data/lib/attachment_magick/version.rb

@@ -1,3 +1,3 @@
 module AttachmentMagick
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/test/attachment_magick/controllers/images_controller_test.rb

@@ -12,6 +12,7 @@ class AttachmentMagick::ImagesControllerTest < ActionController::TestCase
     post :create, artist_hash.merge({ :Filedata => example_file })
     assert_response :success
     assert  assert_element_in(response.body, "img")
+    assert  assert_element_in(response.body, "div[@class='grid_5 attachment_magick_image']")
   end
 
   test "should create artist vimeo video" do
@@ -30,6 +31,8 @@ class AttachmentMagick::ImagesControllerTest < ActionController::TestCase
     post :create, work_hash.merge({ :Filedata => example_file })
     assert_response :success
     assert  assert_element_in(response.body, "img")
+    assert  assert_element_in(response.body, "div[@class='image_caption']")
+    assert  assert_element_in(response.body, "div[@class='image_thumb']")
   end
 
   test "should create place image" do

data/test/attachment_magick/helpers/attachment_magick_test.rb

@@ -61,4 +61,10 @@ class AttachmentMagick::AttachmentMagickHelperTest < ActionView::TestCase
     assert assert_element_in(html, "object")
     assert assert_element_in(html, "object[@width='100'][@height='60']")
   end
+  
+  def test_should_resize_video
+    html = "<iframe width=\"450\" height=\"250\"></iframe>"
+    assert_equal(resize_video(html, 300), "<iframe width='300' height='200'></iframe>")
+  end
+      
 end

data/test/attachment_magick/units/attachment_magick_test.rb

@@ -62,7 +62,9 @@ class AttachmentMagickTest < ActiveSupport::TestCase
     column_amount = 10
     gutter        = 3
 
-    grid_system = open("http://www.spry-soft.com/grids/grid/?column_width=#{column_width}&column_amount=#{column_amount}&gutter_width=#{gutter}") { |url| Hpricot(url) }
+    #grid_system = open("http://www.spry-soft.com/grids/grid/?column_width=#{column_width}&column_amount=#{column_amount}&gutter_width=#{gutter}") { |url| Hpricot(url) }
+    grid_system = open("http://grids.heroku.com/grid?column_width=#{column_width}&column_amount=#{column_amount}&gutter_width=#{gutter}") { |url| Hpricot(url) }    
+
     grids       = Artist.send(:generate_grids, column_amount, column_width, gutter)
 
     assert_equal grids.size, column_amount + AttachmentMagick.configuration.custom_styles.styles.size

data/test/dummy/config/environments/development.rb

@@ -3,7 +3,7 @@ Dummy::Application.configure do
 
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
@@ -11,7 +11,6 @@ Dummy::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
@@ -22,5 +21,10 @@ Dummy::Application.configure do
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
-end
 
+  # Do not compress assets
+  config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
+end

data/test/dummy/config/environments/production.rb

@@ -1,7 +1,6 @@
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
-  # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true
 
@@ -9,14 +8,27 @@ Dummy::Application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_assets = false
+
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+
+  # Generate digests for assets URLs
+  config.assets.digest = true
 
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+  # Defaults to Rails.root.join("public/assets")
+  # config.assets.manifest = YOUR_PATH
 
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
+  # Specifies the header that your server uses for sending files
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
 
   # See everything in the log (default is :info)
   # config.log_level = :debug
@@ -27,13 +39,12 @@ Dummy::Application.configure do
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
 
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
-
-  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
 
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
+
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
 

data/test/dummy/config/environments/test.rb

@@ -1,35 +1,39 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+    # Settings specified here will take precedence over those in config/application.rb
 
-  # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
-  config.cache_classes = true
+    # The test environment is used exclusively to run your application's
+    # test suite.  You never need to work with it otherwise.  Remember that
+    # your test database is "scratch space" for the test suite and is wiped
+    # and recreated between test runs.  Don't rely on the data there!
+    config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+    # Configure static asset server for tests with Cache-Control for performance
+    config.serve_static_assets = true
+    config.static_cache_control = "public, max-age=3600"
 
-  # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+    # Log error messages when you accidentally call methods on nil
+    config.whiny_nils = true
 
-  # Raise exceptions instead of rendering exception templates
-  config.action_dispatch.show_exceptions = false
+    # Show full error reports and disable caching
+    config.consider_all_requests_local       = true
+    config.action_controller.perform_caching = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+    # Raise exceptions instead of rendering exception templates
+    config.action_dispatch.show_exceptions = false
 
-  # Tell Action Mailer not to deliver emails to the real world.
-  # The :test delivery method accumulates sent emails in the
-  # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
+    # Disable request forgery protection in test environment
+    config.action_controller.allow_forgery_protection    = false
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
+    # Tell Action Mailer not to deliver emails to the real world.
+    # The :test delivery method accumulates sent emails in the
+    # ActionMailer::Base.deliveries array.
+    config.action_mailer.delivery_method = :test
 
-  # Print deprecation notices to the stderr
-  config.active_support.deprecation = :stderr
-end
+    # Use SQL instead of Active Record's schema dumper when creating the test database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+
+    # Print deprecation notices to the stderr
+    config.active_support.deprecation = :stderr
+  end

data/test/test_helper.rb

@@ -9,7 +9,6 @@ end
 
 ENV["RAILS_ENV"] = "test"
 
-require 'ruby-debug' ; Debugger.start
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 
@@ -34,15 +33,18 @@ require "generators/attachment_magick/migration_generator"
 
 # Some helpers
 require "attachment_magick/test/attachment_magick_test_helper"
+require "action_dispatch/testing/test_process"
 
 class ActiveSupport::TestCase
   include AttachmentMagickTestHelper
+  include ActionDispatch::TestProcess
 end
 
 class ActionController::TestCase
   include AttachmentMagickTestHelper
+  include ActionDispatch::TestProcess
 end
 
 class ActionView::TestCase
   include AttachmentMagickTestHelper
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attachment_magick
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,34 +11,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000 -02:00
-default_executable: 
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
-  requirement: &2165303660 !ruby/object:Gem::Requirement
+  requirement: &2153159200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.10
   type: :runtime
   prerelease: false
-  version_requirements: *2165303660
+  version_requirements: *2153159200
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &2165303160 !ruby/object:Gem::Requirement
+  requirement: &2153158160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2165303160
+  version_requirements: *2153158160
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2165302700 !ruby/object:Gem::Requirement
+  requirement: &2153157300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +45,10 @@ dependencies:
         version: 0.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *2165302700
+  version_requirements: *2153157300
 - !ruby/object:Gem::Dependency
   name: marcosinger-auto_html
-  requirement: &2165302240 !ruby/object:Gem::Requirement
+  requirement: &2153156620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +56,10 @@ dependencies:
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *2165302240
+  version_requirements: *2153156620
 - !ruby/object:Gem::Dependency
   name: marcosinger-css_parser
-  requirement: &2165301780 !ruby/object:Gem::Requirement
+  requirement: &2153155960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,7 +67,7 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165301780
+  version_requirements: *2153155960
 description: 
 email:
 - markaum@gmail.com
@@ -181,10 +180,10 @@ files:
 - test/dummy/public/stylesheets/swfupload.css
 - test/dummy/public/stylesheets/text.css
 - test/dummy/script/rails
+- test/dummy/test/fixtures/little_girl.jpg
 - test/integration/navigation_test.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/marcosinger/attachment_magick
 licenses: []
 post_install_message: 
@@ -205,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: attachment_magick
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: little more magick when you upload image files (with SwfUpload and Dragonfly)
@@ -284,6 +283,7 @@ test_files:
 - test/dummy/public/stylesheets/swfupload.css
 - test/dummy/public/stylesheets/text.css
 - test/dummy/script/rails
+- test/dummy/test/fixtures/little_girl.jpg
 - test/integration/navigation_test.rb
 - test/support/integration_case.rb
 - test/test_helper.rb