paperclip-aws 1.3.0 → 1.3.1

data/Gemfile

@@ -2,11 +2,13 @@ source "http://rubygems.org"
   gem 'paperclip', '>=2.4.0'
   gem 'aws-sdk', '>=1.2.0'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+end
+
+group :test do
+  gem "sqlite3"
+  gem 'shoulda-context'
+  gem "mocha"    
 end

data/Gemfile.lock

@@ -30,7 +30,10 @@ GEM
       git (>= 1.2.5)
       rake
     json (1.6.1)
+    metaclass (0.0.1)
     mime-types (1.17.2)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
     multi_json (1.0.3)
     multi_xml (0.4.1)
     nokogiri (1.5.0)
@@ -40,8 +43,8 @@ GEM
       cocaine (>= 0.0.2)
       mime-types
     rake (0.9.2)
-    rcov (0.9.10)
-    shoulda (2.11.3)
+    shoulda-context (1.0.0)
+    sqlite3 (1.3.4)
     tzinfo (0.3.31)
     uuidtools (2.1.2)
 
@@ -52,6 +55,7 @@ DEPENDENCIES
   aws-sdk (>= 1.2.0)
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
+  mocha
   paperclip (>= 2.4.0)
-  rcov
-  shoulda
+  shoulda-context
+  sqlite3

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/igor-alexandrov/paperclip-aws.png)](http://travis-ci.org/[YOUR_GITHUB_USERNAME]/[YOUR_PROJECT_NAME])
+
 # Storage module to official 'aws-sdk' gem for Amazon S3 #
 
 'paperclip-aws' is a full featured storage module that supports all S3 locations (American, European and Japanese) without any additional hacking.

data/Rakefile

@@ -28,18 +28,10 @@ Jeweler::RubygemsDotOrgTasks.new
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-
 task :default => :test
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/lib/paperclip-aws.rb

@@ -137,7 +137,7 @@ module Paperclip
               :acl => @s3_permissions[:style.to_sym] || @s3_permissions[:default],
               :storage_class => @s3_storage_class.to_sym,
               :content_type => file.content_type,
-              :server_side_encryption => @s3_sse.to_s
+              :server_side_encryption => @s3_sse
             )
           rescue AWS::S3::Errors::NoSuchBucket => e
             create_bucket

data/paperclip-aws.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{paperclip-aws}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Alexandrov"]
-  s.date = %q{2011-11-11}
+  s.date = %q{2011-11-12}
   s.description = %q{'paperclip-aws' is a full featured storage module that supports all S3 locations (US, European and Tokio) without any additional hacking.}
   s.email = %q{igor.alexandrov@gmail.com}
   s.extra_rdoc_files = [
@@ -25,7 +25,11 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/paperclip-aws.rb",
-    "paperclip-aws.gemspec"
+    "paperclip-aws.gemspec",
+    "test/aws_storage_test.rb",
+    "test/database.yml",
+    "test/debug.log",
+    "test/helper.rb"
   ]
   s.homepage = %q{http://github.com/igor-alexandrov/paperclip-aws}
   s.licenses = ["MIT"]
@@ -39,25 +43,19 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<paperclip>, [">= 2.4.0"])
       s.add_runtime_dependency(%q<aws-sdk>, [">= 1.2.0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<paperclip>, [">= 2.4.0"])
       s.add_dependency(%q<aws-sdk>, [">= 1.2.0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<paperclip>, [">= 2.4.0"])
     s.add_dependency(%q<aws-sdk>, [">= 1.2.0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

data/test/aws_storage_test.rb

@@ -0,0 +1,52 @@
+require './test/helper'
+
+class AwsStorageTest < Test::Unit::TestCase
+  def rails_env(env)
+    silence_warnings do
+      Object.const_set(:Rails, stub('Rails', :env => env))
+    end
+  end
+
+  context "Parsing S3 credentials" do
+    setup do
+      @proxy_settings = {:host => "127.0.0.1", :port => 8888, :user => "foo", :password => "bar"}
+      Rails.stubs(:const_defined?)
+      rebuild_model :storage => :aws,
+                    :bucket => "testing",
+                    :http_proxy => @proxy_settings,
+                    :s3_credentials => {
+                      :access_key_id => "ACCESS_KEY_ID",
+                      :secret_access_key => "SECRET_ACCESS_KEY"
+                    }
+
+      @dummy = Dummy.new
+      @avatar = @dummy.avatar
+    end
+    
+    should "get the correct credentials when RAILS_ENV is production" do
+      rails_env("production")
+      
+      assert_equal(
+        { :access_key_id => "12345" },
+        @avatar.parse_credentials(
+          :production => { :access_key_id => '12345' },
+          :development => { :access_key_id => '54321' }
+        )
+      )
+    end
+    
+    should "get the correct credentials when RAILS_ENV is development" do
+      rails_env("development")
+      
+      assert_equal(
+        { :access_key_id => "54321" },
+        @avatar.parse_credentials(
+          :production => { :access_key_id => '12345' },
+          :development => { :access_key_id => '54321' }
+        )
+      )
+      
+    end
+    
+  end
+end

data/test/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter: sqlite3
+  database: ":memory:"

data/test/debug.log

@@ -0,0 +1,63 @@
+# Logfile created on 2011-11-12 19:28:19 +0400 by logger.rb/25413
+D, [2011-11-12T20:02:26.484258 #40515] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T20:02:26.485445 #40515] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T20:03:26.074040 #40529] DEBUG -- :    (0.4ms)  select sqlite_version(*)
+D, [2011-11-12T20:03:26.075277 #40529] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T20:04:08.897166 #40543] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T20:04:08.898471 #40543] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T20:06:23.301153 #40572] DEBUG -- :    (0.4ms)  select sqlite_version(*)
+D, [2011-11-12T20:06:23.305432 #40572] DEBUG -- :    (0.4ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T20:09:15.001946 #40607] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T20:09:15.003154 #40607] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T20:09:32.905134 #40619] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T20:09:32.907352 #40619] DEBUG -- :    (1.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T20:09:55.062532 #40632] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T20:09:55.063860 #40632] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T20:10:22.997788 #40657] DEBUG -- :    (0.4ms)  select sqlite_version(*)
+D, [2011-11-12T20:10:23.002247 #40657] DEBUG -- :    (2.4ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T20:10:34.390259 #40670] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T20:10:34.391487 #40670] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T20:10:46.446075 #40681] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T20:10:46.447561 #40681] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T20:12:59.086745 #40700] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T20:12:59.087957 #40700] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T20:54:14.084896 #40940] DEBUG -- :    (0.5ms)  select sqlite_version(*)
+D, [2011-11-12T20:54:14.086291 #40940] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T21:31:35.787140 #41167] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T21:31:35.789862 #41167] DEBUG -- :    (0.4ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T21:33:23.962724 #41185] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T21:33:23.964105 #41185] DEBUG -- :    (0.4ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T21:34:39.419519 #41200] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T21:34:39.420868 #41200] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T21:34:56.140131 #41213] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T21:34:56.141382 #41213] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T21:35:50.680401 #41227] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T21:35:50.681564 #41227] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T21:37:06.639397 #41244] DEBUG -- :    (0.7ms)  select sqlite_version(*)
+D, [2011-11-12T21:37:06.640704 #41244] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T21:37:17.887144 #41255] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T21:37:17.888922 #41255] DEBUG -- :    (0.4ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T21:37:30.631160 #41267] DEBUG -- :    (0.6ms)  select sqlite_version(*)
+D, [2011-11-12T21:37:30.632643 #41267] DEBUG -- :    (0.4ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T23:28:13.074928 #41810] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T23:28:13.082355 #41810] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T23:28:42.427358 #41823] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T23:28:42.428589 #41823] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T23:29:17.376127 #41838] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T23:29:17.377345 #41838] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T23:34:31.158834 #41889] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T23:34:31.160038 #41889] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T23:37:23.994236 #41924] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T23:37:23.998533 #41924] DEBUG -- :    (3.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T23:39:11.665461 #41941] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T23:39:11.666608 #41941] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-12T23:39:36.731861 #41954] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-12T23:39:36.733112 #41954] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-13T01:15:43.149647 #42454] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2011-11-13T01:15:43.152773 #42454] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-13T01:15:44.246835 #42454] DEBUG -- :    (0.1ms)  DROP TABLE "dummies"
+D, [2011-11-13T01:15:44.247373 #42454] DEBUG -- :    (0.1ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-13T01:16:15.135664 #42466] DEBUG -- :    (0.4ms)  select sqlite_version(*)
+D, [2011-11-13T01:16:15.137064 #42466] DEBUG -- :    (0.4ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-13T01:16:15.950354 #42466] DEBUG -- :    (0.1ms)  DROP TABLE "dummies"
+D, [2011-11-13T01:16:15.951127 #42466] DEBUG -- :    (0.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 

data/test/helper.rb

@@ -0,0 +1,77 @@
+require 'rubygems'
+require 'test/unit'
+require 'mocha'
+require 'shoulda-context'
+
+require 'active_record'
+require 'logger'
+require 'sqlite3'
+require 'paperclip'
+require 'paperclip-aws'
+
+ROOT       = File.join(File.dirname(__FILE__), '..')
+RAILS_ROOT = ROOT
+$LOAD_PATH << File.join(ROOT, 'lib')
+
+def silence_warnings
+  old_verbose, $VERBOSE = $VERBOSE, nil
+  yield
+ensure
+  $VERBOSE = old_verbose
+end
+
+class Test::Unit::TestCase
+  def setup
+    silence_warnings do
+      Object.const_set(:Rails, stub('Rails', :root => ROOT, :env => 'test'))
+    end
+  end
+end
+
+
+FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
+config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+ActiveRecord::Base.establish_connection(config['test'])
+Paperclip.logger = ActiveRecord::Base.logger
+
+# def reset_dummy(options = {})
+#   reset_dummy(options)
+#   Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+# end
+def rebuild_model options = {}
+  ActiveRecord::Base.connection.create_table :dummies, :force => true do |table|
+    table.column :title, :string
+    table.column :other, :string
+    table.column :avatar_file_name, :string
+    table.column :avatar_content_type, :string
+    table.column :avatar_file_size, :integer
+    table.column :avatar_updated_at, :datetime
+    table.column :avatar_fingerprint, :string
+  end
+  reset_class('Dummy', options)
+end
+
+def reset_class(class_name, options)
+  ActiveRecord::Base.send(:include, Paperclip::Glue)
+  Object.send(:remove_const, class_name) rescue nil
+  klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
+  klass.class_eval do
+    include Paperclip::Glue
+    has_attached_file :avatar, options
+  end
+  klass.reset_column_information
+  klass
+end
+
+# def rebuild_class options = {}
+#   ActiveRecord::Base.send(:include, Paperclip::Glue)
+#   Object.send(:remove_const, "Dummy") rescue nil
+#   Object.const_set("Dummy", Class.new(ActiveRecord::Base))
+#   Paperclip.reset_duplicate_clash_check!
+#   Dummy.class_eval do
+#     include Paperclip::Glue
+#     has_attached_file :avatar, options
+#   end
+#   Dummy.reset_column_information
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-aws
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000Z
+date: 2011-11-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70175097366720 !ruby/object:Gem::Requirement
+  requirement: &70188528166160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70175097366720
+  version_requirements: *70188528166160
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70175097362700 !ruby/object:Gem::Requirement
+  requirement: &70188528165540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70175097362700
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &70175096884900 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70175096884900
+  version_requirements: *70188528165540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70175096882680 !ruby/object:Gem::Requirement
+  requirement: &70188528164900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70175096882680
+  version_requirements: *70188528164900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70175096882000 !ruby/object:Gem::Requirement
+  requirement: &70188528164300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,18 +54,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70175096882000
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70175096880660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70175096880660
+  version_requirements: *70188528164300
 description: ! '''paperclip-aws'' is a full featured storage module that supports
   all S3 locations (US, European and Tokio) without any additional hacking.'
 email: igor.alexandrov@gmail.com
@@ -95,6 +73,10 @@ files:
 - VERSION
 - lib/paperclip-aws.rb
 - paperclip-aws.gemspec
+- test/aws_storage_test.rb
+- test/database.yml
+- test/debug.log
+- test/helper.rb
 homepage: http://github.com/igor-alexandrov/paperclip-aws
 licenses:
 - MIT
@@ -110,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3697909920406882687
+      hash: 1539503514915059301
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: