carrierwave_direct 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm:
+ - 1.9.2
+

data/README.md

@@ -1,5 +1,7 @@
 # CarrierWaveDirect
 
+[![Build Status](https://secure.travis-ci.org/dwilkie/carrierwave_direct.png)](http://travis-ci.org/dwilkie/carrierwave_direct)
+
 [CarrierWave](https://github.com/jnicklas/carrierwave) is a great way to upload files from Ruby applications, but since processing and saving is done in-process, it doesn't scale well. A better way is to upload your files directly then handle the processing and saving in a background process.
 
 [CarrierWaveDirect](https://github.com/dwilkie/carrierwave_direct) works on top of [CarrierWave](https://github.com/jnicklas/carrierwave) and provides a simple way to achieve this.

data/lib/carrierwave_direct/uploader.rb

@@ -21,7 +21,7 @@ module CarrierWaveDirect
 
     module InstanceMethods
       def direct_fog_url(options = {})
-        fog_uri = CarrierWave::Storage::Fog::File.new(self, nil, nil).public_url
+        fog_uri = CarrierWave::Storage::Fog::File.new(self, CarrierWave::Storage::Fog.new(self), nil).public_url
         if options[:with_path]
           uri = URI.parse(fog_uri)
           path = "/#{key}"
@@ -58,7 +58,7 @@ module CarrierWaveDirect
 
         Base64.encode64(
           {
-            'expiration' => Time.now + options[:expiration],
+            'expiration' => Time.now.utc + options[:expiration],
             'conditions' => [
               ["starts-with", "$utf8", ""],
               ["starts-with", "$key", store_dir],

data/lib/carrierwave_direct/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
 module CarrierwaveDirect
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end
 

data/spec/support/model_helpers.rb

@@ -72,7 +72,7 @@ module ModelHelpers
           end
         end
 
-        it_should_be_accessible(name, sample_data, options)
+        it_should_be_accessible(name, sample_data, options) if options[:accessible].present?
       end
     end
   end

data/spec/support/mounted_class.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) << "/direct_uploader"
+
 class MountedClass
   extend CarrierWave::Mount
   extend CarrierWaveDirect::Mount

data/spec/support/uploader_helpers.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) << "/mounted_class"
+
 module UploaderHelpers
   include CarrierWaveDirect::Test::Helpers
 

data/spec/test/helpers_spec.rb

@@ -48,7 +48,7 @@ describe CarrierWaveDirect::Test::Helpers do
       context "with no options" do
         it "should return '*/guid/filename.extension'" do
           sample_key(
-            direct_uploader,
+            direct_uploader
           ).should =~ /#{GUID_REGEXP}\/filename\.extension$/
         end
       end

data/spec/uploader_spec.rb

@@ -313,19 +313,9 @@ describe CarrierWaveDirect::Uploader do
         decoded_policy(options)["expiration"]
       end
 
-      # Stolen from rails
-      def string_to_time(str)
-        d = ::Date._parse(str, false).values_at(
-          :year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset
-        ).map { |arg| arg || 0 }
-        d[6] *= 1000000
-        Time.utc(*d[0..6]) - d[7]
-      end
-
-
       def have_expiration(expires_in = DirectUploader.upload_expiration)
         eql(
-          string_to_time(
+          Time.parse(
             JSON.parse({
               "expiry" => Time.now + expires_in
             }.to_json)["expiry"]
@@ -335,13 +325,17 @@ describe CarrierWaveDirect::Uploader do
 
       it "should be #{DirectUploader.upload_expiration / 3600} hours from now" do
         Timecop.freeze(Time.now) do
-          string_to_time(expiration).should have_expiration
+          Time.parse(expiration).should have_expiration
         end
       end
 
+      it "should be encoded as a utc time" do
+        Time.parse(expiration).should be_utc
+      end
+
       it "should be #{sample(:expiration) / 60 } minutes from now when passing {:expiration => #{sample(:expiration)}}" do
         Timecop.freeze(Time.now) do
-          string_to_time(expiration(:expiration => sample(:expiration))).should have_expiration(sample(:expiration))
+          Time.parse(expiration(:expiration => sample(:expiration))).should have_expiration(sample(:expiration))
         end
       end
     end
@@ -419,7 +413,7 @@ describe CarrierWaveDirect::Uploader do
   # note that 'video' is hardcoded into the MountedClass support file
   # so changing the sample will cause the tests to fail
   context "a class has a '#{sample(:mounted_as)}' mounted" do
-    describe "#{sample(:mounted_as).capitalize}Uploader" do
+    describe "#{sample(:mounted_as).to_s.capitalize}Uploader" do
       describe "##{sample(:mounted_as)}" do
         it "should be defined" do
           direct_subject.should be_respond_to(sample(:mounted_as))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_direct
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-08 00:00:00.000000000Z
+date: 2011-09-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &69135650 !ruby/object:Gem::Requirement
+  requirement: &74846810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *69135650
+  version_requirements: *74846810
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &69457720 !ruby/object:Gem::Requirement
+  requirement: &74846570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *69457720
+  version_requirements: *74846570
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70220670 !ruby/object:Gem::Requirement
+  requirement: &74846360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220670
+  version_requirements: *74846360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70418510 !ruby/object:Gem::Requirement
+  requirement: &74846140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70418510
+  version_requirements: *74846140
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70422900 !ruby/object:Gem::Requirement
+  requirement: &74845930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70422900
+  version_requirements: *74845930
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70478930 !ruby/object:Gem::Requirement
+  requirement: &74845710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70478930
+  version_requirements: *74845710
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70568450 !ruby/object:Gem::Requirement
+  requirement: &74845480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70568450
+  version_requirements: *74845480
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70742260 !ruby/object:Gem::Requirement
+  requirement: &74845250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70742260
+  version_requirements: *74845250
 description: Process your uploads in the background by uploading directly to S3
 email:
 - dwilkie@gmail.com
@@ -107,6 +107,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md