smarter_paperclip 0.2.1 → 0.3.0

data/CHANGELOG.rdoc

@@ -1,3 +1,5 @@
+= Version 0.3.0
+* Moved whole "old" Paperclip here to integrate it with smart extensions
 = Version 0.2.1
 * Fixed gem URLs
 = Version 0.2.0

data/LICENSE

@@ -0,0 +1,26 @@
+
+LICENSE
+
+The MIT License
+
+Copyright (c) 2008 Jon Yurek and thoughtbot, inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+

data/Manifest

@@ -1,9 +1,78 @@
 CHANGELOG.rdoc
-Gemfile
+LICENSE
 MIT-LICENSE
-Manifest
 README.md
 Rakefile
+features/basic.feature
+features/s3.feature
+features/step_definitions/html_steps.rb
+features/step_definitions/rails_steps.rb
+features/step_definitions/s3_steps.rb
+features/step_definitions/web_steps.rb
+features/support/env.rb
+features/support/paths.rb
+features/support/rails.rb
+features/support/s3.rb
+gemfiles/rails2.gemfile
+gemfiles/rails2.gemfile.lock
+gemfiles/rails3.gemfile
+gemfiles/rails3.gemfile.lock
+generators/paperclip/USAGE
+generators/paperclip/paperclip_generator.rb
+generators/paperclip/templates/paperclip_migration.rb.erb
 init.rb
+lib/generators/paperclip/USAGE
+lib/generators/paperclip/paperclip_generator.rb
+lib/generators/paperclip/templates/paperclip_migration.rb.erb
+lib/paperclip.rb
+lib/paperclip/attachment.rb
+lib/paperclip/callback_compatability.rb
+lib/paperclip/command_line.rb
+lib/paperclip/geometry.rb
+lib/paperclip/interpolations.rb
+lib/paperclip/iostream.rb
+lib/paperclip/matchers.rb
+lib/paperclip/matchers/have_attached_file_matcher.rb
+lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
+lib/paperclip/matchers/validate_attachment_presence_matcher.rb
+lib/paperclip/matchers/validate_attachment_size_matcher.rb
+lib/paperclip/processor.rb
+lib/paperclip/railtie.rb
+lib/paperclip/storage.rb
+lib/paperclip/storage/filesystem.rb
+lib/paperclip/storage/s3.rb
+lib/paperclip/style.rb
+lib/paperclip/thumbnail.rb
+lib/paperclip/upfile.rb
+lib/paperclip/version.rb
 lib/smarter_paperclip.rb
+lib/tasks/paperclip.rake
+paperclip.gemspec
+shoulda_macros/paperclip.rb
 smarter_paperclip.gemspec
+test/attachment_test.rb
+test/command_line_test.rb
+test/database.yml
+test/fixtures/12k.png
+test/fixtures/50x50.png
+test/fixtures/5k.png
+test/fixtures/bad.png
+test/fixtures/s3.yml
+test/fixtures/text.txt
+test/fixtures/twopage.pdf
+test/geometry_test.rb
+test/helper.rb
+test/integration_test.rb
+test/interpolations_test.rb
+test/iostream_test.rb
+test/matchers/have_attached_file_matcher_test.rb
+test/matchers/validate_attachment_content_type_matcher_test.rb
+test/matchers/validate_attachment_presence_matcher_test.rb
+test/matchers/validate_attachment_size_matcher_test.rb
+test/paperclip_test.rb
+test/processor_test.rb
+test/storage_test.rb
+test/style_test.rb
+test/thumbnail_test.rb
+test/upfile_test.rb
+Manifest

data/README.md

@@ -1,12 +1,14 @@
 # Smarter Paperclip
 
+Paperclip with some additional cool stuff. This Paperclip version uses old Paperclip but it is tweaked up to work with Rails 3.2.
+
 Collection of Paperclip extensions:
 
 - `validates_attachment_minimum_resolution`
 - `validates_attachment_if_included`
 - `has_interpolated_attached_file`
 
-Works with Ruby 1.8.7, 1.8.7 EE, 1.9.2
+Works with Ruby 1.8.7, 1.8.7 EE, 1.9.2, 1.9.3
 Works with Rails3
 
 ## Install

data/Rakefile

@@ -2,12 +2,11 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('smarter_paperclip', '0.2.1') do |p|
-  p.description    = "Collection of Paperclip extensions"
-  p.url            = "https://github.com/mensfeld/Smarter-Paperclip"
-  p.author         = "Maciej Mensfeld"
-  p.email          = "maciej@mensfeld.pl"
+Echoe.new('smarter_paperclip', '0.3.0') do |p|
+  p.description = "Papercli with bunch of extensions"
+  p.url = "https://github.com/mensfeld/Smarter-Paperclip"
+  p.author = "Maciej Mensfeld"
+  p.email = "maciej@mensfeld.pl"
   p.ignore_pattern = ["tmp/*", "script/*"]
   p.development_dependencies = ["rspec >=2.0.0", "paperclip"]
 end
-

data/features/basic.feature

@@ -0,0 +1,17 @@
+Feature: Running paperclip in a Rails app
+
+  Scenario: Basic utilization
+    Given I have a rails application
+    And I save the following as "app/models/user.rb"
+    """
+    class User < ActiveRecord::Base
+      has_attached_file :avatar
+    end
+    """
+    When I visit /users/new
+    And I fill in "user_name" with "something"
+    And I attach the file "test/fixtures/5k.png" to "user_avatar"
+    And I press "Submit"
+    Then I should see "Name: something"
+    And I should see an image with a path of "/system/avatars/1/original/5k.png"
+    And the file at "/system/avatars/1/original/5k.png" is the same as "test/fixtures/5k.png"

data/features/s3.feature

@@ -0,0 +1,27 @@
+Feature: Running paperclip in a Rails app using basic S3 support
+
+  Scenario: Basic utilization
+    Given I have a rails application
+    And I save the following as "app/models/user.rb"
+    """
+    class User < ActiveRecord::Base
+    has_attached_file :avatar,
+                      :storage => :s3,
+                      :path => "/:attachment/:id/:style/:filename",
+                      :s3_credentials => Rails.root.join("config/s3.yml")
+    end
+    """
+    And I validate my S3 credentials
+    And I save the following as "config/s3.yml"
+    """
+    bucket: <%= ENV['PAPERCLIP_TEST_BUCKET'] || 'paperclip' %>
+    access_key_id: <%= ENV['AWS_ACCESS_KEY_ID'] %>
+    secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
+    """
+    When I visit /users/new
+    And I fill in "user_name" with "something"
+    And I attach the file "test/fixtures/5k.png" to "user_avatar"
+    And I press "Submit"
+    Then I should see "Name: something"
+    And I should see an image with a path of "http://s3.amazonaws.com/paperclip/avatars/1/original/5k.png"
+    And the file at "http://s3.amazonaws.com/paperclip/avatars/1/original/5k.png" is the same as "test/fixtures/5k.png"

data/features/step_definitions/html_steps.rb

@@ -0,0 +1,14 @@
+Then %r{I should see an image with a path of "([^"]*)"} do |path|
+  page.should have_css("img[src^='#{path}']")
+end
+
+Then %r{^the file at "([^"]*)" is 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.body
+  end
+  actual.should == expected
+end

data/features/step_definitions/rails_steps.rb

@@ -0,0 +1,90 @@
+Given "I have a rails application" do
+  steps %{
+    Given I generate a rails application
+    And this plugin is available
+    And I have a "users" resource with "name:string"
+    And I turn off class caching
+    Given I save the following as "app/models/user.rb"
+      """
+      class User < ActiveRecord::Base
+      end
+      """
+    And I save the following as "config/s3.yml"
+      """
+      access_key_id: <%= ENV['AWS_ACCESS_KEY_ID'] %>
+      secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
+      bucket: paperclip
+      """
+    And I save the following as "app/views/users/new.html.erb"
+      """
+      <% form_for @user, :html => { :multipart => true } do |f| %>
+        <%= f.text_field :name %>
+        <%= f.file_field :avatar %>
+        <%= submit_tag "Submit" %>
+      <% end %>
+      """
+    And I save the following as "app/views/users/show.html.erb"
+      """
+      <p>Name: <%= @user.name %></p>
+      <p>Avatar: <%= image_tag @user.avatar.url %></p>
+      """
+    And I run "script/generate paperclip user avatar"
+    And the rails application is prepped and running
+  }
+end
+
+Given %r{I generate a rails application} do
+  FileUtils.rm_rf TEMP_ROOT
+  FileUtils.mkdir_p TEMP_ROOT
+  Dir.chdir(TEMP_ROOT) do
+    `rails _2.3.8_ #{APP_NAME}`
+  end
+end
+
+When %r{I save the following as "([^"]*)"} do |path, string|
+  FileUtils.mkdir_p(File.join(CUC_RAILS_ROOT, File.dirname(path)))
+  File.open(File.join(CUC_RAILS_ROOT, path), 'w') { |file| file.write(string) }
+end
+
+When %r{I turn off class caching} do
+  Dir.chdir(CUC_RAILS_ROOT) do
+    file = "config/environments/test.rb"
+    config = IO.read(file)
+    config.gsub!(%r{^\s*config.cache_classes.*$},
+                 "config.cache_classes = false")
+    File.open(file, "w"){|f| f.write(config) }
+  end
+end
+
+When %r{the rails application is prepped and running$} do
+  When "I reset the database"
+  When "the rails application is running"
+end
+
+When %r{I reset the database} do
+  When %{I run "rake db:drop db:create db:migrate"}
+end
+
+When %r{the rails application is running} do
+  Dir.chdir(CUC_RAILS_ROOT) do
+    require "config/environment"
+    require "capybara/rails"
+  end
+end
+
+When %r{this plugin is available} do
+  $LOAD_PATH << "#{PROJECT_ROOT}/lib"
+  require 'paperclip'
+  When %{I save the following as "vendor/plugins/paperclip/rails/init.rb"},
+       IO.read("#{PROJECT_ROOT}/rails/init.rb") 
+end
+
+When %r{I run "([^"]*)"} do |command|
+  Dir.chdir(CUC_RAILS_ROOT) do
+    `#{command}`
+  end
+end
+
+When %r{I have a "([^"]*)" resource with "([^"]*)"} do |resource, fields|
+  When %{I run "script/generate scaffold #{resource} #{fields}"}
+end

data/features/step_definitions/s3_steps.rb

@@ -0,0 +1,9 @@
+Given /I validate my S3 credentials/ do
+  key = ENV['AWS_ACCESS_KEY_ID']
+  secret = ENV['AWS_SECRET_ACCESS_KEY']
+
+  key.should_not be_nil
+  secret.should_not be_nil
+
+  assert_credentials(key, secret)
+end

data/features/step_definitions/web_steps.rb

@@ -0,0 +1,227 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+
+require 'uri'
+require 'cgi'
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+
+module WithinHelpers
+  def with_scope(locator)
+    locator ? within(locator) { yield } : yield
+  end
+end
+World(WithinHelpers)
+
+Given /^(?:|I )am on (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^(?:|I )go to (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^(?:|I )visit (\/.+)$/ do |page_path|
+  visit page_path
+end
+
+When /^(?:|I )press "([^"]*)"(?: within "([^"]*)")?$/ do |button, selector|
+  with_scope(selector) do
+    click_button(button)
+  end
+end
+
+When /^(?:|I )follow "([^"]*)"(?: within "([^"]*)")?$/ do |link, selector|
+  with_scope(selector) do
+    click_link(link)
+  end
+end
+
+When /^(?:|I )fill in "([^"]*)" with "([^"]*)"(?: within "([^"]*)")?$/ do |field, value, selector|
+  with_scope(selector) do
+    fill_in(field, :with => value)
+  end
+end
+
+When /^(?:|I )fill in "([^"]*)" for "([^"]*)"(?: within "([^"]*)")?$/ do |value, field, selector|
+  with_scope(selector) do
+    fill_in(field, :with => value)
+  end
+end
+
+# Use this to fill in an entire form with data from a table. Example:
+#
+#   When I fill in the following:
+#     | Account Number | 5002       |
+#     | Expiry date    | 2009-11-01 |
+#     | Note           | Nice guy   |
+#     | Wants Email?   |            |
+#
+# TODO: Add support for checkbox, select og option
+# based on naming conventions.
+#
+When /^(?:|I )fill in the following(?: within "([^"]*)")?:$/ do |selector, fields|
+  with_scope(selector) do
+    fields.rows_hash.each do |name, value|
+      When %{I fill in "#{name}" with "#{value}"}
+    end
+  end
+end
+
+When /^(?:|I )select "([^"]*)" from "([^"]*)"(?: within "([^"]*)")?$/ do |value, field, selector|
+  with_scope(selector) do
+    select(value, :from => field)
+  end
+end
+
+When /^(?:|I )check "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    check(field)
+  end
+end
+
+When /^(?:|I )uncheck "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    uncheck(field)
+  end
+end
+
+When /^(?:|I )choose "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    choose(field)
+  end
+end
+
+When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"(?: within "([^"]*)")?$/ do |path, field, selector|
+  with_scope(selector) do
+    attach_file(field, path)
+  end
+end
+
+Then /^(?:|I )should see JSON:$/ do |expected_json|
+  require 'json'
+  expected = JSON.pretty_generate(JSON.parse(expected_json))
+  actual   = JSON.pretty_generate(JSON.parse(response.body))
+  expected.should == actual
+end
+
+Then /^(?:|I )should see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_content(text)
+    else
+      assert page.has_content?(text)
+    end
+  end
+end
+
+Then /^(?:|I )should see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
+  regexp = Regexp.new(regexp)
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_xpath('//*', :text => regexp)
+    else
+      assert page.has_xpath?('//*', :text => regexp)
+    end
+  end
+end
+
+Then /^(?:|I )should not see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_no_content(text)
+    else
+      assert page.has_no_content?(text)
+    end
+  end
+end
+
+Then /^(?:|I )should not see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
+  regexp = Regexp.new(regexp)
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_no_xpath('//*', :text => regexp)
+    else
+      assert page.has_no_xpath?('//*', :text => regexp)
+    end
+  end
+end
+
+Then /^the "([^"]*)" field(?: within "([^"]*)")? should contain "([^"]*)"$/ do |field, selector, value|
+  with_scope(selector) do
+    field = find_field(field)
+    field_value = (field.tag_name == 'textarea') ? field.text : field.value
+    if field_value.respond_to? :should
+      field_value.should =~ /#{value}/
+    else
+      assert_match(/#{value}/, field_value)
+    end
+  end
+end
+
+Then /^the "([^"]*)" field(?: within "([^"]*)")? should not contain "([^"]*)"$/ do |field, selector, value|
+  with_scope(selector) do
+    field = find_field(field)
+    field_value = (field.tag_name == 'textarea') ? field.text : field.value
+    if field_value.respond_to? :should_not
+      field_value.should_not =~ /#{value}/
+    else
+      assert_no_match(/#{value}/, field_value)
+    end
+  end
+end
+
+Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should be checked$/ do |label, selector|
+  with_scope(selector) do
+    field_checked = find_field(label)['checked']
+    if field_checked.respond_to? :should
+      field_checked.should be_true
+    else
+      assert field_checked
+    end
+  end
+end
+
+Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should not be checked$/ do |label, selector|
+  with_scope(selector) do
+    field_checked = find_field(label)['checked']
+    if field_checked.respond_to? :should
+      field_checked.should be_false
+    else
+      assert !field_checked
+    end
+  end
+end
+ 
+Then /^(?:|I )should be on (.+)$/ do |page_name|
+  current_path = URI.parse(current_url).path
+  if current_path.respond_to? :should
+    current_path.should == path_to(page_name)
+  else
+    assert_equal path_to(page_name), current_path
+  end
+end
+
+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(',')} 
+  
+  if actual_params.respond_to? :should
+    actual_params.should == expected_params
+  else
+    assert_equal expected_params, actual_params
+  end
+end
+
+Then /^I save and open the page$/ do
+  save_and_open_page
+end
+
+Then /^show me the page$/ do
+  save_and_open_page
+end