paperclip 4.2.4 → 4.3.0

data/spec/paperclip/storage/fog_spec.rb

@@ -320,6 +320,9 @@ describe Paperclip::Storage::Fog do
         it "honors the scheme in public url" do
           assert_match(/^http:\/\//, @dummy.avatar.url)
         end
+        it "honors the scheme in expiring url" do
+          assert_match(/^http:\/\//, @dummy.avatar.expiring_url)
+        end
       end
 
       context "with scheme not set" do
@@ -334,15 +337,20 @@ describe Paperclip::Storage::Fog do
         it "provides HTTPS public url" do
           assert_match(/^https:\/\//, @dummy.avatar.url)
         end
+        it "provides HTTPS expiring url" do
+          assert_match(/^https:\/\//, @dummy.avatar.expiring_url)
+        end
       end
 
       context "with a valid bucket name for a subdomain" do
+        before { @dummy.stubs(:new_record?).returns(false) }
+
         it "provides an url in subdomain style" do
           assert_match(/^https:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png/, @dummy.avatar.url)
         end
 
         it "provides an url that expires in subdomain style" do
-          assert_match(/^http:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
+          assert_match(/^https:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
         end
       end
 
@@ -390,7 +398,7 @@ describe Paperclip::Storage::Fog do
         end
 
         it "provides a url that expires in folder style" do
-          assert_match(/^http:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
+          assert_match(/^https:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
         end
 
       end
@@ -492,6 +500,7 @@ describe Paperclip::Storage::Fog do
       @file = File.new(fixture_file('5k.png'), 'rb')
       @dummy = Dummy.new
       @dummy.avatar = @file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     after do

data/spec/paperclip/storage/s3_spec.rb

@@ -105,6 +105,7 @@ describe Paperclip::Storage::S3 do
         url: ":s3_path_url"
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a url based on an S3 path" do
@@ -145,6 +146,7 @@ describe Paperclip::Storage::S3 do
         path: ":attachment/:basename:dotextension"
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a url based on an S3 path" do
@@ -161,6 +163,7 @@ describe Paperclip::Storage::S3 do
         path: ":attachment/:basename:dotextension"
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a protocol-relative URL" do
@@ -177,6 +180,7 @@ describe Paperclip::Storage::S3 do
         path: ":attachment/:basename:dotextension"
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a url based on an S3 path" do
@@ -193,6 +197,7 @@ describe Paperclip::Storage::S3 do
         path: ":attachment/:basename:dotextension"
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a url based on an S3 path" do
@@ -236,6 +241,7 @@ describe Paperclip::Storage::S3 do
         s3_host_name: "s3-ap-northeast-1.amazonaws.com"
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a url based on an :s3_host_name path" do
@@ -259,6 +265,7 @@ describe Paperclip::Storage::S3 do
         attr_accessor :value
       end
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "uses s3_host_name as a proc if available" do
@@ -281,6 +288,7 @@ describe Paperclip::Storage::S3 do
         File.open(fixture_file('5k.png'), 'rb') do |file|
           @dummy = Dummy.new
           @dummy.avatar = file
+          @dummy.stubs(:new_record?).returns(false)
         end
     end
 
@@ -342,18 +350,19 @@ describe Paperclip::Storage::S3 do
 
   context "An attachment that uses S3 for storage and has spaces in file name" do
     before do
-      rebuild_model styles: { large: ['500x500#', :jpg] },
+      rebuild_model(
+        styles: { large: ["500x500#", :jpg] },
         storage: :s3,
         bucket: "bucket",
-        s3_credentials: {
-          'access_key_id' => "12345",
-          'secret_access_key' => "54321"
-        }
+        s3_credentials: { "access_key_id" => "12345",
+                          "secret_access_key" => "54321" }
+        )
 
-        File.open(fixture_file('spaced file.png'), 'rb') do |file|
-          @dummy = Dummy.new
-          @dummy.avatar = file
-        end
+      File.open(fixture_file("spaced file.png"), "rb") do |file|
+        @dummy = Dummy.new
+        @dummy.avatar = file
+        @dummy.stubs(:new_record?).returns(false)
+      end
     end
 
     it "returns a replaced version for path" do
@@ -375,16 +384,17 @@ describe Paperclip::Storage::S3 do
           'secret_access_key' => "54321"
         }
 
-        stringio = stringy_file
-        class << stringio
-          def original_filename
-            "question?mark.png"
-          end
+      stringio = stringy_file
+      class << stringio
+        def original_filename
+          "question?mark.png"
         end
-        file = Paperclip.io_adapters.for(stringio)
-        @dummy = Dummy.new
-        @dummy.avatar = file
-        @dummy.save
+      end
+      file = Paperclip.io_adapters.for(stringio)
+      @dummy = Dummy.new
+      @dummy.avatar = file
+      @dummy.save
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a replaced version for path" do
@@ -405,6 +415,7 @@ describe Paperclip::Storage::S3 do
         url: ":s3_domain_url"
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a url based on an S3 subdomain" do
@@ -414,16 +425,20 @@ describe Paperclip::Storage::S3 do
 
   context "" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model(
+        storage: :s3,
         s3_credentials: {
-        production: { bucket: "prod_bucket" },
-        development: { bucket: "dev_bucket" }
-      },
-      s3_host_alias: "something.something.com",
-      path: ":attachment/:basename:dotextension",
-      url: ":s3_alias_url"
+          production: { bucket: "prod_bucket" },
+          development: { bucket: "dev_bucket" }
+        },
+        bucket: "bucket",
+        s3_host_alias: "something.something.com",
+        path: ":attachment/:basename:dotextension",
+        url: ":s3_alias_url"
+        )
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a url based on the host_alias" do
@@ -447,6 +462,7 @@ describe Paperclip::Storage::S3 do
       end
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a url based on the host_alias" do
@@ -469,6 +485,7 @@ describe Paperclip::Storage::S3 do
         url: ":asset_host"
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a relative URL for Rails to calculate assets host" do
@@ -684,6 +701,7 @@ describe Paperclip::Storage::S3 do
         @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
+        @dummy.stubs(:new_record?).returns(false)
       end
 
       after { @file.close }

data/spec/paperclip/tempfile_factory_spec.rb

@@ -26,4 +26,8 @@ describe Paperclip::TempfileFactory do
    file = subject.generate
    assert File.exist?(file.path)
   end
+
+  it "does not throw Errno::ENAMETOOLONG when it has a really long name" do
+    expect { subject.generate("o" * 255) }.to_not raise_error
+  end
 end

data/spec/paperclip/thumbnail_spec.rb

@@ -481,4 +481,20 @@ describe Paperclip::Thumbnail do
       end
     end
   end
+
+  context "with a really long file name" do
+    before do
+      tempfile = Tempfile.new("f")
+      tempfile_additional_chars = tempfile.path.split("/")[-1].length + 15
+      image_file = File.new(fixture_file("5k.png"), "rb")
+      @file = Tempfile.new("f" * (255 - tempfile_additional_chars))
+      @file.write(image_file.read)
+      @file.rewind
+    end
+
+    it "does not throw Errno::ENAMETOOLONG" do
+      thumb = Paperclip::Thumbnail.new(@file, geometry: "50x50", format: :gif)
+      expect { thumb.make }.to_not raise_error
+    end
+  end
 end

data/spec/paperclip/url_generator_spec.rb

@@ -43,7 +43,7 @@ describe Paperclip::UrlGenerator do
   end
 
   it "executes the method named by the symbol as the default URL when no file is assigned" do
-    mock_model = MockModel.new
+    mock_model = FakeModel.new
     mock_attachment = MockAttachment.new(model: mock_model)
     mock_interpolator = MockInterpolator.new
     default_url = :to_s

data/spec/support/fake_model.rb

@@ -18,4 +18,8 @@ class FakeModel
   def valid?
     errors.empty?
   end
+
+  def new_record?
+    false
+  end
 end

data/spec/support/matchers/have_column.rb

@@ -8,7 +8,16 @@ RSpec::Matchers.define :have_column do |column_name|
     column && column.default.to_s == @default.to_s
   end
 
-  failure_message_for_should do |columns|
-    "expected to find '#{column_name}', default '#{@default}' in #{columns.map{|column| [column.name, column.default] }}"
+  failure_message_method =
+    if RSpec::Version::STRING.to_i >= 3
+      :failure_message
+    else
+      :failure_message_for_should
+    end
+
+  send(failure_message_method) do |columns|
+    "expected to find '#{column_name}', " +
+      "default '#{@default}' " +
+      "in #{columns.map { |column| [column.name, column.default] }}"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 4.2.4
+  version: 4.3.0
 platform: ruby
 authors:
 - Jon Yurek
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mimemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +190,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 1.3.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 1.3.18
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -216,16 +230,16 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -360,6 +374,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
+- ".rubocop.yml"
 - ".travis.yml"
 - Appraisals
 - CONTRIBUTING.md
@@ -367,7 +383,7 @@ files:
 - LICENSE
 - NEWS
 - README.md
-- RUNNING_TESTS.md
+- RELEASING.md
 - Rakefile
 - UPGRADING
 - cucumber/paperclip_steps.rb
@@ -389,7 +405,6 @@ files:
 - features/support/rails.rb
 - features/support/selectors.rb
 - gemfiles/3.2.gemfile
-- gemfiles/4.0.gemfile
 - gemfiles/4.1.gemfile
 - gemfiles/4.2.gemfile
 - lib/generators/paperclip/USAGE
@@ -441,6 +456,7 @@ files:
 - lib/paperclip/missing_attachment_styles.rb
 - lib/paperclip/processor.rb
 - lib/paperclip/processor_helpers.rb
+- lib/paperclip/rails_environment.rb
 - lib/paperclip/railtie.rb
 - lib/paperclip/schema.rb
 - lib/paperclip/storage.rb
@@ -500,6 +516,7 @@ files:
 - spec/paperclip/plural_cache_spec.rb
 - spec/paperclip/processor_helpers_spec.rb
 - spec/paperclip/processor_spec.rb
+- spec/paperclip/rails_environment_spec.rb
 - spec/paperclip/rake_spec.rb
 - spec/paperclip/schema_spec.rb
 - spec/paperclip/storage/filesystem_spec.rb
@@ -528,6 +545,7 @@ files:
 - spec/support/fixtures/animated.unknown
 - spec/support/fixtures/bad.png
 - spec/support/fixtures/empty.html
+- spec/support/fixtures/empty.xlsx
 - spec/support/fixtures/fog.yml
 - spec/support/fixtures/rotated.jpg
 - spec/support/fixtures/s3.yml
@@ -541,7 +559,6 @@ files:
 - spec/support/matchers/have_column.rb
 - spec/support/mock_attachment.rb
 - spec/support/mock_interpolator.rb
-- spec/support/mock_model.rb
 - spec/support/mock_url_generator_builder.rb
 - spec/support/model_reconstruction.rb
 - spec/support/rails_helpers.rb
@@ -567,7 +584,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick
-rubyforge_project: paperclip
+rubyforge_project: 
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
@@ -627,6 +644,7 @@ test_files:
 - spec/paperclip/plural_cache_spec.rb
 - spec/paperclip/processor_helpers_spec.rb
 - spec/paperclip/processor_spec.rb
+- spec/paperclip/rails_environment_spec.rb
 - spec/paperclip/rake_spec.rb
 - spec/paperclip/schema_spec.rb
 - spec/paperclip/storage/filesystem_spec.rb
@@ -655,6 +673,7 @@ test_files:
 - spec/support/fixtures/animated.unknown
 - spec/support/fixtures/bad.png
 - spec/support/fixtures/empty.html
+- spec/support/fixtures/empty.xlsx
 - spec/support/fixtures/fog.yml
 - spec/support/fixtures/rotated.jpg
 - spec/support/fixtures/s3.yml
@@ -668,7 +687,6 @@ test_files:
 - spec/support/matchers/have_column.rb
 - spec/support/mock_attachment.rb
 - spec/support/mock_interpolator.rb
-- spec/support/mock_model.rb
 - spec/support/mock_url_generator_builder.rb
 - spec/support/model_reconstruction.rb
 - spec/support/rails_helpers.rb

data/RUNNING_TESTS.md

@@ -1,4 +0,0 @@
-Running Tests
-=============
-
-Please see `CONTRIBUTING.md` in "Running Tests" section for more information.