s3direct 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee3f1ab2d359fbf373c9237b0a621d848985e8a1
-  data.tar.gz: 2722aeaaf920b376816dc101e8bbae44ef2bec98
+  metadata.gz: a5725f0ef72faabfef6926494d8b15ac263e06d9
+  data.tar.gz: c4940ed2f276792757bb2e6dddd876688e93a2d2
 SHA512:
-  metadata.gz: 82f1a13b662cd065e56cb127ff8f5d660c0ff178d088b63951f15b0aba71347abe7d7e114cdaa8edc7638647cd1b9c920f75d3e9d28e0c4353041385252bc4b6
-  data.tar.gz: c3393197d1fb0beb1bd6367d602a7175df01462bbb55a1584d29187c6cc2273ea2c480b5e84856238665d575a93eb9c31687fc41c99af885864f718e5a6a7b33
+  metadata.gz: dba5b1d48a966673d65462e8043e798702995b70573196d55fd8d1c7a86fe5e3be5b98bcb5a8a8754e0be057d9f3415facf63715d8bef28750f8c7d97c545b68
+  data.tar.gz: 62a3a1afd7065b95c5a0d3aff9596b118e4a0223eab6fc314b62f87f525b6f1f0bc1af056cd5d02ef37dcfa1367341341b9c3049923eb3c17631eb1d17355b15

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+### 0.4.0
+
+* enhancements
+  * Previously the Content-Type was not set on s3, it was defaulting to 'binary/octet-stream'.
+    The mime-types gem now provides content type detection based of the filename and, for maximum
+    accuracy, an optional `filetype` param from the browser file object.

data/lib/s3direct.rb

@@ -1,6 +1,7 @@
 require "active_support/all"
 
 require "s3direct/version"
+require "s3direct/content_type_detection"
 require "s3direct/file"
 require "s3direct/string_interpolator"
 require "s3direct/upload_request"

data/lib/s3direct/content_type_detection.rb

@@ -0,0 +1,52 @@
+require "mime-types"
+
+module S3Direct
+  class ContentTypeDetection < Struct.new(:filename, :filetype)
+    class Default
+      def self.content_type
+        'binary/octet-stream'.dup
+      end
+    end
+
+    def lookup
+      value = if filetype.to_s.empty?
+        FilenameStrategy.new(filename).lookup
+      else
+        HybridStrategy.new(filename, filetype).lookup
+      end
+
+      remap(value)
+    end
+
+    def remap(value)
+      mappings = {
+        "application/mp4" => "video/mp4",
+        "audio/mp3" => "audio/mpeg"
+      }
+
+      mappings.fetch(value, value)
+    end
+  end
+
+  class FilenameStrategy < Struct.new(:filename)
+    def lookup
+      types = MIME::Types.type_for(filename)
+      (types.first || ContentTypeDetection::Default).content_type
+    end
+  end
+
+  class HybridStrategy < Struct.new(:filename, :filetype)
+    def lookup
+      types = MIME::Types.type_for(filename)
+
+      type = if types.length == 1
+        types.first
+      elsif types.length > 1
+        media_type = filetype.split('/').first
+        types.detect {|t| t.media_type == media_type}
+      end
+
+      (type || ContentTypeDetection::Default).content_type
+    end
+  end
+end

data/lib/s3direct/upload_request.rb

@@ -29,6 +29,10 @@ module S3Direct
         data["Content-Disposition"] = %Q{attachment; filename="#{attachment_filename}"}
       end
 
+      if content_type
+        data["Content-Type"] = content_type
+      end
+
       data.to_json
     end
 
@@ -36,6 +40,14 @@ module S3Direct
       options[:attachment_filename].presence
     end
 
+    def filetype
+      options[:filetype].presence
+    end
+
+    def content_type
+      ContentTypeDetection.new(filename, filetype).lookup
+    end
+
     def s3_acl
       options.fetch(:acl, config.default_acl)
     end
@@ -63,6 +75,10 @@ module S3Direct
         policy['conditions'] << {"Content-Disposition" => %Q{attachment; filename="#{attachment_filename}"}}
       end
 
+      if content_type
+        policy['conditions'] << {"Content-Type" => content_type}
+      end
+
       encode(policy.to_json)
     end
 

data/lib/s3direct/version.rb

@@ -1,3 +1,3 @@
 module S3Direct
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/s3direct.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'jquery-fileupload-rails', '~> 0.4.1'
   spec.add_dependency 'coffee-rails'
   spec.add_dependency 'ejs'
+  spec.add_dependency 'mime-types'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rails", ">= 3.2.1"

data/spec/content_type_detection_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe S3Direct::ContentTypeDetection do
+  it "will have a content_type of audio/webm for sounds.webm audio/webm" do
+    detection = S3Direct::ContentTypeDetection.new('sounds.webm', 'audio/webm')
+    expect(detection.lookup).to eq('audio/webm')
+  end
+
+  it "will have a content_type of video/webm for sights.webm video/webm" do
+    detection = S3Direct::ContentTypeDetection.new('signed.webm', 'video/webm')
+    expect(detection.lookup).to eq('video/webm')
+  end
+
+  it "will have a content_type of audio/mpeg for sights.webm and a blank filetype" do
+    detection = S3Direct::ContentTypeDetection.new('sing.mp3', '')
+    expect(detection.lookup).to eq('audio/mpeg')
+  end
+
+  it "will have a content_type of video/mp4 for sights.mp4 and a 'video/mp4' filetype" do
+    detection = S3Direct::ContentTypeDetection.new('sights.mp4', 'video/mp4')
+    expect(detection.lookup).to eq('video/mp4')
+  end
+
+  it "will have a content_type of video/mp4 for sights.mp4 and a blank filetype" do
+    detection = S3Direct::ContentTypeDetection.new('sights.mp4', '')
+    expect(detection.lookup).to eq('video/mp4')
+  end
+end

data/spec/upload_request_spec.rb

@@ -14,6 +14,22 @@ describe S3Direct::UploadRequest, '#attachment_filename' do
   end
 end
 
+describe S3Direct::UploadRequest, 'content_type' do
+  it "will have a content_type of image/jpeg for image/jpeg" do
+    upload_request = S3Direct::UploadRequest.new('/foo/bar', 'image.jpg', {
+      filetype: 'image/jpeg'
+    })
+    expect(upload_request.content_type).to eq('image/jpeg')
+  end
+
+  it "will have a content_type of audio/mpeg for audio/mp3" do
+    upload_request = S3Direct::UploadRequest.new('/foo/bar', 'baz.mp3', {
+      filetype: 'audio/mp3'
+    })
+    expect(upload_request.content_type).to eq('audio/mpeg')
+  end
+end
+
 describe S3Direct::UploadRequest, 'the s3 upload policy' do
   before do
     S3Direct.config.stub(bucket_url: 'http://s3.com/mabucket/')
@@ -78,6 +94,23 @@ describe S3Direct::UploadRequest, '#to_json' do
       expect(condition['Content-Disposition']).to eq('attachment; filename="expected.txt"')
     end
   end
+
+  describe "the content_type" do
+    before do
+      upload_request = S3Direct::UploadRequest.new('/foo/bar', 'song.mp3')
+      @data = JSON[upload_request.to_json]
+    end
+
+    it "is included as Content-Type in the data" do
+      expect(@data["Content-Type"]).to eq('audio/mpeg')
+    end
+
+    it "is included n the policy" do
+      policy = JSON[Base64.decode64 @data['policy']]
+      condition =  policy['conditions'].detect {|c| c.is_a?(Hash) && c.keys.include?('Content-Type') }
+      expect(condition['Content-Type']).to eq('audio/mpeg')
+    end
+  end
 end
 
 describe S3Direct::UploadRequest, '#s3_acl' do

metadata

@@ -1,125 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: s3direct
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Brent Dillingham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: jquery-fileupload-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ejs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Upload directly to S3
@@ -129,12 +143,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/s3direct.rb
+- lib/s3direct/content_type_detection.rb
 - lib/s3direct/file.rb
 - lib/s3direct/string_interpolator.rb
 - lib/s3direct/upload_request.rb
@@ -142,6 +158,7 @@ files:
 - lib/s3direct/version.rb
 - s3direct.gemspec
 - spec/config_spec.rb
+- spec/content_type_detection_spec.rb
 - spec/file_spec.rb
 - spec/spec_helper.rb
 - spec/string_interpolator_spec.rb
@@ -159,22 +176,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Upload directly to S3
 test_files:
 - spec/config_spec.rb
+- spec/content_type_detection_spec.rb
 - spec/file_spec.rb
 - spec/spec_helper.rb
 - spec/string_interpolator_spec.rb