storage 0.1.5 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fd2bec2d0dd25eba612ea984b394c8fc4322a019
+  data.tar.gz: 4387f67ab04388059956ec41a410d3793ddc2581
+SHA512:
+  metadata.gz: 4f248beff7dbb3229a2fbc1f3c7f46f3884c19e5dc7b05696e81c55ec20af960ba506f98d57751f2126bf6e5a19cf092f8499a26c02a460129422edd4d74b506
+  data.tar.gz: b621accb8cd68e00218d2b33430e5146d4f9f3d4c486fee9dc2d341f3fd84da4a47a39d33141f489b0e22cd620c13675d043a8a14dc9e93e6f08dad6786524e6

data/Gemfile

@@ -1,2 +1,2 @@
-source "http://gems.simplesideias.com.br"
+source "https://rubygems.org"
 gemspec

data/Gemfile.lock

@@ -1,133 +1,251 @@
 PATH
   remote: .
   specs:
-    storage (0.1.5)
-      aws-s3 (~> 0.6.2)
+    storage (0.2.0)
+      fog
 
 GEM
-  remote: http://gems.simplesideias.com.br/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.1.1)
-      actionpack (= 3.1.1)
-      mail (~> 2.3.0)
-    actionpack (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
+    CFPropertyList (2.3.1)
+    actionmailer (3.2.22)
+      actionpack (= 3.2.22)
+      mail (~> 2.5.4)
+    actionpack (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.2)
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-      arel (~> 2.2.1)
+    activerecord (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-    activesupport (3.1.1)
+    activeresource (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+    activesupport (3.2.22)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    arel (2.2.1)
-    aws-s3 (0.6.2)
+    arel (3.0.3)
+    ast (2.0.0)
+    astrolabe (1.3.0)
+      parser (>= 2.2.0.pre.3, < 3.0)
+    awesome_print (1.6.1)
+    builder (3.0.4)
+    byebug (4.0.5)
+      columnize (= 0.9.0)
+    coderay (1.1.0)
+    columnize (0.9.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    excon (0.45.3)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    fog (1.31.0)
+      fog-atmos
+      fog-aws (~> 0.0)
+      fog-brightbox (~> 0.4)
+      fog-core (~> 1.30)
+      fog-ecloud
+      fog-google (>= 0.0.2)
+      fog-json
+      fog-local
+      fog-powerdns (>= 0.1.1)
+      fog-profitbricks
+      fog-radosgw (>= 0.0.2)
+      fog-riakcs
+      fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
+      fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-xml (~> 0.1.1)
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (0.6.0)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.7.2)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto (~> 0.0.2)
+    fog-core (1.31.1)
       builder
+      excon (~> 0.45)
+      formatador (~> 0.2)
       mime-types
-      xml-simple
-    builder (3.0.0)
-    coderay (0.9.8)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    fakeweb (1.3.0)
-    hike (1.2.1)
-    i18n (0.6.0)
-    json (1.6.1)
-    mail (2.3.0)
-      i18n (>= 0.4.0)
+      net-scp (~> 1.1)
+      net-ssh (>= 2.1.3)
+    fog-ecloud (0.2.0)
+      fog-core
+      fog-xml
+    fog-google (0.0.6)
+      fog-core
+      fog-json
+      fog-xml
+    fog-json (1.0.2)
+      fog-core (~> 1.0)
+      multi_json (~> 1.10)
+    fog-local (0.2.1)
+      fog-core (~> 1.27)
+    fog-powerdns (0.1.1)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+    fog-profitbricks (0.0.3)
+      fog-core
+      fog-xml
+      nokogiri
+    fog-radosgw (0.0.4)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-riakcs (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-sakuracloud (1.0.1)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.2)
+      fog-core
+      fog-json
+    fog-softlayer (0.4.7)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.1)
+      fog-core
+      fog-json
+    fog-terremark (0.1.0)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.1.0)
+      fission
+      fog-core
+    fog-voxel (0.1.0)
+      fog-core
+      fog-xml
+    fog-xml (0.1.2)
+      fog-core
+      nokogiri (~> 1.5, >= 1.5.11)
+    formatador (0.2.5)
+    hike (1.2.3)
+    i18n (0.7.0)
+    inflecto (0.0.2)
+    ipaddress (0.8.0)
+    journey (1.0.4)
+    json (1.8.3)
+    mail (2.5.4)
       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.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)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    mini_portile (0.6.2)
+    multi_json (1.11.1)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    parser (2.3.0.pre.2)
+      ast (>= 1.1, < 3.0)
+    polyglot (0.3.5)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.1.0)
+      byebug (~> 4.0)
+      pry (~> 0.10)
+    pry-meta (0.0.10)
+      awesome_print
+      pry
+      pry-byebug
+      pry-remote
+    pry-remote (0.1.8)
+      pry (~> 0.9)
+      slop (~> 3.0)
+    rack (1.4.7)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.4)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.1.1)
-      actionmailer (= 3.1.1)
-      actionpack (= 3.1.1)
-      activerecord (= 3.1.1)
-      activeresource (= 3.1.1)
-      activesupport (= 3.1.1)
+    rails (3.2.22)
+      actionmailer (= 3.2.22)
+      actionpack (= 3.2.22)
+      activerecord (= 3.2.22)
+      activeresource (= 3.2.22)
+      activesupport (= 3.2.22)
       bundler (~> 1.0)
-      railties (= 3.1.1)
-    railties (3.1.1)
-      actionpack (= 3.1.1)
-      activesupport (= 3.1.1)
+      railties (= 3.2.22)
+    railties (3.2.22)
+      actionpack (= 3.2.22)
+      activesupport (= 3.2.22)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2)
-    rdoc (3.10)
+      thor (>= 0.14.6, < 2.0)
+    rainbow (2.0.0)
+    rake (10.4.2)
+    rdoc (3.12.2)
       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.7.0)
-    rspec-rails (2.7.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      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)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    slop (3.6.0)
+    sprockets (2.2.3)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.4)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
+    thor (0.19.1)
+    tilt (1.4.1)
+    transpec (3.1.0)
+      activesupport (>= 3.0, < 5.0)
+      astrolabe (~> 1.2)
+      bundler (~> 1.3)
+      json (~> 1.8)
+      parser (~> 2.2)
+      rainbow (>= 1.99.1, < 3.0)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.30)
-    xml-simple (1.1.1)
+    tzinfo (0.3.44)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  fakeweb (~> 1.3.0)
-  nokogiri (~> 1.4.4)
-  pry
+  pry-meta
   rails (~> 3.1)
-  rspec-rails (~> 2.7.0)
-  sqlite3 (~> 1.3.3)
+  rspec
   storage!
+  transpec

data/lib/storage.rb

@@ -1,12 +1,12 @@
 require "ostruct"
-require "fileutils" unless defined?(FileUtils)
-require "storage/errors"
-require "aws/s3"
+require "fileutils"
+require "fog"
 
 module Storage
-  autoload :Config,       "storage/config"
-  autoload :Strategies,   "storage/strategies"
-  autoload :Version,      "storage/version"
+  require "storage/errors"
+  require "storage/config"
+  require "storage/strategies"
+  require "storage/version"
 
   # Set up the storage options.
   #
@@ -16,8 +16,9 @@ module Storage
   #
   # Check Storage::Config for available options.
   #
-  def self.setup(&block)
+  def self.setup
     yield Config
+    strategy.prepare!
   end
 
   # A shortcut to the current strategy.

data/lib/storage/config.rb

@@ -29,8 +29,13 @@ module Storage
     # Override setter so we can automatically define the strategy class
     # based on its registered name.
     def self.strategy=(strategy)
-      @strategy_class = eval(Storage::Strategies::STRATEGIES[strategy])
+      @strategy_class = get_class_for_strategy(strategy)
       @strategy = strategy
     end
+
+    def self.get_class_for_strategy(strategy)
+      Storage::Strategies::STRATEGIES[strategy].split('::')
+        .reduce(Object) {|ns, class_name| ns.const_get(class_name) }
+    end
   end
 end

data/lib/storage/strategies.rb

@@ -1,7 +1,7 @@
 module Storage
   module Strategies
-    autoload :S3,           "storage/strategies/s3"
-    autoload :FileSystem,   "storage/strategies/file_system"
+    require "storage/strategies/s3"
+    require "storage/strategies/file_system"
 
     STRATEGIES = {}
 

data/lib/storage/strategies/file_system.rb

@@ -3,6 +3,12 @@ module Storage
     module FileSystem
       extend self
 
+      def connect!
+      end
+
+      def disconnect!
+      end
+
       def prepare!
         FileUtils.mkdir_p File.expand_path(Storage::Config.path)
       end

data/lib/storage/strategies/s3.rb

@@ -3,57 +3,81 @@ module Storage
     module S3
       extend self
 
+      MissingBucket = Class.new(StandardError)
+
+      def connection
+        @connection ||= Fog::Storage.new({
+          :provider                 => 'AWS',
+          :aws_access_key_id        => Storage::Config.access_key,
+          :aws_secret_access_key    => Storage::Config.secret_key
+        })
+      end
+
+      def prepare!
+        disconnect!
+      end
+
       def connect!
-        AWS::S3::Base.establish_connection!({
-          :access_key_id     => Storage::Config.access_key,
-          :secret_access_key => Storage::Config.secret_key
-        }) unless AWS::S3::Base.connected?
       end
 
       def disconnect!
-        AWS::S3::Base.disconnect! if AWS::S3::Base.connected?
+        @connection = nil
       end
 
       def get(file, options = {})
-        connect!
+        expires = options.fetch(:expires, Time.now.to_i + 3600)
         object = find_object(file, options)
-        AWS::S3::S3Object.url_for(file, options[:bucket], :authenticated => false)
-      rescue AWS::S3::NoSuchKey, AWS::S3::NoSuchBucket
-        raise Storage::MissingFileError
+        object.public_url || object.url(expires)
       end
 
       def store(file, options = {})
-        connect!
         object = find_object(file, options) rescue nil
+        raise FileAlreadyExistsError if object
 
-        raise Storage::FileAlreadyExistsError if object
-
-        bucket = find_bucket_or_create(options[:bucket])
+        bucket = find_bucket_or_create(options.fetch(: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 => options.fetch(:access, :public_read))
+
+        create_object(bucket, file, options)
       end
 
       def remove(file, options = {})
-        connect!
         object = find_object(file, options)
-        object.delete
-      rescue AWS::S3::NoSuchKey, AWS::S3::NoSuchBucket
-        raise Storage::MissingFileError
+        object.destroy
       end
 
       def find_bucket(name)
-        AWS::S3::Bucket.find(name)
+        connection.directories.get(name)
+      end
+
+      def find_bucket!(name)
+        find_bucket(name) || raise(MissingBucket)
+      end
+
+      def create_bucket(name)
+        connection.directories.create(
+          :key    => name,
+          :public => false
+        )
+      end
+
+      def create_object(bucket, file, options)
+        bucket.files.create({
+          :key => options.fetch(:name),
+          :body => file,
+          :public => (options[:public] || options[:access] != :public_read)
+        })
       end
 
       def find_object(file, options = {})
         path = options.fetch(:name, file)
-        AWS::S3::S3Object.find(path, options[:bucket])
+        bucket = find_bucket!(options.fetch(:bucket))
+        bucket.files.get(path) || raise(MissingFileError)
+      rescue MissingBucket
+        raise MissingFileError
       end
 
       def find_bucket_or_create(name)
-        bucket = find_bucket(name)
-        bucket ||= AWS::S3::Bucket.create(name)
-        bucket
+        find_bucket(name) || create_bucket(name)
       end
     end
   end

data/lib/storage/version.rb

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

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
-require "bundler"
-Bundler.setup
+require "bundler/setup"
 Bundler.require(:default, :development)
 
 require "storage"
@@ -9,8 +8,10 @@ TMP = Pathname.new(File.expand_path(File.dirname(__FILE__) + "/tmp"))
 RESOURCES = Pathname.new(File.expand_path(File.dirname(__FILE__) + "/resources"))
 
 RSpec.configure do |config|
-  config.around :each do
+  cleaner = proc do
     FileUtils.rm_rf(TMP) rescue nil
     FileUtils.mkdir_p(TMP) rescue nil
   end
+
+  config.before(:each, &cleaner)
 end

data/spec/storage/strategies/file_system_spec.rb

@@ -15,21 +15,21 @@ describe Storage::Strategies::FileSystem do
     handler = File.open(@source)
     Storage.store(handler, :name => "lorem.txt")
 
-    File.should be_file(@destiny)
-    File.read(@destiny).should == File.read(@source)
+    expect(File).to be_file(@destiny)
+    expect(File.read(@destiny)).to eq(File.read(@source))
   end
 
   it "should save a file using a path" do
     Storage.store(@source, :name => "lorem.txt")
 
-    File.should be_file(@destiny)
-    File.read(@destiny).should == File.read(@source)
+    expect(File).to be_file(@destiny)
+    expect(File.read(@destiny)).to eq(File.read(@source))
   end
 
   it "should remove an existing file" do
     Storage.store(@source, :name => "lorem.txt")
-    Storage.remove("lorem.txt").should be_true
-    File.should_not be_file(@destiny)
+    expect(Storage.remove("lorem.txt")).to be_truthy
+    expect(File).not_to be_file(@destiny)
   end
 
   it "should raise when trying to removing an unexesting file" do
@@ -40,7 +40,7 @@ describe Storage::Strategies::FileSystem do
 
   it "should retrieve an existing file" do
     Storage.store(@source, :name => "lorem.txt")
-    Storage.get("lorem.txt").should == File.expand_path(TMP.join("lorem.txt"))
+    expect(Storage.get("lorem.txt")).to eq(File.expand_path(TMP.join("lorem.txt")))
   end
 
   it "should raise when trying to retrieve an unexesting file" do

data/spec/storage/strategies/s3_spec.rb

@@ -2,13 +2,13 @@ require "spec_helper"
 
 describe Storage::Strategies::S3 do
   before do
+    @adapter = Storage::Strategies::S3
     @source = RESOURCES.join("file.txt")
     @destiny = TMP.join("lorem.txt")
-    @bucket = mock("bucket", :name => "files")
+    @connection = double("connection")
+    @bucket = double("bucket")
 
-    AWS::S3::Base.stub :establish_connection!
-    AWS::S3::Bucket.stub :find => @bucket
-    AWS::S3::S3Object.stub :store
+    allow(@adapter).to receive(:connection).and_return(@connection)
 
     Storage.setup do |c|
       c.strategy = :s3
@@ -17,84 +17,95 @@ describe Storage::Strategies::S3 do
     end
   end
 
-  it "should establish connection" do
-    options = {:access_key_id => "abc", :secret_access_key => "123"}
-    AWS::S3::Base.should_receive(:establish_connection!).with(options)
-
-    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.connect!
-  end
-
-  it "should disconnect when connection is established" do
-    AWS::S3::Base.should_receive(:connected?).and_return(true)
-    AWS::S3::Base.should_receive(:disconnect!)
-    Storage::Strategies::S3.disconnect!
-  end
-
-  it "should ignore disconnection when connection is not established" do
-    AWS::S3::Base.should_receive(:connected?).and_return(false)
-    AWS::S3::Base.should_not_receive(:disconnect!)
-    Storage::Strategies::S3.disconnect!
-  end
-
   it "should save a file using file handler" do
     handler = File.open(@source)
-    AWS::S3::S3Object.should_receive(:store).with("lorem.txt", handler, "files", :access => :public_read)
+
+    expect(@connection).to receive_message_chain('directories.get').with('files').and_return(@bucket)
+    expect(@adapter).to receive_message_chain('find_object').and_return(nil)
+    expect(@bucket).to receive_message_chain('files.create').with(:key => 'lorem.txt', :body => handler, :public => true)
+
     Storage.store(handler, :name => "lorem.txt", :bucket => "files")
   end
 
   it "should save a file using a path" do
-    AWS::S3::S3Object.should_receive(:store).with("lorem.txt", kind_of(File), "files", :access => :public_read)
+    expect(@connection).to receive_message_chain('directories.get').with('files').and_return(@bucket)
+    expect(@adapter).to receive_message_chain('find_object').and_return(nil)
+    expect(@bucket).to receive_message_chain('files.create').with(:key => 'lorem.txt', :body => kind_of(File), :public => true)
+
     Storage.store(@source, :name => "lorem.txt", :bucket => "files")
   end
 
   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(:name => "lorem.txt", :bucket => "files").and_return(object)
+    object = double("object")
+    expect(@connection).to receive_message_chain('directories.get').with('files').and_return(@bucket)
+    expect(@bucket).to receive_message_chain('files.get').with('lorem.txt').and_return(object)
+    expect(object).to receive(:destroy).and_return(true)
 
-    Storage.remove("lorem.txt", :bucket => "files").should be_true
+    expect(Storage.remove("lorem.txt", :bucket => "files")).to be_truthy
   end
 
   it "should raise when trying to removing an unexesting file" do
-    Storage::Strategies::S3.should_receive(:find_object).and_raise(AWS::S3::NoSuchKey)
+    expect(@connection).to receive_message_chain('directories.get').with('files').and_return(@bucket)
+    expect(@bucket).to receive_message_chain('files.get').with('lorem.txt').and_return(nil)
 
     expect {
       Storage.remove("lorem.txt", :bucket => "files")
     }.to raise_error(Storage::MissingFileError)
   end
 
-  it "should retrieve an existing file" do
-    object = mock("object")
+  it "should retrieve an existing file (public url)" do
+    object = double("object", public_url: 'PUBLIC_URL')
+    expect(@connection).to receive_message_chain('directories.get').with('files').and_return(@bucket)
+    expect(@bucket).to receive_message_chain('files.get').with('lorem.txt').and_return(object)
 
-    AWS::S3::S3Object.should_receive(:find).with("lorem.txt", "files").and_return(object)
-    AWS::S3::S3Object.should_receive(:url_for).with("lorem.txt", "files", :authenticated => false)
+    expect(Storage.get("lorem.txt", :bucket => "files")).to eq('PUBLIC_URL')
+  end
 
-    Storage.get("lorem.txt", :bucket => "files")
+  it "should retrieve an existing file (private url)" do
+    object = double("object", public_url: nil)
+
+    expect(object).to receive_message_chain('url').with(Time.now.to_i + 3600).and_return('PRIVATE_URL')
+    expect(@connection).to receive_message_chain('directories.get').with('files').and_return(@bucket)
+    expect(@bucket).to receive_message_chain('files.get').with('lorem.txt').and_return(object)
+
+    expect(Storage.get("lorem.txt", :bucket => "files")).to eq('PRIVATE_URL')
   end
 
-  it "should raise when trying to retrieve an unexesting file" do
-    AWS::S3::S3Object.should_receive(:find).with("lorem.txt", "files").and_raise(AWS::S3::NoSuchKey)
-    AWS::S3::S3Object.should_not_receive(:url_for)
+  it "should raise when trying to retrieve an missing file" do
+    expect(@connection).to receive_message_chain('directories.get').with('files').and_return(@bucket)
+    expect(@bucket).to receive_message_chain('files.get').with('lorem.txt').and_return(nil)
 
     expect {
       Storage.get("lorem.txt", :bucket => "files")
     }.to raise_error(Storage::MissingFileError)
   end
 
+  it "should raise when trying to retrieve an missing bucket" do
+    expect(@connection).to receive_message_chain('directories.get').with('files').and_return(nil)
+
+    expect {
+      Storage.get("lorem.txt", :bucket => "files")
+    }.to raise_error(Storage::MissingFileError)
+  end
+
+  it "should create a bucket and trying to store a file on a missing bucket" do
+    expect(@adapter).to receive_message_chain('find_object').and_return(nil)
+    allow(@connection).to receive_message_chain('directories.get').and_return(nil)
+    expect(@connection).to receive_message_chain('directories.create').with(key: 'files', public: false).and_return(@bucket)
+
+    @bucket.as_null_object
+
+    Storage.store(@source, :name => 'lorem.txt', :bucket => "files")
+  end
+
   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(options).and_return(object)
+    object = double("object")
+
+    expect(@connection).to receive_message_chain('directories.get').with('files').and_return(@bucket)
+    expect(@bucket).to receive_message_chain('files.get').with('lorem.txt').and_return(object)
 
     expect {
-      Storage.store(@source, options)
+      Storage.store(@source, :name => 'lorem.txt', :bucket => 'files')
     }.to raise_error(Storage::FileAlreadyExistsError)
   end
 end

data/spec/storage_spec.rb

@@ -2,44 +2,51 @@ require "spec_helper"
 
 describe Storage do
   it "should return the strategy" do
-    @strategy = mock("strategy")
+    @strategy = double("strategy")
     Storage::Config.strategy_class = @strategy
 
-    Storage.strategy.should be(@strategy)
+    expect(Storage.strategy).to be(@strategy)
   end
 
   it "should return the config" do
-    Storage::Strategies::S3.stub :prepare!
+    allow(Storage::Strategies::S3).to receive :prepare!
 
     Storage.setup do |config|
       config.strategy = :s3
-      config.should be(Storage::Config)
+      expect(config).to be(Storage::Config)
     end
   end
 
+  it "should set strategy class based on its name" do
+    Storage::Config.strategy_class = nil
+    Storage::Config.strategy = :s3
+
+    expect(Storage::Config.strategy_class).to eq(Storage::Strategies::S3)
+  end
+
   it "prepare strategy after setting its configuration" do
-    Storage::Strategies::S3.should_receive(:prepare!).once
+    expect(Storage::Strategies::S3).to receive(:prepare!).once
     Storage.setup {|config| config.strategy = :s3}
   end
 
   context "delegation" do
     before do
-      @strategy = mock("strategy")
-      Storage.should_receive(:strategy).and_return(@strategy)
+      @strategy = double("strategy")
+      expect(Storage).to receive(:strategy).and_return(@strategy)
     end
 
     it "should delegate save method" do
-      @strategy.should_receive(:store).with("some/file")
+      expect(@strategy).to receive(:store).with("some/file")
       Storage.store "some/file"
     end
 
     it "should delegate destroy method" do
-      @strategy.should_receive(:remove).with("some/file")
+      expect(@strategy).to receive(:remove).with("some/file")
       Storage.remove "some/file"
     end
 
     it "should delegate get method" do
-      @strategy.should_receive(:get).with("some/file")
+      expect(@strategy).to receive(:get).with("some/file")
       Storage.get "some/file"
     end
   end

data/storage.gemspec

@@ -1,6 +1,4 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "storage/version"
+require "./lib/storage/version"
 
 Gem::Specification.new do |s|
   s.name        = "storage"
@@ -17,12 +15,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "aws-s3", "~> 0.6.2"
+  s.add_dependency "fog"
 
   s.add_development_dependency "rails"        , "~> 3.1"
-  s.add_development_dependency "fakeweb"      , "~> 1.3.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 "pry"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "transpec"
+  s.add_development_dependency "pry-meta"
 end

metadata

@@ -1,94 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: storage
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-18 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-s3
-  requirement: &70300994093180 !ruby/object:Gem::Requirement
-    none: false
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300994093180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70300994120940 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70300994120940
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: &70300994120320 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: *70300994120320
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: &70300994119240 !ruby/object:Gem::Requirement
-    none: false
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300994119240
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &70300994117700 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
-  type: :development
-  prerelease: false
-  version_requirements: *70300994117700
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70300994150300 !ruby/object:Gem::Requirement
-    none: false
+  name: transpec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300994150300
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
-  requirement: &70300994147180 !ruby/object:Gem::Requirement
-    none: false
+  name: pry-meta
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300994147180
-description: ! 'This gem provides a simple API for multiple storage backends. Supported
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 'This gem provides a simple API for multiple storage backends. Supported
   storages: Amazon S3 and FileSystem.'
 email:
 - fnando.vieira@gmail.com
@@ -96,8 +88,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - README.rdoc
@@ -111,46 +103,37 @@ files:
 - lib/storage/version.rb
 - spec/resources/file.txt
 - spec/spec_helper.rb
-- spec/storage/config_spec.rb
 - spec/storage/strategies/file_system_spec.rb
 - spec/storage/strategies/s3_spec.rb
 - spec/storage_spec.rb
 - storage.gemspec
 homepage: http://github.com/fnando/storage
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2661529604855007369
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2661529604855007369
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
-summary: ! 'This gem provides a simple API for multiple storage backends. Supported
+specification_version: 4
+summary: 'This gem provides a simple API for multiple storage backends. Supported
   storages: Amazon S3 and FileSystem.'
 test_files:
 - spec/resources/file.txt
 - spec/spec_helper.rb
-- spec/storage/config_spec.rb
 - spec/storage/strategies/file_system_spec.rb
 - spec/storage/strategies/s3_spec.rb
 - spec/storage_spec.rb

data/spec/storage/config_spec.rb

@@ -1,10 +0,0 @@
-require "spec_helper"
-
-describe Storage::Config do
-  it "should set strategy class based on its name" do
-    Storage::Config.strategy_class = nil
-    Storage::Config.strategy = :s3
-    
-    Storage::Config.strategy_class.should == Storage::Strategies::S3
-  end
-end