carrierwave_direct 2.0.0 → 2.1.0

data/spec/spec_helper.rb

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

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)
@@ -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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_direct
 version: !ruby/object:Gem::Version
-  version: 2.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
@@ -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
@@ -139,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
@@ -146,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
@@ -160,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
@@ -173,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: []
@@ -194,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
@@ -205,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
@@ -218,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

data/lib/carrierwave_direct/uploader/direct_url.rb

@@ -1,16 +0,0 @@
-module CarrierWaveDirect
-  module Uploader
-    module DirectUrl
-
-      def direct_fog_url(options = {})
-        if options[:with_path]
-          warn "calling `#direct_for_url` with :with_path is deprecated, please use `#url` instead."
-          url
-        else
-          CarrierWave::Storage::Fog::File.new(self, CarrierWave::Storage::Fog.new(self), nil).public_url
-        end
-      end
-
-    end
-  end
-end

data/spec/uploader/direct_url_spec.rb

@@ -1,26 +0,0 @@
-# encoding: utf-8
-#
-require 'spec_helper'
-require 'data/sample_data'
-
-describe CarrierWaveDirect::Uploader::DirectUrl do
-
-  let(:subject) { DirectUploader.new }
-
-  let(:mounted_subject) { DirectUploader.new(mounted_model, sample(:mounted_as)) }
-
-  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
-
-    context ":with_path => true" do
-      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
-end