storage 0.1.0 → 0.1.1

data/.gitignore

@@ -0,0 +1,5 @@
+tmp
+pkg
+*.gem
+*.log
+coverage

data/.rspec

@@ -0,0 +1 @@
+--color --format documentation

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,121 @@
+PATH
+  remote: .
+  specs:
+    storage (0.1.1)
+      aws-s3 (~> 0.6.2)
+
+GEM
+  remote: http://gems.simplesideias.com.br/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
+      mail (~> 2.2.15)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      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.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    archive-tar-minitar (0.5.2)
+    arel (2.0.10)
+    aws-s3 (0.6.2)
+      builder
+      mime-types
+      xml-simple
+    builder (2.1.2)
+    columnize (0.3.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.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)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    nokogiri (1.4.4)
+    polyglot (0.3.1)
+    rack (1.2.3)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
+      bundler (~> 1.0)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    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)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.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)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.27)
+    xml-simple (1.0.16)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fakeweb (~> 1.3.0)
+  nokogiri (~> 1.4.4)
+  rails (~> 3.0)
+  rspec-rails (~> 2.5.0)
+  ruby-debug19
+  sqlite3-ruby (~> 1.3.3)
+  storage!

data/Rakefile

@@ -0,0 +1,5 @@
+require "bundler"
+Bundler::GemHelper.install_tasks
+
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new

data/lib/storage/config.rb

@@ -29,7 +29,7 @@ module Storage
     # Override setter so we can automatically define the strategy class
     # based on its registered name.
     def self.strategy=(strategy)
-      self.strategy_class = eval(Storage::Strategies::STRATEGIES[strategy])
+      @strategy_class = eval(Storage::Strategies::STRATEGIES[strategy])
       @strategy = strategy
     end
   end

data/lib/storage/version.rb

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

data/lib/storage.rb

@@ -8,39 +8,37 @@ module Storage
   autoload :Strategies,   "storage/strategies"
   autoload :Version,      "storage/version"
 
-  class << self
-    # Set up the storage options.
-    #
-    #   Storage.setup do |config|
-    #     config.strategy = :s3
-    #   end
-    #
-    # Check Storage::Config for available options.
-    #
-    def setup(&block)
-      yield Config
-      strategy.prepare!
-    end
+  # Set up the storage options.
+  #
+  #   Storage.setup do |config|
+  #     config.strategy = :s3
+  #   end
+  #
+  # Check Storage::Config for available options.
+  #
+  def self.setup(&block)
+    yield Config
+    strategy.prepare!
+  end
 
-    # A shortcut to the current strategy.
-    def strategy
-      Config.strategy_class
-    end
+  # A shortcut to the current strategy.
+  def self.strategy
+    Config.strategy_class
+  end
 
-    # Save a file.
-    def store(*args)
-      strategy.store(*args)
-    end
+  # Save a file.
+  def self.store(*args)
+    strategy.store(*args)
+  end
 
-    # Destroy a file.
-    def remove(*args)
-      strategy.remove(*args)
-    end
+  # Destroy a file.
+  def self.remove(*args)
+    strategy.remove(*args)
+  end
 
-    # Retrieve a file.
-    def get(*args)
-      strategy.get(*args)
-    end
+  # Retrieve a file.
+  def self.get(*args)
+    strategy.get(*args)
   end
 end
 

data/spec/spec_helper.rb

@@ -1,21 +1,16 @@
-require "rspec"
+require "bundler"
+Bundler.setup
+Bundler.require(:default, :development)
+
 require "storage"
-require "fileutils"
 require "pathname"
 
 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.formatter = "documentation"
-  config.color_enabled = true
-
-  config.before :each do
+  config.around :each do
     FileUtils.rm_rf(TMP) rescue nil
     FileUtils.mkdir_p(TMP) rescue nil
   end
-
-  config.after :each do
-    FileUtils.rm_rf(TMP) rescue nil
-  end
 end

data/spec/storage/strategies/file_system_spec.rb

@@ -4,56 +4,56 @@ describe Storage::Strategies::FileSystem do
   before do
     @source = RESOURCES.join("file.txt")
     @destiny = TMP.join("lorem.txt")
-    
-    Storage.setup do |c| 
+
+    Storage.setup do |c|
       c.strategy = :file
       c.path = TMP
     end
   end
-  
+
   it "should save a file using file handler" do
     handler = File.open(@source)
     Storage.store(handler, :name => "lorem.txt")
-    
+
     File.should be_file(@destiny)
     File.read(@destiny).should == 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)
   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)
   end
-  
+
   it "should raise when trying to removing an unexesting file" do
-    lambda {
+    expect {
       Storage.remove("invalid")
-    }.should raise_error(Storage::MissingFileError)
+    }.to raise_error(Storage::MissingFileError)
   end
-  
+
   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"))
   end
-  
+
   it "should raise when trying to retrieve an unexesting file" do
-    lambda {
+    expect {
       Storage.get("invalid")
-    }.should raise_error(Storage::MissingFileError)
+    }.to raise_error(Storage::MissingFileError)
   end
-  
+
   it "should raise when saving a file that already exists" do
     Storage.store(@source, :name => "lorem.txt")
-    
-    lambda {
+
+    expect {
       Storage.store(@source, :name => "lorem.txt")
-    }.should raise_error(Storage::FileAlreadyExistsError)
+    }.to raise_error(Storage::FileAlreadyExistsError)
   end
 end

data/spec/storage/strategies/s3_spec.rb

@@ -5,88 +5,88 @@ describe Storage::Strategies::S3 do
     @source = RESOURCES.join("file.txt")
     @destiny = TMP.join("lorem.txt")
     @bucket = mock("bucket", :name => "files")
-    
-    AWS::S3::Base.stub!(:establish_connection!)
-    AWS::S3::Bucket.stub!(:find).and_return(@bucket)
-    AWS::S3::S3Object.stub!(:store)
-    
-    Storage.setup do |c| 
+
+    AWS::S3::Base.stub :establish_connection!
+    AWS::S3::Bucket.stub :find => @bucket
+    AWS::S3::S3Object.stub :store
+
+    Storage.setup do |c|
       c.strategy = :s3
       c.access_key = "abc"
       c.secret_key = "123"
     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.prepare!
   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!
   end
-  
+
   it "should save a file using file handler" do
-    handler = File.open(@source)    
+    handler = File.open(@source)
     AWS::S3::S3Object.should_receive(:store).with("lorem.txt", handler, "files", :access => :public_read)
     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)
     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("lorem.txt", :bucket => "files").and_return(object)
-    
+
     Storage.remove("lorem.txt", :bucket => "files").should be_true
   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)
-    
-    lambda {
+
+    expect {
       Storage.remove("lorem.txt", :bucket => "files")
-    }.should raise_error(Storage::MissingFileError)
+    }.to raise_error(Storage::MissingFileError)
   end
-  
+
   it "should retrieve an existing file" do
     object = mock("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)
-    
+
     Storage.get("lorem.txt", :bucket => "files")
   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)
-    
-    lambda {
+
+    expect {
       Storage.get("lorem.txt", :bucket => "files")
-    }.should raise_error(Storage::MissingFileError)
+    }.to raise_error(Storage::MissingFileError)
   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(@source, options).and_return(object)
-    
-    lambda {
+
+    expect {
       Storage.store(@source, :name => "lorem.txt", :bucket => "files")
-    }.should raise_error(Storage::FileAlreadyExistsError)
+    }.to raise_error(Storage::FileAlreadyExistsError)
   end
 end

data/spec/storage_spec.rb

@@ -4,40 +4,40 @@ describe Storage do
   it "should return the strategy" do
     @strategy = mock("strategy")
     Storage::Config.strategy_class = @strategy
-    
+
     Storage.strategy.should be(@strategy)
   end
-  
+
   it "should return the config" do
-    Storage::Strategies::S3.stub!(:prepare!)
-    
+    Storage::Strategies::S3.stub :prepare!
+
     Storage.setup do |config|
       config.strategy = :s3
       config.should be(Storage::Config)
     end
   end
-  
+
   it "prepare strategy after setting its configuration" do
     Storage::Strategies::S3.should_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)
     end
-    
+
     it "should delegate save method" do
       @strategy.should_receive(:store).with("some/file")
       Storage.store "some/file"
     end
-    
+
     it "should delegate destroy method" do
       @strategy.should_receive(:remove).with("some/file")
       Storage.remove "some/file"
     end
-    
+
     it "should delegate get method" do
       @strategy.should_receive(:get).with("some/file")
       Storage.get "some/file"

data/storage.gemspec

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "storage/version"
+
+Gem::Specification.new do |s|
+  s.name        = "storage"
+  s.version     = Storage::Version::STRING
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Nando Vieira"]
+  s.email       = ["fnando.vieira@gmail.com"]
+  s.homepage    = "http://github.com/fnando/storage"
+  s.summary     = "This gem provides a simple API for multiple storage backends. Supported storages: Amazon S3 and FileSystem."
+  s.description = s.summary
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  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_development_dependency "rails"        , "~> 3.0"
+  s.add_development_dependency "fakeweb"      , "~> 1.3.0"
+  s.add_development_dependency "rspec-rails"  , "~> 2.5.0"
+  s.add_development_dependency "nokogiri"     , "~> 1.4.4"
+  s.add_development_dependency "sqlite3-ruby" , "~> 1.3.3"
+  s.add_development_dependency "ruby-debug19" if RUBY_VERSION >= "1.9"
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: storage
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,31 +10,101 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 -03:00
-default_executable: 
+date: 2011-05-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: aws-s3
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 0.6.2
   type: :runtime
   version_requirements: *id001
-description: 
-email: fnando.vieira@gmail.com
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "3.0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.5.0
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.4.4
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.3
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id007
+description: "This gem provides a simple API for multiple storage backends. Supported storages: Amazon S3 and FileSystem."
+email: 
+- fnando.vieira@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- .rspec
+- Gemfile
+- Gemfile.lock
 - README.rdoc
+- Rakefile
 - lib/storage.rb
 - lib/storage/config.rb
 - lib/storage/errors.rb
@@ -52,37 +118,36 @@ files:
 - spec/storage/strategies/file_system_spec.rb
 - spec/storage/strategies/s3_spec.rb
 - spec/storage_spec.rb
-has_rdoc: true
+- storage.gemspec
 homepage: http://github.com/fnando/storage
 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 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 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