app/models/consumer_token.rb app/views/oauth_consumers/index.html.haml app/views/oauth_consumers/show.html.haml config/initializers/oauth_consumers.rb db/migrate/20091001010106_create_oauth_consumer_tokens.rb @@ -1,5 +1,8 @@ class User < ActiveRecord::Base acts_as_authentic - + + has_one :meetup, :class_name => "MeetupToken", :dependent => :destroy + has_one :twitter, :class_name => "TwitterToken", :dependent => :destroy + validates_presence_of :name end app/models/user.rb @@ -1,7 +1,7 @@ # Be sure to restart your server when you modify this file # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.3' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') @@ -20,13 +20,10 @@ Rails::Initializer.run do |config| config.gem "haml" config.gem "binarylogic-authlogic", :lib => 'authlogic', :source => 'http://gems.github.com' config.gem "bluecloth" - - # Test related gems - config.gem "thoughtbot-shoulda", :lib => "shoulda", :source => "http://gems.github.com" - config.gem "thoughtbot-factory_girl", :lib => "factory_girl", :source => "http://gems.github.com" - config.gem "mocha" - config.gem "chrisk-fakeweb", :lib => "fake_web", :source => "http://gems.github.com" - + config.gem "oauth", :source => 'http://gems.github.com' #:version => "0.3.6" + config.gem "oauth-plugin", :source => 'http://gems.github.com' #:version => "0.3.12" + config.gem 'twitter' + # Deploy Related Gems # config.gem "vlad" # config.gem "vlad-git", :lib => false config/environment.rb @@ -25,4 +25,10 @@ config.action_mailer.delivery_method = :test # Use SQL instead of Active Record's schema dumper when creating the test database. # This is necessary if your schema can't be completely dumped by the schema dumper, # like if you have constraints or database-specific column types -# config.active_record.schema_format = :sql \ No newline at end of file +# config.active_record.schema_format = :sql + +# Test related gems +config.gem "thoughtbot-shoulda", :lib => "shoulda", :source => "http://gems.github.com" +config.gem "thoughtbot-factory_girl", :lib => "factory_girl", :source => "http://gems.github.com" +config.gem "mocha" +config.gem "chrisk-fakeweb", :lib => "fake_web", :source => "http://gems.github.com" config/environments/test.rb @@ -1,4 +1,6 @@ ActionController::Routing::Routes.draw do |map| + map.resources :oauth_consumers,:member=>{:callback=>:get} + map.resources :pages map.resources :users config/routes.rb @@ -9,7 +9,18 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090909233823) do +ActiveRecord::Schema.define(:version => 20091001010106) do + + create_table "consumer_tokens", :force => true do |t| + t.integer "user_id" + t.string "type", :limit => 30 + t.string "token", :limit => 512 + t.string "secret" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "consumer_tokens", ["token"], :name => "index_consumer_tokens_on_token", :unique => true create_table "pages", :force => true do |t| t.string "title" @@ -32,16 +43,18 @@ ActiveRecord::Schema.define(:version => 20090909233823) do t.datetime "updated_at" end + add_index "sites", ["url"], :name => "index_sites_on_url" + create_table "users", :force => true do |t| t.string "name" - t.string "email", :null => false - t.string "crypted_password", :null => false - t.string "password_salt", :null => false - t.string "persistence_token", :null => false - t.string "single_access_token", :null => false - t.string "perishable_token", :null => false - t.integer "login_count", :default => 0, :null => false - t.integer "failed_login_count", :default => 0, :null => false + t.string "email", :null => false + t.string "crypted_password", :null => false + t.string "password_salt", :null => false + t.string "persistence_token", :null => false + t.string "single_access_token", :null => false + t.string "perishable_token", :null => false + t.integer "login_count", :default => 0, :null => false + t.integer "failed_login_count", :default => 0, :null => false t.datetime "last_request_at" t.datetime "current_login_at" t.datetime "last_login_at" @@ -49,7 +62,12 @@ ActiveRecord::Schema.define(:version => 20090909233823) do t.string "last_login_ip" t.datetime "created_at" t.datetime "updated_at" - t.boolean "admin" + t.boolean "admin", :default => false end + add_index "users", ["email"], :name => "index_users_on_email" + add_index "users", ["perishable_token"], :name => "index_users_on_perishable_token" + add_index "users", ["persistence_token"], :name => "index_users_on_persistence_token" + add_index "users", ["single_access_token"], :name => "index_users_on_single_access_token" + end db/schema.rb 658f191bc82feebca1f40d738e0d8a679a702a8f 4ebbd6de51a7aca3fc409d31cf4917bbeb12a8eb jdpace jared@codewordstudios.com http://github.com/jdpace/hubbub/commit/37980d064c9ba6b5ad35c9cde0fc0eefc0125c54 37980d064c9ba6b5ad35c9cde0fc0eefc0125c54 2009-10-08T04:45:28-07:00 2009-10-08T04:45:28-07:00 Merge in Invalidusrname's change dba02e9b96be0d363a6666af926f7684bed3f323 jdpace jared@codewordstudios.com