s3-publisher 0.4.1 → 0.4.2

data/README.rdoc

@@ -12,7 +12,6 @@ Basic usage:
 
 This will:
 * push test.txt to my-bucket.s3.amazonaws.com
-* use reduced redundancy storage
 * set security to public-read
 * gzip contents ('abc1234') and set a Content-Encoding: gzip header so clients know to decompress
 * set a Cache-Control: max-age=5 header
@@ -30,9 +29,11 @@ In this example:
 A few miscellaneous notes:
 * gzip compress is skipped on .jpg/gif/png/tif files
 * uploads are multi-threaded.  You can control worker thread count on instantiation.
+* pass :redundancy => :reduced when instantiating the publisher to write to reduced
+redundancy storage (this used to be the default, but now requires the option to be set.)
 
 See class docs for further options.
 
 == Copyright
 
-Copyright (c) 2010 Ben Koski. See LICENSE for details.
+Copyright (c) 2011 Ben Koski. See LICENSE for details.

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Ben Koski"]
     gem.add_development_dependency "thoughtbot-shoulda"
     gem.add_dependency 'aws_credentials'
-    gem.add_dependency 'right_aws', '=2.0.0'
+    gem.add_dependency 'right_aws', '>=3.0.0'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/s3-publisher.rb

@@ -1,11 +1,8 @@
-require 'rubygems'
+require 'zlib'
+require 'thread'
 
-gem 'right_aws', '=2.0.0'
 require 'right_aws'
-
 require 'aws_credentials'
-require 'zlib'
-require 'thread'
 
 Thread.abort_on_exception = true
 
@@ -64,7 +61,7 @@ class S3Publisher
       headers['Content-Encoding'] = 'gzip'
     end
     
-    headers['x-amz-storage-class'] = opts[:redundancy] == :standard ? 'STANDARD' : 'REDUCED_REDUNDANCY' 
+    headers['x-amz-storage-class'] = opts[:redundancy] == :reduced ? 'REDUCED_REDUNDANCY' : 'STANDARD'
     headers['Content-Type']        = parse_content_type(opts[:content_type])  if opts[:content_type]
 
     if opts.has_key?(:cache_control)

data/s3-publisher.gemspec

@@ -1,59 +1,53 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{s3-publisher}
-  s.version = "0.4.1"
+  s.name = "s3-publisher"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Koski"]
-  s.date = %q{2010-07-01}
-  s.description = %q{Publish data to S3 for the world to see}
-  s.email = %q{gems@benkoski.com}
+  s.date = "2011-12-12"
+  s.description = "Publish data to S3 for the world to see"
+  s.email = "gems@benkoski.com"
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/s3-publisher.rb",
-     "s3-publisher.gemspec",
-     "test/s3-publisher_test.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/bkoski/s3-publisher}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Publish data to S3 for the world to see}
-  s.test_files = [
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/s3-publisher.rb",
+    "s3-publisher.gemspec",
     "test/s3-publisher_test.rb",
-     "test/test_helper.rb"
+    "test/test_helper.rb"
   ]
+  s.homepage = "http://github.com/bkoski/s3-publisher"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Publish data to S3 for the world to see"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_runtime_dependency(%q<aws_credentials>, [">= 0"])
-      s.add_runtime_dependency(%q<right_aws>, ["= 2.0.0"])
+      s.add_runtime_dependency(%q<right_aws>, [">= 3.0.0"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<aws_credentials>, [">= 0"])
-      s.add_dependency(%q<right_aws>, ["= 2.0.0"])
+      s.add_dependency(%q<right_aws>, [">= 3.0.0"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     s.add_dependency(%q<aws_credentials>, [">= 0"])
-    s.add_dependency(%q<right_aws>, ["= 2.0.0"])
+    s.add_dependency(%q<right_aws>, [">= 3.0.0"])
   end
 end
+

data/test/s3-publisher_test.rb

@@ -43,15 +43,15 @@ class S3PublisherTest < Test::Unit::TestCase
     end
     
     context "redundancy" do
-      should "set REDUCED_REDUNDANCY by default" do
-        set_put_expectation(:headers => { 'x-amz-storage-class' => 'REDUCED_REDUNDANCY' })
+      should "set STANDARD by default" do
+        set_put_expectation(:headers => { 'x-amz-storage-class' => 'STANDARD' })
         push_test_data('myfile.txt', '1234', {})
 
       end
       
-      should "set STANDARD if :redundancy => :standard is passed" do
-        set_put_expectation(:headers => { 'x-amz-storage-class' => 'STANDARD' })
-        push_test_data('myfile.txt', '1234', :redundancy => :standard)
+      should "set REDUCED_REDUNDANCY if :redundancy => :reduced is passed" do
+        set_put_expectation(:headers => { 'x-amz-storage-class' => 'REDUCED_REDUNDANCY' })
+        push_test_data('myfile.txt', '1234', :redundancy => :reduced)
       end
     end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3-publisher
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  hash: 11
+  prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Ben Koski
@@ -9,39 +15,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 -04:00
-default_executable: 
+date: 2011-12-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: aws_credentials
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: right_aws
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
-    version: 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id003
 description: Publish data to S3 for the world to see
 email: gems@benkoski.com
 executables: []
@@ -53,7 +72,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -62,34 +80,38 @@ files:
 - s3-publisher.gemspec
 - test/s3-publisher_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/bkoski/s3-publisher
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Publish data to S3 for the world to see
-test_files: 
-- test/s3-publisher_test.rb
-- test/test_helper.rb
+test_files: []
+

data/.gitignore

@@ -1,5 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg