scribd-carrierwave 0.0.4 → 0.0.5

data/lib/scribd-carrierwave/version.rb

@@ -1,5 +1,5 @@
 module Scribd
   module Carrierwave
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/scribd-carrierwave.rb

@@ -11,7 +11,7 @@ module ScribdCarrierWave
     end
     
     def upload uploader
-      args = { file: uploader.url, access: 'private' }
+      args = { file: full_path(uploader), access: 'private' }
       scribd_user.upload(args)
     end
     
@@ -20,6 +20,14 @@ module ScribdCarrierWave
       document.destroy if !document.nil?
     end
     
+    def full_path uploader
+      if uploader.url =~ /http(s?):\/\//
+        uploader.url
+      else
+        uploader.root + uploader.url
+      end
+    end
+    
     module ClassMethods
       def has_ipaper
         include InstanceMethods

data/spec/scribd-carrierwave_spec.rb

@@ -11,7 +11,8 @@ describe ScribdCarrierWave do
     describe "upload" do
       it "calls rscribd.upload with the correct arguments" do
         @uploader.stubs(:url).returns('test_url')
-        @scribd_user_mock.expects(:upload).with(has_entries(file: 'test_url', access: 'private'))
+        @uploader.stubs(:root).returns('/root/path/')
+        @scribd_user_mock.expects(:upload).with(has_entries(file: '/root/path/test_url', access: 'private'))
         ScribdCarrierWave::upload @uploader
       end
     end
@@ -25,6 +26,20 @@ describe ScribdCarrierWave do
         ScribdCarrierWave::destroy @uploader
       end
     end
+    
+    describe "full_path" do
+      it "returns the full file path for file storage" do
+        @uploader.stubs(:url).returns('/test/path.pdf')
+        @uploader.stubs(:root).returns('/full/path')
+        ScribdCarrierWave::full_path(@uploader).should eq '/full/path/test/path.pdf'
+      end
+      
+      it "returns the url for fog storage" do
+        @uploader.stubs(:url).returns('http://www.test.com/file.pdf')
+        @uploader.stubs(:root).returns('/full/path')
+        ScribdCarrierWave::full_path(@uploader).should eq 'http://www.test.com/file.pdf'
+      end
+    end
   end
   
   context "instance methods" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scribd-carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70106425569720 !ruby/object:Gem::Requirement
+  requirement: &70123369856980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70106425569720
+  version_requirements: *70123369856980
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70106425569200 !ruby/object:Gem::Requirement
+  requirement: &70123369856500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70106425569200
+  version_requirements: *70123369856500
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70106425568640 !ruby/object:Gem::Requirement
+  requirement: &70123369856020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70106425568640
+  version_requirements: *70123369856020
 - !ruby/object:Gem::Dependency
   name: rscribd
-  requirement: &70106425568080 !ruby/object:Gem::Requirement
+  requirement: &70123369855440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106425568080
+  version_requirements: *70123369855440
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70106425567620 !ruby/object:Gem::Requirement
+  requirement: &70123369854900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106425567620
+  version_requirements: *70123369854900
 - !ruby/object:Gem::Dependency
   name: configatron
-  requirement: &70106425567120 !ruby/object:Gem::Requirement
+  requirement: &70123369854440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106425567120
+  version_requirements: *70123369854440
 description: Allows you to have a CarrierWave uploader automatically upload to scribd
 email:
 - aubrey.c.rhodes@gmail.com
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3848791878573906466
+      hash: 2333765513920577874
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3848791878573906466
+      hash: 2333765513920577874
 requirements: []
 rubyforge_project: scribd-carrierwave
 rubygems_version: 1.8.10