diff --git a/Gemfile b/Gemfile index cc92bec3de8e950802ef7dc73f2bc5f20b37b33f..adc4431aa9b102bc881ded831123b83892ce59d5 100644 --- a/Gemfile +++ b/Gemfile @@ -38,6 +38,10 @@ gem 'magent', :git => 'http://github.com/dcu/magent.git' gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch gem 'mini_magick' +#sinatra +gem 'sinatra', '1.0' +gem 'async_sinatra' + group :test, :development do gem 'factory_girl_rails' end diff --git a/Gemfile.lock b/Gemfile.lock index dd181b3204b59c3413425919cd802ab36c8d63a1..abad548284bf30fe996a1102c5b0aa245f691a36 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -104,6 +104,8 @@ GEM addressable (2.2.1) arel (1.0.1) activesupport (~> 3.0.0) + async_sinatra (0.2.3) + sinatra (>= 1.0) autotest (4.3.2) bcrypt-ruby (2.1.2) bson (1.0.7) @@ -212,6 +214,8 @@ GEM selenium-client (1.2.18) selenium-rc (2.2.4) selenium-client (>= 1.2.18) + sinatra (1.0) + rack (>= 1.0) subexec (0.0.4) thin (1.2.7) daemons (>= 1.0.9) @@ -238,6 +242,7 @@ PLATFORMS DEPENDENCIES addressable + async_sinatra autotest bson (= 1.0.7) bson_ext (= 1.0.7) @@ -266,6 +271,7 @@ DEPENDENCIES ruby-debug saucelabs-adapter (= 0.8.12) selenium-rc + sinatra (= 1.0) sprinkle! thin webmock diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb index e0b81ba8ae48fcb82382e706dd92dc3d16e344d2..44e1a801685838b98d0d993b2960240d16c2fce9 100644 --- a/app/controllers/requests_controller.rb +++ b/app/controllers/requests_controller.rb @@ -42,6 +42,9 @@ class RequestsController < ApplicationController return end + + + # rel_hash = {:friend => params[:friend_handle]} Rails.logger.debug("Sending request: #{rel_hash}") begin diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 15880df0bbeb051ac4434cb712f349bc16b8dd0a..a2de719b59676cdcbee875a51cee3db4078b0b5a 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -10,7 +10,7 @@ = f.label :username = f.text_field :username %p.user_network - ="@#{APP_CONFIG[:pod_url]}" + ="@#{APP_CONFIG[:terse_pod_url]}" %p = f.label :password diff --git a/config/routes.rb b/config/routes.rb index 0ac115b76e67e6b68edaa3de375cf80ce5d7f78b..f4f49b01d20c37f40b5864e8ff9a9ed8d93b3ec9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -33,6 +33,7 @@ Diaspora::Application.routes.draw do match 'signup', :to => 'registrations#new', :as => "new_user_registration" match 'get_to_the_choppa', :to => redirect("/signup") + match "/finger", :to => AsyncController #public routes # match 'webfinger', :to => 'publics#webfinger'