Permalink
Browse files

Merge branch 'master' into kreuzwerker

  • Loading branch information...
2 parents 4b746b3 + 94d35f9 commit 1655bf2904c1f6cb5d7b35d2e96fac00563778be @Overbryd Overbryd committed Oct 18, 2011
Showing with 3,792 additions and 1,403 deletions.
  1. +3 −0 .gitignore
  2. +13 −0 .travis.yml
  3. +8 −2 Appraisals
  4. +38 −0 CONTRIBUTING.md
  5. +18 −5 Gemfile
  6. +0 −37 Gemfile.lock
  7. +192 −10 README.md
  8. +11 −5 Rakefile
  9. +0 −17 features/basic.feature
  10. +46 −0 features/basic_integration.feature
  11. +63 −0 features/rake_tasks.feature
  12. +0 −27 features/s3.feature
  13. +68 −0 features/step_definitions/attachment_steps.rb
  14. +1 −0 features/step_definitions/html_steps.rb
  15. +145 −53 features/step_definitions/rails_steps.rb
  16. +12 −7 features/step_definitions/s3_steps.rb
  17. +88 −106 features/step_definitions/web_steps.rb
  18. +5 −0 features/support/env.rb
  19. +3 −0 features/support/fakeweb.rb
  20. BIN features/support/fixtures/.boot_config.rb.swo
  21. +15 −0 features/support/fixtures/boot_config.txt
  22. +5 −0 features/support/fixtures/gemfile.txt
  23. +20 −0 features/support/fixtures/preinitializer.txt
  24. +2 −9 features/support/paths.rb
  25. +43 −2 features/support/rails.rb
  26. +0 −25 features/support/s3.rb
  27. +19 −0 features/support/selectors.rb
  28. +20 −6 gemfiles/rails2.gemfile
  29. +0 −56 gemfiles/rails2.gemfile.lock
  30. +20 −6 gemfiles/rails3.gemfile
  31. +0 −97 gemfiles/rails3.gemfile.lock
  32. +25 −0 gemfiles/rails3_1.gemfile
  33. +3 −0 init.rb
  34. +3 −1 lib/generators/paperclip/paperclip_generator.rb
  35. +147 −49 lib/paperclip.rb
  36. +106 −60 lib/paperclip/attachment.rb
  37. 0 lib/paperclip/{callback_compatability.rb → callback_compatibility.rb}
  38. +0 −86 lib/paperclip/command_line.rb
  39. +9 −4 lib/paperclip/geometry.rb
  40. +33 −0 lib/paperclip/interpolated_string.rb
  41. +53 −8 lib/paperclip/interpolations.rb
  42. +1 −1 lib/paperclip/iostream.rb
  43. +20 −14 lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
  44. +87 −0 lib/paperclip/missing_attachment_styles.rb
  45. +78 −0 lib/paperclip/options.rb
  46. +1 −1 lib/paperclip/processor.rb
  47. +2 −0 lib/paperclip/railtie.rb
  48. +1 −0 lib/paperclip/storage.rb
  49. +11 −3 lib/paperclip/storage/filesystem.rb
  50. +162 −0 lib/paperclip/storage/fog.rb
  51. +99 −29 lib/paperclip/storage/s3.rb
  52. +11 −6 lib/paperclip/style.rb
  53. +33 −7 lib/paperclip/thumbnail.rb
  54. +20 −13 lib/paperclip/upfile.rb
  55. +1 −1 lib/paperclip/version.rb
  56. +58 −29 lib/tasks/paperclip.rake
  57. +8 −5 paperclip.gemspec
  58. +8 −2 shoulda_macros/paperclip.rb
  59. +209 −10 test/attachment_test.rb
  60. +0 −138 test/command_line_test.rb
  61. BIN test/fixtures/animated.gif
  62. +8 −0 test/fixtures/fog.yml
  63. BIN test/fixtures/spaced file.png
  64. +1 −0 test/fixtures/text.txt
  65. +191 −0 test/fog_test.rb
  66. +29 −0 test/geometry_test.rb
  67. +7 −1 test/helper.rb
  68. +88 −4 test/integration_test.rb
  69. +62 −0 test/interpolated_string_test.rb
  70. +61 −2 test/interpolations_test.rb
  71. +42 −2 test/matchers/validate_attachment_content_type_matcher_test.rb
  72. +75 −0 test/options_test.rb
  73. +80 −0 test/paperclip_missing_attachment_styles_test.rb
  74. +73 −35 test/paperclip_test.rb
  75. +56 −0 test/storage/filesystem_test.rb
  76. +88 −0 test/storage/s3_live_test.rb
  77. +636 −0 test/storage/s3_test.rb
  78. +0 −386 test/storage_test.rb
  79. +67 −28 test/style_test.rb
  80. +162 −6 test/thumbnail_test.rb
  81. +19 −2 test/upfile_test.rb
View
@@ -8,3 +8,6 @@ capybara*.html
*.rbc
.bundle
*SPIKE*
+.rvmrc
+*emfile.lock
+.rbx
View
@@ -0,0 +1,13 @@
+rvm:
+ - 1.8.7
+ - 1.9.2
+ - ree
+ - rbx-2.0
+
+before_script: "sudo ntpdate -ub ntp.ubuntu.com pool.ntp.org; true"
+script: "bundle exec rake clean test cucumber"
+
+gemfile:
+ - gemfiles/rails2.gemfile
+ - gemfiles/rails3.gemfile
+ - gemfiles/rails3_1.gemfile
View
@@ -1,8 +1,14 @@
appraise "rails2" do
- gem "rails", "~>2.3.0"
+ gem "rails", "~> 2.3.14"
+ gem "paperclip", :path => "../"
end
appraise "rails3" do
- gem "rails", "~>3.0.0"
+ gem "rails", "~> 3.0.10"
+ gem "paperclip", :path => "../"
end
+appraise "rails3_1" do
+ gem "rails", "~> 3.1.0"
+ gem "paperclip", :path => "../"
+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
23 Gemfile
@@ -1,8 +1,21 @@
source "http://rubygems.org"
-gem "shoulda"
+
+gem "activerecord", :require => "active_record"
+gem "appraisal"
+gem "aruba"
+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 "ruby-debug"
-gem "aws-s3", :require => "aws/s3"
-gem "sqlite3-ruby", "~>1.3.0"
-gem "appraisal"
+gem "rdoc", :require => false
+gem "capybara"
+gem "cucumber", "~> 1.0.0"
+gem "shoulda"
+gem "sqlite3", "~>1.3.4"
+gem "fakeweb", :require => false
+
+gem 'pry'
View
@@ -1,37 +0,0 @@
-GEM
- remote: http://rubygems.org/
- specs:
- appraisal (0.1)
- bundler
- rake
- aws-s3 (0.6.2)
- builder
- mime-types
- xml-simple
- builder (3.0.0)
- columnize (0.3.2)
- linecache (0.43)
- mime-types (1.16)
- mocha (0.9.9)
- rake
- rake (0.8.7)
- ruby-debug (0.10.4)
- columnize (>= 0.1)
- ruby-debug-base (~> 0.10.4.0)
- ruby-debug-base (0.10.4)
- linecache (>= 0.3)
- shoulda (2.11.3)
- sqlite3-ruby (1.3.2)
- xml-simple (1.0.12)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- appraisal
- aws-s3
- mocha
- rake
- ruby-debug
- shoulda
- sqlite3-ruby (~> 1.3.0)
Oops, something went wrong.

0 comments on commit 1655bf2

Please sign in to comment.