fileinfo 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fd22a80c28289631c040bde751eee82a7b51369
-  data.tar.gz: 38320adc6dc77ad1e6e38e6d4d1b4c49052da480
+  metadata.gz: fcd1fd05aadb34fa3d1aef1668aba25b3aa00065
+  data.tar.gz: ed0deda9b544ad738036ab76e623075fdbee4dcb
 SHA512:
-  metadata.gz: 24f820540d61e3e613b3c511eb3d5e8cebc7663de1c8828d6b4456a7215835ec7c18e1574411315e8961c0a7b1de2c63f7eddf1654b675a45139a0cf0ac8b59c
-  data.tar.gz: 2823c8c4c042db5d8b8aecbfffd38b3c552c7c2b20f1300bbddd4aacf5b08ff8139127339fd20d19043d795e1152dc6c3a88f32195aa86ec8f9d2eaf2f466e54
+  metadata.gz: 4cf59a46aac29733336c2d45905e99297158c61b098b8fc0b46ee6df9f7a777ff7648207d3610bed6d3aa26802a048e51ff7cabf0c222eaf52d1be2b27c332d3
+  data.tar.gz: 020c7a148b70c453077d1a564477882cb3ca3bb9ce8a1eb49ef76079d8429ea9905c716645df32f12a544c2cadc87c44e907c000d9c341e5f1997908411053c0

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 
 rvm:
+  - 2.1.2
   - 2.0.0
   - 1.9.3
 

data/lib/file_info.rb

@@ -54,7 +54,7 @@ class FileInfo
   end
 
   def self.parse(content)
-    file = Tempfile.new(rand.to_s)
+    file = Tempfile.new(rand.to_s, encoding: Encoding::ASCII_8BIT)
     file.write(content)
     file.rewind
     new `file --mime --brief #{file.path}`

data/lib/file_info/version.rb

@@ -1,3 +1,3 @@
 class FileInfo
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/spec/file_info_spec.rb

@@ -65,6 +65,21 @@ describe FileInfo do
       expect(FileInfo.parse(isowindows_file.read).encoding).to eq Encoding::ISO_8859_1
       expect(FileInfo.parse(utf8_file.read).encoding).to       eq Encoding::UTF_8
     end
+
+    context 'when internal encoding is UTF-8 (like Rails forces)' do
+      around do |example|
+        previous_encoding = Encoding.default_internal
+        Encoding.default_internal = Encoding::UTF_8
+        example.run
+        Encoding.default_internal = previous_encoding
+      end
+
+      [Encoding::ASCII_8BIT, Encoding::US_ASCII].each do |encoding|
+        it "accepts #{encoding} characters with no UTF-8 equivalent" do
+          expect { FileInfo.parse("\xFF".force_encoding(encoding)) }.not_to raise_error
+        end
+      end
+    end
   end
 
   let(:txt) { FileInfo.parse(FileInfo.parse('Hello, world!')) }
@@ -78,7 +93,7 @@ describe FileInfo do
       expect(txt.content_type).to eq 'text/plain; charset=us-ascii'
       expect(csv.content_type).to eq 'text/plain; charset=utf-8'
       expect(psd.content_type).to eq 'image/vnd.adobe.photoshop; charset=binary'
-      expect(empty.content_type).to eq 'application/x-empty; 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'
     end
   end
@@ -88,7 +103,7 @@ describe FileInfo do
       expect(txt.type).to eq 'text/plain'
       expect(csv.type).to eq 'text/plain'
       expect(psd.type).to eq 'image/vnd.adobe.photoshop'
-      expect(empty.type).to eq 'application/x-empty'
+      expect(empty.type).to match %r{(application|inode)/x-empty}
       expect(bytes.type).to eq 'application/octet-stream'
     end
   end
@@ -98,7 +113,7 @@ describe FileInfo do
       expect(txt.media_type).to eq 'text'
       expect(csv.media_type).to eq 'text'
       expect(psd.media_type).to eq 'image'
-      expect(empty.media_type).to eq 'application'
+      expect(empty.media_type).to match %r{(application|inode)}
       expect(bytes.media_type).to eq 'application'
     end
   end
@@ -124,7 +139,7 @@ describe FileInfo do
       expect(empty.mime_type).to eq nil
     end
 
-    context 'when "mime-types" gem isn’t available' do
+    context 'when "mime-types" gem is not available' do
       before do
         MIME.send(:remove_const, :Types)
         allow_any_instance_of(FileInfo).to receive(:require).with('mime/types').and_raise(LoadError)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fileinfo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Rafaël Blais Masson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler