epitools 0.4.47 → 0.4.48

data/lib/epitools/path.rb

@@ -450,7 +450,7 @@ class Path
   def mimetype_from_ext
     MimeMagic.by_extension(ext)
   end
-  
+
   #
   # Find the file's mimetype (by magic)
   #  
@@ -458,11 +458,29 @@ class Path
     open { |io| MimeMagic.by_magic(io) }
   end
   
-  def ext_by_magic
-    # TODO: return the extension for the mime type.
-    raise NotImplementedError
+  def type
+    @magictype ||= proc do 
+      
+      ext   = self.ext
+      magic = self.magic
+      
+      if !ext and magic
+        magic.extensions.first
+      elsif ext and !magic
+        ext
+      elsif !ext and !magic
+        :unknown
+      else # ext and magic
+        if magic.extensions.include? ext
+          ext
+        else
+          magic.extensions.first # just incase the extension is incorrect
+        end
+      end
+      
+    end.call
   end
-
+  
   ############################################################################
   ## Class Methods
 

data/spec/autoreq_spec.rb

@@ -2,17 +2,18 @@ require 'epitools'
 
 describe "autoreq" do
 
-  it "should have MimeMagic and Units installed" do
+  it "should have Haml and Units installed" do
     gems = Gem.source_index.to_a.map{|name, spec| spec.name}.uniq
-    gems.include?("mimemagic").should == true
+    gems.include?("haml").should == true
     gems.include?("units").should == true
   end
 
   it "autoreqs a gem" do
-    defined?(MimeMagic).should == nil
+    defined?(Haml).should == nil
 
-    autoreq :MimeMagic, 'mimemagic'
-    lambda { MimeMagic }.should_not raise_error
+    autoreq :Haml, 'haml'
+    !!defined?(Haml).should == false
+    lambda { Haml }.should_not raise_error
   end
     
   it "autoreqs a regular ruby file" do

data/spec/path_spec.rb

@@ -246,7 +246,11 @@ describe Path do
   end
   
   it "mimes" do
-    Path[__FILE__].mimetype == "application/x-ruby"
+    Path[__FILE__].mimetype.should == "application/x-ruby"
+  end
+  
+  it "magic types" do
+    Path[__FILE__].type.should == "rb"
   end
   
   it "whiches" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.4.47
+  version: 0.4.48
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-25 00:00:00.000000000 -04:00
+date: 2011-06-29 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &73254740 !ruby/object:Gem::Requirement
+  requirement: &75924720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *73254740
+  version_requirements: *75924720
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &73253840 !ruby/object:Gem::Requirement
+  requirement: &75924440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *73253840
+  version_requirements: *75924440
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &73253590 !ruby/object:Gem::Requirement
+  requirement: &75924150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73253590
+  version_requirements: *75924150
 description: Miscellaneous utility libraries to make my life easier.
 email: chris@ill-logic.com
 executables: []
@@ -70,6 +70,8 @@ files:
 - lib/epitools/hexdump.rb
 - lib/epitools/its.rb
 - lib/epitools/lcs.rb
+- lib/epitools/mimemagic.rb
+- lib/epitools/mimemagic_tables.rb
 - lib/epitools/niceprint.rb
 - lib/epitools/numwords.rb
 - lib/epitools/path.rb