jnicklas-carrierwave 0.3.2 → 0.3.2.1

data/README.rdoc

@@ -1,11 +1,18 @@
 = CarrierWave
 
+http://carrierwave.rubyforge.org
+
+== Summary
+
 This plugin for Merb and Rails provides a simple and extremely flexible way to
 upload files.
 
+== 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]
 
 == Getting Started
 

data/Rakefile

@@ -1,115 +1,29 @@
-require 'rubygems'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-gem 'rdoc', '>=2.4.0'
-require 'rdoc'
-begin
-  require 'sdoc'
-rescue LoadError
-end
-
-require 'spec/rake/spectask'
-require 'spec/rake/verify_rcov'
-require 'cucumber/rake/task'
-
-NAME = "carrierwave"
-GEM_VERSION = "0.3.2"
-AUTHOR = "Jonas Nicklas"
-EMAIL = "jonas.nicklas@gmail.com"
-HOMEPAGE = "http://www.example.com"
-SUMMARY = "Simple and powerful uploads for Merb and Rails"
-
-spec = Gem::Specification.new do |s|
-  s.rubyforge_project = 'carrierwave'
-  s.name = NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.require_path = 'lib'
-  s.files = %w(LICENSE Generators README.rdoc Rakefile TODO) + Dir.glob("{lib,spec,rails_generators}/**/*")
-  
-end
-
-# Try these:
-#
-# rake features
-# rake features PROFILE=html
-Cucumber::Rake::Task.new do |t|
-  profile = ENV['PROFILE'] || 'default'
-  t.cucumber_opts = "--profile #{profile}"
-end
-
-Rake::RDocTask.new do |rd|
-  rd.main = "README.rdoc"
-  rd.title = "CarrierWave"
-  rd.template = 'direct'
-  rd.options << "--diagram" if ENV["DIAGRAM"]
-  rd.rdoc_dir = File.join(File.dirname(__FILE__), 'doc')
-  rd.rdoc_files.include("README.rdoc", "LICENSE", "TODO", 'lib/carrierwave/**/*.rb')
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "install the plugin locally"
-task :install => [:package] do
-  sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources}
-end
-
-desc "create a gemspec file"
-task :make_spec do
-  File.open("#{NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
-end
-
-namespace :jruby do
-
-  desc "Run :package and install the resulting .gem with jruby"
-  task :install => :package do
-    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
-  end
-
-end
-
-file_list = FileList['spec/**/*_spec.rb']
-
-desc "Run all examples"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_files = file_list
-end
-
-RCov::VerifyTask.new(:verify_coverage => "spec:rcov") do |t|
-  t.threshold = 95.64
-  t.index_html = 'doc/coverage/index.html'
-end
-
-namespace :spec do
-  desc "Run all examples with RCov"
-  Spec::Rake::SpecTask.new('rcov') do |t|
-    t.spec_files = file_list
-    t.rcov = true
-    t.rcov_dir = "doc/coverage"
-    t.rcov_opts = ['--exclude', 'spec,features,lib/generators,gems/*']
-  end
-  
-  desc "Generate an html report"
-  Spec::Rake::SpecTask.new('report') do |t|
-    t.spec_files = file_list
-    t.spec_opts = ["--format", "html:doc/reports/specs.html"]
-    t.fail_on_error = false
-  end
-
-end
-
-task :superspec => [:spec, :features]
-
-desc 'Default: run unit tests and features.'
-task :default => 'superspec'
+require 'rubygems'
+gem 'hoe', '>= 2.1.0'
+require 'hoe'
+require 'fileutils'
+require './lib/carrierwave'
+
+Hoe.plugin :newgem
+# Hoe.plugin :website
+Hoe.plugin :cucumberfeatures
+
+$hoe = Hoe.spec '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 << ['rspec', '>=1.2.8']
+  self.extra_dev_deps << ['cucumber', '>=0.3.96']
+  self.extra_dev_deps << ['activerecord', '>=2.3.3']
+  self.extra_dev_deps << ['dm-core', '>=0.9.11']
+  self.extra_dev_deps << ['sequel', '>=3.2.0']
+  self.extra_dev_deps << ['rmagick', '>=2.10.0']
+  self.extra_rdoc_files << 'README.rdoc'
+  self.extra_rdoc_files << 'LICENSE'
+end
+
+require 'newgem/tasks'
+Dir['tasks/**/*.rake'].each { |t| load t }
+
+task :default => [:spec, :features]

data/lib/carrierwave.rb

@@ -6,6 +6,9 @@ require 'carrierwave/core_ext/module_setup'
 require 'carrierwave/core_ext/inheritable_attributes'
 
 module CarrierWave
+
+  VERSION = "0.3.2"
+
   class << self
     attr_accessor :config, :logger
 

data/lib/carrierwave/processing/rmagick.rb

@@ -1,9 +1,11 @@
 # encoding: utf-8
 
-begin
-  require 'rmagick'
-rescue LoadError
-  require 'RMagick'
+unless Module.const_defined?('Magick')
+  begin
+    require 'rmagick'
+  rescue LoadError
+    require 'RMagick'
+  end
 end
 
 module CarrierWave

data/lib/carrierwave/storage/abstract.rb

@@ -14,19 +14,19 @@ module CarrierWave
       def initialize(uploader)
         @uploader = uploader
       end
-      
+
       def self.setup!; end
-      
+
       def identifier
         uploader.filename
       end
-      
+
       def store!(file)
       end
-      
+
       def retrieve!(identifier)
       end
-      
+
     end # Abstract
   end # Storage
 end # CarrierWave

data/lib/carrierwave/storage/s3.rb

@@ -29,6 +29,18 @@ module CarrierWave
     #
     # The default is :public_read, it should work in most cases.
     #
+    # You can change the generated url to a cnamed domain by setting the cnamed config:
+    #
+    #     CarrierWave.config[:s3][:cnamed] = true
+    #
+    # No the resulting url will be
+    #     
+    #     http://bucket_name.domain.tld/path/to/file
+    #
+    # instead of
+    #
+    #     http://s3.amazonaws.com/bucket_name.domain.tld/path/to/file
+    #
     class S3 < Abstract
 
       class File
@@ -86,7 +98,11 @@ module CarrierWave
         # [String] file's url
         #
         def url
-          ["http://s3.amazonaws.com", bucket, @path].compact.join('/')
+          if CarrierWave::config[:s3][:cnamed]
+            ["http://", bucket, @path].compact.join('/')
+          else
+            ["http://s3.amazonaws.com", bucket, @path].compact.join('/')
+          end
         end
 
         def about

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnicklas-carrierwave
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.2.1
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -22,13 +22,11 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 - LICENSE
-- TODO
 files: 
 - LICENSE
 - Generators
 - README.rdoc
 - Rakefile
-- TODO
 - lib/carrierwave
 - lib/carrierwave/compatibility
 - lib/carrierwave/compatibility/paperclip.rb
@@ -100,6 +98,7 @@ files:
 - rails_generators/uploader/USAGE
 has_rdoc: true
 homepage: http://www.example.com
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -120,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: carrierwave
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Simple and powerful uploads for Merb and Rails