carrierwave 0.3.5.2 → 0.4.0

data/spec/storage/s3_spec.rb

@@ -0,0 +1,75 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'aws/s3'
+
+if ENV['S3_SPEC']
+  describe CarrierWave::Storage::S3 do
+    before do
+      @uploader = mock('an uploader')
+      @uploader.stub!(:s3_access_key_id).and_return(ENV["S3_ACCESS_KEY_ID"])
+      @uploader.stub!(:s3_secret_access_key).and_return(ENV["S3_SECRET_ACCESS_KEY"])
+      @uploader.stub!(:s3_bucket).and_return('carrierwave_test')
+      @uploader.stub!(:s3_access).and_return(:public_read)
+      @uploader.stub!(:s3_cnamed).and_return(false)
+
+      @storage = CarrierWave::Storage::S3.new(@uploader)
+      @file = CarrierWave::SanitizedFile.new(file_path('test.jpg'))
+    end
+  
+    after do
+      AWS::S3::S3Object.delete('uploads/bar.txt', 'carrierwave_test')
+    end
+
+    describe '#store!' do
+      before do
+        @uploader.stub!(:store_path).and_return('uploads/bar.txt')
+        @s3_file = @storage.store!(@file)
+      end
+    
+      it "should upload the file to s3" do
+        AWS::S3::S3Object.value('uploads/bar.txt', 'carrierwave_test').should == 'this is stuff'
+      end
+    
+      it "should have a path" do
+        @s3_file.path.should == 'uploads/bar.txt'
+      end
+    
+      it "should have an Amazon URL" do
+        @s3_file.url.should == 'http://s3.amazonaws.com/carrierwave_test/uploads/bar.txt'
+      end
+    
+      it "should be deletable" do
+        @s3_file.delete
+        AWS::S3::S3Object.exists?('uploads/bar.txt', 'carrierwave_test').should be_false
+      end
+    end
+  
+    describe '#retrieve!' do
+      before do
+        AWS::S3::S3Object.store('uploads/bar.txt', "A test, 1234", 'carrierwave_test')
+  
+        @uploader.stub!(:store_path).with('bar.txt').and_return('uploads/bar.txt')
+        @s3_file = @storage.retrieve!('bar.txt')
+      end
+
+      it "should retrieve the file contents from s3" do
+        @s3_file.read.chomp.should == "A test, 1234"
+      end
+    
+      it "should have a path" do
+        @s3_file.path.should == 'uploads/bar.txt'
+      end
+    
+      it "should have an Amazon URL" do
+        @s3_file.url.should == 'http://s3.amazonaws.com/carrierwave_test/uploads/bar.txt'
+      end
+    
+      it "should be deletable" do
+        @s3_file.delete
+        AWS::S3::S3Object.exists?('uploads/bar.txt', 'carrierwave_test').should be_false
+      end
+    end
+
+  end
+end

data/spec/uploader/cache_spec.rb

@@ -51,15 +51,6 @@ describe CarrierWave::Uploader do
       @uploader.file.exists?.should be_true
     end
 
-    it "should not move it if cache_to_cache_dir is false" do
-      CarrierWave.config[:cache_to_cache_dir] = false
-      path = file_path('test.jpg')
-      @uploader.cache!(File.open(path))
-      @uploader.current_path.should == path
-      @uploader.file.exists?.should be_true
-      CarrierWave.config[:cache_to_cache_dir] = true
-    end
-
     it "should set the url" do
       @uploader.cache!(File.open(file_path('test.jpg')))
       @uploader.url.should == '/uploads/tmp/20071201-1234-345-2255/test.jpg'
@@ -82,13 +73,10 @@ describe CarrierWave::Uploader do
     end
 
     it "should set permissions if options are given" do
-      old_permissions = CarrierWave.config[:permissions]
-      CarrierWave.config[:permissions] = 0777
+      @uploader_class.permissions = 0777
 
       @uploader.cache!(File.open(file_path('test.jpg')))
       @uploader.should have_permissions(0777)
-
-      CarrierWave.config[:permissions] = old_permissions
     end
   end
 

data/spec/uploader/configuration_spec.rb

@@ -0,0 +1,71 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+
+describe CarrierWave do
+  before do
+    @uploader_class = Class.new(CarrierWave::Uploader::Base)
+  end
+
+  describe '.configure' do
+    it "should proxy to Uploader configuration" do
+      CarrierWave::Uploader::Base.add_config :test_config
+      CarrierWave.configure do |config|
+        config.test_config = "foo"
+      end
+      CarrierWave::Uploader::Base.test_config.should == 'foo'
+    end
+  end
+end
+
+describe CarrierWave::Uploader::Base do
+  before do
+    @uploader_class = Class.new(CarrierWave::Uploader::Base)
+  end
+
+  describe '.configure' do
+    it "should set a configuration parameter" do
+      @uploader_class.add_config :foo_bar
+      @uploader_class.configure do |config|
+        config.foo_bar = "monkey"
+      end
+      @uploader_class.foo_bar.should == 'monkey'
+    end
+  end
+  
+  describe '.add_config' do
+    it "should add a class level accessor" do
+      @uploader_class.add_config :foo_bar
+      @uploader_class.foo_bar = 'foo'
+      @uploader_class.foo_bar.should == 'foo'
+    end
+    
+    it "should be inheritable" do
+      @child_class = Class.new(@uploader_class)
+      @uploader_class.add_config :foo_bar
+
+      @uploader_class.foo_bar = 'foo'
+      @uploader_class.foo_bar.should == 'foo'
+
+      #@child_class.foo_bar.should == 'foo'
+
+      @child_class.foo_bar = 'bar'
+      @child_class.foo_bar.should == 'bar'
+
+      @uploader_class.foo_bar.should == 'foo'
+    end
+    
+    it "should add an instance level accessor" do
+      @uploader_class.add_config :foo_bar
+      @uploader_class.foo_bar = 'foo'
+      @uploader_class.new.foo_bar.should == 'foo'
+    end
+    
+    it "should add a convenient in-class setter" do
+      @uploader_class.add_config :foo_bar
+      @uploader_class.foo_bar "monkey"
+      @uploader_class.foo_bar.should == "monkey"
+    end
+  end
+end

data/spec/uploader/paths_spec.rb

@@ -15,7 +15,7 @@ describe CarrierWave::Uploader do
 
   describe '#root' do
     it "should default to the config option" do
-      @uploader.root.should == public_path('..')
+      @uploader.root.should == public_path
     end
   end
 

data/spec/uploader/store_spec.rb

@@ -14,14 +14,8 @@ describe CarrierWave::Uploader do
   end
 
   describe ".storage" do
-    before do
-      CarrierWave::Storage::File.stub!(:setup!)
-      CarrierWave::Storage::S3.stub!(:setup!)
-    end
-
     it "should set the storage if an argument is given" do
       storage = mock('some kind of storage')
-      storage.should_receive(:setup!)
       @uploader_class.storage storage
       @uploader_class.storage.should == storage
     end
@@ -208,10 +202,6 @@ describe CarrierWave::Uploader do
         @uploader_class.storage.stub!(:new).with(@uploader).and_return(@storage)
       end
 
-      after do
-        CarrierWave.config[:use_cache] = true
-      end
-
       it "should set the current path" do
         @uploader.store!(@file)
         @uploader.current_path.should == '/path/to/somewhere'
@@ -227,12 +217,6 @@ describe CarrierWave::Uploader do
         @uploader.filename.should == 'gpj.tset'
       end
 
-      it "should, if a files is given as an argument and use_cache is false, reverse the filename" do
-        CarrierWave.config[:use_cache] = false
-        @uploader.store!(@file)
-        @uploader.filename.should == 'gpj.tset'
-      end
-
     end
 
     describe '#retrieve_from_store!' do

data/spec/uploader/versions_spec.rb

@@ -169,10 +169,6 @@ describe CarrierWave::Uploader do
         @uploader_class.version(:thumb).storage.stub!(:new).with(@uploader.thumb).and_return(@thumb_storage)
       end
 
-      after do
-        CarrierWave.config[:use_cache] = true
-      end
-
       it "should set the current path for the version" do
         @uploader.store!(@file)
         @uploader.current_path.should == '/path/to/somewhere'
@@ -226,10 +222,6 @@ describe CarrierWave::Uploader do
         @uploader.store!(@file)
       end
 
-      after do
-        CarrierWave.config[:use_cache] = true
-      end
-
       it "should reset the current path for the version" do
         @uploader.remove!
         @uploader.current_path.should be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave
 version: !ruby/object:Gem::Version 
-  version: 0.3.5.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -12,6 +12,16 @@ cert_chain: []
 date: 2009-10-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: newgem
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development
@@ -62,6 +72,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.11
     version: 
+- !ruby/object:Gem::Dependency 
+  name: data_objects
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.12
+    version: 
 - !ruby/object:Gem::Dependency 
   name: do_sqlite3
   type: :development
@@ -93,14 +113,24 @@ dependencies:
         version: 2.10.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: jnunemaker-mongomapper
+  name: mongo_mapper
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: aws-s3
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.3
+        version: 0.6.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -135,7 +165,6 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- carrierwave.gemspec
 - cucumber.yml
 - features/caching.feature
 - features/file_storage.feature
@@ -144,6 +173,7 @@ files:
 - features/file_storage_reversing_processor.feature
 - features/fixtures/bork.txt
 - features/fixtures/monkey.txt
+- features/grid_fs_storage.feature
 - features/mount_activerecord.feature
 - features/mount_datamapper.feature
 - features/step_definitions/activerecord_steps.rb
@@ -175,23 +205,23 @@ files:
 - lib/carrierwave/sanitized_file.rb
 - lib/carrierwave/storage/abstract.rb
 - lib/carrierwave/storage/file.rb
+- lib/carrierwave/storage/grid_fs.rb
 - lib/carrierwave/storage/s3.rb
 - lib/carrierwave/test/matchers.rb
 - lib/carrierwave/uploader.rb
 - lib/carrierwave/uploader/cache.rb
 - lib/carrierwave/uploader/callbacks.rb
-- lib/carrierwave/uploader/default_path.rb
+- lib/carrierwave/uploader/configuration.rb
 - lib/carrierwave/uploader/default_url.rb
 - lib/carrierwave/uploader/extension_whitelist.rb
 - lib/carrierwave/uploader/mountable.rb
-- lib/carrierwave/uploader/paths.rb
 - lib/carrierwave/uploader/processing.rb
 - lib/carrierwave/uploader/proxy.rb
 - lib/carrierwave/uploader/remove.rb
 - lib/carrierwave/uploader/store.rb
 - lib/carrierwave/uploader/url.rb
 - lib/carrierwave/uploader/versions.rb
-- lib/generators/uploader_generator.rb
+- merb_generators/uploader_generator.rb
 - rails_generators/uploader/USAGE
 - rails_generators/uploader/templates/uploader.rb
 - rails_generators/uploader/uploader_generator.rb
@@ -209,8 +239,10 @@ files:
 - spec/orm/sequel_spec.rb
 - spec/sanitized_file_spec.rb
 - spec/spec_helper.rb
+- spec/storage/grid_fs_spec.rb
+- spec/storage/s3_spec.rb
 - spec/uploader/cache_spec.rb
-- spec/uploader/default_path_spec.rb
+- spec/uploader/configuration_spec.rb
 - spec/uploader/default_url_spec.rb
 - spec/uploader/extension_whitelist_spec.rb
 - spec/uploader/mountable_spec.rb

data/carrierwave.gemspec

@@ -1,63 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{carrierwave}
-  s.version = "0.3.5.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jonas Nicklas"]
-  s.date = %q{2009-10-12}
-  s.description = %q{* RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/rdoc].
-* Source code {hosted at GitHub}[http://github.com/jnicklas/carrierwave]
-* Please {report any issues}[http://github.com/jnicklas/carrierwave/issues] on GitHub
-* Please direct any questions at the {mailing list}[http://groups.google.com/group/carrierwave]}
-  s.email = ["jonas.nicklas@gmail.com"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "features/fixtures/bork.txt", "features/fixtures/monkey.txt", "README.rdoc"]
-  s.files = ["Generators", "History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "carrierwave.gemspec", "cucumber.yml", "features/caching.feature", "features/file_storage.feature", "features/file_storage_overridden_filename.feature", "features/file_storage_overridden_store_dir.feature", "features/file_storage_reversing_processor.feature", "features/fixtures/bork.txt", "features/fixtures/monkey.txt", "features/mount_activerecord.feature", "features/mount_datamapper.feature", "features/step_definitions/activerecord_steps.rb", "features/step_definitions/caching_steps.rb", "features/step_definitions/datamapper_steps.rb", "features/step_definitions/file_steps.rb", "features/step_definitions/general_steps.rb", "features/step_definitions/mount_steps.rb", "features/step_definitions/store_steps.rb", "features/support/activerecord.rb", "features/support/datamapper.rb", "features/support/env.rb", "features/versions_basics.feature", "features/versions_nested_versions.feature", "features/versions_overridden_filename.feature", "features/versions_overriden_store_dir.feature", "lib/carrierwave.rb", "lib/carrierwave/compatibility/paperclip.rb", "lib/carrierwave/core_ext/blank.rb", "lib/carrierwave/core_ext/inheritable_attributes.rb", "lib/carrierwave/core_ext/module_setup.rb", "lib/carrierwave/mount.rb", "lib/carrierwave/orm/activerecord.rb", "lib/carrierwave/orm/datamapper.rb", "lib/carrierwave/orm/mongomapper.rb", "lib/carrierwave/orm/sequel.rb", "lib/carrierwave/processing/image_science.rb", "lib/carrierwave/processing/rmagick.rb", "lib/carrierwave/sanitized_file.rb", "lib/carrierwave/storage/abstract.rb", "lib/carrierwave/storage/file.rb", "lib/carrierwave/storage/s3.rb", "lib/carrierwave/test/matchers.rb", "lib/carrierwave/uploader.rb", "lib/carrierwave/uploader/cache.rb", "lib/carrierwave/uploader/callbacks.rb", "lib/carrierwave/uploader/default_path.rb", "lib/carrierwave/uploader/default_url.rb", "lib/carrierwave/uploader/extension_whitelist.rb", "lib/carrierwave/uploader/mountable.rb", "lib/carrierwave/uploader/paths.rb", "lib/carrierwave/uploader/processing.rb", "lib/carrierwave/uploader/proxy.rb", "lib/carrierwave/uploader/remove.rb", "lib/carrierwave/uploader/store.rb", "lib/carrierwave/uploader/url.rb", "lib/carrierwave/uploader/versions.rb", "lib/generators/uploader_generator.rb", "rails_generators/uploader/USAGE", "rails_generators/uploader/templates/uploader.rb", "rails_generators/uploader/uploader_generator.rb", "script/console", "script/destroy", "script/generate", "spec/compatibility/paperclip_spec.rb", "spec/fixtures/bork.txt", "spec/fixtures/test.jpeg", "spec/fixtures/test.jpg", "spec/mount_spec.rb", "spec/orm/activerecord_spec.rb", "spec/orm/datamapper_spec.rb", "spec/orm/mongomapper_spec.rb", "spec/orm/sequel_spec.rb", "spec/sanitized_file_spec.rb", "spec/spec_helper.rb", "spec/uploader/cache_spec.rb", "spec/uploader/default_path_spec.rb", "spec/uploader/default_url_spec.rb", "spec/uploader/extension_whitelist_spec.rb", "spec/uploader/mountable_spec.rb", "spec/uploader/paths_spec.rb", "spec/uploader/processing_spec.rb", "spec/uploader/proxy_spec.rb", "spec/uploader/remove_spec.rb", "spec/uploader/store_spec.rb", "spec/uploader/url_spec.rb", "spec/uploader/versions_spec.rb"]
-  s.homepage = %q{http://carrierwave.rubyforge.org}
-  s.rdoc_options = ["--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{carrierwave}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{* RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/rdoc]}
-
-  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
-      s.add_development_dependency(%q<rspec>, [">= 1.2.8"])
-      s.add_development_dependency(%q<cucumber>, [">= 0.3.96"])
-      s.add_development_dependency(%q<activerecord>, [">= 2.3.3"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
-      s.add_development_dependency(%q<dm-core>, [">= 0.9.11"])
-      s.add_development_dependency(%q<do_sqlite3>, [">= 0.9.11"])
-      s.add_development_dependency(%q<sequel>, [">= 3.2.0"])
-      s.add_development_dependency(%q<rmagick>, [">= 2.10.0"])
-      s.add_development_dependency(%q<jnunemaker-mongomapper>, [">= 0.3.3"])
-      s.add_development_dependency(%q<hoe>, [">= 2.3.2"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.8"])
-      s.add_dependency(%q<cucumber>, [">= 0.3.96"])
-      s.add_dependency(%q<activerecord>, [">= 2.3.3"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
-      s.add_dependency(%q<dm-core>, [">= 0.9.11"])
-      s.add_dependency(%q<do_sqlite3>, [">= 0.9.11"])
-      s.add_dependency(%q<sequel>, [">= 3.2.0"])
-      s.add_dependency(%q<rmagick>, [">= 2.10.0"])
-      s.add_dependency(%q<jnunemaker-mongomapper>, [">= 0.3.3"])
-      s.add_dependency(%q<hoe>, [">= 2.3.2"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.8"])
-    s.add_dependency(%q<cucumber>, [">= 0.3.96"])
-    s.add_dependency(%q<activerecord>, [">= 2.3.3"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
-    s.add_dependency(%q<dm-core>, [">= 0.9.11"])
-    s.add_dependency(%q<do_sqlite3>, [">= 0.9.11"])
-    s.add_dependency(%q<sequel>, [">= 3.2.0"])
-    s.add_dependency(%q<rmagick>, [">= 2.10.0"])
-    s.add_dependency(%q<jnunemaker-mongomapper>, [">= 0.3.3"])
-    s.add_dependency(%q<hoe>, [">= 2.3.2"])
-  end
-end

data/lib/carrierwave/uploader/default_path.rb

@@ -1,24 +0,0 @@
-# encoding: utf-8
-
-module CarrierWave
-  module Uploader
-    module DefaultPath
-
-      def initialize(*args)
-        super
-        if default_path
-          puts "WARNING: Default Path is deprecated and will be removed in CarrierWave 0.4. Please use default_url instead!"
-          @file = CarrierWave::SanitizedFile.new(File.expand_path(default_path, public))
-          def @file.blank?; true; end
-        end
-      end
-
-      ##
-      # Override this method in your uploader to provide a default path
-      # in case no file has been cached/stored yet.
-      #
-      def default_path; end
-
-    end # DefaultPath
-  end # Uploader
-end # CarrierWave