carrierwave-cascade 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9746a3d779b60a48a92d241387a48d7a857541f0
-  data.tar.gz: cdd429f82a3125d72c9c9d0d85a6d7ef0b460c17
+SHA256:
+  metadata.gz: 159f531b71016527e29e57fea784ee76a842f375b6c158a4f1489b8696d1038f
+  data.tar.gz: f719f3ec25817acd89c4de01af9a524dd020280b6332995e7bf23d8858dcda4f
 SHA512:
-  metadata.gz: f189001bf4a6f8d50a3e4ca9b77af8f1acee997f0da7266b7d0f5a5daa8fffee401eb85a7889dfb9986c0bf390921e0d7e03d5c918daf82c5cb792c27ffb405d
-  data.tar.gz: 8bd4c2da7b78642bc8e39773521b0faea85733bfe95d6c0f0ffa77c07711ac7d9826bbe9d3a6374743224b4d32f4dacfdf015979f871d917c62bd9bfe89066e1
+  metadata.gz: bd784ecc0cc1257ef1285d2f603bbdaa422c487e72052212f88e2b1a4bc6f11c452278fd4868875ad41c56bd304d497b01e670f6f85ca2c9c4b73a3e3515e6f3
+  data.tar.gz: fec7ae9c27d865687279bafafe715fd2311b19d1f345ec1a969d1f82205f596887a76b318663fdaac877a92811840f9d98965d79bd5ca6ebecc15d1c6361a7e3

data/.travis.yml

@@ -1,6 +1,4 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
+  - 2.4.10
 script: bundle exec rspec spec

data/carrierwave-cascade.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'carrierwave', '>= 0.5.8'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency 'rspec', '~> 2.12.0'
-  spec.add_development_dependency 'fog'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'fog-aws'
 end

data/lib/carrierwave/cascade/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Cascade
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/lib/carrierwave/storage/cascade.rb

@@ -55,6 +55,10 @@ module CarrierWave
         def respond_to?(*args)
           @real_file.respond_to?(*args)
         end
+
+        def method(*args)
+          real_file.send(:method, *args)
+        end
       end
 
     end

data/spec/carrierwave-cascade_spec.rb

@@ -1,9 +1,12 @@
 require 'spec_helper'
 
 describe CarrierWave::Uploader::Base do
-  it { should respond_to :primary_storage }
-  it { should respond_to :secondary_storage }
-  it { should respond_to :allow_secondary_file_deletion }
+  it { is_expected.to respond_to :primary_storage }
+  it { is_expected.to respond_to :secondary_storage }
+  it { is_expected.to respond_to :allow_secondary_file_deletion }
 
-  its(:storage_engines){ should have_key :cascade }
+  describe '#storage_engines' do
+    subject { super().storage_engines }
+    it { is_expected.to have_key :cascade }
+  end
 end

data/spec/carrierwave/storage/cascade_spec.rb

@@ -14,25 +14,32 @@ describe CarrierWave::Storage::Cascade do
   subject(:cascade){ CarrierWave::Storage::Cascade.new(uploader) }
 
   describe "#initialize" do
-    its(:primary_storage){ should be_a(CarrierWave::Storage::Fog)}
-    its(:secondary_storage){ should be_a(CarrierWave::Storage::File)}
+    describe '#primary_storage' do
+      subject { super().primary_storage }
+      it { is_expected.to be_a(CarrierWave::Storage::Fog)}
+    end
+
+    describe '#secondary_storage' do
+      subject { super().secondary_storage }
+      it { is_expected.to be_a(CarrierWave::Storage::File)}
+    end
   end
 
   describe "#store!" do
     let(:file){ CarrierWave::SanitizedFile.new("hello") }
 
     before do
-      cascade.primary_storage.stub(:store! => file)
-      cascade.secondary_storage.stub(:store! => file)
+      allow(cascade.primary_storage).to receive_messages(:store! => file)
+      allow(cascade.secondary_storage).to receive_messages(:store! => file)
     end
 
     it "stores to the primary_storage" do
-      cascade.primary_storage.should_receive(:store!).with(file)
+      expect(cascade.primary_storage).to receive(:store!).with(file)
       cascade.store!(file)
     end
 
     it "does not store to the secondary_storage" do
-      cascade.secondary_storage.should_not_receive(:store!)
+      expect(cascade.secondary_storage).not_to receive(:store!)
       cascade.store!(file)
     end
   end
@@ -42,32 +49,32 @@ describe CarrierWave::Storage::Cascade do
     let(:secondary_file){ CarrierWave::SanitizedFile.new("secondary") }
 
     before do
-      cascade.primary_storage.stub(:retrieve! => primary_file)
-      cascade.secondary_storage.stub(:retrieve! => secondary_file)
+      allow(cascade.primary_storage).to receive_messages(:retrieve! => primary_file)
+      allow(cascade.secondary_storage).to receive_messages(:retrieve! => secondary_file)
     end
 
     context "when file exists in primary_storage" do
       before do
-        primary_file.stub(:exists? => true)
+        allow(primary_file).to receive_messages(:exists? => true)
       end
 
       context "when file exists in secondary_storage" do
         before do
-          secondary_file.stub(:exists? => true)
+          allow(secondary_file).to receive_messages(:exists? => true)
         end
 
         it "returns the primary_file" do
-          cascade.retrieve!('file').should == primary_file
+          expect(cascade.retrieve!('file')).to eq(primary_file)
         end
       end
 
       context "when file doesn't exist in secondary_storage" do
         before do
-          secondary_file.stub(:exists? => false)
+          allow(secondary_file).to receive_messages(:exists? => false)
         end
 
         it "returns the primary_file" do
-          cascade.retrieve!('file').should == primary_file
+          expect(cascade.retrieve!('file')).to eq(primary_file)
         end
       end
 
@@ -75,15 +82,15 @@ describe CarrierWave::Storage::Cascade do
 
     context "when file doesn't exist in primary_storage" do
       before do
-        primary_file.stub(:exists? => false)
+        allow(primary_file).to receive_messages(:exists? => false)
       end
 
       it "returns a secondary_file proxy" do
-        cascade.retrieve!('file').should be_a(CarrierWave::Storage::Cascade::SecondaryFileProxy)
+        expect(cascade.retrieve!('file')).to be_a(CarrierWave::Storage::Cascade::SecondaryFileProxy)
       end
 
       it "returns a proxy to the real secondary_file" do
-        cascade.retrieve!('file').real_file.should == secondary_file
+        expect(cascade.retrieve!('file').real_file).to eq(secondary_file)
       end
 
     end
@@ -104,13 +111,13 @@ describe CarrierWave::Storage::Cascade::SecondaryFileProxy do
   end
 
   it "delegates all methods to the real file" do
-    file.should_receive(:foooooo)
+    expect(file).to receive(:foooooo)
     cascade_file.foooooo
   end
 
   context "when allow_secondary_file_deletion is not set" do
     it "doesn't delete the file" do
-      file.should_not_receive(:delete)
+      expect(file).not_to receive(:delete)
       cascade_file.delete
     end
   end
@@ -123,7 +130,7 @@ describe CarrierWave::Storage::Cascade::SecondaryFileProxy do
     end
 
     it "doesn't delete the file" do
-      file.should_not_receive(:delete)
+      expect(file).not_to receive(:delete)
       cascade_file.delete
     end
   end
@@ -136,7 +143,7 @@ describe CarrierWave::Storage::Cascade::SecondaryFileProxy do
     end
 
     it "does delete the file" do
-      file.should_receive(:delete)
+      expect(file).to receive(:delete)
       cascade_file.delete
     end
   end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
 require 'rspec'
 require 'carrierwave'
 require 'carrierwave-cascade'
-require 'fog'
+require 'fog/aws'

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-cascade
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Kevin Glowacz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-aws
   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: "A storage plugin for carrierwave that will\n    retrieving files from
@@ -91,8 +91,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -109,24 +109,23 @@ homepage: https://github.com/kjg/carrierwave-cascade
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Retrieve from a secondary storage when the file is not in the primary storage.
 test_files: