mdarby-scribd_fu 2.0.2 → 2.0.3

data/README.textile

@@ -57,6 +57,10 @@ h2. Access
 
 You can set the access level on all documents by setting the @access@ key in the scribd_fu.yml file to either 'private' or 'public'. ScribdFu assumes that you'd like to keep your documents private.
 
+h2. Help
+
+Add a ticket to "ScribdFu's Lighthouse Account":http://mdarby.lighthouseapp.com/projects/28697-scribdfu/overview
+
 h2. About the Author
 
 My name is "Matt Darby.":http://blog.matt-darby.com I’m an IT Manager and pro-web-dev at for "Dynamix Engineering":http://dynamix-ltd.com and hold a Master’s Degree in Computer Science from "Franklin University":http://www.franklin.edu in sunny "Columbus, OH.":http://en.wikipedia.org/wiki/Columbus,_Ohio

data/lib/scribd_fu/attachment_fu.rb

@@ -28,7 +28,7 @@ module ScribdFu
 
       # Yields the correct path to the file, either the local filename or the S3 URL.
       def file_path
-        if public_filename.starts_with?("http://s3.amazonaws.com/")
+        if public_filename =~ /^https{0,1}:\/\/s3.amazonaws.com/
           public_filename
         else
           "#{RAILS_ROOT}/public#{public_filename}"

data/lib/scribd_fu/paperclip.rb

@@ -35,7 +35,7 @@ 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
-        if attached_file.url =~ /^https{0,1}:\/\/s3.amazonaws.com$/
+        if attached_file.url =~ /^https{0,1}:\/\/s3.amazonaws.com/
           attached_file.url
         else
           attached_file.path

data/lib/scribd_fu.rb

@@ -62,7 +62,7 @@ module ScribdFu
     # Upload a file to Scribd
     def upload(obj, file_path)
       begin
-        res = scribd_user.upload(:file => "#{file_path}", :access => access_level)
+        res = scribd_user.upload(:file => escape(file_path), :access => access_level)
         obj.update_attributes({:ipaper_id => res.doc_id, :ipaper_access_key => res.access_key})
       rescue
         raise ScribdFuUploadError, "Sorry, but #{obj.class} ##{obj.id} could not be uploaded to Scribd"
@@ -96,6 +96,11 @@ module ScribdFu
       end
     end
 
+    # Replace spaces with '%20' (needed by Paperclip models).
+    def escape(str)
+      str.gsub(' ', '%20')
+    end
+
   end
 
   module ClassMethods

data/scribd_fu.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "scribd_fu"
-  s.version  = "2.0.2"
-  s.date     = "2009-04-02"
+  s.version  = "2.0.3"
+  s.date     = "2009-04-06"
   s.summary  = "Quick and easy interactions with Scribd's iPaper service"
   s.email    = "matt@matt-darby.com"
   s.homepage = "http://github.com/mdarby/scribd_fu/tree/master"

data/spec/scribd_fu_spec.rb

@@ -57,7 +57,16 @@ describe "An AttachmentFu model" do
 
         describe "and is scribdable?" do
           before do
-            @document.stub!(:scribdable? => true)
+            @document.stub!(:update_attributes)
+          end
+
+          describe "and has spaces in the filename" do
+            it "should sanitize the file path" do
+              res = mock('response', :doc_id => 1, :access_key => "ASDF")
+              @scribd_user.should_receive(:upload).with(:file => "some%20filename%20with%20spaces", :access => 'access').and_return(res)
+              ScribdFu::upload(@document, "some filename with spaces")
+            end
+            
           end
 
           describe "and uploading to Scribd succeeded" do
@@ -162,7 +171,6 @@ describe "A Paperclip model" do
       describe "that was just created" do
         before do
           @attachment.attributes = {:ipaper_id => nil, :ipaper_access_key => nil, :attachment_content_type => "application/pdf"}
-          @attachment.stub!(:file_path => "/path/to/somewhere")
         end
 
         describe "and is scribdable?" do
@@ -170,6 +178,20 @@ describe "A Paperclip model" do
             @attachment.stub!(:scribdable? => true)
           end
 
+          describe "and has spaces in the filename" do
+            before do
+              @attached_file.stub!(:path => "/path/to/somewhere with spaces.pdf")
+              @attachment.stub!(:update_attributes)
+            end
+            
+            it "should sanitize the file path" do
+              res = mock('response', :doc_id => 1, :access_key => "ASDF")
+              @scribd_user.should_receive(:upload).with(:file => "/path/to/somewhere%20with%20spaces.pdf", :access => 'access').and_return(res)
+              ScribdFu::upload(@attachment, "/path/to/somewhere with spaces.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")
@@ -258,17 +280,21 @@ describe "Viewing an iPaper document" do
   end
   
   it "should return this HTML by default" do
-    @document.display_ipaper.should == "        <script type=\"text/javascript\" src=\"http://www.scribd.com/javascripts/view.js\"></script>\n        <div id=\"embedded_flash\"></div>\n        <script type=\"text/javascript\">\n          var scribd_doc = scribd.Document.getDoc(doc_id, 'access_key');\n          \n          scribd_doc.write(\"embedded_flash\");\n        </script>\n"
+    @document.display_ipaper.gsub(/\s{2,}/, "").should == "<script type=\"text/javascript\" src=\"http://www.scribd.com/javascripts/view.js\"></script><div id=\"embedded_flash\"></div><script type=\"text/javascript\">var scribd_doc = scribd.Document.getDoc(doc_id, 'access_key');scribd_doc.write(\"embedded_flash\");</script>\n"
   end
   
   it "should allow custom Javascript params" do
     options = {:height => 100, :width => 100}
-    @document.display_ipaper(options).should == "        <script type=\"text/javascript\" src=\"http://www.scribd.com/javascripts/view.js\"></script>\n        <div id=\"embedded_flash\"></div>\n        <script type=\"text/javascript\">\n          var scribd_doc = scribd.Document.getDoc(doc_id, 'access_key');\n          scribd_doc.addParam('width', '100');\nscribd_doc.addParam('height', '100');\n          scribd_doc.write(\"embedded_flash\");\n        </script>\n"
+    
+    @document.display_ipaper(options).should =~ /.*scribd_doc\.addParam\('height', '100'\);.*/
+    @document.display_ipaper(options).should =~ /.*scribd_doc\.addParam\('width', '100'\);.*/
   end
   
   it "should allow not allow crazy custom Javascript params" do
     options = {:some_dumb_setting => 100, :width => 100}
-    @document.display_ipaper(options).should == "        <script type=\"text/javascript\" src=\"http://www.scribd.com/javascripts/view.js\"></script>\n        <div id=\"embedded_flash\"></div>\n        <script type=\"text/javascript\">\n          var scribd_doc = scribd.Document.getDoc(doc_id, 'access_key');\n          scribd_doc.addParam('width', '100');\n          scribd_doc.write(\"embedded_flash\");\n        </script>\n"
+    
+    @document.display_ipaper(options).should =~ /.*scribd_doc\.addParam\('width', '100'\);.*/
+    @document.display_ipaper(options).should_not =~ /.*scribd_doc\.addParam\('some_dumb_setting', '100'\);.*/
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mdarby-scribd_fu
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Matt Darby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-02 00:00:00 -07:00
+date: 2009-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency