paperclipdropbox 1.0.3 → 1.0.4

data/README.rdoc

@@ -18,26 +18,14 @@ Or install it yourself as:
 
   gem install paperclipdropbox
 
-Then run the authotization rake task
+Then create the paperclipdropbox.yml file and run the authotization rake task
 
   rake paperclipdropbox:authorize
 
 you'll then be given a url to login to dropbox to authorize this plugin access to your dropbox account.
-Then once logged in run the rake task again.
 
-== Usage
-
-Create the file config/paperclipdropbox.yml:
 
-  development:
-    dropbox_user: user_email
-    dropbox_password: user_password
-
-  test:
-    ...
-
-  production:
-    ...
+== Usage
 
 In your model:
 
@@ -49,4 +37,19 @@ In your model:
   end
 
 
+== Optional
+
+Create the file config/paperclipdropbox.yml:
+
+  development:
+    dropbox_key: user_email
+    dropbox_secret: user_password
+    path: "/:attachment/:attachment/:id/:style/:filename"
+
+  test:
+    ...
+
+  production:
+    ...
+
 You can add the path option to the config/paperclipdropbox.yml file for ease of use.

data/lib/paperclipdropbox/version.rb

@@ -1,3 +1,3 @@
 module Paperclipdropbox
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/lib/paperclipdropbox.rb

@@ -5,6 +5,8 @@ end
 module Paperclip
 	module Storage
 		module Dropboxstorage
+    extend self
+    
 			def self.extended(base)
 				require "dropbox"
 				base.instance_eval do
@@ -13,8 +15,6 @@ module Paperclip
 						@options.merge!(YAML.load_file("#{Rails.root}/config/paperclipdropbox.yml")[Rails.env].symbolize_keys)
 					end
 					
-					@dropbox_user = @options[:dropbox_user]
-					@dropbox_password = @options[:dropbox_password]
 					@dropbox_key = '8ti7qntpcysl91j'
 					@dropbox_secret = 'i0tshr4cpd1pa4e'
 					@dropbox_public_url = @options[:dropbox_public_url] || "http://dl.dropbox.com/u/"
@@ -26,26 +26,26 @@ module Paperclip
 			end
 
 			def exists?(style = default_style)
-				log("exists?  #{style}")
+				log("exists?  #{style}") if respond_to?(:log)
 				begin
 					dropbox_session.metadata("/Public#{File.dirname(path(style))}")
-					log("true")
+					log("true") if respond_to?(:log)
 					true
 				rescue
-					log("false")
+					log("false") if respond_to?(:log)
 					false
 				end
 			end
 
 			def to_file(style=default_style)
-				log("to_file  #{style}")
+				log("to_file  #{style}") if respond_to?(:log)
 				return @queued_for_write[style] || "#{@dropbox_public_url}#{user_id}/#{path(style)}"
 			end
 
 			def flush_writes #:nodoc:
 				log("[paperclip] Writing files #{@queued_for_write.count}")
 				@queued_for_write.each do |style, file|
-					log("[paperclip] Writing files for ")
+					log("[paperclip] Writing files for ") if respond_to?(:log)
 					file.close
 					dropbox_session.upload(file.path, "/Public#{File.dirname(path(style))}", :as=> File.basename(path(style)))
 				end
@@ -54,7 +54,7 @@ module Paperclip
 
 			def flush_deletes #:nodoc:
 				@queued_for_delete.each do |path|
-					log("[paperclip] Deleting files for #{path}")
+					log("[paperclip] Deleting files for #{path}") if respond_to?(:log)
 					begin
 						dropbox_session.rm("/Public/#{path}")
 					rescue
@@ -69,24 +69,23 @@ module Paperclip
 					Rails.cache.write('DropboxSession:uid', dropbox_session.account.uid)
 					dropbox_session.account.uid
 				else
-					log("read Dropbox User_id")
+					log("read Dropbox User_id") if respond_to?(:log)
 					Rails.cache.read('DropboxSession:uid')
 				end
 			end
 
-			private
 			def dropbox_session
 				unless Rails.cache.exist?('DropboxSession')
 					if @dropboxsession.blank?
-						log("loading session from yaml");
+						log("loading session from yaml") if respond_to?(:log)
 						if File.exists?("#{Rails.root}/config/dropboxsession.yml")
 							@dropboxsession = Dropbox::Session.deserialize(File.read("#{Rails.root}/config/dropboxsession.yml"))
 						end
 					end
-					@dropboxsession.mode = :dropbox
+					@dropboxsession.mode = :dropbox unless @dropboxsession.blank?
 					@dropboxsession
 				else
-					log("reading Dropbox Session")
+					log("reading Dropbox Session") if respond_to?(:log)
 					Rails.cache.read('DropboxSession')
 				end
 			end

data/lib/tasks/paperclipdropbox.rake

@@ -2,46 +2,53 @@ require "yaml"
 require "dropbox"
 
 namespace :paperclipdropbox do
-	
+
 
 	desc "Create DropBox Authorized Session Yaml"
 	task :authorize => :environment do
-		
+
 		SESSION_FILE = "#{Rails.root}/config/dropboxsession.yml"
-		
-		if File.exists?(SESSION_FILE)
-			@dropboxsession = Dropbox::Session.deserialize(File.read(SESSION_FILE))
-		else
-			@options = (YAML.load_file("#{Rails.root}/config/paperclipdropbox.yml")[Rails.env].symbolize_keys)
-			
-			@dropbox_user = @options[:dropbox_user]
-			@dropbox_password = @options[:dropbox_password]
-			@dropbox_key = @options[:dropbox_key] ||'8ti7qntpcysl91j'
-			@dropbox_secret = @options[:dropbox_secret] || 'i0tshr4cpd1pa4e'
-			
+
+    puts ""
+    puts ""
+    puts ""
+    
+		unless @dropboxsession = Paperclip::Storage::Dropboxstorage.dropbox_session
+      if File.exists?("#{Rails.root}/config/paperclipdropbox.yml")
+        @options = (YAML.load_file("#{Rails.root}/config/paperclipdropbox.yml")[Rails.env].symbolize_keys)
+      end
+      
+			@dropbox_key = @options.blank? ? '8ti7qntpcysl91j' : @options[:dropbox_key]
+			@dropbox_secret = @options.blank? ? 'i0tshr4cpd1pa4e' : @options[:dropbox_secret]
+
 			@dropboxsession = Dropbox::Session.new(@dropbox_key, @dropbox_secret)
 			@dropboxsession.mode = :dropbox
-			@dropboxsession.authorizing_user = @dropbox_user
-			@dropboxsession.authorizing_password = @dropbox_password
+
+      puts "Visit #{@dropboxsession.authorize_url} to log in to Dropbox. Hit enter when you have done this."
+
+      $stdin.flush
+
+      STDIN.gets
+
 		end
-		puts ""
-		puts ""
-		puts ""
+
 		begin
 			@dropboxsession.authorize
-			
+      puts ""
 			puts "Authorized - #{@dropboxsession.authorized?}"
 		rescue
 			begin
+        puts ""
 				puts "Please login to dropbox using this link : #{@dropboxsession.authorize_url}"
 				puts "then run this rake task again."
 			rescue
+        puts ""
 				puts "Already Authorized - #{@dropboxsession.authorized?}"
 			end
 		end
 
 		puts ""
-		puts ""		
+		puts ""
 		File.open(SESSION_FILE, "w") do |f|
 			f.puts @dropboxsession.serialize
 		end

metadata

@@ -1,49 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: paperclipdropbox
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.4
   prerelease: 
-  version: 1.0.3
 platform: ruby
-authors: 
+authors:
 - Paul Ketelle
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: paperclip
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &10442076 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: dropbox
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *10442076
+- !ruby/object:Gem::Dependency
+  name: dropbox
+  requirement: &10441824 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *10441824
 description: Adds Dropbox storage support for the Paperclip gem. Dropbox account required.
-email: 
+email:
 - paul@ketelle.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.rdoc
@@ -55,30 +51,26 @@ files:
 - paperclipdropbox.gemspec
 homepage: https://github.com/dripster82/paperclipdropbox
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: paperclipdropbox
-rubygems_version: 1.8.8
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Dropbox storage support for paperclip file attachment
 test_files: []
-