joint 0.5.3 → 0.5.4

data/lib/joint.rb

@@ -26,11 +26,18 @@ module Joint
   end
 
   def self.type(file)
-    if file.respond_to?(:content_type)
-      file.content_type
-    else
-      Wand.wave(file.path, :original_filename => Joint.name(file))
+    type = file.content_type if file.respond_to?(:content_type)
+
+    if blank?(type)
+      type = Wand.wave(file.path, :original_filename => Joint.name(file))
     end
+
+    type
+  end
+
+private
+  def self.blank?(str)
+    str.nil? || str !~ /\S/
   end
 end
 

data/lib/joint/version.rb

@@ -1,3 +1,3 @@
 module Joint
-  Version = '0.5.3'
+  Version = '0.5.4'
 end

data/test/test_joint.rb

@@ -43,13 +43,21 @@ class JointTest < Test::Unit::TestCase
   end
 
   context ".type" do
-    should "return type" do
+    should "return content_type if responds to it" do
       def @image.content_type
         'plain/text'
       end
       Joint.type(@image).should == 'plain/text'
     end
 
+    should "fall back to Wand if content_type is blank" do
+      def @image.content_type; '' end
+      Joint.type(@image).should == 'image/jpeg'
+
+      def @image.content_type; '   ' end
+      Joint.type(@image).should == 'image/jpeg'
+    end
+
     should "fall back to Wand" do
       Joint.type(@image).should == 'image/jpeg'
     end
@@ -361,4 +369,34 @@ class JointTest < Test::Unit::TestCase
       @asset.file.read.should == 'This is my stuff'
     end
   end
+
+  context "A font file" do
+    setup do
+      @file = open_file('font.eot')
+      @doc = Asset.create(:file => @file)
+    end
+    subject { @doc }
+
+    should "assign joint keys" do
+      subject.file_size.should   == 17610
+      subject.file_type.should   == "application/octet-stream"
+      subject.file_id.should_not be_nil
+      subject.file_id.should be_instance_of(BSON::ObjectId)
+    end
+  end
+
+  context "A music file" do
+    setup do
+      @file = open_file('example.m4r')
+      @doc = Asset.create(:file => @file)
+    end
+    subject { @doc }
+
+    should "assign joint keys" do
+      subject.file_size.should   == 50790
+      subject.file_type.should   == "audio/mp4"
+      subject.file_id.should_not be_nil
+      subject.file_id.should be_instance_of(BSON::ObjectId)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: joint
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - John Nunemaker
@@ -128,6 +128,8 @@ files:
 - lib/joint/io.rb
 - lib/joint/version.rb
 - specs.watchr
+- test/fixtures/example.m4r
+- test/fixtures/font.eot
 - test/fixtures/harmony.png
 - test/fixtures/mr_t.jpg
 - test/fixtures/test1.txt
@@ -171,6 +173,8 @@ signing_key:
 specification_version: 3
 summary: MongoMapper and GridFS joined in file upload love.
 test_files: 
+- test/fixtures/example.m4r
+- test/fixtures/font.eot
 - test/fixtures/harmony.png
 - test/fixtures/mr_t.jpg
 - test/fixtures/test1.txt