carrierwave_direct 0.0.11 → 0.0.12

data/README.md

@@ -310,11 +310,11 @@ Validates that your mounted model has an avatar attached. This checks whether th
 
 Validates that the filename in the database is unique. Turned *on* by default
 
-      validates :avatar :filename_format => true
+      validates :avatar, :filename_format => true
 
 Validates that the uploaded filename is valid. As well as validating the extension against the `extension_white_list` it also validates that the `upload_dir` is correct. Turned *on* by default
 
-      validates :avatar :remote_net_url_format => true
+      validates :avatar, :remote_net_url_format => true
 
 Validates that the remote net url is valid. As well as validating the extension against the `extension_white_list` it also validates that url is valid and has only the schemes specified in the `url_scheme_whitelist`. Turned *on* by default
 

data/carrierwave_direct.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "carrierwave_direct"
 
   s.add_dependency "carrierwave"
-  s.add_dependency "uuid"
+  s.add_dependency "uuidtools"
   s.add_dependency "fog"
 
   s.add_development_dependency "rspec"

data/lib/carrierwave_direct.rb

@@ -3,10 +3,9 @@
 require "carrierwave_direct/version"
 
 require "carrierwave"
+require "uuidtools"
 require "fog"
 
-autoload :UUID, "uuid"
-
 module CarrierWaveDirect
 
   autoload :Uploader, "carrierwave_direct/uploader"

data/lib/carrierwave_direct/uploader.rb

@@ -22,8 +22,8 @@ module CarrierWaveDirect
     def direct_fog_url(options = {})
       fog_uri = CarrierWave::Storage::Fog::File.new(self, CarrierWave::Storage::Fog.new(self), nil).public_url
       if options[:with_path]
-        uri = URI.parse(fog_uri)
-        path = "#{key}"
+        uri = URI.parse(fog_uri.chomp('/'))
+        path = "/#{key}"
         uri.path += URI.escape(path)
         fog_uri = uri.to_s
       end
@@ -31,7 +31,7 @@ module CarrierWaveDirect
     end
 
     def guid
-      UUID.generate
+      UUIDTools::UUID.random_create
     end
 
     def key=(k)
@@ -42,7 +42,7 @@ module CarrierWaveDirect
     def key
       return @key if @key.present?
       if url.present?
-        self.key = CGI.unescape(URI.parse(url).path) # explicitly set key
+        self.key = URI.parse(URI.encode(url)).path # explicitly set key
       else
         @key = "#{store_dir}/#{guid}/#{FILENAME_WILDCARD}"
       end
@@ -61,7 +61,7 @@ module CarrierWaveDirect
       options[:expiration] ||= self.class.upload_expiration
       options[:min_file_size] ||= self.class.min_file_size
       options[:max_file_size] ||= self.class.max_file_size
-      
+
       conditions = [ ["starts-with", "$utf8", ""], ["starts-with", "$key", store_dir] ]
       conditions << ["starts-with", "$Content-Type", ""] if self.class.will_include_content_type
 

data/lib/carrierwave_direct/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
 module CarrierwaveDirect
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_direct
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: uuid
+  name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -200,13 +200,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 681164957
 requirements: []
 rubyforge_project: carrierwave_direct
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Upload direct to S3 using CarrierWave
-test_files: []
+test_files:
+- spec/action_view_extensions/form_helper_spec.rb
+- spec/form_builder_spec.rb
+- spec/mount_spec.rb
+- spec/orm/activerecord_spec.rb
+- spec/orm/indirect_activerecord_spec.rb
+- spec/spec_helper.rb
+- spec/support/carrier_wave_config.rb
+- spec/support/direct_uploader.rb
+- spec/support/form_builder_helpers.rb
+- spec/support/global_helpers.rb
+- spec/support/model_helpers.rb
+- spec/support/mounted_class.rb
+- spec/support/uploader_helpers.rb
+- spec/support/view_helpers.rb
+- spec/test/capybara_helpers_spec.rb
+- spec/test/helpers_spec.rb
+- spec/uploader_spec.rb