paperclip 3.0.3 → 3.5.1

data/features/basic_integration.feature

@@ -7,13 +7,27 @@ Feature: Rails integration
     And I run a migration
     And I update my new user view to include the file upload field
     And I update my user view to include the attachment
+    And I allow the attachment to be submitted
+
+  Scenario: Configure defaults for all attachments through Railtie
+    Given I add this snippet to config/application.rb:
+      """
+      config.paperclip_defaults = {:url => "/paperclip/custom/:attachment/:style/:filename"}
+      """
+    And I attach :attachment
+    And I start the rails application
+    When I go to the new user page
+    And I fill in "Name" with "something"
+    And I attach the file "test/fixtures/5k.png" to "Attachment"
+    And I press "Submit"
+    Then I should see "Name: something"
+    And I should see an image with a path of "/paperclip/custom/attachments/original/5k.png"
+    And the file at "/paperclip/custom/attachments/original/5k.png" should be the same as "test/fixtures/5k.png"
 
   Scenario: Filesystem integration test
-    Given I add this snippet to the User model:
+    Given I attach :attachment with:
       """
-      attr_accessible :name, :attachment
-      has_attached_file :attachment, :url => "/system/:attachment/:style/:filename",
-                                     :styles => { :square => "100x100#" }
+        :url => "/system/:attachment/:style/:filename"
       """
     And I start the rails application
     When I go to the new user page
@@ -25,14 +39,12 @@ Feature: Rails integration
     And the file at "/system/attachments/original/5k.png" should be the same as "test/fixtures/5k.png"
 
   Scenario: S3 Integration test
-    Given I add this snippet to the User model:
-      """
-      attr_accessible :name, :attachment
-      has_attached_file :attachment,
-                        :storage => :s3,
-                        :path => "/:attachment/:style/:filename",
-                        :s3_credentials => Rails.root.join("config/s3.yml"),
-                        :styles => { :square => "100x100#" }
+    Given I attach :attachment with:
+      """
+        :storage => :s3,
+        :path => "/:attachment/:style/:filename",
+        :s3_credentials => Rails.root.join("config/s3.yml"),
+        :styles => { :square => "100x100#" }
       """
     And I write to "config/s3.yml" with:
       """

data/features/migration.feature

@@ -0,0 +1,94 @@
+Feature: Migration
+
+  Background:
+    Given I generate a new rails application
+    And I write to "app/models/user.rb" with:
+      """
+      class User < ActiveRecord::Base; end
+      """
+
+  Scenario: Vintage syntax
+    When I write to "db/migrate/01_add_attachment_to_users.rb" with:
+      """
+      class AddAttachmentToUsers < ActiveRecord::Migration
+        def self.up
+          create_table :users do |t|
+            t.has_attached_file :avatar
+          end
+        end
+
+        def self.down
+          drop_attached_file :users, :avatar
+        end
+      end
+      """
+    And I run a migration
+    Then I should have attachment columns for "avatar"
+
+    When I rollback a migration
+    Then I should not have attachment columns for "avatar"
+
+  Scenario: New syntax with create_table
+    When I write to "db/migrate/01_add_attachment_to_users.rb" with:
+      """
+      class AddAttachmentToUsers < ActiveRecord::Migration
+        def self.up
+          create_table :users do |t|
+            t.attachment :avatar
+          end
+        end
+      end
+      """
+    And I run a migration
+    Then I should have attachment columns for "avatar"
+
+  Scenario: New syntax outside of create_table
+    When I write to "db/migrate/01_create_users.rb" with:
+      """
+      class CreateUsers < ActiveRecord::Migration
+        def self.up
+          create_table :users
+        end
+      end
+      """
+    And I write to "db/migrate/02_add_attachment_to_users.rb" with:
+      """
+      class AddAttachmentToUsers < ActiveRecord::Migration
+        def self.up
+          add_attachment :users, :avatar
+        end
+
+        def self.down
+          remove_attachment :users, :avatar
+        end
+      end
+      """
+    And I run a migration
+    Then I should have attachment columns for "avatar"
+
+    When I rollback a migration
+    Then I should not have attachment columns for "avatar"
+
+  Scenario: Rails 3.2 change method
+    Given I am using Rails newer than 3.1
+    When I write to "db/migrate/01_create_users.rb" with:
+      """
+      class CreateUsers < ActiveRecord::Migration
+        def self.up
+          create_table :users
+        end
+      end
+      """
+    When I write to "db/migrate/02_add_attachment_to_users.rb" with:
+      """
+      class AddAttachmentToUsers < ActiveRecord::Migration
+        def change
+          add_attachment :users, :avatar
+        end
+      end
+      """
+    And I run a migration
+    Then I should have attachment columns for "avatar"
+
+    When I rollback a migration
+    Then I should not have attachment columns for "avatar"

data/features/rake_tasks.feature

@@ -5,10 +5,9 @@ Feature: Rake tasks
     And I run a rails generator to generate a "User" scaffold with "name:string"
     And I run a paperclip generator to add a paperclip "attachment" to the "User" model
     And I run a migration
-    And I add this snippet to the User model:
+    And I attach :attachment with:
       """
-      attr_accessible :name, :attachment
-      has_attached_file :attachment, :path => ":rails_root/public/system/:attachment/:style/:filename"
+        :path => ":rails_root/public/system/:attachment/:style/:filename"
       """
 
   Scenario: Paperclip refresh thumbnails task

data/features/step_definitions/attachment_steps.rb

@@ -72,3 +72,31 @@ Then /^the attachment file "([^"]*)" should (not )?exist$/ do |filename, not_exi
     check_file_presence([attachment_path(filename)], !not_exist)
   end
 end
+
+Then /^I should have attachment columns for "([^"]*)"$/ do |attachment_name|
+  in_current_dir do
+    columns = eval(`bundle exec #{runner_command} "puts User.columns.map{ |column| [column.name, column.type] }.inspect"`.strip)
+    expect_columns = [
+      ["#{attachment_name}_file_name", :string],
+      ["#{attachment_name}_content_type", :string],
+      ["#{attachment_name}_file_size", :integer],
+      ["#{attachment_name}_updated_at", :datetime]
+    ]
+
+    expect_columns.all?{ |column| columns.include? column }.should be_true
+  end
+end
+
+Then /^I should not have attachment columns for "([^"]*)"$/ do |attachment_name|
+  in_current_dir do
+    columns = eval(`bundle exec #{runner_command} "puts User.columns.map{ |column| [column.name, column.type] }.inspect"`.strip)
+    expect_columns = [
+      ["#{attachment_name}_file_name", :string],
+      ["#{attachment_name}_content_type", :string],
+      ["#{attachment_name}_file_size", :integer],
+      ["#{attachment_name}_updated_at", :datetime]
+    ]
+
+    expect_columns.none?{ |column| columns.include? column }.should be_true
+  end
+end

data/features/step_definitions/rails_steps.rb

@@ -3,6 +3,7 @@ Given /^I generate a new rails application$/ do
     When I run `bundle exec #{new_application_command} #{APP_NAME} --skip-bundle`
     And I cd to "#{APP_NAME}"
     And I turn off class caching
+    And I fix the application.rb for 3.0.12
     And I write to "Gemfile" with:
       """
       source "http://rubygems.org"
@@ -14,12 +15,75 @@ Given /^I generate a new rails application$/ do
       gem "gherkin"
       gem "aws-sdk"
       """
+    And I remove turbolinks
+    And I empty the application.js file
     And I configure the application to use "paperclip" from this project
     And I reset Bundler environment variable
     And I successfully run `bundle install --local`
   }
 end
 
+Given "I fix the application.rb for 3.0.12" do
+  in_current_dir do
+    File.open("config/application.rb", "a") do |f|
+      f << "ActionController::Base.config.relative_url_root = ''"
+    end
+  end
+end
+
+Given "I allow the attachment to be submitted" do
+  in_current_dir do
+    transform_file("app/controllers/users_controller.rb") do |content|
+      content.gsub("params.require(:user).permit(:name)",
+                   "params.require(:user).permit!")
+    end
+  end
+end
+
+Given "I remove turbolinks" do
+  in_current_dir do
+    transform_file("app/assets/javascripts/application.js") do |content|
+      content.gsub("//= require turbolinks", "")
+    end
+    transform_file("app/views/layouts/application.html.erb") do |content|
+      content.gsub(', "data-turbolinks-track" => true', "")
+    end
+  end
+end
+
+Given /^I attach :attachment$/ do
+  attach_attachment("attachment")
+end
+
+Given /^I attach :attachment with:$/ do |definition|
+  attach_attachment("attachment", definition)
+end
+
+def attach_attachment(name, definition = nil)
+  snippet = ""
+  if using_protected_attributes?
+    snippet += "attr_accessible :name, :#{name}\n"
+  end
+  snippet += "has_attached_file :#{name}"
+  if definition
+    snippet += ", \n"
+    snippet += definition
+  end
+  in_current_dir do
+    transform_file("app/models/user.rb") do |content|
+      content.sub(/end\Z/, "#{snippet}\nend")
+    end
+  end
+end
+
+Given "I empty the application.js file" do
+  in_current_dir do
+    transform_file("app/assets/javascripts/application.js") do |content|
+      ""
+    end
+  end
+end
+
 Given /^I run a rails generator to generate a "([^"]*)" scaffold with "([^"]*)"$/ do |model_name, attributes|
   step %[I successfully run `bundle exec #{generator_command} scaffold #{model_name} #{attributes}`]
 end
@@ -29,7 +93,11 @@ Given /^I run a paperclip generator to add a paperclip "([^"]*)" to the "([^"]*)
 end
 
 Given /^I run a migration$/ do
-  step %[I successfully run `bundle exec rake db:migrate`]
+  step %[I successfully run `bundle exec rake db:migrate --trace`]
+end
+
+When /^I rollback a migration$/ do
+  step %[I successfully run `bundle exec rake db:rollback STEPS=1 --trace`]
 end
 
 Given /^I update my new user view to include the file upload field$/ do
@@ -65,6 +133,14 @@ Given /^I add this snippet to the User model:$/ do |snippet|
   end
 end
 
+Given /^I add this snippet to config\/application.rb:$/ do |snippet|
+  file_name = "config/application.rb"
+  in_current_dir do
+    content = File.read(file_name)
+    File.open(file_name, 'w') {|f| f << content.sub(/class Application < Rails::Application.*$/, "class Application < Rails::Application\n#{snippet}\n")}
+  end
+end
+
 Given /^I start the rails application$/ do
   in_current_dir do
     require "./config/environment"
@@ -88,13 +164,7 @@ end
 
 Then /^the file at "([^"]*)" should be the same as "([^"]*)"$/ do |web_file, path|
   expected = IO.read(path)
-  actual = if web_file.match %r{^https?://}
-    Net::HTTP.get(URI.parse(web_file))
-  else
-    visit(web_file)
-    page.source
-  end
-  actual.force_encoding("UTF-8") if actual.respond_to?(:force_encoding)
+  actual = read_from_web(web_file)
   actual.should == expected
 end
 
@@ -118,3 +188,19 @@ end
 When /^I comment out the gem "([^"]*)" from the Gemfile$/ do |gemname|
   comment_out_gem_in_gemfile gemname
 end
+
+Given /^I am using Rails newer than ([\d\.]+)$/ do |version|
+  if framework_version < version
+    pending "Not supported in Rails < #{version}"
+  end
+end
+
+def transform_file(filename)
+  if File.exists?(filename)
+    content = File.read(filename)
+    File.open(filename, "w") do |f|
+      content = yield(content)
+      f.write(content)
+    end
+  end
+end

data/features/step_definitions/s3_steps.rb

@@ -1,5 +1,5 @@
 When /^I attach the file "([^"]*)" to "([^"]*)" on S3$/ do |file_path, field|
-  definition = User.attachment_definitions[field.downcase.to_sym]
+  definition = Paperclip::AttachmentRegistry.definitions_for(User)[field.downcase.to_sym]
   path = "https://paperclip.s3.amazonaws.com#{definition[:path]}"
   path.gsub!(':filename', File.basename(file_path))
   path.gsub!(/:([^\/\.]+)/) do |match|

data/features/step_definitions/web_steps.rb

@@ -181,7 +181,7 @@ Then /^the "([^"]*)" checkbox(?: within (.*))? should not be checked$/ do |label
     end
   end
 end
- 
+
 Then /^(?:|I )should be on (.+)$/ do |page_name|
   current_path = URI.parse(current_url).path
   if current_path.respond_to? :should
@@ -195,8 +195,8 @@ Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
   query = URI.parse(current_url).query
   actual_params = query ? CGI.parse(query) : {}
   expected_params = {}
-  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} 
-  
+  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')}
+
   if actual_params.respond_to? :should
     actual_params.should == expected_params
   else

data/features/support/fakeweb.rb

@@ -4,7 +4,10 @@ FakeWeb.allow_net_connect = false
 
 module FakeWeb
   class StubSocket
-    def read_timeout=(ignored)
+    def read_timeout=(_ignored)
+    end
+
+    def continue_timeout=(_ignored)
     end
   end
 end

data/features/support/file_helpers.rb

@@ -19,6 +19,16 @@ module FileHelpers
       File.open("Gemfile", 'w'){ |file| file.write(gemfile) }
     end
   end
+
+  def read_from_web(url)
+    file = if url.match %r{^https?://}
+             Net::HTTP.get(URI.parse(url))
+           else
+             visit(url)
+             page.source
+           end
+    file.force_encoding("UTF-8") if file.respond_to?(:force_encoding)
+  end
 end
 
 World(FileHelpers)

data/features/support/rails.rb

@@ -31,16 +31,32 @@ module RailsCommandHelpers
     @framework_version ||= `rails -v`[/^Rails (.+)$/, 1]
   end
 
+  def framework_major_version
+    framework_version.split(".").first.to_i
+  end
+
+  def using_protected_attributes?
+    framework_major_version < 4
+  end
+
   def new_application_command
     "rails new"
   end
 
   def generator_command
-    "script/rails generate"
+    if framework_major_version >= 4
+      "rails generate"
+    else
+      "script/rails generate"
+    end
   end
 
   def runner_command
-    "script/rails runner"
+    if framework_major_version >= 4
+      "rails runner"
+    else
+      "script/rails runner"
+    end
   end
 end
 World(RailsCommandHelpers)

data/gemfiles/3.0.gemfile

@@ -1,11 +1,11 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "jruby-openssl", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
 gem "sqlite3", :platform=>:ruby
-gem "rails", "~> 3.0.12"
+gem "rails", "~> 3.0.15"
 gem "paperclip", :path=>"../"
 
 gemspec :path=>"../"

data/gemfiles/3.1.gemfile

@@ -1,11 +1,11 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "jruby-openssl", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
 gem "sqlite3", :platform=>:ruby
-gem "rails", "~> 3.1.4"
+gem "rails", "~> 3.1.6"
 gem "paperclip", :path=>"../"
 
 gemspec :path=>"../"

data/gemfiles/3.2.gemfile

@@ -1,11 +1,11 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "jruby-openssl", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
 gem "sqlite3", :platform=>:ruby
-gem "rails", "~> 3.2.2"
+gem "rails", "~> 3.2.6"
 gem "paperclip", :path=>"../"
 
 gemspec :path=>"../"

data/gemfiles/4.0.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jruby-openssl", :platform=>:jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+gem "sqlite3", :platform=>:ruby
+gem "rails", "~> 4.0.0"
+gem "paperclip", :path=>"../"
+
+gemspec :path=>"../"

data/lib/generators/paperclip/templates/paperclip_migration.rb.erb

@@ -1,19 +1,15 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
   def self.up
+    change_table :<%= table_name %> do |t|
 <% attachment_names.each do |attachment| -%>
-    add_column :<%= name.underscore.camelize.tableize %>, :<%= attachment %>_file_name, :string
-    add_column :<%= name.underscore.camelize.tableize %>, :<%= attachment %>_content_type, :string
-    add_column :<%= name.underscore.camelize.tableize %>, :<%= attachment %>_file_size, :integer
-    add_column :<%= name.underscore.camelize.tableize %>, :<%= attachment %>_updated_at, :datetime
+      t.attachment :<%= attachment %>
 <% end -%>
+    end
   end
 
   def self.down
 <% attachment_names.each do |attachment| -%>
-    remove_column :<%= name.underscore.camelize.tableize %>, :<%= attachment %>_file_name
-    remove_column :<%= name.underscore.camelize.tableize %>, :<%= attachment %>_content_type
-    remove_column :<%= name.underscore.camelize.tableize %>, :<%= attachment %>_file_size
-    remove_column :<%= name.underscore.camelize.tableize %>, :<%= attachment %>_updated_at
+    drop_attached_file :<%= table_name %>, :<%= attachment %>
 <% end -%>
   end
 end