ruby-filemagic 0.2.1 → 0.2.2

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to filemagic version 0.2.1
+This documentation refers to filemagic version 0.2.2
 
 
 == DESCRIPTION
@@ -15,7 +15,11 @@ Similar to Ricardo[http://github.com/ricardochimal/ruby-filemagic]
 I wanted this project to make some progress. My needs went a bit
 farther than his, though ;-) Enjoy anyway!
 
-Install the gem from github[http://github.com]:
+Install the gem from Rubyforge[http://rubyforge.org]:
+
+  sudo gem install ruby-filemagic
+
+or from Github[http://github.com]:
 
   sudo gem install blackwinter-ruby-filemagic --source http://gems.github.com
 
@@ -42,10 +46,11 @@ Travis
 
 == LINKS
 
-* <http://grub.ath.cx/filemagic/>
-* <http://github.com/blackwinter/ruby-filemagic>
-* <http://ruby-filemagic.rubyforge.org/>
-* <http://rubyforge.org/projects/ruby-filemagic>
+<b></b>
+Homepage::          <http://grub.ath.cx/filemagic/>
+Documentation::     <http://ruby-filemagic.rubyforge.org/>
+Source code::       <http://github.com/blackwinter/ruby-filemagic>
+Rubyforge project:: <http://rubyforge.org/projects/ruby-filemagic>
 
 
 == AUTHORS

data/lib/filemagic.rb

@@ -171,7 +171,7 @@ class FileMagic
   private
 
   def simplify_mime(mime, simplified = true)
-    simplified ? mime[/([\w\/-]+)/, 1].downcase : mime
+    simplified ? mime[/([.\w\/-]+)/, 1].downcase : mime
   end
 
 end

data/lib/filemagic/ext.rb

@@ -2,6 +2,13 @@ require 'filemagic'
 
 module FileMagic::Ext
 
+  def self.included(base)
+    base.class_eval {
+      extend ClassMethods
+      include InstanceMethods
+    }
+  end
+
   module ClassMethods
 
     def file_type(file, *flags)
@@ -47,8 +54,7 @@ end
 
 class File
 
-  include FileMagic::Ext::InstanceMethods
-  extend  FileMagic::Ext::ClassMethods
+  include FileMagic::Ext
 
   def self.file_type(file, *flags)
     FileMagic.fm(*flags).file(file.respond_to?(:path) ? file.path : file)
@@ -60,8 +66,7 @@ end
 
 class String
 
-  include FileMagic::Ext::InstanceMethods
-  extend  FileMagic::Ext::ClassMethods
+  include FileMagic::Ext
 
   def self.file_type(string, *flags)
     FileMagic.fm(*flags).buffer(string)

data/lib/filemagic/version.rb

@@ -4,7 +4,7 @@ class FileMagic
 
     MAJOR = 0
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     class << self
 

data/test/filemagic_test.rb

@@ -26,7 +26,7 @@ class TestFileMagic < Test::Unit::TestCase
     fm = FileMagic.new(FileMagic::MAGIC_SYMLINK | FileMagic::MAGIC_MIME)
 
     res = fm.file(path_to('pylink'))
-    assert_equal('text/plain; charset=us-ascii', res)
+    assert_equal('text/plain', res)
 
     fm.close
     fm = FileMagic.new(FileMagic::MAGIC_COMPRESS)
@@ -95,7 +95,7 @@ class TestFileMagic < Test::Unit::TestCase
   def test_mahoro_mime_file
     fm = FileMagic.new
     fm.flags = FileMagic::MAGIC_MIME
-    assert_equal('text/x-c; charset=us-ascii', fm.file(path_to('mahoro.c')))
+    assert_equal('text/x-c', fm.file(path_to('mahoro.c')))
   end
 
   def test_mahoro_buffer
@@ -107,7 +107,7 @@ class TestFileMagic < Test::Unit::TestCase
   def test_mahoro_mime_buffer
     fm = FileMagic.new
     fm.flags = FileMagic::MAGIC_MIME
-    assert_equal('text/x-c; charset=us-ascii', fm.buffer(File.read(path_to('mahoro.c'))))
+    assert_equal('text/x-c', fm.buffer(File.read(path_to('mahoro.c'))))
   end
 
   def test_mahoro_valid
@@ -115,6 +115,13 @@ class TestFileMagic < Test::Unit::TestCase
     assert(fm.valid?, 'Default database was not valid.')
   end
 
+  # test abbreviating mime types
+
+  def test_abbrev_mime_type
+    fm = FileMagic.mime
+    assert_match(/\Aapplication\/vnd.ms-/, fm.file(path_to('excel-example.xls')))
+  end
+
   # utility methods:
 
   def path_to(file, dir = File.dirname(__FILE__))

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-filemagic
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Travis Whitton
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-18 00:00:00 +02:00
+date: 2010-03-02 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -30,29 +35,32 @@ files:
 - lib/filemagic.rb
 - ext/filemagic.c
 - test/pyfile
+- test/mahoro.c
+- test/pylink
 - test/pyfile-compressed.gz
 - test/perl
 - test/leaktest.rb
-- test/mahoro.c
 - test/filemagic_test.rb
-- test/pylink
+- test/excel-example.xls
 - README
 - CHANGELOG
-- TODO
 - Rakefile
+- TODO
 - info/filemagic.rd
 - info/example.rb
 has_rdoc: true
 homepage: http://ruby-filemagic.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --line-numbers
+- --title
+- ruby-filemagic Application documentation
 - --main
 - README
-- --all
+- --line-numbers
 - --inline-source
-- --title
-- ruby-filemagic Application documentation
+- --all
 - --charset
 - UTF-8
 require_paths: 
@@ -61,20 +69,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ruby-filemagic
-rubygems_version: 1.2.0
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby bindings to the magic(4) library
 test_files: []