content_type 2.1.4 → 2.2.0

data/Rakefile

@@ -1,8 +1,7 @@
-require 'vendor/gems/environment'
-
 require 'rake'
-require 'spec'
-require 'spec/rake/spectask'
+require 'jeweler'
+require 'rspec'
+require 'rspec/core/rake_task'
 
 task :default => [:clean, :make, :spec]
 
@@ -13,16 +12,15 @@ task :make do
   end
 end
 
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = %w(-fs -c)
-  t.spec_files = FileList['spec/*_spec.rb']
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = %w(-fs -c)
+  t.pattern = FileList['spec/*_spec.rb']
 end
 
 task :clean do
   `rm -r ext/*.o ext/*.so ext/*.bundle ext/conftest.dSYM 2>/dev/null`
 end
 
-require 'jeweler'
 Jeweler::Tasks.new do |s|
   s.name = 'content_type'
   s.summary = 'libmagic bindings to quickly determine content type of files'

data/ext/extconf.rb

@@ -4,8 +4,15 @@ RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 extension_name = 'content_type'
 dir_config(extension_name)
 
-find_header('magic.h', '/opt/local/include')
-find_library('magic', 'magic_open', '/opt/local/lib')
+brew_magic = Dir['/usr/local/Cellar/libmagic/**/magic.h']
+if brew_magic
+  brew_dir = File.dirname(File.dirname(brew_magic[0]))
+  find_header('magic.h', File.join(brew_dir, 'include'))
+  find_library('magic', 'magic_open', File.join(brew_dir, 'lib'))
+else
+  find_header('magic.h', '/opt/local/include')
+  find_library('magic', 'magic_open', '/opt/local/lib')
+end
 
 $CFLAGS += ' -Werror -Wall'
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: content_type
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 2
-  - 1
-  - 4
-  version: 2.1.4
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - David Turnbull
@@ -14,10 +15,66 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-14 00:00:00 +10:00
-default_executable: 
-dependencies: []
-
+date: 2011-05-16 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake
+  prerelease: false
+  type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rspec
+  prerelease: false
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: jeweler
+  prerelease: false
+  type: :runtime
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
+        version: 0.1.0
+  name: should_be_faster
+  prerelease: false
+  type: :runtime
+  requirement: *id004
 description: "      Provides ContentType#content_type, File#content_type, File::content_type\n      and String#content_type methods to determine mime type\n"
 email: dsturnbull@me.com
 executables: []
@@ -31,35 +88,38 @@ files:
 - ext/content_type.c
 - ext/extconf.rb
 - README
-has_rdoc: true
 homepage: http://github.com/dsturnbull/content_type
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: libmagic bindings to quickly determine content type of files
-test_files: 
-- spec/content_type_spec.rb
+test_files: []
+

data/spec/content_type_spec.rb

@@ -1,121 +0,0 @@
-require 'rubygems'
-require 'should_be_faster'
-require 'tempfile'
-require 'ext/content_type'
-
-describe ContentType do
-  before do
-    @img = 'spec/fixtures/grindewald.jpg'
-    @pdf = 'spec/fixtures/pdftest.pdf'
-    @lzm = 'spec/fixtures/compressed.jpg.lz'
-    @doc = 'spec/fixtures/wordtest.doc'
-    @dcx = 'spec/fixtures/wordtest.docx'
-    @dot = 'spec/fixtures/.supercabanafuntimekgozzzzzzzzzzzzzzzzzzzz'
-    @pdf_with_charset = 'spec/fixtures/bash.pdf'
-  end
-
-  context 'initialising' do
-    it 'should take a file path' do
-      path = @img
-      ct = ContentType.new(path)
-      ct.filepath.should == path
-    end
-
-    it 'should check that the file exists' do
-      lambda {
-        ct = ContentType.new('poopstain')
-      }.should raise_error ArgumentError
-    end
-
-    it 'should memoize the content type' do
-      ct = ContentType.new(@img)
-      lambda {
-        ct.content_type.should == 'image/jpeg'
-      }.should change(ct, :processed).to(true)
-    end
-  end
-
-  context 'file ext overrides' do
-    it 'should detect docx files' do
-      ct = ContentType.new(@dcx)
-      ct.content_type.should ==
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
-    end
-
-    it 'should handle dot files' do
-      ct = ContentType.new(@dot)
-      ct.content_type.should == 'text/plain'
-    end
-  end
-
-  context 'detecting mime type' do
-    it 'should detect images' do
-      ct = ContentType.new(@img)
-      ct.content_type.should == 'image/jpeg'
-    end
-
-    it 'should detect pdfs' do
-      ct = ContentType.new(@pdf)
-      ct.content_type.should == 'application/pdf'
-    end
-
-    it 'should detect mime types with charsets by ignoring the charset' do
-      ct = ContentType.new(@pdf_with_charset)
-      ct.content_type.should == 'application/pdf'
-    end
-
-    it 'should detect lzma files' do
-      ct = ContentType.new(@lzm)
-      ct.content_type.should == 'application/x-lzip'
-    end
-
-    it 'should detect doc files' do
-      ct = ContentType.new(@doc)
-      ct.content_type.should == 'application/msword'
-    end
-  end
-
-  context 'comparing with shelling out' do
-    it 'should be much faster' do
-      shell = lambda { `file -i #{@img}` }
-      ext   = lambda { ContentType.new(@img).content_type }
-      ext.should be_at_least(5).times.faster_than(shell)
-    end
-
-    it 'should slower to reinstantiate' do
-      @ct = ContentType.new(@img)
-      memo = lambda { @ct.content_type }
-      kgo  = lambda { ContentType.new(@img).content_type }
-      kgo.should be_at_least(5).times.slower_than(memo, :iterations => 1000)
-    end
-  end
-
-  context 'when using the file class methods' do
-    it 'should have File.content_type(path)' do
-      File.content_type(@img).should == 'image/jpeg'
-    end
-
-    it 'should have File#content_type' do
-      File.open(@img).content_type.should == 'image/jpeg'
-    end
-
-    it 'should make it into tempfile' do
-      t = Tempfile.new('hi')
-      t.content_type.should == 'application/x-empty'
-      t << File.read(@img)
-      t.content_type.should == 'image/jpeg'
-      File.unlink(t.path)
-    end
-  end
-
-  context 'on strings' do
-    it 'should have String#content_type' do
-      str = File.read(@img)
-      str.content_type.should == 'image/jpeg'
-    end
-
-    it 'should work on empty strings' do
-      ''.content_type.should == 'application/x-empty'
-    end
-  end
-end