scribd_fu 2.0.6 → 2.0.7

data/VERSION

@@ -1 +1 @@
-2.0.6
+2.0.7

data/lib/scribd_fu/paperclip.rb

@@ -28,7 +28,9 @@ 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
-        attached_file.url =~ ScribdFu::S3 ? attached_file.url : attached_file.path
+        path = (attached_file.url =~ ScribdFu::S3) ? attached_file.url : attached_file.path
+        pos  = path.rindex('?')
+        (pos) ? path[0, pos] : path
       end
 
 

data/scribd_fu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scribd_fu}
-  s.version = "2.0.6"
+  s.version = "2.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Darby"]
-  s.date = %q{2009-12-16}
+  s.date = %q{2010-06-30}
   s.description = %q{A Rails gem that streamlines interactions with the Scribd service}
   s.email = %q{matt@matt-darby.com}
   s.extra_rdoc_files = [
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/mdarby/scribd_fu}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A Rails gem that streamlines interactions with the Scribd service}
   s.test_files = [
     "spec/scribd_fu_spec.rb",
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/spec/scribd_fu_spec.rb

@@ -66,7 +66,7 @@ describe "An AttachmentFu model" do
               @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
@@ -187,13 +187,23 @@ describe "A Paperclip model" 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
+
+          context "and it was uploaded to S3" do
+            before do
+              @attached_file.stub!(:url => "http://s3.amazonaws.com/path/to/somewhere.pdf?0000000000")
+            end
+
+            it "should strip the trailing cache string before sending to Scribd" do
+              @attachment.file_path.should == "http://s3.amazonaws.com/path/to/somewhere.pdf"
+            end
           end
 
           describe "and uploading to Scribd succeeded" do
@@ -203,7 +213,10 @@ describe "A Paperclip model" do
             end
 
             it "should update the Scribd-centric attributes" do
-              @attachment.should_receive(:update_attributes).with({:ipaper_id => 'doc_id', :ipaper_access_key => 'access_key'})
+              @attachment.should_receive(:update_attributes).with({
+                :ipaper_id         => 'doc_id',
+                :ipaper_access_key => 'access_key'
+              })
               @attachment.save
             end
 
@@ -270,39 +283,39 @@ end
 describe "Viewing an iPaper document" do
   before do
     rebuild_model
-    
+
     config = YAML.load_file("spec/scribd_fu.yml")
     File.stub!(:file?).with(ScribdFu::ConfigPath).and_return(true)
     YAML.stub!(:load_file).and_return(config)
-    
+
     Document.class_eval do
       has_ipaper_and_uses 'AttachmentFu'
     end
-    
+
     @document = Document.new
     @document.attributes = {:ipaper_id => 'doc_id', :ipaper_access_key => 'access_key'}
   end
-  
+
   it "should return this HTML by default" do
     @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 alt text" do
     @document.display_ipaper(:alt => "something").should =~ /.*<div id="embedded_flash">something<\/div>.*/
   end
-  
+
   it "should allow custom Javascript params" do
     options = {:height => 100, :width => 100}
-    
+
     @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 =~ /.*scribd_doc\.addParam\('width', '100'\);.*/
     @document.display_ipaper(options).should_not =~ /.*scribd_doc\.addParam\('some_dumb_setting', '100'\);.*/
   end
-  
-end
+
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scribd_fu
 version: !ruby/object:Gem::Version 
-  version: 2.0.6
+  hash: 1
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 7
+  version: 2.0.7
 platform: ruby
 authors: 
 - Matt Darby
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 -05:00
+date: 2010-06-30 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -50,21 +56,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Rails gem that streamlines interactions with the Scribd service