storage 0.1.3 → 0.1.5

data/Gemfile.lock

@@ -1,112 +1,124 @@
 PATH
   remote: .
   specs:
-    storage (0.1.3)
+    storage (0.1.5)
       aws-s3 (~> 0.6.2)
 
 GEM
   remote: http://gems.simplesideias.com.br/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
-      mail (~> 2.2.19)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
-    archive-tar-minitar (0.5.2)
-    arel (2.0.10)
+    actionmailer (3.1.1)
+      actionpack (= 3.1.1)
+      mail (~> 2.3.0)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    arel (2.2.1)
     aws-s3 (0.6.2)
       builder
       mime-types
       xml-simple
-    builder (2.1.2)
-    columnize (0.3.4)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+    builder (3.0.0)
+    coderay (0.9.8)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
     fakeweb (1.3.0)
-    i18n (0.5.0)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.6.1)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    method_source (0.6.6)
+      ruby_parser (~> 2.0.5)
     mime-types (1.16)
+    multi_json (1.0.3)
     nokogiri (1.4.7)
-    polyglot (0.3.1)
-    rack (1.2.3)
-    rack-mount (0.6.14)
+    polyglot (0.3.2)
+    pry (0.9.6.2)
+      coderay (~> 0.9.8)
+      method_source (~> 0.6.5)
+      ruby_parser (~> 2.0.5)
+      slop (~> 2.1.0)
+    rack (1.3.4)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
+    rails (3.1.1)
+      actionmailer (= 3.1.1)
+      actionpack (= 3.1.1)
+      activerecord (= 3.1.1)
+      activeresource (= 3.1.1)
+      activesupport (= 3.1.1)
       bundler (~> 1.0)
-      railties (= 3.0.9)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
+      railties (= 3.1.1)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (~> 0.14.6)
     rake (0.9.2)
-    rdoc (3.8)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.2)
-    rspec-expectations (2.5.0)
+    rdoc (3.10)
+      json (~> 1.4)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.0)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
+    rspec-mocks (2.7.0)
+    rspec-rails (2.7.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.5.0)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
+      rspec (~> 2.7.0)
+    ruby_parser (2.0.6)
+      sexp_processor (~> 3.0)
+    sexp_processor (3.0.7)
+    slop (2.1.0)
+    sprockets (2.0.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
     thor (0.14.6)
-    treetop (1.4.9)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
-    xml-simple (1.1.0)
+    tzinfo (0.3.30)
+    xml-simple (1.1.1)
 
 PLATFORMS
   ruby
@@ -114,8 +126,8 @@ PLATFORMS
 DEPENDENCIES
   fakeweb (~> 1.3.0)
   nokogiri (~> 1.4.4)
-  rails (~> 3.0)
-  rspec-rails (~> 2.5.0)
-  ruby-debug19
+  pry
+  rails (~> 3.1)
+  rspec-rails (~> 2.7.0)
   sqlite3 (~> 1.3.3)
   storage!

data/lib/storage/strategies/s3.rb

@@ -46,7 +46,8 @@ module Storage
       end
 
       def find_object(file, options = {})
-        AWS::S3::S3Object.find(file, options[:bucket])
+        path = options.fetch(:name, file)
+        AWS::S3::S3Object.find(path, options[:bucket])
       end
 
       def find_bucket_or_create(name)

data/lib/storage/version.rb

@@ -2,7 +2,7 @@ module Storage
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 3
+    PATCH = 5
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/spec/storage/strategies/s3_spec.rb

@@ -57,7 +57,7 @@ describe Storage::Strategies::S3 do
   it "should remove an existing file" do
     object = mock("object")
     object.should_receive(:delete).and_return(true)
-    Storage::Strategies::S3.should_receive(:find_object).with("lorem.txt", :bucket => "files").and_return(object)
+    Storage::Strategies::S3.should_receive(:find_object).with(:name => "lorem.txt", :bucket => "files").and_return(object)
 
     Storage.remove("lorem.txt", :bucket => "files").should be_true
   end
@@ -91,10 +91,10 @@ describe Storage::Strategies::S3 do
   it "should raise when saving a file that already exists" do
     object = mock("object")
     options = {:name => "lorem.txt", :bucket => "files"}
-    Storage::Strategies::S3.should_receive(:find_object).with(@source, options).and_return(object)
+    Storage::Strategies::S3.should_receive(:find_object).with(options).and_return(object)
 
     expect {
-      Storage.store(@source, :name => "lorem.txt", :bucket => "files")
+      Storage.store(@source, options)
     }.to raise_error(Storage::FileAlreadyExistsError)
   end
 end

data/storage.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
 
   s.add_dependency "aws-s3", "~> 0.6.2"
 
-  s.add_development_dependency "rails"        , "~> 3.0"
+  s.add_development_dependency "rails"        , "~> 3.1"
   s.add_development_dependency "fakeweb"      , "~> 1.3.0"
-  s.add_development_dependency "rspec-rails"  , "~> 2.5.0"
+  s.add_development_dependency "rspec-rails"  , "~> 2.7.0"
   s.add_development_dependency "nokogiri"     , "~> 1.4.4"
   s.add_development_dependency "sqlite3"      , "~> 1.3.3"
-  s.add_development_dependency "ruby-debug19" if RUBY_VERSION >= "1.9"
+  s.add_development_dependency "pry"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storage
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-07 00:00:00.000000000 Z
+date: 2011-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &70179973046000 !ruby/object:Gem::Requirement
+  requirement: &70300994093180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70179973046000
+  version_requirements: *70300994093180
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70179973061260 !ruby/object:Gem::Requirement
+  requirement: &70300994120940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70179973061260
+  version_requirements: *70300994120940
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70179973059740 !ruby/object:Gem::Requirement
+  requirement: &70300994120320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +43,21 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70179973059740
+  version_requirements: *70300994120320
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70179973058100 !ruby/object:Gem::Requirement
+  requirement: &70300994119240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70179973058100
+  version_requirements: *70300994119240
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70179973056700 !ruby/object:Gem::Requirement
+  requirement: &70300994117700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.4.4
   type: :development
   prerelease: false
-  version_requirements: *70179973056700
+  version_requirements: *70300994117700
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70179973053920 !ruby/object:Gem::Requirement
+  requirement: &70300994150300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70179973053920
+  version_requirements: *70300994150300
 - !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &70179973061040 !ruby/object:Gem::Requirement
+  name: pry
+  requirement: &70300994147180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70179973061040
+  version_requirements: *70300994147180
 description: ! 'This gem provides a simple API for multiple storage backends. Supported
   storages: Amazon S3 and FileSystem.'
 email:
@@ -130,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3809248445555190213
+      hash: -2661529604855007369
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -139,10 +139,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3809248445555190213
+      hash: -2661529604855007369
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ! 'This gem provides a simple API for multiple storage backends. Supported