carrierwave_direct 0.0.7 → 0.0.8

data/README.md

@@ -6,16 +6,16 @@
 
 [CarrierWaveDirect](https://github.com/dwilkie/carrierwave_direct) works on top of [CarrierWave](https://github.com/jnicklas/carrierwave) and provides a simple way to achieve this.
 
+## Example Application
+
+For a concrete example on how to use [CarrierWaveDirect](https://github.com/dwilkie/carrierwave_direct) in a Rails application check out the [Example Application](https://github.com/dwilkie/carrierwave_direct_example).
+
 ## Compatibility
 
 Right now, CarrierWaveDirect works with [Amazon S3](http://aws.amazon.com/s3/). Adding support for [Google Storage for Developers](http://code.google.com/apis/storage/) should be fairly straight forward since the direct upload form is essentially the same. Please see the contributing section if you would like support for Google Storage for Developers or any other service that provides direct upload capabilities.
 
 Please be aware that this gem (and S3 in general) only support single file uploads. If you want to upload multiple files simultaneously you'll have to use a javascript or flash uploader.
 
-## Information
-
-More information, and how-tos [available on the wiki](https://github.com/dwilkie/carrierwave_direct/wiki)
-
 ## Installation
 
 Install the latest release:
@@ -32,7 +32,7 @@ Note that CarrierWaveDirect is not compatible with Rails 2.
 
 Please read the [CarrierWave readme](https://github.com/jnicklas/carrierwave) first
 
-CarrierWaveDirect works with [fog](https://github.com/geemus/fog) so make sure you have [CarrierWave](https://github.com/jnicklas/carrierwave) set up and initialized with your fog credentials, for example:
+CarrierWaveDirect works with [fog](https://github.com/fog/fog) so make sure you have [CarrierWave](https://github.com/jnicklas/carrierwave) set up and initialized with your fog credentials, for example:
 
     CarrierWave.configure do |config|
       config.fog_credentials = {
@@ -41,10 +41,9 @@ CarrierWaveDirect works with [fog](https://github.com/geemus/fog) so make sure y
         :aws_secret_access_key  => 'yyy',       # required
         :region                 => 'eu-west-1'  # optional, defaults to 'us-east-1'
       }
-      config.fog_directory  = 'name_of_directory'                     # required
-      config.fog_host       = 'https://assets.example.com'            # optional, defaults to nil
-      config.fog_public     = false                                   # optional, defaults to true
-      config.fog_attributes = {'Cache-Control'=>'max-age=315576000'}  # optional, defaults to {}
+      config.fog_directory  = 'name_of_your_aws_bucket' # required
+      # see https://github.com/jnicklas/carrierwave#using-amazon-s3
+      # for more optional configuration
     end
 
 If you haven't already done so generate an uploader
@@ -376,12 +375,15 @@ The Active Record validations use the Rails i18n framework. Add these keys to yo
           carrierwave_direct_filename_taken: filename was already taken
           carrierwave_direct_upload_missing: upload is missing
           carrierwave_direct_attachment_missing: attachment is missing
-          carrierwave_direct_filename_invalid: is invalid. Allowed file types are %{extension_white_list}
-          carrierwave_direct_remote_net_url_invalid: is invalid. Allowed file types are %{extension_white_list}. Allowed url schemes are %{url_scheme_white_list}
+          carrierwave_direct_filename_invalid: "is invalid. "
+          carrierwave_direct_allowed_extensions: Allowed file types are %{extensions}
+          carrierwave_direct_allowed_schemes: Allowed schemes are %{schemes}
 
 ## Caveats
 
-Don't name your string column `file`. It will result in a stack level too deep exception. See [this issue](https://github.com/dwilkie/carrierwave_direct/issues/10) for more info
+Don't name your string column `file`. It will result in a stack level too deep exception. See [this issue](https://github.com/dwilkie/carrierwave_direct/issues/10) for more info.
+
+If you're Rails app was newly generated *after* version 3.2.3 and your testing this in development you may run into an issue where an `ActiveModel::MassAssignmentSecurity::Error` is raised when being redirected from S3. You can fix this by setting `config.active_record.mass_assignment_sanitizer = :logger` in your `config/environments/development.rb` file.
 
 ## Contributing to CarrierWaveDirect
 
@@ -404,3 +406,6 @@ You should now be able to run the tests
 * [jgorset (Johannes Gorset)](https://github.com/jgorset) - Added note about removing 'store_dir' in README
 * [frahugo (Hugo Frappier)](https://github.com/frahugo) - Fix bug where CarrierWaveDirect Validations were being added to non CarrierWaveDirect ActiveRecord models
 * [bak (Benjamin Cullen-Kerney)](https://github.com/bak) - Fix bug where CarrierWaveDirect specific methods were being added to non CarrierWaveDirect ActiveRecord models
+* [rhalff (Rob Halff)](https://github.com/rhalff) - Doc fix
+* [nicknovitski (Nick Novitski)](https://github.com/nicknovitski) - Update old link in README
+* [gabrielengel (Gabriel Engel)](https://github.com/gabrielengel) - Refactor I18n not to use procs

data/lib/carrierwave_direct/locale/en.yml

@@ -4,4 +4,6 @@ en:
       carrierwave_direct_filename_taken: filename was already taken
       carrierwave_direct_upload_missing: upload is missing
       carrierwave_direct_attachment_missing: attachment is missing
-
+      carrierwave_direct_filename_invalid: "is invalid. "
+      carrierwave_direct_allowed_extensions: Allowed file types are %{extensions}
+      carrierwave_direct_allowed_schemes: Allowed schemes are %{schemes}

data/lib/carrierwave_direct/uploader.rb

@@ -40,11 +40,17 @@ module CarrierWaveDirect
     end
 
     def key
-      @key ||= "#{store_dir}/#{guid}/#{FILENAME_WILDCARD}"
+      return @key if @key.present?
+      if url.present?
+        self.key = URI.parse(url).path # explicitly set key
+      else
+        @key = "#{store_dir}/#{guid}/#{FILENAME_WILDCARD}"
+      end
+      @key
     end
 
     def has_key?
-      @key.present? && !(@key =~ /#{Regexp.escape(FILENAME_WILDCARD)}\z/)
+      key !~ /#{Regexp.escape(FILENAME_WILDCARD)}\z/
     end
 
     def acl

data/lib/carrierwave_direct/validations/active_model.rb

@@ -22,11 +22,14 @@ module CarrierWaveDirect
       class FilenameFormatValidator < ::ActiveModel::EachValidator
         def validate_each(record, attribute, value)
           if record.new_record? && record.send("has_#{attribute}_upload?") && record.key !~ record.send(attribute).key_regexp
-            record.errors.add(
-              attribute,
-              :carrierwave_direct_filename_invalid,
-              :extension_white_list => record.send(attribute).extension_white_list
-            )
+            extensions = record.send(attribute).extension_white_list
+            message = I18n.t("errors.messages.carrierwave_direct_filename_invalid")
+
+            if extensions.present?
+              message += I18n.t("errors.messages.carrierwave_direct_allowed_extensions", :extensions => extensions.to_sentence)
+            end
+
+            record.errors.add(attribute, message)
           end
         end
       end
@@ -37,13 +40,21 @@ module CarrierWaveDirect
             remote_net_url = record.send("remote_#{attribute}_net_url")
             uploader = record.send(attribute)
             url_scheme_white_list = uploader.url_scheme_white_list
+
             if (remote_net_url !~ URI.regexp(url_scheme_white_list) || remote_net_url !~ /#{uploader.extension_regexp}\z/)
-              record.errors.add(
-                :"remote_#{attribute}_net_url",
-                :carrierwave_direct_remote_net_url_invalid,
-                :extension_white_list => uploader.extension_white_list,
-                :url_scheme_white_list => url_scheme_white_list
-              )
+              extensions = uploader.extension_white_list
+
+              message = I18n.t("errors.messages.carrierwave_direct_filename_invalid")
+
+              if extensions.present?
+                message += I18n.t("errors.messages.carrierwave_direct_allowed_extensions", :extensions => extensions.to_sentence)
+              end
+
+              if url_scheme_white_list.present?
+                message += I18n.t("errors.messages.carrierwave_direct_allowed_schemes", :schemes => url_scheme_white_list.to_sentence)
+              end
+
+              record.errors.add(:"remote_#{attribute}_net_url", message)
             end
           end
         end
@@ -123,4 +134,3 @@ module CarrierWaveDirect
 end
 
 Dir[File.dirname(__FILE__) << "/../locale/*.*"].each {|file| I18n.load_path << file }
-

data/lib/carrierwave_direct/version.rb

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

data/spec/orm/activerecord_spec.rb

@@ -72,7 +72,8 @@ describe CarrierWaveDirect::ActiveRecord do
       it "should use i18n for the error messages" do
         subject.valid?
         subject.errors[:video].should == [
-          I18n.t("errors.messages.carrierwave_direct_filename_invalid", :extension_white_list => %w{avi mp4})
+          I18n.t("errors.messages.carrierwave_direct_filename_invalid") +
+          I18n.t("errors.messages.carrierwave_direct_allowed_extensions", :extensions => %w{avi mp4}.to_sentence)
         ]
       end
     end
@@ -80,7 +81,22 @@ describe CarrierWaveDirect::ActiveRecord do
     shared_examples_for "a remote net url i18n error message" do
       it "should use i18n for the error messages" do
         subject.valid?
-        subject.errors[:remote_video_net_url].should == [I18n.t("errors.messages.carrierwave_direct_remote_net_url_invalid", i18n_options)]
+
+        messages = I18n.t("errors.messages.carrierwave_direct_filename_invalid")
+
+        if i18n_options
+          if i18n_options[:extension_white_list]
+            extensions = i18n_options[:extension_white_list].to_sentence
+            messages += I18n.t("errors.messages.carrierwave_direct_allowed_extensions", :extensions => extensions)
+          end
+
+           if i18n_options[:url_scheme_white_list]
+            schemes = i18n_options[:url_scheme_white_list].to_sentence
+            messages += I18n.t("errors.messages.carrierwave_direct_allowed_schemes", :schemes => schemes)
+          end
+        end
+
+        subject.errors[:remote_video_net_url].should == [ messages ]
       end
     end
 
@@ -548,4 +564,3 @@ describe CarrierWaveDirect::ActiveRecord do
     end
   end
 end
-

data/spec/spec_helper.rb

@@ -8,3 +8,6 @@ require File.dirname(__FILE__) << '/support/view_helpers' # Catch dependency ord
 
 Dir[ File.dirname(__FILE__) << "/support/**/*.rb"].each {|file| require file }
 
+RSpec.configure do |c|
+  c.treat_symbols_as_metadata_keys_with_true_values = true
+end

data/spec/uploader_spec.rb

@@ -21,7 +21,8 @@ describe CarrierWaveDirect::Uploader do
     :mounted_as => :video,
     :filename => "filename",
     :extension => ".avi",
-    :version => :thumb
+    :version => :thumb,
+    :s3_bucket_url => "https://s3-bucket.s3.amazonaws.com"
   }
 
   SAMPLE_DATA.merge!(
@@ -37,6 +38,10 @@ describe CarrierWaveDirect::Uploader do
     :s3_key => "#{sample(:store_dir)}/#{sample(:stored_filename)}"
   )
 
+  SAMPLE_DATA.merge!(
+    :s3_file_url => "#{sample(:s3_bucket_url)}/#{sample(:s3_key)}"
+  )
+
   SAMPLE_DATA.freeze
 
   let(:subject) { DirectUploader.new }
@@ -105,6 +110,21 @@ describe CarrierWaveDirect::Uploader do
           mounted_subject.key.should =~ /^#{sample(:store_dir)}\/#{GUID_REGEXP}\/\$\{filename\}$/
         end
       end
+
+      context "but the uploaders url is '#{sample(:s3_file_url)}'" do
+        before do
+          mounted_subject.stub(:url).and_return(sample(:s3_file_url))
+        end
+
+        it "should return '/#{sample(:s3_key)}'" do
+          mounted_subject.key.should == "/#{sample(:s3_key)}"
+        end
+
+        it "should set the key explicitly in order to update the version keys" do
+          mounted_subject.should_receive("key=").with("/#{sample(:s3_key)}")
+          mounted_subject.key
+        end
+      end
     end
 
     context "where the key is set to '#{sample(:key)}'" do
@@ -284,20 +304,20 @@ describe CarrierWaveDirect::Uploader do
           mounted_subject.filename
         end
       end
-      
+
       context "and the model's remote #{sample(:mounted_as)} url has whitespace in it" do
         before do
           mounted_model.stub(
             "remote_#{mounted_subject.mounted_as}_url"
           ).and_return("http://anyurl.com/any_path/video_dir/filename 2.avi")
         end
-        
+
         it "should be sanitized (whitespace replaced with _)" do
           mounted_subject.filename
           mounted_subject.key.should =~ /filename_2.avi$/
         end
       end
-      
+
       context "and the model's remote #{sample(:mounted_as)} url is blank" do
         before do
           mounted_model.stub(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_direct
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000Z
+date: 2012-11-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &79942990 !ruby/object:Gem::Requirement
+  requirement: &80672100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79942990
+  version_requirements: *80672100
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &79925320 !ruby/object:Gem::Requirement
+  requirement: &80671730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79925320
+  version_requirements: *80671730
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &79924230 !ruby/object:Gem::Requirement
+  requirement: &80671380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79924230
+  version_requirements: *80671380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &79923830 !ruby/object:Gem::Requirement
+  requirement: &80671060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79923830
+  version_requirements: *80671060
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &79923400 !ruby/object:Gem::Requirement
+  requirement: &80670780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79923400
+  version_requirements: *80670780
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &79922550 !ruby/object:Gem::Requirement
+  requirement: &80670500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79922550
+  version_requirements: *80670500
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &79920990 !ruby/object:Gem::Requirement
+  requirement: &80670220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79920990
+  version_requirements: *80670220
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &79920000 !ruby/object:Gem::Requirement
+  requirement: &80669910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79920000
+  version_requirements: *80669910
 description: Process your uploads in the background by uploading directly to S3
 email:
 - dwilkie@gmail.com
@@ -116,7 +116,6 @@ files:
 - lib/carrierwave_direct.rb
 - lib/carrierwave_direct/action_view_extensions/form_helper.rb
 - lib/carrierwave_direct/form_builder.rb
-- lib/carrierwave_direct/locale/en.rb
 - lib/carrierwave_direct/locale/en.yml
 - lib/carrierwave_direct/mount.rb
 - lib/carrierwave_direct/orm/activerecord.rb
@@ -155,12 +154,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 763991155
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 763991155
 requirements: []
 rubyforge_project: carrierwave_direct
 rubygems_version: 1.8.10

data/lib/carrierwave_direct/locale/en.rb

@@ -1,22 +0,0 @@
-# encoding: utf-8
-
-{
-  :en => {
-    :errors => {
-      :messages => {
-        :carrierwave_direct_filename_invalid => lambda {|key, options|
-          message = "is invalid"
-          message << ". Allowed file types are #{options[:extension_white_list].to_sentence}" if options[:extension_white_list] && options[:extension_white_list].any?
-          message
-        },
-        :carrierwave_direct_remote_net_url_invalid => lambda {|key, options|
-          message = "is invalid"
-          message << ". Allowed file types are #{options[:extension_white_list].to_sentence}" if options[:extension_white_list] && options[:extension_white_list].any?
-          message << ". Allowed url schemes are #{options[:url_scheme_white_list].to_sentence}" if options[:url_scheme_white_list] && options[:url_scheme_white_list].any?
-          message
-        }
-      }
-    }
-  }
-}
-