carrierwave_direct 1.0.0 → 2.1.0

data/spec/policies/aws_base64_sha1_spec.rb

@@ -0,0 +1,229 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'data/sample_data'
+
+describe CarrierWaveDirect::Policies::AwsBase64Sha1 do
+  let(:subject) { described_class.new(uploader) }
+  let(:uploader) { DirectUploader.new }
+  let(:mounted_model) { MountedClass.new }
+  let(:mounted_subject) { DirectUploader.new(mounted_model, sample(:mounted_as)) }
+
+  describe "#direct_fog_hash" do
+    it "should return the policy hash" do
+      expect(subject.direct_fog_hash.keys).to eq([:key, :AWSAccessKeyId, :acl, :policy, :signature, :uri])
+      expect(subject.direct_fog_hash[:acl]).to eq 'public-read'
+      expect(subject.direct_fog_hash[:key]).to match /\$\{filename\}/
+      expect(subject.direct_fog_hash[:uri]).to eq "https://s3.amazonaws.com/AWS_FOG_DIRECTORY/"
+    end
+  end
+
+  describe "#policy" do
+    def decoded_policy(options = {}, &block)
+      instance = options.delete(:subject) || subject
+      JSON.parse(Base64.decode64(instance.policy(options, &block)))
+    end
+
+    context "policy is given a block" do
+      it "should yield the options to the block" do
+        number = 0
+        subject.policy do |conditions|
+          number+=1
+        end
+        expect(number).to eq 1
+      end
+      it "should include new options in the conditions" do
+        policy = subject.policy do |conditions|
+          conditions << {"x-aws-storage-class" => "STANDARD"}
+        end
+        decoded = JSON.parse(Base64.decode64(policy))
+        expect(decoded['conditions'].last['x-aws-storage-class']).to eq "STANDARD"
+      end
+    end
+
+    it "should return Base64-encoded JSON" do
+      expect(decoded_policy).to be_a(Hash)
+    end
+
+    it "should not contain any new lines" do
+      expect(subject.policy).to_not include("\n")
+    end
+
+    it "should be cached" do
+      Timecop.freeze(Time.now) do
+        @policy_now = subject.policy
+      end
+      Timecop.freeze(1.second.from_now) do
+        @policy_later = subject.policy
+      end
+      expect(@policy_later).to eql @policy_now
+    end
+
+    context "expiration" do
+      def expiration(options = {})
+        decoded_policy(options)["expiration"]
+      end
+
+      # JSON times have no seconds, so accept upto one second inaccuracy
+      def have_expiration(expires_in = DirectUploader.upload_expiration)
+        be_within(1.second).of (Time.now + expires_in)
+      end
+
+      it "should be valid ISO8601 and not use default Time#to_json" do
+        Time.any_instance.stub(:to_json) { '"Invalid time"' } # JSON gem
+        Time.any_instance.stub(:as_json) { '"Invalid time"' } # Active Support
+        expect { Time.iso8601(expiration) }.to_not raise_error
+      end
+
+      it "should be #{DirectUploader.upload_expiration / 3600} hours from now" do
+        Timecop.freeze(Time.now) do
+          expect(Time.parse(expiration)).to have_expiration
+        end
+      end
+
+      it "should be encoded as a utc time" do
+        expect(Time.parse(expiration)).to be_utc
+      end
+
+      it "should be #{sample(:expiration) / 60 } minutes from now when passing {:expiration => #{sample(:expiration)}}" do
+        Timecop.freeze(Time.now) do
+          expect(Time.parse(expiration(:expiration => sample(:expiration)))).to have_expiration(sample(:expiration))
+        end
+      end
+    end
+
+    context "conditions" do
+      def conditions(options = {})
+        decoded_policy(options)["conditions"]
+      end
+
+      def have_condition(field, value = nil)
+        field.is_a?(Hash) ? include(field) : include(["starts-with", "$#{field}", value.to_s])
+      end
+
+      context "should include" do
+        it "'utf8' if enforce_ut8 is set" do
+          expect(conditions(enforce_utf8: true)).to have_condition(:utf8)
+        end
+
+        it "'utf8' if enforce_ut8 is set" do
+          expect(conditions).to_not have_condition(:utf8)
+        end
+
+        # S3 conditions
+        it "'key'" do
+          allow(mounted_subject).to receive(:key).and_return(sample(:s3_key))
+          expect(conditions(
+            :subject => mounted_subject
+          )).to have_condition(:key, sample(:s3_key))
+        end
+
+        it "'key' without FILENAME_WILDCARD" do
+          expect(conditions(
+            :subject => mounted_subject
+          )).to have_condition(:key, mounted_subject.key.sub("${filename}", ""))
+        end
+
+        it "'bucket'" do
+          expect(conditions).to have_condition("bucket" => uploader.fog_directory)
+        end
+
+        it "'acl'" do
+          expect(conditions).to have_condition("acl" => uploader.acl)
+        end
+
+        it "'success_action_redirect'" do
+          uploader.success_action_redirect = "http://example.com/some_url"
+          expect(conditions).to have_condition("success_action_redirect" => "http://example.com/some_url")
+        end
+
+        it "does not have 'content-type' when will_include_content_type is false" do
+          allow(uploader.class).to receive(:will_include_content_type).and_return(false)
+          expect(conditions).to_not have_condition('Content-Type')
+        end
+
+        it "has 'content-type' when will_include_content_type is true" do
+          allow(uploader.class).to receive(:will_include_content_type).and_return(true)
+          expect(conditions).to have_condition('Content-Type')
+        end
+
+        context 'when use_action_status is true' do
+          before(:all) do
+            DirectUploader.use_action_status = true
+          end
+
+          after(:all) do
+            DirectUploader.use_action_status = false
+          end
+
+          it "'success_action_status'" do
+            uploader.success_action_status = '200'
+            expect(conditions).to have_condition("success_action_status" => "200")
+          end
+
+          it "does not have 'success_action_redirect'" do
+            uploader.success_action_redirect = "http://example.com/some_url"
+            expect(conditions).to_not have_condition("success_action_redirect" => "http://example.com/some_url")
+          end
+        end
+
+        context "'content-length-range of'" do
+          def have_content_length_range(options = {})
+            include([
+              "content-length-range",
+              options[:min_file_size] || DirectUploader.min_file_size,
+              options[:max_file_size] || DirectUploader.max_file_size,
+            ])
+          end
+
+          it "#{DirectUploader.min_file_size} bytes" do
+            expect(conditions).to have_content_length_range
+          end
+
+          it "#{DirectUploader.max_file_size} bytes" do
+            expect(conditions).to have_content_length_range
+          end
+
+          it "#{sample(:min_file_size)} bytes when passing {:min_file_size => #{sample(:min_file_size)}}" do
+            expect(conditions(
+              :min_file_size => sample(:min_file_size)
+            )).to have_content_length_range(:min_file_size => sample(:min_file_size))
+          end
+
+          it "#{sample(:max_file_size)} bytes when passing {:max_file_size => #{sample(:max_file_size)}}" do
+            expect(conditions(
+              :max_file_size => sample(:max_file_size)
+            )).to have_content_length_range(:max_file_size => sample(:max_file_size))
+          end
+        end
+      end
+    end
+  end
+
+  describe "clear!" do
+    it "should reset the cached policy string" do
+      Timecop.freeze(Time.now) do
+        @policy_now = subject.policy
+      end
+      subject.clear!
+
+      Timecop.freeze(1.second.from_now) do
+        @policy_after_reset = subject.policy
+      end
+      expect(@policy_after_reset).not_to eql @policy_now
+    end
+  end
+
+  describe "#signature" do
+    it "should not contain any new lines" do
+      expect(subject.signature).to_not include("\n")
+    end
+
+    it "should return a base64 encoded 'sha1' hash of the secret key and policy document" do
+      expect(Base64.decode64(subject.signature)).to eq OpenSSL::HMAC.digest(
+        OpenSSL::Digest.new('sha1'),
+        uploader.aws_secret_access_key, subject.policy
+      )
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -3,6 +3,11 @@
 require 'carrierwave_direct'
 require 'json'
 require 'timecop'
+begin
+  require 'byebug'
+rescue LoadError
+  puts "Byebug not installed"
+end
 
 require File.dirname(__FILE__) << '/support/view_helpers' # Catch dependency order
 

data/spec/support/carrier_wave_config.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 CarrierWave.configure do |config|
+  config.fog_provider = 'fog/aws'
   config.fog_credentials = {
     :provider               => 'AWS',
     :aws_access_key_id      => 'AWS_ACCESS_KEY_ID',

data/spec/test/helpers_spec.rb

@@ -19,7 +19,7 @@ describe CarrierWaveDirect::Test::Helpers do
 
         context "['exe', 'bmp']" do
           before do
-            allow(direct_uploader).to receive(:extension_white_list).and_return(%w{exe bmp})
+            allow(direct_uploader).to receive(:extension_whitelist).and_return(%w{exe bmp})
           end
 
           it "should return '*/guid/filename.exe'" do
@@ -29,7 +29,7 @@ describe CarrierWaveDirect::Test::Helpers do
 
         context "[]" do
           before do
-            allow(direct_uploader).to receive(:extension_white_list).and_return([])
+            allow(direct_uploader).to receive(:extension_whitelist).and_return([])
           end
 
           it_should_behave_like "returning the default extension"
@@ -37,7 +37,7 @@ describe CarrierWaveDirect::Test::Helpers do
 
         context "nil" do
           before do
-            allow(direct_uploader).to receive(:extension_white_list).and_return(nil)
+            allow(direct_uploader).to receive(:extension_whitelist).and_return(nil)
           end
 
           it_should_behave_like "returning the default extension"

data/spec/uploader_spec.rb

@@ -7,10 +7,8 @@ describe CarrierWaveDirect::Uploader do
   include ModelHelpers
 
   let(:subject) { DirectUploader.new }
-  let(:mounted_model) { double(sample(:mounted_model_name), video_identifier: sample(:stored_filename)) }
+  let(:mounted_model) { MountedClass.new }
   let(:mounted_subject) { DirectUploader.new(mounted_model, sample(:mounted_as)) }
-  let(:direct_subject) { DirectUploader.new }
-
 
   DirectUploader.fog_credentials.keys.each do |key|
     describe "##{key}" do
@@ -74,8 +72,9 @@ describe CarrierWaveDirect::Uploader do
       context "but the uploaders url is '#{sample(:s3_file_url)}'" do
         before do
           allow(mounted_subject).to receive(:store_dir).and_return(sample(:store_dir))
-          allow(mounted_subject).to receive(:url).and_return(sample(:s3_file_url))
           allow(mounted_subject).to receive(:present?).and_return(true)
+          allow(mounted_model).to   receive(:video_identifier).and_return(sample(:stored_filename))
+          mounted_model.remote_video_url = sample(:s3_file_url)
         end
 
         it "should return '#{sample(:s3_key)}'" do
@@ -104,6 +103,14 @@ describe CarrierWaveDirect::Uploader do
     end
   end
 
+  describe "#direct_fog_url" do
+    it "should return the result from CarrierWave::Storage::Fog::File#public_url" do
+      expect(subject.direct_fog_url).to eq CarrierWave::Storage::Fog::File.new(
+        subject, nil, nil
+      ).public_url
+    end
+  end
+
   describe "#key_regexp" do
     it "should return a regexp" do
       expect(subject.key_regexp).to be_a(Regexp)
@@ -138,26 +145,26 @@ describe CarrierWaveDirect::Uploader do
       expect(subject.extension_regexp).to be_a(String)
     end
 
-    context "where #extension_white_list returns nil" do
+    context "where #extension_whitelist returns nil" do
       before do
-        allow(subject).to receive(:extension_white_list).and_return(nil)
+        allow(subject).to receive(:extension_whitelist).and_return(nil)
       end
 
       it_should_behave_like "a globally allowed file extension"
     end
 
-    context "where #extension_white_list returns []" do
+    context "where #extension_whitelist returns []" do
       before do
-        allow(subject).to receive(:extension_white_list).and_return([])
+        allow(subject).to receive(:extension_whitelist).and_return([])
       end
 
       it_should_behave_like "a globally allowed file extension"
     end
 
-    context "where #extension_white_list returns ['exe', 'bmp']" do
+    context "where #extension_whitelist returns ['exe', 'bmp']" do
 
       before do
-        allow(subject).to receive(:extension_white_list).and_return(%w{exe bmp})
+        allow(subject).to receive(:extension_whitelist).and_return(%w{exe bmp})
       end
 
       it "should return '(exe|bmp)'" do
@@ -474,42 +481,17 @@ describe CarrierWaveDirect::Uploader do
     end
   end
 
-  describe "#signature" do
-    it "should not contain any new lines" do
-      expect(subject.signature).to_not include("\n")
-    end
-
-    it "should return a HMAC hexdigest encoded 'sha256' hash of the secret key and policy document" do
-      expect(subject.signature).to eq OpenSSL::HMAC.hexdigest(
-        OpenSSL::Digest.new('sha256'),
-        subject.send(:signing_key), subject.policy
-      )
-    end
-  end
-  #http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-UsingHTTPPOST.html
-  describe "#signature_key" do
-    it "should include correct signature_key elements" do
-      kDate    = OpenSSL::HMAC.digest('sha256', "AWS4" + subject.aws_secret_access_key, Time.now.utc.strftime("%Y%m%d"))
-      kRegion  = OpenSSL::HMAC.digest('sha256', kDate, subject.region)
-      kService = OpenSSL::HMAC.digest('sha256', kRegion, 's3')
-      kSigning = OpenSSL::HMAC.digest('sha256', kService, "aws4_request")
-
-      expect(subject.send(:signing_key)).to eq (kSigning)
-    end
-  end
-
-
   # note that 'video' is hardcoded into the MountedClass support file
   # so changing the sample will cause the tests to fail
   context "a class has a '#{sample(:mounted_as)}' mounted" do
     describe "#{sample(:mounted_as).to_s.capitalize}Uploader" do
       describe "##{sample(:mounted_as)}" do
         it "should be defined" do
-          expect(direct_subject).to be_respond_to(sample(:mounted_as))
+          expect(subject).to be_respond_to(sample(:mounted_as))
         end
 
         it "should return itself" do
-          expect(direct_subject.send(sample(:mounted_as))).to eq direct_subject
+          expect(subject.send(sample(:mounted_as))).to eq subject
         end
       end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_direct
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - David Wilkie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Process your uploads in the background by uploading directly to S3
 email:
 - dwilkie@gmail.com
@@ -125,6 +139,7 @@ files:
 - carrierwave_direct.gemspec
 - gemfiles/4.2.gemfile
 - gemfiles/5.1.gemfile
+- gemfiles/5.2.gemfile
 - lib/carrierwave_direct.rb
 - lib/carrierwave_direct/action_view_extensions/form_helper.rb
 - lib/carrierwave_direct/form_builder.rb
@@ -132,12 +147,14 @@ files:
 - lib/carrierwave_direct/locale/nl.yml
 - lib/carrierwave_direct/mount.rb
 - lib/carrierwave_direct/orm/activerecord.rb
+- lib/carrierwave_direct/policies/aws4_hmac_sha256.rb
+- lib/carrierwave_direct/policies/aws_base64_sha1.rb
+- lib/carrierwave_direct/policies/base.rb
 - lib/carrierwave_direct/test/capybara_helpers.rb
 - lib/carrierwave_direct/test/helpers.rb
 - lib/carrierwave_direct/uploader.rb
 - lib/carrierwave_direct/uploader/configuration.rb
 - lib/carrierwave_direct/uploader/content_type.rb
-- lib/carrierwave_direct/uploader/direct_url.rb
 - lib/carrierwave_direct/validations/active_model.rb
 - lib/carrierwave_direct/version.rb
 - spec/action_view_extensions/form_helper_spec.rb
@@ -146,6 +163,8 @@ files:
 - spec/mount_spec.rb
 - spec/orm/activerecord_spec.rb
 - spec/orm/indirect_activerecord_spec.rb
+- spec/policies/aws4_hmac_sha256_spec.rb
+- spec/policies/aws_base64_sha1_spec.rb
 - spec/spec_helper.rb
 - spec/support/carrier_wave_config.rb
 - spec/support/direct_uploader.rb
@@ -159,7 +178,6 @@ files:
 - spec/test/helpers_spec.rb
 - spec/uploader/configuration_spec.rb
 - spec/uploader/content_type_spec.rb
-- spec/uploader/direct_url_spec.rb
 - spec/uploader_spec.rb
 homepage: https://github.com/dwilkie/carrierwave_direct
 licenses: []
@@ -180,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: carrierwave_direct
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Upload direct to S3 using CarrierWave
@@ -191,6 +209,8 @@ test_files:
 - spec/mount_spec.rb
 - spec/orm/activerecord_spec.rb
 - spec/orm/indirect_activerecord_spec.rb
+- spec/policies/aws4_hmac_sha256_spec.rb
+- spec/policies/aws_base64_sha1_spec.rb
 - spec/spec_helper.rb
 - spec/support/carrier_wave_config.rb
 - spec/support/direct_uploader.rb
@@ -204,5 +224,4 @@ test_files:
 - spec/test/helpers_spec.rb
 - spec/uploader/configuration_spec.rb
 - spec/uploader/content_type_spec.rb
-- spec/uploader/direct_url_spec.rb
 - spec/uploader_spec.rb