Merge remote branch 'upstream/master'

Conflicts:
	lib/paperclip/upfile.rb
	paperclip.gemspec

.gitignore

@@ -3,3 +3,9 @@
 tmp
 test/s3.yml
 public
+paperclip*.gem
+capybara*.html
+*.rbc
+.bundle
+*SPIKE*
+.rvmrc

.travis.yml

@@ -0,0 +1,11 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+  - rbx-2.0
+
+script: "bundle exec rake clean test"
+gemfile:
+  - gemfiles/rails2.gemfile
+  - gemfiles/rails3.gemfile
+  - gemfiles/rails3_1.gemfile

Appraisals

@@ -0,0 +1,11 @@
+appraise "rails2" do
+  gem "rails", "~> 2.3.12"
+end
+
+appraise "rails3" do
+  gem "rails", "~> 3.0.9"
+end
+
+appraise "rails3_1" do
+  gem "rails", "~> 3.1.0.rc5"
+end

CONTRIBUTING.md

@@ -0,0 +1,38 @@
+We love pull requests. Here's a quick guide:
+
+1. Fork the repo.
+
+2. Run the tests. We only take pull requests with passing tests, and it's great
+to know that you have a clean slate: `bundle && rake`
+
+3. Add a test for your change. Only refactoring and documentation changes
+require no new tests. If you are adding functionality or fixing a bug, we need
+a test!
+
+4. Make the test pass.
+
+5. Push to your fork and submit a pull request.
+
+
+At this point you're waiting on us. We like to at least comment on, if not
+accept, pull requests within three business days (and, typically, one business
+day). We may suggest some changes or improvements or alternatives.
+
+Some things that will increase the chance that your pull request is accepted,
+taken straight from the Ruby on Rails guide:
+
+* Use Rails idioms and helpers
+* Include tests that fail without your code, and pass with it
+* Update the documentation, the surrounding one, examples elsewhere, guides,
+  whatever is affected by your contribution
+
+Syntax:
+
+* Two spaces, no tabs.
+* No trailing whitespace. Blank lines should not have any space.
+* Prefer &&/|| over and/or.
+* MyClass.my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
+* a = b and not a=b.
+* Follow the conventions you see used in the source already.
+
+And in case we didn't emphasize it enough: we love tests!

Gemfile

@@ -0,0 +1,21 @@
+source "http://rubygems.org"
+
+gem "activerecord", :require => "active_record"
+gem "appraisal"
+gem "aws-s3", :require => "aws/s3"
+gem "bundler"
+gem "cocaine", "~>0.2"
+gem "fog"
+gem "jruby-openssl", :platform => :jruby
+gem "mime-types"
+gem "mocha"
+gem "rake"
+gem "rdoc", :require => false
+gem "shoulda"
+gem "sqlite3", "~>1.3.4"
+
+# This is for Rails 3.1
+gem "sprockets", "~> 2.0.0.beta.13", :require => false
+
+# gem "ruby-debug", :platform => :ruby_18
+# gem "ruby-debug19", :platform => :ruby_19

Gemfile.lock

@@ -0,0 +1,100 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.12)
+      activesupport (= 2.3.12)
+    activesupport (2.3.12)
+    appraisal (0.3.5)
+      aruba (~> 0.3.6)
+      bundler
+      rake
+    aruba (0.3.7)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.5)
+      rspec (>= 2.6.0)
+    aws-s3 (0.6.2)
+      builder
+      mime-types
+      xml-simple
+    bouncy-castle-java (1.5.0146.1)
+    builder (3.0.0)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
+    cocaine (0.2.0)
+    cucumber (0.10.5)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    diff-lcs (1.1.2)
+    excon (0.6.3)
+    ffi (1.0.9)
+    ffi (1.0.9-java)
+    fog (0.8.2)
+      builder
+      excon (~> 0.6.1)
+      formatador (>= 0.1.3)
+      json
+      mime-types
+      net-ssh (>= 2.1.3)
+      nokogiri (>= 1.4.4)
+      ruby-hmac
+    formatador (0.1.4)
+    gherkin (2.4.5)
+      json (>= 1.4.6)
+    gherkin (2.4.5-java)
+      json (>= 1.4.6)
+    hike (1.2.0)
+    jruby-openssl (0.7.4)
+      bouncy-castle-java
+    json (1.5.3)
+    json (1.5.3-java)
+    mime-types (1.16)
+    mocha (0.9.12)
+    net-ssh (2.1.4)
+    nokogiri (1.4.4)
+    nokogiri (1.4.4-java)
+      weakling (>= 0.0.3)
+    rack (1.3.2)
+    rake (0.9.2)
+    rdoc (3.8)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    ruby-hmac (0.4.0)
+    shoulda (2.11.3)
+    sprockets (2.0.0.beta.13)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.4)
+    term-ansicolor (1.0.5)
+    tilt (1.3.2)
+    weakling (0.0.4-java)
+    xml-simple (1.0.16)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activerecord
+  appraisal
+  aws-s3
+  bundler
+  cocaine (~> 0.2)
+  fog
+  jruby-openssl
+  mime-types
+  mocha
+  rake
+  rdoc
+  shoulda
+  sprockets (~> 2.0.0.beta.13)
+  sqlite3 (~> 1.3.4)