scribd_fu 2.0.7 → 2.0.8

data/Rakefile

@@ -10,6 +10,7 @@ begin
     gem.email = "matt@matt-darby.com"
     gem.homepage = "http://github.com/mdarby/scribd_fu"
     gem.authors = ["Matt Darby"]
+    gem.add_dependency('rscribd')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-2.0.7
+2.0.8

data/lib/scribd_fu/attachment_fu.rb

@@ -22,11 +22,13 @@ module ScribdFu
 
       # Yields the correct path to the file, either the local filename or the S3 URL.
       def file_path
-        if public_filename =~ ScribdFu::S3 || public_filename =~ ScribdFu::CLOUD_FRONT
-          public_filename
+        if ScribdFu::amazon_based?(public_filename)
+          path = public_filename
         else
-          "#{RAILS_ROOT}/public#{public_filename}"
+          path = "#{RAILS_ROOT}/public#{public_filename}"
         end
+
+        ScribdFu::strip_cache_string(path)
       end
     end
 

data/lib/scribd_fu/paperclip.rb

@@ -28,9 +28,13 @@ module ScribdFu
       # stored on S3, this is a full S3 URI, while it is a full path to the
       # local file if the file is stored locally.
       def file_path
-        path = (attached_file.url =~ ScribdFu::S3) ? attached_file.url : attached_file.path
-        pos  = path.rindex('?')
-        (pos) ? path[0, pos] : path
+        if ScribdFu::amazon_based?(attached_file.url)
+          path = attached_file.url
+        else
+          path = attached_file.path
+        end
+
+        ScribdFu::strip_cache_string(path)
       end
 
 

data/lib/scribd_fu.rb

@@ -103,6 +103,18 @@ module ScribdFu
       str.gsub(' ', '%20')
     end
 
+    # See if a URL is S3 or CloudFront based
+    def amazon_based?(url)
+      url =~ S3 || url =~ CLOUD_FRONT
+    end
+
+    # Strip off any trailing "?1234567890" cache strings
+    # They cause headaches on Scribd's end.
+    def strip_cache_string(url)
+      pos = url.rindex('?')
+      (pos) ? url[0, pos] : url
+    end
+
   end
 
   module ClassMethods

data/scribd_fu.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scribd_fu}
-  s.version = "2.0.7"
+  s.version = "2.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Darby"]
@@ -50,9 +50,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rscribd>, [">= 0"])
     else
+      s.add_dependency(%q<rscribd>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rscribd>, [">= 0"])
   end
 end
 

data/spec/scribd_fu_spec.rb

@@ -69,6 +69,28 @@ describe "An AttachmentFu model" do
 
           end
 
+          context "and is destined for CloudFront" do
+            before do
+              @document.stub!(:public_filename => "http://a9.cloudfront.net/something.pdf?0000000000")
+            end
+
+            it "should return the CloudFront URL, not the local filesystem path" do
+              @document.file_path.should == "http://a9.cloudfront.net/something.pdf"
+            end
+
+          end
+
+          context "and is destined for S3" do
+            before do
+              @document.stub!(:public_filename => "http://s3.amazonaws.com/something.pdf")
+            end
+
+            it "should return the AWS URL, not the local filesystem path" do
+              @document.file_path.should == "http://s3.amazonaws.com/something.pdf"
+            end
+
+          end
+
           describe "and uploading to Scribd succeeded" do
             before do
               @scribd_response = mock('scribd_response', :doc_id => "doc_id", :access_key => "access_key")
@@ -206,6 +228,17 @@ describe "A Paperclip model" do
             end
           end
 
+          context "and is destined for CloudFront" do
+            before do
+              @attached_file.stub!(:url => "http://a9.cloudfront.net/something.pdf?0000000000")
+            end
+
+            it "should return the CloudFront URL, not the local filesystem path" do
+              @attachment.file_path.should == "http://a9.cloudfront.net/something.pdf"
+            end
+
+          end
+
           describe "and uploading to Scribd succeeded" do
             before do
               @scribd_response = mock('scribd_response', :doc_id => "doc_id", :access_key => "access_key")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scribd_fu
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: false
   segments: 
   - 2
   - 0
-  - 7
-  version: 2.0.7
+  - 8
+  version: 2.0.8
 platform: ruby
 authors: 
 - Matt Darby
@@ -17,8 +17,21 @@ cert_chain: []
 
 date: 2010-06-30 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rscribd
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: A Rails gem that streamlines interactions with the Scribd service
 email: matt@matt-darby.com
 executables: []