scribd_fu 2.0.10 → 2.0.11

data/VERSION

@@ -1 +1 @@
-2.0.10
+2.0.11

data/lib/scribd_fu.rb

@@ -1,6 +1,6 @@
 module ScribdFu
 
-  ConfigPath = "#{::Rails.root.to_s}/config/scribd_fu.yml".freeze
+  ConfigPath = "config/scribd_fu.yml".freeze
 
   # A list of content types supported by iPaper.
   ContentTypes = [
@@ -80,10 +80,11 @@ module ScribdFu
 
     # Read, store, and return the ScribdFu config file's contents
     def config
-      raise ScribdFuError, "#{ConfigPath} does not exist" unless File.file?(ConfigPath)
+      path = defined?(Rails) ? File.join(Rails.root, ConfigPath) : ConfigPath
+      raise ScribdFuError, "#{path} does not exist" unless File.file?(path)
 
       # Load the config file and strip any whitespace from the values
-      @config ||= YAML.load_file(ConfigPath).each_pair{|k,v| {k=>v.to_s.strip}}.symbolize_keys!
+      @config ||= YAML.load_file(path).each_pair{|k,v| {k=>v.to_s.strip}}.symbolize_keys!
     end
 
     # Get the preferred access level for iPaper documents
@@ -120,13 +121,14 @@ module ScribdFu
   module ClassMethods
 
     # Load and inject ScribdFu goodies
-    def has_ipaper_and_uses(str)
+    # opts can be :on => :create, defaults to :on => :save
+    def has_ipaper_and_uses(str, opts = {:on => :save })
       check_environment
       load_base_plugin(str)
 
       include InstanceMethods
 
-      after_save :upload_to_scribd # This *MUST* be an after_save
+      send("after_#{opts[:on]}", :upload_to_scribd) # This *MUST* be an after_save
       before_destroy :destroy_ipaper_document
     end
 
@@ -265,3 +267,4 @@ end
 
 # Let's do this.
 ActiveRecord::Base.send(:include, ScribdFu) if Object.const_defined?("ActiveRecord")
+

data/lib/scribd_fu/paperclip.rb

@@ -29,7 +29,11 @@ module ScribdFu
       # local file if the file is stored locally.
       def file_path
         if ScribdFu::amazon_based?(attached_file.url)
-          path = attached_file.url
+          if attached_file.instance_variable_get(:@s3_permissions) == "authenticated-read"
+            return attached_file.expiring_url(60)
+          else
+            path = attached_file.url
+          end
         else
           path = attached_file.path
         end
@@ -55,3 +59,4 @@ module ScribdFu
   end
 
 end
+

data/scribd_fu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scribd_fu}
-  s.version = "2.0.10"
+  s.version = "2.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Darby"]
-  s.date = %q{2011-03-28}
+  s.date = %q{2011-03-29}
   s.description = %q{A Rails gem that streamlines interactions with the Scribd service}
   s.email = %q{matt@matt-darby.com}
   s.extra_rdoc_files = [

data/spec/scribd_fu_spec.rb

@@ -14,7 +14,7 @@ describe "ScribdFu" do
 
   describe "that is missing a config file" do
     before do
-      File.should_receive(:file?).with("#{RAILS_ROOT}/config/scribd_fu.yml").and_return(false)
+      File.should_receive(:file?).with("config/scribd_fu.yml").and_return(false)
     end
 
     it "should raise an error" do
@@ -350,10 +350,11 @@ describe "Viewing an iPaper document" do
     @document.display_ipaper(options).should =~ /.*scribd_doc\.addParam\('width', '100'\);.*/
     @document.display_ipaper(options).should_not =~ /.*scribd_doc\.addParam\('some_dumb_setting', '100'\);.*/
   end
-  
+
   it "should send booleans as booleans" do
     options = {:hide_disabled_buttons => true}
     @document.display_ipaper(options).should =~ /.*scribd_doc\.addParam\('hide_disabled_buttons', true\);.*/
   end
 
 end
+

metadata

@@ -2,7 +2,7 @@
 name: scribd_fu
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.10
+  version: 2.0.11
 platform: ruby
 authors: 
 - Matt Darby
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -04:00
+date: 2011-03-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency