mdarby-scribd_fu 2.0.3 → 2.0.4

data/lib/scribd_fu.rb

@@ -29,6 +29,9 @@ module ScribdFu
     'application/vnd.openxmlformats-officedocument.wordprocessingml.template'
   ]
 
+  # RegExp that matches AWS S3 URLs
+  S3 = /^https?:\/\/s3.amazonaws.com/
+
   # Available parameters for the JS API
   # http://www.scribd.com/publisher/api/api?method_name=Javascript+API
   Available_JS_Params = [ :height, :width, :page, :my_user_id, :search_query,
@@ -89,11 +92,9 @@ module ScribdFu
 
     # Load, store, and return the associated iPaper document
     def load_ipaper_document(id)
-      begin
-        @document ||= scribd_user.find_document(id)
-      rescue
-        raise ScribdFuError, "Scribd Document ##{id} not found!"
-      end
+      # Yes, catch-all rescues are bad, but the end rescue
+      # should return nil, so laziness FTW.
+      scribd_user.find_document(id) rescue nil
     end
 
     # Replace spaces with '%20' (needed by Paperclip models).
@@ -221,11 +222,9 @@ module ScribdFu
 
     # Display the iPaper document in a view
     def display_ipaper(options = {})
-      alt = options.has_key?(:alt) ? options[:alt] : ""
-
       <<-END
         <script type="text/javascript" src="http://www.scribd.com/javascripts/view.js"></script>
-        <div id="embedded_flash">#{alt}</div>
+        <div id="embedded_flash">#{options.delete(:alt)}</div>
         <script type="text/javascript">
           var scribd_doc = scribd.Document.getDoc(#{ipaper_id}, '#{ipaper_access_key}');
           #{js_params(options)}
@@ -253,4 +252,4 @@ module ScribdFu
 end
 
 # Let's do this.
-ActiveRecord::Base.send(:include, ScribdFu) if Object.const_defined?("ActiveRecord")
+ActiveRecord::Base.send(:include, ScribdFu) if Object.const_defined?("ActiveRecord")

data/lib/scribd_fu/attachment_fu.rb

@@ -5,36 +5,26 @@ module ScribdFu
     end
 
     module InstanceMethods
-      
+
       def self.included(base)
         base.extend ClassMethods
       end
 
       # Returns a URL for a thumbnail for this model's attachment.
-      #
-      # If Scribd does not provide a thumbnail URL, then Attachment_fu's
-      # thumbnail is fallen back on by returning the value of
-      # <tt>public_filename(:thumb)</tt>.
-      #
-      # Sample use in a view:
-      #  <%= image_tag(@attachment.thumbnail_url, :alt => @attachment.name) %>
       def thumbnail_url
         (ipaper_document && ipaper_document.thumbnail_url) || public_filename(:thumb)
       end
 
+      # Returns the content type for this model's attachment.
       def get_content_type
         self.content_type
       end
 
       # Yields the correct path to the file, either the local filename or the S3 URL.
       def file_path
-        if public_filename =~ /^https{0,1}:\/\/s3.amazonaws.com/
-          public_filename
-        else
-          "#{RAILS_ROOT}/public#{public_filename}"
-        end
+        public_filename =~ ScribdFu::S3 ? public_filename : "#{RAILS_ROOT}/public#{public_filename}"
       end
     end
-  
+
   end
 end

data/lib/scribd_fu/paperclip.rb

@@ -5,7 +5,7 @@ module ScribdFu
     end
 
     module InstanceMethods
-      
+
       def self.included(base)
         base.extend ClassMethods
       end
@@ -15,14 +15,7 @@ module ScribdFu
         self.send("#{prefix}_content_type")
       end
 
-      # Returns a URL for a thumbnail for the specified +attribute+ attachment.
-      #
-      # If Scribd does not provide a thumbnail URL, then Paperclip's thumbnail
-      # is fallen back on by returning the value of
-      # <tt>attribute.url(:thumb)</tt>.
-      #
-      # Sample use in a view:
-      #  <%= image_tag(@attachment.thumbnail_url, :alt => @attachment.name) %>
+      # Returns a URL for a thumbnail for the attached file object.
       def thumbnail_url
         begin
           (ipaper_document && ipaper_document.thumbnail_url) || attached_file.url(:thumb)
@@ -35,11 +28,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/
-          attached_file.url
-        else
-          attached_file.path
-        end
+        attached_file.url =~ ScribdFu::S3 ? attached_file.url : attached_file.path
       end
 
 

data/scribd_fu.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "scribd_fu"
-  s.version  = "2.0.3"
-  s.date     = "2009-04-06"
+  s.version  = "2.0.4"
+  s.date     = "2009-04-12"
   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

@@ -105,6 +105,10 @@ describe "An AttachmentFu model" do
             @document.save
           end
 
+          it "should not error out when deleted" do
+            lambda {@document.destroy}.should_not raise_error(ScribdFu::ScribdFuError)
+          end
+
         end
 
       end
@@ -283,6 +287,10 @@ describe "Viewing an iPaper document" 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}
     

metadata

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