storage 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    storage (0.1.1)
+    storage (0.1.2)
       aws-s3 (~> 0.6.2)
 
 GEM

data/lib/storage/strategies/file_system.rb

@@ -3,26 +3,29 @@ module Storage
     module FileSystem
       extend self
 
-      def self.prepare!
+      def prepare!
         FileUtils.mkdir_p File.expand_path(Storage::Config.path)
       end
 
       def fullpath(file)
-        File.expand_path(File.join(Storage::Config.path, file))
+        File.expand_path File.join(Storage::Config.path, file)
       end
 
-      def get(file)
+      def get(file, *noop)
+        prepare!
         path = fullpath(file)
         raise Storage::MissingFileError unless File.file?(path)
         path
       end
 
-      def remove(file)
+      def remove(file, *noop)
+        prepare!
         path = get(file)
         File.unlink(path)
       end
 
       def store(file, options = {})
+        prepare!
         file = File.open(file, "rb") unless file.respond_to?(:read) && !file.kind_of?(Pathname)
         path = fullpath(options[:name])
 

data/lib/storage/strategies/s3.rb

@@ -3,7 +3,7 @@ module Storage
     module S3
       extend self
 
-      def prepare!
+      def connect!
         AWS::S3::Base.establish_connection!({
           :access_key_id     => Storage::Config.access_key,
           :secret_access_key => Storage::Config.secret_key
@@ -11,6 +11,7 @@ module Storage
       end
 
       def get(file, options = {})
+        connect!
         object = find_object(file, options)
         AWS::S3::S3Object.url_for(file, options[:bucket], :authenticated => false)
       rescue AWS::S3::NoSuchKey, AWS::S3::NoSuchBucket
@@ -18,16 +19,18 @@ module Storage
       end
 
       def store(file, options = {})
+        connect!
         object = find_object(file, options) rescue nil
 
         raise Storage::FileAlreadyExistsError if object
 
         bucket = find_bucket_or_create(options[:bucket])
         file = File.open(file, "rb") unless file.respond_to?(:read) && !file.kind_of?(Pathname)
-        AWS::S3::S3Object.store(options[:name], file, bucket.name, :access => :public_read)
+        AWS::S3::S3Object.store(options[:name], file, bucket.name, :access => options.fetch(:access, :public_read))
       end
 
       def remove(file, options = {})
+        connect!
         object = find_object(file, options)
         object.delete
       rescue AWS::S3::NoSuchKey, AWS::S3::NoSuchBucket

data/lib/storage/version.rb

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

data/lib/storage.rb

@@ -18,7 +18,6 @@ module Storage
   #
   def self.setup(&block)
     yield Config
-    strategy.prepare!
   end
 
   # A shortcut to the current strategy.

data/spec/storage/strategies/s3_spec.rb

@@ -21,14 +21,14 @@ describe Storage::Strategies::S3 do
     options = {:access_key_id => "abc", :secret_access_key => "123"}
     AWS::S3::Base.should_receive(:establish_connection!).with(options)
 
-    Storage::Strategies::S3.prepare!
+    Storage::Strategies::S3.connect!
   end
 
   it "should not reconnect when a connection is already established" do
     AWS::S3::Base.should_receive(:connected?).and_return(true)
     AWS::S3::Base.should_not_receive(:establish_connection!)
 
-    Storage::Strategies::S3.prepare!
+    Storage::Strategies::S3.connect!
   end
 
   it "should save a file using file handler" do
@@ -51,8 +51,6 @@ describe Storage::Strategies::S3 do
   end
 
   it "should raise when trying to removing an unexesting file" do
-    pending "spec is failing but real code works"
-
     Storage::Strategies::S3.should_receive(:find_object).and_raise(AWS::S3::NoSuchKey)
 
     expect {
@@ -70,8 +68,6 @@ describe Storage::Strategies::S3 do
   end
 
   it "should raise when trying to retrieve an unexesting file" do
-    pending "spec is failing but real code works"
-
     AWS::S3::S3Object.should_receive(:find).with("lorem.txt", "files").and_raise(AWS::S3::NoSuchKey)
     AWS::S3::S3Object.should_not_receive(:url_for)
 

metadata

@@ -2,7 +2,7 @@
 name: storage
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Nando Vieira
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 Z
+date: 2011-06-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: aws-s3
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.3
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: "This gem provides a simple API for multiple storage backends. Supported storages: Amazon S3 and FileSystem."