paperclipdropbox 1.0.6 → 1.0.7

data/lib/paperclipdropbox/railtie.rb

@@ -2,7 +2,6 @@ require 'paperclipdropbox'
 require 'rails'
 module Paperclipdropbox
   class Railtie < Rails::Railtie
-    railtie_name :paperclipdropbox
 
     rake_tasks do
       load "tasks/paperclipdropbox.rake"

data/lib/paperclipdropbox/version.rb

@@ -1,3 +1,3 @@
 module Paperclipdropbox
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/lib/tasks/paperclipdropbox.rake

@@ -9,46 +9,55 @@ namespace :paperclipdropbox do
 
 		SESSION_FILE = "#{Rails.root}/config/dropboxsession.yml"
 
-    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
-      
+		puts ""
+		puts ""
+		puts ""
+
+		@dropboxsession = Paperclip::Storage::Dropboxstorage.dropbox_session
+
+		if @dropboxsession.blank?
+			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
 
-      puts "Visit #{@dropboxsession.authorize_url} to log in to Dropbox. Hit enter when you have done this."
+			puts "Visit #{@dropboxsession.authorize_url} to log in to Dropbox. Hit enter when you have done this."
 
-      STDIN.gets
+			STDIN.gets
 
 		end
 
 		begin
 			@dropboxsession.authorize
-      puts ""
+			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."
+				puts ""
+				puts "Visit #{@dropboxsession.authorize_url} to log in to Dropbox. Hit enter when you have done this."
+
+				STDIN.gets
+				@dropboxsession.authorize
+				puts ""
+				puts "Authorized - #{@dropboxsession.authorized?}"
 			rescue
-        puts ""
-				puts "Already Authorized - #{@dropboxsession.authorized?}"
+				puts ""
+				puts "Already Authorized - #{@dropboxsession.authorized?}" unless @dropboxsession.blank?
+				puts "Failed Authorization. Please try delete /config/dropboxsession.yml and try again." if @dropboxsession.blank?
 			end
 		end
 
 		puts ""
 		puts ""
-		File.open(SESSION_FILE, "w") do |f|
-			f.puts @dropboxsession.serialize
+		unless @dropboxsession.blank?
+			File.open(SESSION_FILE, "w") do |f|
+				f.puts @dropboxsession.serialize
+			end
 		end
 	end
 

metadata

@@ -2,7 +2,7 @@
 name: paperclipdropbox
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - Paul Ketelle
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-07 00:00:00 Z
+date: 2012-01-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: paperclip