carrierwave_direct 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df532738055d7fe9993268699211f219bdf0eeb2
-  data.tar.gz: 73234daa2e001178a73ef9caec211d2aaecfd3c6
+  metadata.gz: 4f9e56f05064fcec0e706c91c80c85c5e4bdbf93
+  data.tar.gz: 0f8c4b55fc49a71f4e4a8ac5992e82a684ffb99b
 SHA512:
-  metadata.gz: fa994ea1bdab12573044260fc76389f0bde0866a355eb648c82726637e26247dca2aaab1e08c2122380f9704a8a59c90c4c422754e3d79fc581651fd83563452
-  data.tar.gz: b4c5109688c2dfe132686f9ea3f86e7ae7d08d8c7f66216d7385569b9f715e5ca0e41325b00c25bbe2e519aa864164d2483b3a400d88754ad92bbef67db04950
+  metadata.gz: 47fe09989e7dba3b47476aaa6c3137e2d01f9809778ff3763a3121c922bc0690816593add6a3a625be6174e9e0f2c00e1b8d9221372e4a9890953cc28e0d8a1a
+  data.tar.gz: ae5b467e4542cd5940df6aca828396b82eb0df9647a0b283ae4abf7c3babdf862041c46a76290f5081bd70c78fe1772a6cda347d3c550d56d415582c000b0ca2

data/.travis.yml

@@ -2,3 +2,11 @@ rvm:
  - 1.9.3
  - 2.0.0
  - 2.1.0
+install:
+  - 'travis_retry bundle install'
+script: 'bundle exec rspec spec'
+gemfile:
+  - Gemfile
+  - gemfiles/3.2.gemfile
+  - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile

data/Changelog.md

@@ -1,6 +1,24 @@
+### 0.0.15
+
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.14...v0.0.15)
+
+Features:
+  * Allow format validators to be used on update (Grey Baker @greysteil)
+  * Add cache_dir to allowed paths (Grey Baker @greysteil)
+
+Bug Fixes:
+  * Use Carrierwave to generate URL's (Petrik de Heus @p8)
+
+Misc:
+  * README update (Samuel Reh @samuelreh)
+  * Fix typo in README (Brandon Conway @brandoncc)
+  * Fix specs for rspec 3 (Hanachin @hanachin)
+  * Fix typo in nl.yml (Petrik de Heus @p8)
+  * Add multiple rails versions support to travis (Petrik de Heus @p8)
+
 ### 0.0.14
 
-[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.13...master)
+[Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/v0.0.13...v0.0.14)
 
 Features:
  * Add ability to set content type in upload form (John Kamenik @jkamenik)

data/README.md

@@ -172,6 +172,9 @@ Note if `User` is not an ActiveRecord object e.g.
 
 ```ruby
 class User
+  extend CarrierWave::Mount
+  extend CarrierWaveDirect::Mount
+
   mount_uploader :avatar, AvatarUploader
 end
 ```
@@ -337,7 +340,7 @@ class AvatarProcessor
 end
 ```
 
-The method `self.remote_avatar_url=` from [CarrierWave](https://github.com/jnicklas/carrierwave) downloads the avatar from S3 and processes it. `save` then re-uploads the processed avatar to to S3
+The method `self.remote_avatar_url=` from [CarrierWave](https://github.com/jnicklas/carrierwave) downloads the avatar from S3 and processes it. `save` then re-uploads the processed avatar to S3
 
 ## Uploading from a remote location
 

data/gemfiles/3.2.gemfile

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+gem "carrierwave"
+gem "uuidtools"
+gem "fog"
+
+group :test do
+  gem "rspec", '3.0.0'
+  gem "timecop"
+  gem "rails", "~>3.2.12"
+  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+  gem "capybara"
+  # gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
+end

data/gemfiles/4.0.gemfile

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+gem "carrierwave"
+gem "uuidtools"
+gem "fog"
+
+group :test do
+  gem "rspec", '3.0.0'
+  gem "timecop"
+  gem "rails", "~>4.0.0"
+  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+  gem "capybara"
+  # gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
+end

data/gemfiles/4.1.gemfile

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+gem "carrierwave"
+gem "uuidtools"
+gem "fog"
+
+group :test do
+  gem "rspec", '3.0.0'
+  gem "timecop"
+  gem "rails", "~>4.1.0"
+  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+  gem "capybara"
+  # gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
+end

data/lib/carrierwave_direct/locale/nl.yml

@@ -5,5 +5,5 @@ nl:
       carrierwave_direct_upload_missing: geüpload bestand ontbreekt
       carrierwave_direct_attachment_missing: bestand ontbreekt
       carrierwave_direct_filename_invalid: "is ongeldig. "
-      carrierwave_direct_allowed_extensions: Toegestane betandstypen zijn %{extensions}
+      carrierwave_direct_allowed_extensions: Toegestane bestandstypen zijn %{extensions}
       carrierwave_direct_allowed_schemes: "Toegestane schema's zijn %{schemes}"

data/lib/carrierwave_direct/orm/activerecord.rb

@@ -25,9 +25,9 @@ module CarrierWaveDirect
 
       validates_is_attached column if uploader_option(column.to_sym, :validate_is_attached)
       validates_is_uploaded column if uploader_option(column.to_sym, :validate_is_uploaded)
-      validates_filename_uniqueness_of column if uploader_option(column.to_sym, :validate_unique_filename)
-      validates_filename_format_of column if uploader_option(column.to_sym, :validate_filename_format)
-      validates_remote_net_url_format_of column if uploader_option(column.to_sym, :validate_remote_net_url_format)
+      validates_filename_uniqueness_of(column, on: :create) if uploader_option(column.to_sym, :validate_unique_filename)
+      validates_filename_format_of(column, on: :create) if uploader_option(column.to_sym, :validate_filename_format)
+      validates_remote_net_url_format_of(column, on: :create) if uploader_option(column.to_sym, :validate_remote_net_url_format)
 
       self.instance_eval <<-RUBY, __FILE__, __LINE__+1
         attr_accessor   :skip_is_attached_validations

data/lib/carrierwave_direct/uploader.rb

@@ -61,7 +61,7 @@ module CarrierWaveDirect
     def key
       return @key if @key.present?
       if present?
-        self.key = URI.parse(encoded_url).path[1 .. -1] # explicitly set key
+        self.key = decoded_key # explicitly set key
       else
         @key = "#{store_dir}/#{guid}/#{FILENAME_WILDCARD}"
       end
@@ -82,7 +82,7 @@ module CarrierWaveDirect
     end
 
     def key_regexp
-      /\A#{store_dir}\/[a-f\d\-]+\/.+\.(?i)#{extension_regexp}(?-i)\z/
+      /\A(#{store_dir}|#{cache_dir})\/[a-f\d\-]+\/.+\.(?i)#{extension_regexp}(?-i)\z/
     end
 
     def extension_regexp
@@ -107,8 +107,8 @@ module CarrierWaveDirect
 
     private
 
-    def encoded_url
-      URI.encode(URI.decode(url), " []+()")
+    def decoded_key
+      URI.decode(URI.parse(url).path[1 .. -1])
     end
 
     def key_from_file(fname)

data/lib/carrierwave_direct/uploader/direct_url.rb

@@ -3,14 +3,11 @@ module CarrierWaveDirect
     module DirectUrl
 
       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.chomp('/'))
-          path = "/#{URI.decode(key)}"
-          uri.path += URI.escape(path)
-          fog_uri = uri.to_s
+          url
+        else
+          CarrierWave::Storage::Fog::File.new(self, CarrierWave::Storage::Fog.new(self), nil).public_url
         end
-        fog_uri
       end
 
     end

data/lib/carrierwave_direct/validations/active_model.rb

@@ -11,7 +11,7 @@ module CarrierWaveDirect
 
       class UniqueFilenameValidator < ::ActiveModel::EachValidator
         def validate_each(record, attribute, value)
-          if record.new_record? && record.errors[attribute].empty? && (record.send("has_#{attribute}_upload?") || record.send("has_remote_#{attribute}_net_url?"))
+          if record.errors[attribute].empty? && (record.send("has_#{attribute}_upload?") || record.send("has_remote_#{attribute}_net_url?"))
             column = record.class.uploader_options[attribute].fetch(:mount_on, attribute)
             if record.class.where(column => record.send(attribute).filename).exists?
               record.errors.add(attribute, :carrierwave_direct_filename_taken)
@@ -22,7 +22,7 @@ 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
+          if record.send("has_#{attribute}_upload?") && record.key !~ record.send(attribute).key_regexp
             extensions = record.send(attribute).extension_white_list
             message = I18n.t("errors.messages.carrierwave_direct_filename_invalid")
 
@@ -37,7 +37,7 @@ module CarrierWaveDirect
 
       class RemoteNetUrlFormatValidator < ::ActiveModel::EachValidator
         def validate_each(record, attribute, value)
-          if record.new_record? && record.send("has_remote_#{attribute}_net_url?")
+          if record.send("has_remote_#{attribute}_net_url?")
             remote_net_url = record.send("remote_#{attribute}_net_url")
             uploader = record.send(attribute)
             url_scheme_white_list = uploader.url_scheme_white_list

data/lib/carrierwave_direct/version.rb

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

data/spec/data/sample_data.rb

@@ -5,6 +5,7 @@ SAMPLE_DATA = {
   :key => "some key",
   :guid => "guid",
   :store_dir => "store_dir",
+  :cache_dir => "cache_dir",
   :extension_regexp => "(avi)",
   :url => "http://example.com/some_url",
   :expiration => 60,

data/spec/orm/activerecord_spec.rb

@@ -154,7 +154,7 @@ describe CarrierWaveDirect::ActiveRecord do
 
     describe ".validates_filename_uniqueness_of" do
       it "should be turned on by default" do
-        party_class.should_receive(:validates_filename_uniqueness_of).with(:video)
+        party_class.should_receive(:validates_filename_uniqueness_of).with(:video, on: :create)
         mount_uploader
       end
 
@@ -205,7 +205,7 @@ describe CarrierWaveDirect::ActiveRecord do
 
     describe ".validates_filename_format_of" do
       it "should be turned on by default" do
-        party_class.should_receive(:validates_filename_format_of).with(:video)
+        party_class.should_receive(:validates_filename_format_of).with(:video, on: :create)
         mount_uploader
       end
 
@@ -282,7 +282,7 @@ describe CarrierWaveDirect::ActiveRecord do
 
     describe ".validates_remote_net_url_format_of" do
       it "should be turned on by default" do
-        party_class.should_receive(:validates_remote_net_url_format_of).with(:video)
+        party_class.should_receive(:validates_remote_net_url_format_of).with(:video, on: :create)
         mount_uploader
       end
 
@@ -545,7 +545,7 @@ describe CarrierWaveDirect::ActiveRecord do
 
       context "does not have an upload" do
         it "should be true" do
-          subject.filename_valid?.should be_true
+          subject.filename_valid?.should be true
         end
 
         it_should_behave_like "having empty errors"
@@ -558,7 +558,7 @@ describe CarrierWaveDirect::ActiveRecord do
           end
 
           it "should be true" do
-            subject.filename_valid?.should be_true
+            subject.filename_valid?.should be true
           end
 
           it_should_behave_like "having empty errors"
@@ -568,7 +568,7 @@ describe CarrierWaveDirect::ActiveRecord do
           before { subject.key = sample_key(:model_class => subject.class, :valid => false) }
 
           it "should be false" do
-            subject.filename_valid?.should be_false
+            subject.filename_valid?.should be false
           end
 
           context "after the call, #errors" do

data/spec/spec_helper.rb

@@ -8,6 +8,20 @@ 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
+module Rails
+  def self.env
+    ActiveSupport::StringInquirer.new("test")
+  end
+end
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:expect, :should]
+  end
+end
+
+RSpec.configure do |config|
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = [:expect, :should]
+  end
 end

data/spec/uploader/configuration_spec.rb

@@ -12,19 +12,19 @@ describe CarrierWaveDirect::Uploader::Configuration do
 
   describe "default configuration" do
     it "returns false for validate_is_attached" do
-      expect(subject.validate_is_attached).to be_false
+      expect(subject.validate_is_attached).to be false
     end
 
     it "returns false for validate_is_uploaded" do
-      expect(subject.validate_is_uploaded).to be_false
+      expect(subject.validate_is_uploaded).to be false
     end
 
     it "return true for validate_unique_filename" do
-      expect(subject.validate_unique_filename).to be_true
+      expect(subject.validate_unique_filename).to be true
     end
 
     it "returns true for validate_remote_net_url_format" do
-      expect(subject.validate_remote_net_url_format).to be_true
+      expect(subject.validate_remote_net_url_format).to be true
     end
 
     it "has upload_expiration of 10 hours" do
@@ -40,7 +40,7 @@ describe CarrierWaveDirect::Uploader::Configuration do
     end
 
     it "returns false for use_action_status" do
-      expect(subject.use_action_status).to be_false
+      expect(subject.use_action_status).to be false
     end
   end
 end

data/spec/uploader/direct_url_spec.rb

@@ -15,38 +15,9 @@ describe CarrierWaveDirect::Uploader::DirectUrl do
     end
 
     context ":with_path => true" do
-
-      context "#key is set to '#{sample(:path_with_special_chars)}'" do
-        before { subject.key = sample(:path_with_special_chars) }
-
-        it "should return the full url with '/#{URI.escape(sample(:path_with_special_chars))}' as the path" do
-          direct_fog_url = CarrierWave::Storage::Fog::File.new(
-            subject, nil, nil
-          ).public_url
-          expect(subject.direct_fog_url(:with_path => true)).to eq direct_fog_url + "#{URI.escape(sample(:path_with_special_chars))}"
-        end
-      end
-
-      context "#key is set to '#{sample(:path_with_escaped_chars)}'" do
-        before { subject.key = sample(:path_with_escaped_chars) }
-
-        it "should return the full url with '/#{sample(:path_with_escaped_chars)}' as the path" do
-          direct_fog_url = CarrierWave::Storage::Fog::File.new(
-            subject, nil, nil
-          ).public_url
-          expect(subject.direct_fog_url(:with_path => true)).to eq direct_fog_url + sample(:path_with_escaped_chars)
-        end
-      end
-
-      context "#key is set to '#{sample(:path)}'" do
-        before { subject.key = sample(:path) }
-
-        it "should return the full url with '/#{sample(:path)}' as the path" do
-          direct_fog_url = CarrierWave::Storage::Fog::File.new(
-            subject, nil, nil
-          ).public_url
-          expect(subject.direct_fog_url(:with_path => true)).to eq direct_fog_url + "#{sample(:path)}"
-        end
+      it "should return the full url set by carrierwave" do
+        allow(subject).to receive(:url).and_return("url")
+        expect(subject.direct_fog_url(:with_path => true)).to eq "url"
       end
     end
   end

data/spec/uploader_spec.rb

@@ -111,6 +111,7 @@ describe CarrierWaveDirect::Uploader do
     context "where #store_dir returns '#{sample(:store_dir)}'" do
       before do
         allow(subject).to receive(:store_dir).and_return(sample(:store_dir))
+        allow(subject).to receive(:cache_dir).and_return(sample(:cache_dir))
       end
 
       context "and #extension_regexp returns '#{sample(:extension_regexp)}'" do
@@ -118,8 +119,8 @@ describe CarrierWaveDirect::Uploader do
           allow(subject).to receive(:extension_regexp).and_return(sample(:extension_regexp))
         end
 
-        it "should return /\\A#{sample(:store_dir)}\\/#{GUID_REGEXP}\\/.+\\.#{sample(:extension_regexp)}\\z/" do
-          expect(subject.key_regexp).to eq /\A#{sample(:store_dir)}\/#{GUID_REGEXP}\/.+\.(?i)#{sample(:extension_regexp)}(?-i)\z/
+        it "should return /\\A(#{sample(:store_dir)}|#{sample(:cache_dir)})\\/#{GUID_REGEXP}\\/.+\\.#{sample(:extension_regexp)}\\z/" do
+          expect(subject.key_regexp).to eq /\A(#{sample(:store_dir)}|#{sample(:cache_dir)})\/#{GUID_REGEXP}\/.+\.(?i)#{sample(:extension_regexp)}(?-i)\z/
         end
       end
     end
@@ -239,28 +240,16 @@ describe CarrierWaveDirect::Uploader do
         end
       end
 
-      context "and the model's remote #{sample(:mounted_as)} url has whitespace in it" do
+      context "and the model's remote #{sample(:mounted_as)} url has special characters in it" do
         before do
           allow(mounted_model).to receive(
             "remote_#{mounted_subject.mounted_as}_url"
-          ).and_return("http://anyurl.com/any_path/video_dir/filename 2.avi")
+          ).and_return("http://anyurl.com/any_path/video_dir/filename ()+[]2.avi")
         end
 
-        it "should be sanitized (whitespace replaced with _)" do
+        it "should be sanitized (special characters replaced with _)" do
           mounted_subject.filename
-          expect(mounted_subject.key).to match /filename_2.avi$/
-        end
-      end
-
-      context "and the model's remote url contains escape characters" do
-        before do 
-          subject.key = nil
-          allow(subject).to receive(:present?).and_return(:true)
-          allow(subject).to receive(:url).and_return("http://anyurl.com/any_path/video_dir/filename ()+[]2.avi")
-        end
-
-        it "should be escaped and replaced with non whitespace characters" do
-          expect(subject.key).to match /filename%20%28%29%2B%5B%5D2.avi/
+          expect(mounted_subject.key).to match /filename___\+__2.avi$/
         end
       end
 
@@ -272,7 +261,7 @@ describe CarrierWaveDirect::Uploader do
         end
 
         it "should not double escape already escaped characters" do
-          expect(subject.key).to match /filename%20%28%29%2B%5B%5D2.avi/
+          expect(subject.key).to match /filename \(\)\+\[\]2.avi/
         end
 
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_direct
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - David Wilkie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -137,6 +137,9 @@ files:
 - README.md
 - Rakefile
 - carrierwave_direct.gemspec
+- gemfiles/3.2.gemfile
+- gemfiles/4.0.gemfile
+- gemfiles/4.1.gemfile
 - lib/carrierwave_direct.rb
 - lib/carrierwave_direct/action_view_extensions/form_helper.rb
 - lib/carrierwave_direct/form_builder.rb