Permalink
Browse files

Merge remote branch 'upstream/master'

Conflicts:
	lib/paperclip/upfile.rb
	paperclip.gemspec
  • Loading branch information...
2 parents 3eb7b90 + cbfaca4 commit 237597eb3a920ebef8ad7d2ab0fb5e4e0ccd4d24 @monde monde committed Aug 24, 2011
Showing with 4,299 additions and 1,234 deletions.
  1. +6 −0 .gitignore
  2. +11 −0 .travis.yml
  3. +11 −0 Appraisals
  4. +38 −0 CONTRIBUTING.md
  5. +21 −0 Gemfile
  6. +100 −0 Gemfile.lock
  7. +270 −0 README.md
  8. +0 −174 README.rdoc
  9. +18 −41 Rakefile
  10. +17 −0 features/basic.feature
  11. +27 −0 features/s3.feature
  12. +14 −0 features/step_definitions/html_steps.rb
  13. +90 −0 features/step_definitions/rails_steps.rb
  14. +9 −0 features/step_definitions/s3_steps.rb
  15. +227 −0 features/step_definitions/web_steps.rb
  16. +3 −0 features/support/env.rb
  17. +35 −0 features/support/paths.rb
  18. +5 −0 features/support/rails.rb
  19. +25 −0 features/support/s3.rb
  20. +20 −0 gemfiles/rails2.gemfile
  21. +121 −0 gemfiles/rails2.gemfile.lock
  22. +20 −0 gemfiles/rails3.gemfile
  23. +163 −0 gemfiles/rails3.gemfile.lock
  24. +20 −0 gemfiles/rails3_1.gemfile
  25. +172 −0 gemfiles/rails3_1.gemfile.lock
  26. +2 −2 generators/paperclip/USAGE
  27. +8 −8 generators/paperclip/paperclip_generator.rb
  28. +3 −0 init.rb
  29. +8 −0 lib/generators/paperclip/USAGE
  30. +33 −0 lib/generators/paperclip/paperclip_generator.rb
  31. +19 −0 lib/generators/paperclip/templates/paperclip_migration.rb.erb
  32. +156 −97 lib/paperclip.rb
  33. +140 −72 lib/paperclip/attachment.rb
  34. +0 −33 lib/paperclip/callback_compatability.rb
  35. +61 −0 lib/paperclip/callback_compatibility.rb
  36. +11 −8 lib/paperclip/geometry.rb
  37. +67 −11 lib/paperclip/interpolations.rb
  38. +12 −26 lib/paperclip/iostream.rb
  39. +29 −0 lib/paperclip/matchers.rb
  40. +8 −0 lib/paperclip/matchers/have_attached_file_matcher.rb
  41. +30 −14 lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
  42. +9 −3 lib/paperclip/matchers/validate_attachment_presence_matcher.rb
  43. +12 −2 lib/paperclip/matchers/validate_attachment_size_matcher.rb
  44. +15 −6 lib/paperclip/processor.rb
  45. +24 −0 lib/paperclip/railtie.rb
  46. +3 −247 lib/paperclip/storage.rb
  47. +78 −0 lib/paperclip/storage/filesystem.rb
  48. +133 −0 lib/paperclip/storage/fog.rb
  49. +230 −0 lib/paperclip/storage/s3.rb
  50. +19 −14 lib/paperclip/style.rb
  51. +38 −19 lib/paperclip/thumbnail.rb
  52. +24 −12 lib/paperclip/upfile.rb
  53. +3 −0 lib/paperclip/version.rb
  54. +81 −0 lib/tasks/paperclip.rake
  55. +33 −45 paperclip.gemspec
  56. +2 −0 rails/init.rb
  57. +5 −4 shoulda_macros/paperclip.rb
  58. +0 −79 tasks/paperclip_tasks.rake
  59. +346 −45 test/attachment_test.rb
  60. BIN test/fixtures/animated.gif
  61. BIN test/fixtures/uppercase.PNG
  62. +131 −0 test/fog_test.rb
  63. +31 −2 test/geometry_test.rb
  64. +71 −30 test/helper.rb
  65. +166 −11 test/integration_test.rb
  66. +74 −10 test/interpolations_test.rb
  67. +7 −14 test/iostream_test.rb
  68. +10 −7 test/matchers/have_attached_file_matcher_test.rb
  69. +65 −9 test/matchers/validate_attachment_content_type_matcher_test.rb
  70. +9 −6 test/matchers/validate_attachment_presence_matcher_test.rb
  71. +18 −18 test/matchers/validate_attachment_size_matcher_test.rb
  72. +76 −95 test/paperclip_test.rb
  73. +1 −1 test/processor_test.rb
  74. +347 −24 test/storage_test.rb
  75. +66 −21 test/style_test.rb
  76. +130 −21 test/thumbnail_test.rb
  77. +12 −3 test/upfile_test.rb
View
@@ -3,3 +3,9 @@
tmp
test/s3.yml
public
+paperclip*.gem
+capybara*.html
+*.rbc
+.bundle
+*SPIKE*
+.rvmrc
View
@@ -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
View
@@ -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
View
@@ -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!
View
21 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
View
@@ -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)
Oops, something went wrong.

0 comments on commit 237597e

Please sign in to comment.