dsturnbull-carrierwave 0.4.6 → 0.4.7

data/Rakefile

@@ -1,38 +1,35 @@
-require 'rubygems'
-gem 'hoe', '>= 2.1.0'
-require 'hoe'
-require 'fileutils'
+require 'rake'
+require 'spec'
+require 'spec/rake/spectask'
+require 'cucumber/rake/task'
+
 $:.unshift File.join(File.dirname(__FILE__), 'lib')
 require 'carrierwave'
 
-Hoe.plugin :newgem
-# Hoe.plugin :website
-Hoe.plugin :cucumberfeatures
+Dir['tasks/**/*.rake'].each { |t| load t }
 
-$hoe = Hoe.spec 'dsturnbull-carrierwave' do
-  self.developer 'Jonas Nicklas', 'jonas.nicklas@gmail.com'
-  self.rubyforge_name = self.name
-  self.readme_file = 'README.rdoc'
-  self.version = CarrierWave::VERSION
-  self.extra_dev_deps << ['newgem', '>=1.5.2']
-  self.extra_dev_deps << ['rspec', '>=1.2.8']
-  self.extra_dev_deps << ['cucumber', '>=0.3.96']
-  self.extra_dev_deps << ['activerecord', '>=2.3.3']
-  self.extra_dev_deps << ['sqlite3-ruby', '>=1.2.5']
-  self.extra_dev_deps << ['dm-core', '>=0.9.11']
-  self.extra_dev_deps << ['data_objects', '>=0.9.12']
-  self.extra_dev_deps << ['do_sqlite3', '>=0.9.11']
-  self.extra_dev_deps << ['sequel', '>=3.2.0']
-  self.extra_dev_deps << ['rmagick', '>=2.10.0']
-  self.extra_dev_deps << ['mini_magick', '>=1.2.5']
-  self.extra_dev_deps << ['mongo_mapper', '>=0.6.8']
-  self.extra_dev_deps << ['mongoid', '>=0.10.4']
-  self.extra_dev_deps << ['aws-s3', '>=0.6.2']
-  self.extra_dev_deps << ['timecop', '>=0.3.4']
-  self.extra_rdoc_files << 'README.rdoc'
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_opts = %w(-fs -c)
+  t.spec_files = FileList['spec/*_spec.rb']
 end
 
-require 'newgem/tasks'
-Dir['tasks/**/*.rake'].each { |t| load t }
+Cucumber::Rake::Task.new(:features, 'Run features that should pass') do |t|
+  t.profile = 'default'
+end
 
 task :default => [:spec, :features]
+
+require 'jeweler'
+Jeweler::Tasks.new do |s|
+  s.name = 'dsturnbull-carrierwave'
+  s.summary = 'fork of carrierwave'
+  s.email = 'dsturnbull@me.com'
+  s.homepage = 'http://github.com/dsturnbull/carrierwave'
+  s.description =<<-eod
+    Fork with some nice features
+  eod
+  s.executables = []
+  s.authors = ['David Turnbull']
+  s.files = FileList['**/**']
+  s.version = CarrierWave::VERSION
+end

data/dsturnbull-carrierwave.gemspec

@@ -0,0 +1,178 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{dsturnbull-carrierwave}
+  s.version = "0.4.7"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["David Turnbull"]
+  s.date = %q{2010-05-07}
+  s.description = %q{    Fork with some nice features
+}
+  s.email = %q{dsturnbull@me.com}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    "Generators",
+     "History.txt",
+     "Manifest.txt",
+     "README.rdoc",
+     "Rakefile",
+     "cucumber.yml",
+     "dsturnbull-carrierwave.gemspec",
+     "features/caching.feature",
+     "features/download.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/grid_fs_storage.feature",
+     "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/download_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/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/configuration.rb",
+     "lib/carrierwave/uploader/default_url.rb",
+     "lib/carrierwave/uploader/download.rb",
+     "lib/carrierwave/uploader/extension_whitelist.rb",
+     "lib/carrierwave/uploader/mountable.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",
+     "merb_generators/uploader_generator.rb",
+     "pkg/carrierwave-0.4.5.gem",
+     "pkg/dsturnbull-carrierwave-0.4.5.gem",
+     "pkg/dsturnbull-carrierwave-0.4.6.gem",
+     "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/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/configuration_spec.rb",
+     "spec/uploader/default_url_spec.rb",
+     "spec/uploader/download_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://github.com/dsturnbull/carrierwave}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{fork of carrierwave}
+  s.test_files = [
+    "spec/compatibility/paperclip_spec.rb",
+     "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/configuration_spec.rb",
+     "spec/uploader/default_url_spec.rb",
+     "spec/uploader/download_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"
+  ]
+
+  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
+    else
+    end
+  else
+  end
+end
+

data/lib/carrierwave.rb

@@ -7,7 +7,7 @@ require 'carrierwave/core_ext/inheritable_attributes'
 
 module CarrierWave
 
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 
   class << self
     attr_accessor :root

data/lib/carrierwave/storage/s3.rb

@@ -69,7 +69,7 @@ module CarrierWave
 
         def initialize(uploader, path)
           @uploader = uploader
-          @path = path
+          @path = File.mangle_path_for_s3(path)
         end
 
         ##
@@ -148,6 +148,12 @@ module CarrierWave
           @s3_object ||= AWS::S3::S3Object.find(@path, @uploader.s3_bucket)
         end
 
+        def self.mangle_path_for_s3(path)
+          if path
+            ::File.join(::File.dirname(path), CGI.escape(::File.basename(path)))
+          end
+        end
+
       end
 
       ##
@@ -165,7 +171,7 @@ module CarrierWave
         connect!(uploader)
         s3_options = {:access => uploader.s3_access, :content_type => file.content_type}
         s3_options.merge!(uploader.s3_headers)
-        AWS::S3::S3Object.store(uploader.store_path, file.read, uploader.s3_bucket, s3_options)
+        AWS::S3::S3Object.store(File.mangle_path_for_s3(uploader.store_path), file.read, uploader.s3_bucket, s3_options)
         CarrierWave::Storage::S3::File.new(uploader, uploader.store_path)
       end
 
@@ -180,6 +186,7 @@ module CarrierWave
       #
       # [CarrierWave::Storage::S3::File] the stored file
       #
+      # FIXME maybe need to mangle here, too
       def retrieve!(identifier)
         connect!(uploader)
         CarrierWave::Storage::S3::File.new(uploader, uploader.store_path(identifier))

metadata

@@ -1,214 +1,30 @@
 --- !ruby/object:Gem::Specification 
 name: dsturnbull-carrierwave
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
-- Jonas Nicklas
+- David Turnbull
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 +11:00
+date: 2010-05-07 00:00:00 +10:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.0
-    version: 
-- !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
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.8
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.96
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !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
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !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
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.2.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rmagick
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.10.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mini_magick
-  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: 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: timecop
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.4
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
-    version: 
-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]
-  * Check out the {example app}[http://github.com/jnicklas/carrierwave-example-app]
-email: 
-- jonas.nicklas@gmail.com
+dependencies: []
+
+description: "    Fork with some nice features\n"
+email: dsturnbull@me.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- features/fixtures/bork.txt
-- features/fixtures/monkey.txt
 - README.rdoc
 files: 
 - Generators
@@ -217,6 +33,7 @@ files:
 - README.rdoc
 - Rakefile
 - cucumber.yml
+- dsturnbull-carrierwave.gemspec
 - features/caching.feature
 - features/download.feature
 - features/file_storage.feature
@@ -279,6 +96,9 @@ files:
 - lib/carrierwave/uploader/url.rb
 - lib/carrierwave/uploader/versions.rb
 - merb_generators/uploader_generator.rb
+- pkg/carrierwave-0.4.5.gem
+- pkg/dsturnbull-carrierwave-0.4.5.gem
+- pkg/dsturnbull-carrierwave-0.4.6.gem
 - rails_generators/uploader/USAGE
 - rails_generators/uploader/templates/uploader.rb
 - rails_generators/uploader/uploader_generator.rb
@@ -319,33 +139,61 @@ files:
 - spec/uploader/url_spec.rb
 - spec/uploader/versions_spec.rb
 has_rdoc: true
-homepage: http://carrierwave.rubyforge.org
+homepage: http://github.com/dsturnbull/carrierwave
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: dsturnbull-carrierwave
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: "* RDoc Documentation {available at Rubyforge}[http://carrierwave.rubyforge.org/rdoc]"
-test_files: []
-
+summary: fork of carrierwave
+test_files: 
+- spec/compatibility/paperclip_spec.rb
+- 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/configuration_spec.rb
+- spec/uploader/default_url_spec.rb
+- spec/uploader/download_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