fileinfo 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef15eb6d6152498892fa78fa6d4361e6c3d14932
-  data.tar.gz: 2313c820cbafacdb9c707966c1a0786554464627
+  metadata.gz: 68f73db3aad615d284bfbdd368005c6aefc2d111
+  data.tar.gz: d63bf9b1aede2fa3b31030dfa135afac5abdf059
 SHA512:
-  metadata.gz: e885d126ade6f5f077b181b24bed9d316e236105a6b15dc22977d297d7f1363388ef4f75cdf7329b6f32b3672b54407d9c4040edc40c543c4f588d676eb3c1ec
-  data.tar.gz: 3415d0dfcfd593df5177a6a660fbc0f6b605b5607cb934a4e44f100cbeacf582b1425611758097c5b9d2c33fd0fe4c2cd7dd2cb4ece170da54e75c6e9e14e410
+  metadata.gz: a17b722285eddd803477a48b77e48323e34a8f7d3d24959c58167fd8f84f50838fc2de14675caf9758814ed597ec3e63abd84579b1c0f0890d53ed2faec3bc77
+  data.tar.gz: 55f417126301e67db3e3ba5ccbeeacb963e158c89e0adf6b6674d65d5615faf50989d31a5038ff613f69b7c436cf6758fb4eec6f6b30b8c84a6312dc3e03c29c

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Rafaël Blais Masson
+Copyright (c) 2017 Rafaël Blais Masson
 
 MIT License
 

data/README.md

@@ -79,4 +79,4 @@ info.content_type # => "text/plain; charset=utf-8"
 
 ---
 
-© 2014 [Rafaël Blais Masson](http://rafbm.com). FileInfo is released under the MIT license.
+© 2017 [Rafaël Blais Masson](http://rafbm.com). FileInfo is released under the MIT license.

data/fileinfo.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 2.14'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'mime-types'
 end

data/lib/file_info.rb

@@ -10,6 +10,7 @@ class FileInfo
   CHARSET_REGEX = /charset=(\S+)/
 
   MIME_TYPE_ERROR_MESSAGE = 'You must install the "mime-types" gem to use FileInfo#mime_type'
+  DEFAULT_MIME_TYPE = 'application/octet-stream'
 
   attr_reader :content_type
 
@@ -18,7 +19,10 @@ class FileInfo
   end
 
   def type
-    @type ||= content_type.match(MIME_TYPE_REGEX)[0]
+    @type ||= begin
+      match = content_type.match(MIME_TYPE_REGEX)
+      match ? match[0] : DEFAULT_MIME_TYPE
+    end
   end
 
   def media_type

data/lib/file_info/version.rb

@@ -1,3 +1,3 @@
 class FileInfo
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/spec/file_info_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe FileInfo do
-  let(:binary_file)     { fixture('one_byte.txt') }
+  let(:one_byte_file)   { fixture('one_byte.txt') }
   let(:ascii_file)      { fixture('encoding_ascii.csv') }
   let(:isolatin_file)   { fixture('encoding_isolatin.csv') }
   let(:isowindows_file) { fixture('encoding_isowindows.csv') }
@@ -10,6 +10,7 @@ describe FileInfo do
 
   let(:photoshop_file)  { fixture('mockup.psd') }
   let(:binary_file)     { fixture('bytes') }
+  let(:max_file)        { fixture('earth.max') }
 
   describe '#charset' do
     it 'returns encoding string' do
@@ -18,16 +19,18 @@ describe FileInfo do
       expect(FileInfo.load(isolatin_file.path).charset).to   eq 'iso-8859-1'
       expect(FileInfo.load(isowindows_file.path).charset).to eq 'iso-8859-1'
       expect(FileInfo.load(utf8_file.path).charset).to       eq 'utf-8'
+      expect(FileInfo.load(max_file.path).charset).to        eq 'binary'
     end
   end
 
   describe '#encoding' do
     it 'returns Encoding instance' do
-      expect(FileInfo.load(binary_file.path).encoding).to     eq Encoding::BINARY
+      expect(FileInfo.load(one_byte_file.path).encoding).to   eq Encoding::BINARY
       expect(FileInfo.load(ascii_file.path).encoding).to      eq Encoding::US_ASCII
       expect(FileInfo.load(isolatin_file.path).encoding).to   eq Encoding::ISO_8859_1
       expect(FileInfo.load(isowindows_file.path).encoding).to eq Encoding::ISO_8859_1
       expect(FileInfo.load(utf8_file.path).encoding).to       eq Encoding::UTF_8
+      expect(FileInfo.load(max_file.path).encoding).to        eq Encoding::BINARY
     end
 
     it 'raises UnknownEncodingError' do
@@ -59,6 +62,18 @@ describe FileInfo do
     it 'raises ArgumentError if file does not exist' do
       expect { FileInfo.load('WRONG!!1') }.to raise_error ArgumentError
     end
+
+    it 'prevents command line hacks' do
+      filename = "#{File.dirname(__FILE__)}/hacked.txt"
+      File.unlink(filename) if File.exists? filename
+
+      expect {
+        begin
+          FileInfo.load("foo; touch #{filename}")
+        rescue ArgumentError
+        end
+      }.not_to change { File.exists? filename }
+    end
   end
 
   describe '.parse' do
@@ -69,7 +84,7 @@ describe FileInfo do
       expect(FileInfo.parse(utf8_file.read).encoding).to       eq Encoding::UTF_8
     end
 
-    context 'when internal encoding is UTF-8 (like Rails forces)' do
+    context 'when internal encoding is UTF-8 (like Rails enforces)' do
       around do |example|
         previous_encoding = Encoding.default_internal
         Encoding.default_internal = Encoding::UTF_8
@@ -85,11 +100,12 @@ describe FileInfo do
     end
   end
 
-  let(:txt) { FileInfo.parse(FileInfo.parse('Hello, world!')) }
+  let(:txt) { FileInfo.parse('Hello, world!') }
   let(:csv) { FileInfo.load(utf8_file.path) }
   let(:psd) { FileInfo.load(photoshop_file.path) }
   let(:empty) { FileInfo.parse('') }
   let(:bytes) { FileInfo.load(binary_file.path) }
+  let(:max) { FileInfo.load(max_file.path) }
 
   describe '#content_type' do
     it 'returns full Content-Type string' do
@@ -98,6 +114,7 @@ describe FileInfo do
       expect(psd.content_type).to eq 'image/vnd.adobe.photoshop; charset=binary'
       expect(empty.content_type).to match %r{(application|inode)/x-empty; charset=binary}
       expect(bytes.content_type).to eq 'application/octet-stream; charset=binary'
+      expect(max.content_type).to eq '; charset=binary'
     end
   end
 
@@ -108,6 +125,7 @@ describe FileInfo do
       expect(psd.type).to eq 'image/vnd.adobe.photoshop'
       expect(empty.type).to match %r{(application|inode)/x-empty}
       expect(bytes.type).to eq 'application/octet-stream'
+      expect(max.type).to eq 'application/octet-stream'
     end
   end
 
@@ -118,6 +136,7 @@ describe FileInfo do
       expect(psd.media_type).to eq 'image'
       expect(empty.media_type).to match %r{(application|inode)}
       expect(bytes.media_type).to eq 'application'
+      expect(max.media_type).to eq 'application'
     end
   end
 
@@ -128,12 +147,13 @@ describe FileInfo do
       expect(psd.sub_type).to eq 'vnd.adobe.photoshop'
       expect(empty.sub_type).to eq 'x-empty'
       expect(bytes.sub_type).to eq 'octet-stream'
+      expect(max.sub_type).to eq 'octet-stream'
     end
   end
 
   describe '#mime_type' do
     it 'returns a MIME::Type instance' do
-      [txt, csv, psd, bytes].each do |fileinfo|
+      [txt, csv, psd, bytes, max].each do |fileinfo|
         expect(fileinfo.mime_type).to be_a MIME::Type
       end
     end
@@ -144,7 +164,7 @@ describe FileInfo do
 
     context 'when "mime-types" gem is not available' do
       before do
-        MIME.send(:remove_const, :Types)
+        hide_const 'MIME::Types'
         allow_any_instance_of(FileInfo).to receive(:require).with('mime/types').and_raise(LoadError)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fileinfo
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Rafaël Blais Masson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2017-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +87,7 @@ files:
 - lib/fileinfo.rb
 - spec/file_info_spec.rb
 - spec/fixtures/bytes
+- spec/fixtures/earth.max
 - spec/fixtures/encoding_ascii.csv
 - spec/fixtures/encoding_isolatin.csv
 - spec/fixtures/encoding_isowindows.csv
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: FileInfo detects file encodings and MIME types using the wonderful Unix `file`
@@ -123,6 +124,7 @@ summary: FileInfo detects file encodings and MIME types using the wonderful Unix
 test_files:
 - spec/file_info_spec.rb
 - spec/fixtures/bytes
+- spec/fixtures/earth.max
 - spec/fixtures/encoding_ascii.csv
 - spec/fixtures/encoding_isolatin.csv
 - spec/fixtures/encoding_isowindows.csv