nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pushing to my website for further debugging

Browse source
This commit is contained in:
maxwell 2010-12-02 11:05:10 -08:00
parent 38d9d75162
commit b9131c0e46
4 changed files with 56 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -13,8 +13,8 @@ gem 'devise-mongo_mapper', :git => 'git://github.com/collectiveidea/devise-mongo
gem 'devise_invitable','0.3.5'
#Authentication
gem 'omniauth'
gem 'twitter', '1.0.0.rc.8'
gem 'omniauth', :git => 'https://github.com/intridea/omniauth.git'
gem 'twitter', :git => 'https://github.com/jnunemaker/twitter.git'
#Mongo
gem 'mongo_mapper', :branch => 'rails3', :git => 'git://github.com/jnunemaker/mongomapper.git'

86
Gemfile.lock
View file

@ -63,6 +63,52 @@ GIT
carrierwave (0.5.0)
activesupport (~> 3.0)
GIT
remote: https://github.com/intridea/omniauth.git
revision: 3cdb4908d1a79df038be75e28077738584547cb6
specs:
oa-basic (0.2.0.beta1)
multi_json (~> 0.0.2)
nokogiri (~> 1.4.2)
oa-core (= 0.2.0.beta1)
rest-client (~> 1.6.0)
oa-core (0.2.0.beta1)
rack (~> 1.1)
oa-enterprise (0.2.0.beta1)
net-ldap (~> 0.1.1)
nokogiri (~> 1.4.2)
oa-core (= 0.2.0.beta1)
pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.1.1)
oa-oauth (0.2.0.beta1)
multi_json (~> 0.0.2)
nokogiri (~> 1.4.2)
oa-core (= 0.2.0.beta1)
oauth (~> 0.4.0)
oauth2 (~> 0.1.0)
oa-openid (0.2.0.beta1)
oa-core (= 0.2.0.beta1)
rack-openid (~> 1.2.0)
ruby-openid-apps-discovery
omniauth (0.2.0.beta1)
oa-basic (= 0.2.0.beta1)
oa-core (= 0.2.0.beta1)
oa-enterprise (= 0.2.0.beta1)
oa-oauth (= 0.2.0.beta1)
oa-openid (= 0.2.0.beta1)
GIT
remote: https://github.com/jnunemaker/twitter.git
revision: 4ba1444ea061c130836d671d0b451040687f757b
specs:
twitter (1.0.0)
faraday (~> 0.5.3)
faraday_middleware (~> 0.3.0)
hashie (~> 0.4.0)
multi_json (~> 0.0.5)
multi_xml (~> 0.2.0)
simple_oauth (~> 0.1.3)
PATH
remote: vendor/gems/jasmine
specs:
@ -228,29 +274,6 @@ GEM
multipart-post (1.0.1)
net-ldap (0.1.1)
nokogiri (1.4.3.1)
oa-basic (0.1.6)
multi_json (~> 0.0.2)
nokogiri (~> 1.4.2)
oa-core (= 0.1.6)
rest-client (~> 1.6.0)
oa-core (0.1.6)
rack (~> 1.1)
oa-enterprise (0.1.6)
net-ldap (~> 0.1.1)
nokogiri (~> 1.4.2)
oa-core (= 0.1.6)
pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.1.1)
oa-oauth (0.1.6)
multi_json (~> 0.0.2)
nokogiri (~> 1.4.2)
oa-core (= 0.1.6)
oauth (~> 0.4.0)
oauth2 (~> 0.1.0)
oa-openid (0.1.6)
oa-core (= 0.1.6)
rack-openid (~> 1.2.0)
ruby-openid-apps-discovery
oauth (0.4.4)
oauth2 (0.1.0)
faraday (~> 0.5.0)
@ -262,12 +285,6 @@ GEM
mixlib-config
mixlib-log
systemu
omniauth (0.1.6)
oa-basic (= 0.1.6)
oa-core (= 0.1.6)
oa-enterprise (= 0.1.6)
oa-oauth (= 0.1.6)
oa-openid (= 0.1.6)
plucky (0.3.6)
mongo (~> 1.1)
polyglot (0.3.1)
@ -342,13 +359,6 @@ GEM
thor (0.14.6)
treetop (1.4.9)
polyglot (>= 0.3.1)
twitter (1.0.0.rc.8)
faraday (~> 0.5.3)
faraday_middleware (~> 0.3.0)
hashie (~> 0.4.0)
multi_json (~> 0.0.5)
multi_xml (~> 0.2.0)
simple_oauth (~> 0.1.2)
tzinfo (0.3.23)
uuidtools (2.1.1)
warden (0.10.7)
@ -394,7 +404,7 @@ DEPENDENCIES
mongo_mapper!
mongrel
nokogiri (= 1.4.3.1)
omniauth
omniauth!
pubsubhubbub
rails (= 3.0.1)
roxml!
@ -403,6 +413,6 @@ DEPENDENCIES
rspec-rails (>= 2.0.0)
ruby-debug
thin
twitter (= 1.0.0.rc.8)
twitter!
webmock
will_paginate (= 3.0.pre2)

5
app/controllers/services_controller.rb
View file

@ -40,6 +40,11 @@ class ServicesController < ApplicationController
end
end
def failure
puts params.inspect
end
def destroy
@service = current_user.services.find(params[:id])
@service.destroy

1
config/routes.rb
View file

@ -15,6 +15,7 @@ Diaspora::Application.routes.draw do
match '/people/by_handle' => 'people#retrieve_remote', :as => 'person_by_handle'
match '/auth/:provider/callback' => 'services#create'
match '/auth/failure' => 'services#failure'
match 'photos/make_profile_photo' => 'photos#make_profile_photo'
resources :photos, :except => [:index]