dropbox-sdk 1.6.4 → 1.6.5

data/examples/copy_between_accounts.rb

@@ -9,139 +9,139 @@ APP_SECRET = ''
 STATE_FILE = 'copy_between_accounts.json'
 
 def main()
-    prog_name = __FILE__
-    if APP_KEY == '' or APP_SECRET == ''
-        warn "ERROR: Set your APP_KEY and APP_SECRET at the top of #{prog_name}"
-        exit
-    end
-    args = ARGV
-    if args.size == 0
-        warn("Usage:\n")
-        warn("   #{prog_name} link                                   Link to a user's account.  Also displays UID.")
-        warn("   #{prog_name} list                                   List linked users including UID.")
-        warn("   #{prog_name} copy '<uid>:<path>' '<uid>:<path>'     Copies a file from the first user's path, to the second user's path.")
-        warn("\n\n   <uid> is the account UID shown when linked.  <path> is a path to a file on that user's dropbox.")
-        exit
-    end
-
-    command = args[0]
-    if command == 'link'
-        command_link(args)
-    elsif command == 'list'
-        command_list(args)
-    elsif command == 'copy'
-        command_copy(args)
-    else
-        warn "ERROR: Unknown command: #{command}"
-        warn "Run with no arguments for help."
-        exit(1)
-    end
+  prog_name = __FILE__
+  if APP_KEY == '' or APP_SECRET == ''
+    warn "ERROR: Set your APP_KEY and APP_SECRET at the top of #{prog_name}"
+    exit
+  end
+  args = ARGV
+  if args.size == 0
+    warn("Usage:\n")
+    warn("   #{prog_name} link                                   Link to a user's account.  Also displays UID.")
+    warn("   #{prog_name} list                                   List linked users including UID.")
+    warn("   #{prog_name} copy '<uid>:<path>' '<uid>:<path>'     Copies a file from the first user's path, to the second user's path.")
+    warn("\n\n   <uid> is the account UID shown when linked.  <path> is a path to a file on that user's dropbox.")
+    exit
+  end
+
+  command = args[0]
+  if command == 'link'
+    command_link(args)
+  elsif command == 'list'
+    command_list(args)
+  elsif command == 'copy'
+    command_copy(args)
+  else
+    warn "ERROR: Unknown command: #{command}"
+    warn "Run with no arguments for help."
+    exit(1)
+  end
 end
 
 def command_link(args)
-    if args.size != 1
-        warn "ERROR: \"link\" doesn't take any arguments"
-        exit
-    end
-
-    web_auth = DropboxOAuth2FlowNoRedirect.new(APP_KEY, APP_SECRET)
-    authorize_url = web_auth.start()
-    puts "1. Go to: #{authorize_url}"
-    puts "2. Click \"Allow\" (you might have to log in first)."
-    puts "3. Copy the authorization code."
-
-    print "Enter the authorization code here: "
-    STDOUT.flush
-    auth_code = STDIN.gets.strip
-
-    access_token, user_id = web_auth.finish(auth_code)
-
-    c = DropboxClient.new(access_token)
-    account_info = c.account_info()
-    puts "Link successful. #{account_info['display_name']} is uid #{account_info['uid']} "
-
-    state = load_state()
-    state[account_info['uid']] = {
-                    'access_token' => access_token,
-                    'display_name' => account_info['display_name'],
-    }
-
-    if account_info['team']
-        state[account_info['uid']]['team_name'] = account_info['team']['name']
-    end
-
-    save_state(state)
+  if args.size != 1
+    warn "ERROR: \"link\" doesn't take any arguments"
+    exit
+  end
+
+  web_auth = DropboxOAuth2FlowNoRedirect.new(APP_KEY, APP_SECRET)
+  authorize_url = web_auth.start()
+  puts "1. Go to: #{authorize_url}"
+  puts "2. Click \"Allow\" (you might have to log in first)."
+  puts "3. Copy the authorization code."
+
+  print "Enter the authorization code here: "
+  STDOUT.flush
+  auth_code = STDIN.gets.strip
+
+  access_token, user_id = web_auth.finish(auth_code)
+
+  c = DropboxClient.new(access_token)
+  account_info = c.account_info()
+  puts "Link successful. #{account_info['display_name']} is uid #{account_info['uid']} "
+
+  state = load_state()
+  state[account_info['uid']] = {
+          'access_token' => access_token,
+          'display_name' => account_info['display_name'],
+  }
+
+  if account_info['team']
+    state[account_info['uid']]['team_name'] = account_info['team']['name']
+  end
+
+  save_state(state)
 end
 
 def command_list(args)
-    if args.size != 1
-        warn "ERROR: \"list\" doesn't take any arguments"
-        exit
-    end
-
-    state = load_state()
-    for e in state.keys()
-        if state[e]['team_name']
-            puts "#{state[e]['display_name']} (#{state[e]['team_name']}) is uid #{e}"
-        else
-            puts "#{state[e]['display_name']} is uid #{e}"
-        end
+  if args.size != 1
+    warn "ERROR: \"list\" doesn't take any arguments"
+    exit
+  end
+
+  state = load_state()
+  for e in state.keys()
+    if state[e]['team_name']
+      puts "#{state[e]['display_name']} (#{state[e]['team_name']}) is uid #{e}"
+    else
+      puts "#{state[e]['display_name']} is uid #{e}"
     end
+  end
 end
 
 def command_copy(args)
-    if args.size != 3
-        warn "ERROR: \"copy\" takes exactly two arguments"
-        exit
-    end
+  if args.size != 3
+    warn "ERROR: \"copy\" takes exactly two arguments"
+    exit
+  end
 
-    state = load_state()
+  state = load_state()
 
-    if state.keys().length < 2
-        warn "ERROR: You can't use the copy command until at least two users have linked"
-        exit
-    end
+  if state.keys().length < 2
+    warn "ERROR: You can't use the copy command until at least two users have linked"
+    exit
+  end
 
-    from = args[1].gsub(/['"]/,'')
-    to = args[2].gsub(/['"]/,'')
+  from = args[1].gsub(/['"]/,'')
+  to = args[2].gsub(/['"]/,'')
 
-    if not to.index(':') or not from.index(':')
-        warn "ERROR: Ill-formated paths. Run #{prog_name} without arugments to see documentation."
-        exit
-    end
+  if not to.index(':') or not from.index(':')
+    warn "ERROR: Ill-formated paths. Run #{prog_name} without arugments to see documentation."
+    exit
+  end
 
-    from_uid, from_path = from.split ":"
-    to_uid, to_path = to.split ":"
+  from_uid, from_path = from.split ":"
+  to_uid, to_path = to.split ":"
 
-    if not state.has_key?(to_uid) or not state.has_key?(from_uid)
-        warn "ERROR: Those UIDs have not linked.  Run #{prog_name} list to see linked UIDs."
-        exit
-    end
+  if not state.has_key?(to_uid) or not state.has_key?(from_uid)
+    warn "ERROR: Those UIDs have not linked.  Run #{prog_name} list to see linked UIDs."
+    exit
+  end
 
-    from_client = DropboxClient.new(state[from_uid]['access_token'])
-    to_client = DropboxClient.new(state[to_uid]['access_token'])
+  from_client = DropboxClient.new(state[from_uid]['access_token'])
+  to_client = DropboxClient.new(state[to_uid]['access_token'])
 
-    #Create a copy ref under the identity of the from user
-    copy_ref = from_client.create_copy_ref(from_path)['copy_ref']
+  #Create a copy ref under the identity of the from user
+  copy_ref = from_client.create_copy_ref(from_path)['copy_ref']
 
-    metadata = to_client.add_copy_ref(to_path, copy_ref)
+  metadata = to_client.add_copy_ref(to_path, copy_ref)
 
-    puts "File successly copied from #{state[from_uid]['display_name']} to #{state[to_uid]['display_name']}!"
-    puts "The file now exists at #{metadata['path']}"
+  puts "File successly copied from #{state[from_uid]['display_name']} to #{state[to_uid]['display_name']}!"
+  puts "The file now exists at #{metadata['path']}"
 
 end
 
 def save_state(state)
-    File.open(STATE_FILE,"w") do |f|
-        f.write(JSON.pretty_generate(state))
-    end
+  File.open(STATE_FILE,"w") do |f|
+    f.write(JSON.pretty_generate(state))
+  end
 end
 
 def load_state()
-    if not FileTest.exists?(STATE_FILE)
-        return {}
-    end
-    JSON.parse(File.read(STATE_FILE))
+  if not FileTest.exists?(STATE_FILE)
+    return {}
+  end
+  JSON.parse(File.read(STATE_FILE))
 end
 
 

data/examples/dropbox_controller.rb

@@ -28,86 +28,86 @@ APP_SECRET = ""
 
 class DropboxController < ApplicationController
 
-    def main
-        client = get_dropbox_client
-        unless client
-            redirect_to(:action => 'auth_start') and return
-        end
-
-        account_info = client.account_info
-
-        # Show a file upload page
-        render :inline =>
-            "#{account_info['email']} <br/><%= form_tag({:action => :upload}, :multipart => true) do %><%= file_field_tag 'file' %><%= submit_tag 'Upload' %><% end %>"
+  def main
+    client = get_dropbox_client
+    unless client
+      redirect_to(:action => 'auth_start') and return
     end
 
-    def upload
-        client = get_dropbox_client
-        unless client
-            redirect_to(:action => 'auth_start') and return
-        end
+    account_info = client.account_info
+
+    # Show a file upload page
+    render :inline =>
+      "#{account_info['email']} <br/><%= form_tag({:action => :upload}, :multipart => true) do %><%= file_field_tag 'file' %><%= submit_tag 'Upload' %><% end %>"
+  end
 
-        begin
-            # Upload the POST'd file to Dropbox, keeping the same name
-            resp = client.put_file(params[:file].original_filename, params[:file].read)
-            render :text => "Upload successful.  File now at #{resp['path']}"
-        rescue DropboxAuthError => e
-            session.delete(:access_token)  # An auth error means the access token is probably bad
-            logger.info "Dropbox auth error: #{e}"
-            render :text => "Dropbox auth error"
-        rescue DropboxError => e
-            logger.info "Dropbox API error: #{e}"
-            render :text => "Dropbox API error"
-        end
+  def upload
+    client = get_dropbox_client
+    unless client
+      redirect_to(:action => 'auth_start') and return
     end
 
-    def get_dropbox_client
-        if session[:access_token]
-            begin
-                access_token = session[:access_token]
-                DropboxClient.new(access_token)
-            rescue
-                # Maybe something's wrong with the access token?
-                session.delete(:access_token)
-                raise
-            end
-        end
+    begin
+      # Upload the POST'd file to Dropbox, keeping the same name
+      resp = client.put_file(params[:file].original_filename, params[:file].read)
+      render :text => "Upload successful.  File now at #{resp['path']}"
+    rescue DropboxAuthError => e
+      session.delete(:access_token)  # An auth error means the access token is probably bad
+      logger.info "Dropbox auth error: #{e}"
+      render :text => "Dropbox auth error"
+    rescue DropboxError => e
+      logger.info "Dropbox API error: #{e}"
+      render :text => "Dropbox API error"
     end
+  end
 
-    def get_web_auth()
-        redirect_uri = url_for(:action => 'auth_finish')
-        DropboxOAuth2Flow.new(APP_KEY, APP_SECRET, redirect_uri, session, :dropbox_auth_csrf_token)
+  def get_dropbox_client
+    if session[:access_token]
+      begin
+        access_token = session[:access_token]
+        DropboxClient.new(access_token)
+      rescue
+        # Maybe something's wrong with the access token?
+        session.delete(:access_token)
+        raise
+      end
     end
+  end
 
-    def auth_start
-        authorize_url = get_web_auth().start()
+  def get_web_auth()
+    redirect_uri = url_for(:action => 'auth_finish')
+    DropboxOAuth2Flow.new(APP_KEY, APP_SECRET, redirect_uri, session, :dropbox_auth_csrf_token)
+  end
 
-        # Send the user to the Dropbox website so they can authorize our app.  After the user
-        # authorizes our app, Dropbox will redirect them here with a 'code' parameter.
-        redirect_to authorize_url
-    end
+  def auth_start
+    authorize_url = get_web_auth().start()
+
+    # Send the user to the Dropbox website so they can authorize our app.  After the user
+    # authorizes our app, Dropbox will redirect them here with a 'code' parameter.
+    redirect_to authorize_url
+  end
 
-    def auth_finish
-        begin
-            access_token, user_id, url_state = get_web_auth.finish(params)
-            session[:access_token] = access_token
-            redirect_to :action => 'main'
-        rescue DropboxOAuth2Flow::BadRequestError => e
-            render :text => "Error in OAuth 2 flow: Bad request: #{e}"
-        rescue DropboxOAuth2Flow::BadStateError => e
-            logger.info("Error in OAuth 2 flow: No CSRF token in session: #{e}")
-            redirect_to(:action => 'auth_start')
-        rescue DropboxOAuth2Flow::CsrfError => e
-            logger.info("Error in OAuth 2 flow: CSRF mismatch: #{e}")
-            render :text => "CSRF error"
-        rescue DropboxOAuth2Flow::NotApprovedError => e
-            render :text => "Not approved?  Why not, bro?"
-        rescue DropboxOAuth2Flow::ProviderError => e
-            logger.info "Error in OAuth 2 flow: Error redirect from Dropbox: #{e}"
-            render :text => "Strange error."
-        rescue DropboxError => e
-            logger.info "Error getting OAuth 2 access token: #{e}"
-            render :text => "Error communicating with Dropbox servers."
-        end
+  def auth_finish
+    begin
+      access_token, user_id, url_state = get_web_auth.finish(params)
+      session[:access_token] = access_token
+      redirect_to :action => 'main'
+    rescue DropboxOAuth2Flow::BadRequestError => e
+      render :text => "Error in OAuth 2 flow: Bad request: #{e}"
+    rescue DropboxOAuth2Flow::BadStateError => e
+      logger.info("Error in OAuth 2 flow: No CSRF token in session: #{e}")
+      redirect_to(:action => 'auth_start')
+    rescue DropboxOAuth2Flow::CsrfError => e
+      logger.info("Error in OAuth 2 flow: CSRF mismatch: #{e}")
+      render :text => "CSRF error"
+    rescue DropboxOAuth2Flow::NotApprovedError => e
+      render :text => "Not approved?  Why not, bro?"
+    rescue DropboxOAuth2Flow::ProviderError => e
+      logger.info "Error in OAuth 2 flow: Error redirect from Dropbox: #{e}"
+      render :text => "Strange error."
+    rescue DropboxError => e
+      logger.info "Error getting OAuth 2 access token: #{e}"
+      render :text => "Error communicating with Dropbox servers."
     end
+  end
 end

data/examples/oauth1_upgrade.rb

@@ -7,34 +7,34 @@ APP_KEY = ''
 APP_SECRET = ''
 
 def main
-    if APP_KEY == '' or APP_SECRET == ''
-        warn "ERROR: Set your APP_KEY and APP_SECRET at the top of search_cache.rb"
-        exit
-    end
-
-    prog_name = __FILE__
-    args = ARGV
-    if args.size != 2
-        warn "Usage: #{prog_name} <oauth1-access-token-key> <oauth1-access-token-secret>"
-        exit 1
-    end
-
-    access_token_key = args[0]
-    access_token_secret = args[1]
-
-    sess = DropboxSession.new(APP_KEY, APP_SECRET)
-    sess.set_access_token(access_token_key, access_token_secret)
-    c = DropboxClient.new(sess)
-
-    print "Creating OAuth 2 access token...\n"
-    oauth2_access_token = c.create_oauth2_access_token
-
-    print "Using OAuth 2 access token to get account info...\n"
-    c2 = DropboxClient.new(oauth2_access_token)
-    pp c2.account_info
-
-    print "Disabling OAuth 1 access token...\n"
-    c.disable_access_token
+  if APP_KEY == '' or APP_SECRET == ''
+    warn "ERROR: Set your APP_KEY and APP_SECRET at the top of search_cache.rb"
+    exit
+  end
+
+  prog_name = __FILE__
+  args = ARGV
+  if args.size != 2
+    warn "Usage: #{prog_name} <oauth1-access-token-key> <oauth1-access-token-secret>"
+    exit 1
+  end
+
+  access_token_key = args[0]
+  access_token_secret = args[1]
+
+  sess = DropboxSession.new(APP_KEY, APP_SECRET)
+  sess.set_access_token(access_token_key, access_token_secret)
+  c = DropboxClient.new(sess)
+
+  print "Creating OAuth 2 access token...\n"
+  oauth2_access_token = c.create_oauth2_access_token
+
+  print "Using OAuth 2 access token to get account info...\n"
+  c2 = DropboxClient.new(oauth2_access_token)
+  pp c2.account_info
+
+  print "Disabling OAuth 1 access token...\n"
+  c.disable_access_token
 end
 
 main()