durran-carrierwave 0.3.2.3 → 0.4.3

data/spec/uploader/processing_spec.rb

@@ -46,6 +46,17 @@ describe CarrierWave::Uploader do
       @uploader.should_receive(:format).with('png')
       @uploader.process!
     end
+    
+    context "with 'enable_processing' set to false" do
+      it "should not do any processing" do
+        @uploader_class.enable_processing = false
+        @uploader_class.process :sepiatone, :desaturate, :invert
+        @uploader.should_not_receive(:sepiatone)
+        @uploader.should_not_receive(:desaturate)
+        @uploader.should_not_receive(:invert)
+        @uploader.process!
+      end
+    end
   end
 
   describe '#cache!' do

data/spec/uploader/store_spec.rb

@@ -13,43 +13,6 @@ describe CarrierWave::Uploader do
     FileUtils.rm_rf(public_path)
   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
-
-    it "should default to file" do
-      @uploader_class.storage.should == CarrierWave::Storage::File
-    end
-
-    it "should set the storage from the configured shortcuts if a symbol is given" do
-      @uploader_class.storage :file
-      @uploader_class.storage.should == CarrierWave::Storage::File
-    end
-
-    it "should remember the storage when inherited" do
-      @uploader_class.storage :s3
-      subclass = Class.new(@uploader_class)
-      subclass.storage.should == CarrierWave::Storage::S3
-    end
-
-    it "should be changeable when inherited" do
-      @uploader_class.storage :s3
-      subclass = Class.new(@uploader_class)
-      subclass.storage.should == CarrierWave::Storage::S3
-      subclass.storage :file
-      subclass.storage.should == CarrierWave::Storage::File
-    end
-  end
-
   describe '#store_dir' do
     it "should default to the config option" do
       @uploader.store_dir.should == 'uploads'
@@ -184,6 +147,27 @@ describe CarrierWave::Uploader do
       @uploader.file.should == @stored_file
     end
   end
+  
+  describe 'with an overridden filename' do
+    before do
+      @uploader_class.class_eval do
+        def filename; "foo.jpg"; end
+      end
+    end
+
+    it "should create new files if there is a file" do
+      @file = File.open(file_path('test.jpg'))
+      @uploader.store!(@file)
+      @path = ::File.expand_path(@uploader.store_path, @uploader.root)
+      File.exist?(@path).should be_true
+    end
+    
+    it "should not create new files if there is no file" do
+      @uploader.store!(nil)
+      @path = ::File.expand_path(@uploader.store_path, @uploader.root)
+      File.exist?(@path).should be_false
+    end
+  end
 
   describe 'with an overridden, reversing, filename' do
     before do
@@ -208,10 +192,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 +207,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: durran-carrierwave
 version: !ruby/object:Gem::Version 
-  version: 0.3.2.3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-28 00:00:00 -07:00
+date: 2009-12-28 00:00:00 -05: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
@@ -42,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.3.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.5
+    version: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
   type: :development
@@ -52,6 +72,26 @@ 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
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.11
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sequel
   type: :development
@@ -73,14 +113,44 @@ dependencies:
         version: 2.10.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mongomapper
+  name: mini_magick
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.3
+        version: 1.2.5
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mongo_mapper
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.8
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mongoid
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.10.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.6.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -90,9 +160,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.3.3
     version: 
-description: "* RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/]. * 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]"
+description: |-
+  * 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]
 email: 
 - jonas.nicklas@gmail.com
 executables: []
@@ -105,14 +179,12 @@ extra_rdoc_files:
 - features/fixtures/bork.txt
 - features/fixtures/monkey.txt
 - README.rdoc
-- LICENSE
 files: 
 - Generators
 - History.txt
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- carrierwave.gemspec
 - cucumber.yml
 - features/caching.feature
 - features/file_storage.feature
@@ -121,6 +193,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
@@ -145,29 +218,33 @@ files:
 - lib/carrierwave/mount.rb
 - lib/carrierwave/orm/activerecord.rb
 - lib/carrierwave/orm/datamapper.rb
+- lib/carrierwave/orm/mongoid.rb
 - lib/carrierwave/orm/mongomapper.rb
 - lib/carrierwave/orm/sequel.rb
 - lib/carrierwave/processing/image_science.rb
+- lib/carrierwave/processing/mini_magick.rb
 - lib/carrierwave/processing/rmagick.rb
 - lib/carrierwave/sanitized_file.rb
 - lib/carrierwave/storage/abstract.rb
 - lib/carrierwave/storage/file.rb
+- lib/carrierwave/storage/grid_fs.rb
+- lib/carrierwave/storage/right_s3.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
@@ -176,17 +253,27 @@ files:
 - script/generate
 - spec/compatibility/paperclip_spec.rb
 - spec/fixtures/bork.txt
+- spec/fixtures/landscape.jpg
+- spec/fixtures/portrait.jpg
 - spec/fixtures/test.jpeg
 - spec/fixtures/test.jpg
 - spec/mount_spec.rb
 - spec/orm/activerecord_spec.rb
 - spec/orm/datamapper_spec.rb
+- spec/orm/mongoid_spec.rb
 - spec/orm/mongomapper_spec.rb
 - spec/orm/sequel_spec.rb
+- spec/processing/image_science_spec.rb
+- spec/processing/mini_magick_spec.rb
+- spec/processing/rmagick_spec.rb
 - spec/sanitized_file_spec.rb
 - spec/spec_helper.rb
+- spec/storage/grid_fs_spec.rb
+- spec/storage/right_s3_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
 - spec/uploader/paths_spec.rb
@@ -196,9 +283,10 @@ files:
 - spec/uploader/store_spec.rb
 - spec/uploader/url_spec.rb
 - spec/uploader/versions_spec.rb
-- LICENSE
-has_rdoc: false
+has_rdoc: true
 homepage: http://carrierwave.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -219,10 +307,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: carrierwave
-rubygems_version: 1.2.0
+rubyforge_project: durran-carrierwave
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: "* RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/]"
+summary: "* RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/rdoc]"
 test_files: []
 

data/LICENSE

@@ -1,8 +0,0 @@
-Copyright © 2008 Jonas Nicklas
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

data/carrierwave.gemspec

@@ -1,57 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{carrierwave}
-  s.version = "0.3.2.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jonas Nicklas"]
-  s.date = %q{2009-08-28}
-  s.description = %q{* RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/].
-* 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", "LICENSE"]
-  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/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/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", "LICENSE"]
-  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/]}
-
-  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<dm-core>, [">= 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<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<dm-core>, [">= 0.9.11"])
-      s.add_dependency(%q<sequel>, [">= 3.2.0"])
-      s.add_dependency(%q<rmagick>, [">= 2.10.0"])
-      s.add_dependency(%q<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<dm-core>, [">= 0.9.11"])
-    s.add_dependency(%q<sequel>, [">= 3.2.0"])
-    s.add_dependency(%q<rmagick>, [">= 2.10.0"])
-    s.add_dependency(%q<mongomapper>, [">= 0.3.3"])
-    s.add_dependency(%q<hoe>, [">= 2.3.2"])
-  end
-end