carrierwave_direct 0.0.5 → 0.0.6

data/README.md

@@ -69,31 +69,51 @@ Remove the line `storage :file` and replace it with `include CarrierWaveDirect::
 
 This adds the extra functionality for direct uploading.
 
-If you're *not* using Rails you can generate a direct upload form to S3 similar to this (see also [http://doc.s3.amazonaws.com/proposals/post.html#A_Sample_Form](http://doc.s3.amazonaws.com/proposals/post.html#A_Sample_Form)):
-
-    <form action="https://s3-bucket.s3.amazonaws.com/" method="post" enctype="multipart/form-data">
-      <input type="hidden" name="key" value="uploads/${filename}">
-      <input type="hidden" name="AWSAccessKeyId" value="YOUR_AWS_ACCESS_KEY">
-      <input type="hidden" name="acl" value="private">
-      <input type="hidden" name="success_action_redirect" value="http://localhost/">
-      <input type="hidden" name="policy" value="YOUR_POLICY_DOCUMENT_BASE64_ENCODED">
-      <input type="hidden" name="signature" value="YOUR_CALCULATED_SIGNATURE">
-      <input name="file" type="file">
-      <input type="submit" value="Upload to S3">
-    </form>
-
-by making use of the following methods in your uploader:
-
-    uploader = AvatarUploader.new
-
-    uploader.direct_fog_url           # return the url to post to based off your bucket name
-    uploader.key                      # returns a key based off your store_dir
-    uploader.aws_access_key_id        # returns your aws_access_key_id from your fog configuration
-    uploader.acl                      # returns your acl from your fog configuration
-    uploader.success_action_redirect= # sets the success action redirect url
-    uploader.success_action_redirect  # gets the success action redirect url
-    uploader.policy                   # a base 64 encoded policy document
-    uploader.signature                # your signature
+Finally, remove the `store_dir` method in order to default CarrierWaveDirect to its own storage directory.
+
+If you're *not* using Rails you can generate a direct upload form to S3 similar to [this example](http://doc.s3.amazonaws.com/proposals/post.html#A_Sample_Form)) by making use of the CarrierWaveDirect helper methods.
+
+### Sinatra
+
+Here is an example using Sinatra and Haml
+
+    # uploader_test.rb
+
+    CarrierWave.configure do |config|
+      config.fog_credentials = {
+        :provider               => 'AWS',
+        :aws_access_key_id      => ENV['AWS_ACCESS_KEY_ID'],
+        :aws_secret_access_key  => ENV['AWS_SECRET_ACCESS_KEY']
+      }
+      config.fog_directory  = ENV['AWS_FOG_DIRECTORY'] # bucket name
+    end
+
+    class ImageUploader < CarrierWave::Uploader::Base
+      include CarrierWaveDirect::Uploader
+    end
+
+    class UploaderTest < Sinatra::Base
+      get "/" do
+        @uploader = ImageUploader.new
+        @uploader.success_action_redirect = request.url
+        haml :index
+      end
+    end
+
+    # index.haml
+
+    %form{:action => @uploader.direct_fog_url, :method => "post", :enctype => "multipart/form-data"}
+      %input{:name => "utf8", :type => "hidden"}
+      %input{:type => "hidden", :name => "key", :value => @uploader.key}
+      %input{:type => "hidden", :name => "AWSAccessKeyId", :value => @uploader.aws_access_key_id}
+      %input{:type => "hidden", :name => "acl", :value => @uploader.acl}
+      %input{:type => "hidden", :name => "success_action_redirect", :value => @uploader.success_action_redirect}
+      %input{:type => "hidden", :name => "policy", :value => @uploader.policy}
+      %input{:type => "hidden", :name => "signature", :value => @uploader.signature}
+      %input{:name => "file", :type => "file"}
+      %input{:type => "submit", :value => "Upload to S3"}
+
+### Rails
 
 If you *are* using Rails and you've mounted your uploader like this:
 
@@ -217,7 +237,7 @@ Your users may find it convenient to upload a file from a location on the Intern
 
     <%= form_for @user do |f| %>
       <%= f.hidden_field :key %>
-      <% unless @hangover.has_avatar_upload? %>
+      <% unless @user.has_avatar_upload? %>
         <%= f.label :remote_avatar_net_url %>
         <%= f.text_field :remote_avatar_net_url %>
       <%= f.submit %>
@@ -308,13 +328,13 @@ To attach a file to the direct upload form you can use
 
 To simulate a successful upload and redirect to S3 you can use
 
-    upload_directly(AvatarUploader, "Upload to S3")
+    upload_directly(AvatarUploader.new, "Upload to S3")
 
 This will click the Upload to S3 button on the form and redirect you to the `success_action_redirect` url (in the form) with a sample response from S3
 
 To simulate an unsuccessful upload you can pass `:success => false` and you'll remain on the upload page e.g.
 
-    upload_directly(AvatarUploader, "Upload to S3", :success => false)
+    upload_directly(AvatarUploader.new, "Upload to S3", :success => false)
 
 You can also use `find_key` and `find_upload_path` to get the key and upload path from the form
 
@@ -356,8 +376,8 @@ 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. 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}
 
 ## Caveats
 
@@ -381,3 +401,5 @@ You should now be able to run the tests
 * [tylr (Tyler Love)](https://github.com/tylr) - Bug fix
 * [vlado (Vlado Cingel)](https://github.com/vlado) - Properly sanitize filename
 * [travisp (Travis Pew)](https://github.com/travisp) - Compatibility for CarrierWave 0.6.0
+* [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

data/lib/carrierwave_direct/orm/activerecord.rb

@@ -1,5 +1,8 @@
 # encoding: utf-8
 
+# This file tests that a ActiveRecord class that uses a standard CarrierWave uploader
+# does not get CarrierWaveDirect validators.
+
 require 'active_record'
 require 'carrierwave_direct/validations/active_model'
 
@@ -10,6 +13,9 @@ module CarrierWaveDirect
     def mount_uploader(column, uploader=nil, options={}, &block)
       super
 
+      # Don't go further unless the class included CarrierWaveDirect::Uploader
+      return unless uploader.ancestors.include?(CarrierWaveDirect::Uploader)
+
       uploader.instance_eval <<-RUBY, __FILE__, __LINE__+1
         include ActiveModel::Conversion
         extend ActiveModel::Naming

data/lib/carrierwave_direct/version.rb

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

data/spec/orm/indirect_activerecord_spec.rb

@@ -0,0 +1,68 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require 'carrierwave/orm/activerecord'
+require 'carrierwave_direct/orm/activerecord'
+
+describe CarrierWave::ActiveRecord do
+  dbconfig = {
+    :adapter => 'sqlite3',
+    :database => ':memory:'
+  }
+
+  class OtherTestMigration < ActiveRecord::Migration
+    def self.up
+      create_table :other_parties, :force => true do |t|
+        t.column :video, :string
+      end
+    end
+
+    def self.down
+      drop_table :other_parties
+    end
+  end
+
+  class StandardUploader < CarrierWave::Uploader::Base
+  end
+
+  class OtherParty < ActiveRecord::Base
+    # mount_uploader :video, StandardUploader
+  end
+
+  ActiveRecord::Base.establish_connection(dbconfig)
+
+  # turn off migration output
+  ActiveRecord::Migration.verbose = false
+
+  before(:all) { OtherTestMigration.up }
+  after(:all) { OtherTestMigration.down }
+  after { OtherParty.delete_all }
+
+  describe "class OtherParty < ActiveRecord::Base; mount_uploader :video, StandardUploader; end" do
+    $arclass = 0
+
+    let(:party_class) do
+      Class.new(OtherParty)
+    end
+
+    let(:subject) do
+      party = party_class.new
+    end
+
+    before do
+      # see https://github.com/jnicklas/carrierwave/blob/master/spec/orm/activerecord_spec.rb
+      $arclass += 1
+      Object.const_set("OtherParty#{$arclass}", party_class)
+      party_class.table_name = "other_parties"
+    end
+
+    describe "#mount_uploader" do
+      it "does not inject CarrierWaveDirect validation into ActiveRecord class" do
+        subject.class.mount_uploader :video, StandardUploader
+
+        subject.class.ancestors.should_not include(CarrierWaveDirect::Validations::ActiveModel)
+      end
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_direct
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000Z
+date: 2012-07-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &75422450 !ruby/object:Gem::Requirement
+  requirement: &71299690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75422450
+  version_requirements: *71299690
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &75422160 !ruby/object:Gem::Requirement
+  requirement: &71299200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75422160
+  version_requirements: *71299200
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &75421880 !ruby/object:Gem::Requirement
+  requirement: &71298880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75421880
+  version_requirements: *71298880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &75421510 !ruby/object:Gem::Requirement
+  requirement: &71298350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75421510
+  version_requirements: *71298350
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &75421180 !ruby/object:Gem::Requirement
+  requirement: &71297740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75421180
+  version_requirements: *71297740
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &75420760 !ruby/object:Gem::Requirement
+  requirement: &71297330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75420760
+  version_requirements: *71297330
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &75420100 !ruby/object:Gem::Requirement
+  requirement: &71296950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75420100
+  version_requirements: *71296950
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &75419660 !ruby/object:Gem::Requirement
+  requirement: &71296410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75419660
+  version_requirements: *71296410
 description: Process your uploads in the background by uploading directly to S3
 email:
 - dwilkie@gmail.com
@@ -130,6 +130,7 @@ files:
 - 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
@@ -156,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 300511313
+      hash: -508082893
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 300511313
+      hash: -508082893
 requirements: []
 rubyforge_project: carrierwave_direct
 rubygems_version: 1.8.10