s3direct 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a0da6ea008f558ec274a57def5b4c2d262c23470
+  data.tar.gz: 75afb9a551087d2a8c2a8bc5d351f374d59d5532
+SHA512:
+  metadata.gz: 6c878f375eff37ed2156f114c9fa8f5f415e8cb1be32fa42e9a8640b82137d8acda8765ff00d3497dd993b76fef9f6982e5c1c7d2cd02cbe0689bc61d3470a63
+  data.tar.gz: bb5ac94ee6e6219d1aa26e15aa8f95a8b16d2c1ad0870066fba611fc833401a04170153d330d518c1dfb265088212d8e3652745a18c42f2db029ad815691b825

data/lib/s3direct/file.rb

@@ -1,7 +1,7 @@
 module S3Direct
   class File
 
-    attr_reader :model, :identifier, :pattern
+    attr_reader :model, :identifier, :pattern, :options
 
     def self.sanitize_filename(name)
       unless name.nil?
@@ -10,11 +10,11 @@ module S3Direct
     end
 
     def initialize(model, identifier, pattern, opts={})
-      setup_options opts
-
       @model = model
       @identifier = identifier
       @pattern = pattern
+
+      @options = default_options.merge(opts)
     end
 
     def name
@@ -33,12 +33,12 @@ module S3Direct
       end
     end
 
-    def upload_request(filename = name, options = {})
+    def upload_request(filename = name, opts = {})
       if filename.blank?
         raise "Can't create an upload request without a filename - " +
           "provide it as an argument or set #{identifier}_file on the model"
       end
-      UploadRequest.new s3_path, self.class.sanitize_filename(filename), options
+      UploadRequest.new s3_path, self.class.sanitize_filename(filename), options.merge(opts)
     end
 
     def key
@@ -49,19 +49,24 @@ module S3Direct
       name.present?
     end
 
+    def max_upload_size
+      max_method = "#{identifier}_max_upload_size"
+
+      if model.respond_to?(max_method)
+        model.public_send(max_method)
+      end
+    end
+
     private
 
     def config
       ::S3Direct.config
     end
 
-    def options
-      # set up any defaults here
-      @options ||= {}
-    end
-
-    def setup_options(opts)
-      options.merge! opts
+    def default_options
+      Hash.new.tap do |h|
+        h[:max_upload_size] = max_upload_size if max_upload_size
+      end
     end
 
     def default_url

data/lib/s3direct/upload_request.rb

@@ -39,6 +39,10 @@ module S3Direct
       options.fetch(:acl, config.default_acl)
     end
 
+    def max_upload_size
+      options.fetch(:max_upload_size, config.max_upload_size)
+    end
+
     private
 
     # generate the policy document that amazon is expecting.
@@ -50,7 +54,7 @@ module S3Direct
           {'acl' => s3_acl},
           {'success_action_status' => '200'},
           {'key' => key},
-          ['content-length-range', 0, config.max_upload_size]
+          ['content-length-range', 0, max_upload_size]
         ]
       }
 

data/lib/s3direct/version.rb

@@ -1,3 +1,3 @@
 module S3Direct
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/file_spec.rb

@@ -26,6 +26,18 @@ describe S3Direct::File do
     expect(file.url).to_not eql "http://example.com/default.png"
   end
 
+  it "returns a nil max_upload_size if the model does not provide it" do
+    model = double(:model, avatar_file: nil)
+    file = S3Direct::File.new(model, :avatar, "some/path")
+    expect(file.max_upload_size).to be_nil
+  end
+
+  it "returns a the max_upload_size from the model if it responds to a method like avatar_max_upload_size" do
+    model = double(:model, avatar_file: nil, avatar_max_upload_size: 123)
+    file = S3Direct::File.new(model, :avatar, "some/path")
+    expect(file.max_upload_size).to eq(123)
+  end
+
 end
 
 describe S3Direct::File, "#exists?" do
@@ -66,6 +78,13 @@ describe S3Direct::File, "#upload_request" do
     file.upload_request('test.txt', {foo: 'bar'})
   end
 
+  it "receives the max_upload_size option if the model provides it" do
+    model = double(:model, media_max_upload_size: 2048)
+    file = S3Direct::File.new(model, :media, "foo/bar/bat")
+    S3Direct::UploadRequest.should_receive(:new).with("foo/bar/bat", "test.txt", {max_upload_size: 2048, foo: 'bar'})
+    file.upload_request('test.txt', {foo: 'bar'})
+  end
+
   it "raises an error if the filename is not set or provided" do
     model = double(:model)
     file = S3Direct::File.new(model, :media, "foo/bar/bat")

data/spec/upload_request_spec.rb

@@ -14,6 +14,28 @@ describe S3Direct::UploadRequest, '#attachment_filename' do
   end
 end
 
+describe S3Direct::UploadRequest, 'the s3 upload policy' do
+  before do
+    S3Direct.config.stub(bucket_url: 'http://s3.com/mabucket/')
+    S3Direct.config.stub(secret_key: 'sekret')
+  end
+
+  def content_length_condition(upload_request)
+    policy = JSON[Base64.decode64(JSON[upload_request.to_json]['policy'])]
+    policy['conditions'].detect {|c| c.is_a?(Array) && c[0] == 'content-length-range'}
+  end
+
+  it 'defaults the max upload size to the config' do
+    upload_request = S3Direct::UploadRequest.new('/foo/bar', 'buzz.txt')
+    expect(content_length_condition(upload_request)).to eq(['content-length-range', 0, 1073741824])
+  end
+
+  it 'uses the max_upload_size instance option if provided' do
+    upload_request = S3Direct::UploadRequest.new('/foo/bar', 'buzz.txt', max_upload_size: 1024)
+    expect(content_length_condition(upload_request)).to eq(['content-length-range', 0, 1024])
+  end
+end
+
 describe S3Direct::UploadRequest, '#to_json' do
   before do
     S3Direct.config.stub(bucket_url: 'http://s3.com/mabucket/')

metadata

@@ -1,142 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: s3direct
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Brent Dillingham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: jquery-fileupload-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ejs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Upload directly to S3
@@ -146,7 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -169,33 +152,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1023143937309546202
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1023143937309546202
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Upload directly to S3
 test_files:
 - spec/config_spec.rb