joint 0.5.4 → 0.5.5

data/lib/joint.rb

@@ -26,13 +26,8 @@ module Joint
   end
 
   def self.type(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
+    return file.type if file.is_a?(Joint::IO)
+    Wand.wave(file.path, :original_filename => Joint.name(file))
   end
 
 private

data/lib/joint/io.rb

@@ -1,10 +1,10 @@
 module Joint
   class IO
-    attr_accessor :name, :content, :content_type, :size
+    attr_accessor :name, :content, :type, :size
 
     def initialize(attrs={})
       attrs.each { |key, value| send("#{key}=", value) }
-      @content_type ||= 'plain/text'
+      @type ||= 'plain/text'
       @size ||= @content.size unless @content.nil?
     end
 

data/lib/joint/version.rb

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

data/test/joint/test_io.rb

@@ -7,8 +7,8 @@ class IOTest < Test::Unit::TestCase
     end
   end
 
-  should "default content_type to plain text" do
-    Joint::IO.new.content_type.should == 'plain/text'
+  should "default type to plain text" do
+    Joint::IO.new.type.should == 'plain/text'
   end
 
   should "default size to content size" do

data/test/test_joint.rb

@@ -43,18 +43,8 @@ class JointTest < Test::Unit::TestCase
   end
 
   context ".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
+    should "return type if Joint::Io instance" do
+      file = Joint::IO.new(:type => 'image/jpeg')
       Joint.type(@image).should == 'image/jpeg'
     end
 
@@ -354,10 +344,10 @@ class JointTest < Test::Unit::TestCase
   context "Assigning joint io instance" do
     setup do
       io = Joint::IO.new({
-        :name         => 'foo.txt',
-        :content_type => 'plain/text',
-        :content      => 'This is my stuff',
-        :size         => 19,
+        :name    => 'foo.txt',
+        :type    => 'plain/text',
+        :content => 'This is my stuff',
+        :size    => 19,
       })
       @asset = Asset.create(:file => io)
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: joint
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - John Nunemaker