phocoder-rails 0.0.43 → 0.0.44

data/Gemfile

@@ -14,7 +14,7 @@ gem "rails", ">=3.0.0"
 
 gem 'phocoder-rb'
 gem 'zencoder'
-gem "mimetype-fu", "~> 0.1.2"
+gem "mimetype-fu", "~> 0.1.2", :require => 'mimetype_fu'
 gem 'aws-s3', :require => 'aws/s3'
 #gem "spawn", :git => "git://github.com/jagthedrummer/spawn.git"
 gem "spawn", :git => 'git://github.com/tra/spawn', :branch => "edge"

data/VERSION

@@ -1,4 +1,4 @@
-0.0.43
+0.0.44
 
 
 

data/lib/phocoder_rails.rb

@@ -5,8 +5,8 @@ module PhocoderRails
   #require 'action_pack'
   #require 'active_support'
   require 'aws/s3'
-  
   require 'phocoder_rails/acts_as_phocodable'
   require 'phocoder_rails/errors'
   #require 'phocoder_rails/base'
+  
 end

data/lib/phocoder_rails/acts_as_phocodable.rb

@@ -921,15 +921,14 @@ module ActsAsPhocodable
       cleanup
       if new_file.is_a? File
         self.filename = File.basename new_file.path
-        self.content_type = MIME::Types.type_for(self.filename).first.content_type || File.mime_type?(self.filename)
+        self.content_type = MIME::Types.type_for(self.filename).first.content_type 
         self.file_size = new_file.size
       else
-        self.filename = new_file.original_filename || File.mime_type?(self.filename)
-
-        self.content_type = new_file.content_type  
+        self.filename = new_file.original_filename
+        self.content_type = new_file.content_type
         self.file_size = new_file.size
       end
-      
+      self.content_type = File.mime_type?(self.filename) if self.content_type.blank?
       if new_file.respond_to? :tempfile
         @saved_file = new_file.tempfile
       else

data/spec/models/acts_as_phocodable_spec.rb

@@ -169,7 +169,17 @@ describe ActsAsPhocodable do
     phorams[:input][:url].should == iu.public_url
     phorams[:thumbnails].size.should == 1
   end
-    
+  
+  describe "automatically setting the content type" do
+    it "should work for jpgs" do
+      iu = ImageUpload.new(:file => fixture_file_upload(fixture_path + '/big_eye_tiny.jpg'))
+      iu.content_type.should == "image/jpeg"
+    end
+    it "should work for nefs" do
+      iu = ImageUpload.new(:file => fixture_file_upload(fixture_path + '/test_image.nef'))
+      iu.content_type.should == "image/x-nikon-nef"
+    end
+  end
   
   it "should create zencooder params based on the acts_as_phocodable :videos options" do
     iu = ImageUpload.new(@vid_attr)
@@ -599,8 +609,8 @@ describe ActsAsPhocodable do
     
     iu.save_s3_file
     # Now we should have a thumb
-    puts "@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-    puts iu.thumbnails.map{|t| t.thumbnail }.to_json
+    #puts "@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+    #puts iu.thumbnails.map{|t| t.thumbnail }.to_json
     iu.thumbnails.size.should == 1
     # Mock the AWS reqeust for deleting the file and it's thumbnail
     AWS::S3::S3Object.should_receive(:delete).twice.and_return(nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phocoder-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.44
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &72774960 !ruby/object:Gem::Requirement
+  requirement: &77450400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *72774960
+  version_requirements: *77450400
 - !ruby/object:Gem::Dependency
   name: phocoder-rb
-  requirement: &72774570 !ruby/object:Gem::Requirement
+  requirement: &77450070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72774570
+  version_requirements: *77450070
 - !ruby/object:Gem::Dependency
   name: zencoder
-  requirement: &72774250 !ruby/object:Gem::Requirement
+  requirement: &77428450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72774250
+  version_requirements: *77428450
 - !ruby/object:Gem::Dependency
   name: mimetype-fu
-  requirement: &72752830 !ruby/object:Gem::Requirement
+  requirement: &77428150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *72752830
+  version_requirements: *77428150
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &72752530 !ruby/object:Gem::Requirement
+  requirement: &77427850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72752530
+  version_requirements: *77427850
 - !ruby/object:Gem::Dependency
   name: spawn
-  requirement: &72752230 !ruby/object:Gem::Requirement
+  requirement: &77427580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72752230
+  version_requirements: *77427580
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &72751980 !ruby/object:Gem::Requirement
+  requirement: &77427270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: 2.4.1
   type: :development
   prerelease: false
-  version_requirements: *72751980
+  version_requirements: *77427270
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &72751710 !ruby/object:Gem::Requirement
+  requirement: &77426990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72751710
+  version_requirements: *77426990
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &72751400 !ruby/object:Gem::Requirement
+  requirement: &77426700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72751400
+  version_requirements: *77426700
 description: Rails engine for easy integration with phocoder.com
 email: jagthedrummer@gmail.com
 executables: []
@@ -227,6 +227,7 @@ files:
 - spec/fixtures/big_eye_tiny.jpg
 - spec/fixtures/octologo.png
 - spec/fixtures/test.txt
+- spec/fixtures/test_image.nef
 - spec/fixtures/video-test.mov
 - spec/helpers/phocoder_helper_spec.rb
 - spec/integration/navigation_spec.rb
@@ -250,7 +251,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -916334765
+      hash: -30062993
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: