muck-activities 0.1.25 → 0.1.26

data/VERSION

@@ -1 +1 @@
-0.1.25
+0.1.26

data/app/views/activities/_activity_feed.html.erb

@@ -8,7 +8,7 @@
   jQuery(document).ready(function(){
     setup_submit_delete();
     <% if GlobalConfig.enable_live_activity_updates -%>
-    setInterval(function() {jQuery.ajax({success:function(request){update_feed(request);}, type: "GET", url:'<%= activities_path(:parent_id => activities_object, :parent_type => activities_object.type, :activity_filter => params[:activity_filter], :format => 'js') %>&amp;latest_activity_id=' + get_latest_activity_id()})}, <%=GlobalConfig.live_activity_update_interval%> * 1000)
+    setInterval(function() {jQuery.ajax({success:function(request){update_feed(request);}, type: "GET", url:'<%= activities_path(:parent_id => activities_object, :parent_type => activities_object.class, :activity_filter => params[:activity_filter], :format => 'js') %>&amp;latest_activity_id=' + get_latest_activity_id()})}, <%=GlobalConfig.live_activity_update_interval%> * 1000)
     <% end -%>
   });
 <% end -%>

data/muck-activities.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{muck-activities}
-  s.version = "0.1.25"
+  s.version = "0.1.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2009-11-17}
+  s.date = %q{2010-01-20}
   s.description = %q{Activity engine for the muck system.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -122,6 +122,7 @@ Gem::Specification.new do |s|
      "test/rails_root/config/environments/production.rb",
      "test/rails_root/config/environments/test.rb",
      "test/rails_root/config/global_config.yml",
+     "test/rails_root/config/initializers/geokit_config.rb",
      "test/rails_root/config/initializers/inflections.rb",
      "test/rails_root/config/initializers/mime_types.rb",
      "test/rails_root/config/initializers/requires.rb",
@@ -129,35 +130,78 @@ Gem::Specification.new do |s|
      "test/rails_root/config/routes.rb",
      "test/rails_root/db/.keep",
      "test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb",
+     "test/rails_root/db/migrate/20090327231918_create_users.rb",
      "test/rails_root/db/migrate/20090402033319_add_muck_activities.rb",
      "test/rails_root/db/migrate/20090402234137_create_languages.rb",
      "test/rails_root/db/migrate/20090426041056_create_countries.rb",
      "test/rails_root/db/migrate/20090426041103_create_states.rb",
      "test/rails_root/db/migrate/20090512013727_create_profiles.rb",
-     "test/rails_root/db/migrate/20090602041838_create_users.rb",
      "test/rails_root/db/migrate/20090613173314_create_comments.rb",
      "test/rails_root/db/migrate/20090730044139_add_comment_cache.rb",
+     "test/rails_root/db/migrate/20090730154102_allow_null_user.rb",
      "test/rails_root/db/migrate/20090803185323_create_shares.rb",
+     "test/rails_root/db/migrate/20090804184247_add_comment_count_to_shares.rb",
+     "test/rails_root/db/migrate/20090804231857_add_shares_uri_index.rb",
      "test/rails_root/db/migrate/20090818204527_add_activity_indexes.rb",
      "test/rails_root/db/migrate/20090819030523_add_attachable_to_activities.rb",
+     "test/rails_root/db/migrate/20091124203137_add_location_to_profiles.rb",
+     "test/rails_root/db/migrate/20091124205819_add_fields_to_profiles.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
      "test/rails_root/features/support/env.rb",
      "test/rails_root/features/support/paths.rb",
      "test/rails_root/lib/tasks/cucumber.rake",
+     "test/rails_root/lib/tasks/muck.rake",
      "test/rails_root/public/.htaccess",
      "test/rails_root/public/404.html",
      "test/rails_root/public/422.html",
      "test/rails_root/public/500.html",
      "test/rails_root/public/dispatch.rb",
      "test/rails_root/public/favicon.ico",
+     "test/rails_root/public/images/arrow_down.gif",
      "test/rails_root/public/images/arrow_left.gif",
      "test/rails_root/public/images/arrow_right.gif",
+     "test/rails_root/public/images/arrow_up.gif",
      "test/rails_root/public/images/blue/preview.gif",
+     "test/rails_root/public/images/fancybox/fancy_closebox.png",
+     "test/rails_root/public/images/fancybox/fancy_left.png",
+     "test/rails_root/public/images/fancybox/fancy_progress.png",
+     "test/rails_root/public/images/fancybox/fancy_right.png",
+     "test/rails_root/public/images/fancybox/fancy_shadow_e.png",
+     "test/rails_root/public/images/fancybox/fancy_shadow_n.png",
+     "test/rails_root/public/images/fancybox/fancy_shadow_ne.png",
+     "test/rails_root/public/images/fancybox/fancy_shadow_nw.png",
+     "test/rails_root/public/images/fancybox/fancy_shadow_s.png",
+     "test/rails_root/public/images/fancybox/fancy_shadow_se.png",
+     "test/rails_root/public/images/fancybox/fancy_shadow_sw.png",
+     "test/rails_root/public/images/fancybox/fancy_shadow_w.png",
+     "test/rails_root/public/images/fancybox/fancy_title_left.png",
+     "test/rails_root/public/images/fancybox/fancy_title_main.png",
+     "test/rails_root/public/images/fancybox/fancy_title_right.png",
      "test/rails_root/public/images/icons/accept.png",
      "test/rails_root/public/images/icons/add.png",
+     "test/rails_root/public/images/icons/blue_guy.png",
+     "test/rails_root/public/images/icons/button_background.png",
+     "test/rails_root/public/images/icons/cancel.png",
+     "test/rails_root/public/images/icons/close.png",
+     "test/rails_root/public/images/icons/comment.png",
      "test/rails_root/public/images/icons/delete.png",
+     "test/rails_root/public/images/icons/exclaim.png",
+     "test/rails_root/public/images/icons/external.png",
+     "test/rails_root/public/images/icons/feed.png",
+     "test/rails_root/public/images/icons/grey_guy.png",
+     "test/rails_root/public/images/icons/hide.png",
+     "test/rails_root/public/images/icons/information.png",
+     "test/rails_root/public/images/icons/minus.png",
+     "test/rails_root/public/images/icons/pending.png",
+     "test/rails_root/public/images/icons/question.png",
+     "test/rails_root/public/images/icons/search_box.png",
+     "test/rails_root/public/images/icons/star.png",
+     "test/rails_root/public/images/icons/stop.png",
+     "test/rails_root/public/images/icons/thumb_down.png",
+     "test/rails_root/public/images/icons/thumb_up.png",
      "test/rails_root/public/images/icons/vote.png",
      "test/rails_root/public/images/loading.gif",
+     "test/rails_root/public/images/nothing.png",
      "test/rails_root/public/images/profile_default.jpg",
      "test/rails_root/public/images/rails.png",
      "test/rails_root/public/images/red/preview.gif",
@@ -169,17 +213,30 @@ Gem::Specification.new do |s|
      "test/rails_root/public/javascripts/dragdrop.js",
      "test/rails_root/public/javascripts/effects.js",
      "test/rails_root/public/javascripts/fancyzoom.min.js",
+     "test/rails_root/public/javascripts/jquery/colorpicker.js",
      "test/rails_root/public/javascripts/jquery/jquery-ui.js",
+     "test/rails_root/public/javascripts/jquery/jquery.autocomplete.js.readme",
+     "test/rails_root/public/javascripts/jquery/jquery.autocomplete.min.js",
+     "test/rails_root/public/javascripts/jquery/jquery.autocomplete.pack.js",
+     "test/rails_root/public/javascripts/jquery/jquery.easing.js",
+     "test/rails_root/public/javascripts/jquery/jquery.fancybox.js",
      "test/rails_root/public/javascripts/jquery/jquery.form.js",
      "test/rails_root/public/javascripts/jquery/jquery.jgrowl.js",
      "test/rails_root/public/javascripts/jquery/jquery.js",
+     "test/rails_root/public/javascripts/jquery/jquery.metadata.min.js",
+     "test/rails_root/public/javascripts/jquery/jquery.queryString.js",
+     "test/rails_root/public/javascripts/jquery/jquery.swapimage.js",
+     "test/rails_root/public/javascripts/jquery/jquery.swapimage.min.js",
      "test/rails_root/public/javascripts/jquery/jquery.tips.js",
+     "test/rails_root/public/javascripts/jquery/jrails.js",
      "test/rails_root/public/javascripts/muck.js",
      "test/rails_root/public/javascripts/muck_activities.js",
+     "test/rails_root/public/javascripts/muck_time/en.js",
      "test/rails_root/public/javascripts/prototype.js",
      "test/rails_root/public/javascripts/scriptaculous.js",
      "test/rails_root/public/javascripts/slider.js",
      "test/rails_root/public/javascripts/sound.js",
+     "test/rails_root/public/javascripts/tree.js",
      "test/rails_root/public/robots.txt",
      "test/rails_root/public/stylesheets/.keep",
      "test/rails_root/public/stylesheets/admin.css",
@@ -233,6 +290,8 @@ Gem::Specification.new do |s|
      "test/rails_root/public/stylesheets/jquery/cupertino/images/ui-icons_cd0a0a_256x240.png",
      "test/rails_root/public/stylesheets/jquery/cupertino/images/ui-icons_ffffff_256x240.png",
      "test/rails_root/public/stylesheets/jquery/cupertino/jquery-ui-1.7.1.custom.css",
+     "test/rails_root/public/stylesheets/jquery/jquery.autocomplete.css",
+     "test/rails_root/public/stylesheets/jquery/jquery.fancybox.css",
      "test/rails_root/public/stylesheets/jquery/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png",
      "test/rails_root/public/stylesheets/jquery/redmond/images/ui-bg_flat_55_fbec88_40x100.png",
      "test/rails_root/public/stylesheets/jquery/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png",
@@ -278,6 +337,7 @@ Gem::Specification.new do |s|
      "test/rails_root/public/stylesheets/jquery/ui-lightness/images/ui-icons_ffd27a_256x240.png",
      "test/rails_root/public/stylesheets/jquery/ui-lightness/images/ui-icons_ffffff_256x240.png",
      "test/rails_root/public/stylesheets/jquery/ui-lightness/jquery-ui-1.7.1.custom.css",
+     "test/rails_root/public/stylesheets/muck-activities.css",
      "test/rails_root/public/stylesheets/reset.css",
      "test/rails_root/public/stylesheets/styles.css",
      "test/rails_root/public/stylesheets/themes/blue/styles.css",
@@ -309,6 +369,48 @@ Gem::Specification.new do |s|
      "test/rails_root/test/unit/activity_test.rb",
      "test/rails_root/test/unit/share_test.rb",
      "test/rails_root/test/unit/user_test.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/CHANGELOG.rdoc",
+     "test/rails_root/vendor/plugins/geokit-rails/MIT-LICENSE",
+     "test/rails_root/vendor/plugins/geokit-rails/README.markdown",
+     "test/rails_root/vendor/plugins/geokit-rails/Rakefile",
+     "test/rails_root/vendor/plugins/geokit-rails/about.yml",
+     "test/rails_root/vendor/plugins/geokit-rails/assets/api_keys_template",
+     "test/rails_root/vendor/plugins/geokit-rails/init.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/install.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/acts_as_mappable.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/adapters/abstract.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/adapters/mysql.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/adapters/postgresql.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/adapters/sqlserver.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/defaults.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/geocoder_control.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/ip_geocode_lookup.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/acts_as_mappable_test.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/boot.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/database.yml",
+     "test/rails_root/vendor/plugins/geokit-rails/test/fixtures/companies.yml",
+     "test/rails_root/vendor/plugins/geokit-rails/test/fixtures/custom_locations.yml",
+     "test/rails_root/vendor/plugins/geokit-rails/test/fixtures/locations.yml",
+     "test/rails_root/vendor/plugins/geokit-rails/test/fixtures/mock_addresses.yml",
+     "test/rails_root/vendor/plugins/geokit-rails/test/fixtures/mock_families.yml",
+     "test/rails_root/vendor/plugins/geokit-rails/test/fixtures/mock_houses.yml",
+     "test/rails_root/vendor/plugins/geokit-rails/test/fixtures/mock_organizations.yml",
+     "test/rails_root/vendor/plugins/geokit-rails/test/fixtures/mock_people.yml",
+     "test/rails_root/vendor/plugins/geokit-rails/test/fixtures/stores.yml",
+     "test/rails_root/vendor/plugins/geokit-rails/test/ip_geocode_lookup_test.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/company.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/custom_location.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/location.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/mock_address.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/mock_family.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/mock_house.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/mock_organization.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/mock_person.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/store.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/schema.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/tasks.rake",
+     "test/rails_root/vendor/plugins/geokit-rails/test/test_helper.rb",
      "uninstall.rb"
   ]
   s.homepage = %q{http://github.com/tatemae/muck_activities}
@@ -333,23 +435,29 @@ Gem::Specification.new do |s|
      "test/rails_root/config/environments/development.rb",
      "test/rails_root/config/environments/production.rb",
      "test/rails_root/config/environments/test.rb",
+     "test/rails_root/config/initializers/geokit_config.rb",
      "test/rails_root/config/initializers/inflections.rb",
      "test/rails_root/config/initializers/mime_types.rb",
      "test/rails_root/config/initializers/requires.rb",
      "test/rails_root/config/initializers/session_store.rb",
      "test/rails_root/config/routes.rb",
      "test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb",
+     "test/rails_root/db/migrate/20090327231918_create_users.rb",
      "test/rails_root/db/migrate/20090402033319_add_muck_activities.rb",
      "test/rails_root/db/migrate/20090402234137_create_languages.rb",
      "test/rails_root/db/migrate/20090426041056_create_countries.rb",
      "test/rails_root/db/migrate/20090426041103_create_states.rb",
      "test/rails_root/db/migrate/20090512013727_create_profiles.rb",
-     "test/rails_root/db/migrate/20090602041838_create_users.rb",
      "test/rails_root/db/migrate/20090613173314_create_comments.rb",
      "test/rails_root/db/migrate/20090730044139_add_comment_cache.rb",
+     "test/rails_root/db/migrate/20090730154102_allow_null_user.rb",
      "test/rails_root/db/migrate/20090803185323_create_shares.rb",
+     "test/rails_root/db/migrate/20090804184247_add_comment_count_to_shares.rb",
+     "test/rails_root/db/migrate/20090804231857_add_shares_uri_index.rb",
      "test/rails_root/db/migrate/20090818204527_add_activity_indexes.rb",
      "test/rails_root/db/migrate/20090819030523_add_attachable_to_activities.rb",
+     "test/rails_root/db/migrate/20091124203137_add_location_to_profiles.rb",
+     "test/rails_root/db/migrate/20091124205819_add_fields_to_profiles.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
      "test/rails_root/features/support/env.rb",
      "test/rails_root/features/support/paths.rb",
@@ -361,7 +469,32 @@ Gem::Specification.new do |s|
      "test/rails_root/test/unit/activity_feed_test.rb",
      "test/rails_root/test/unit/activity_test.rb",
      "test/rails_root/test/unit/share_test.rb",
-     "test/rails_root/test/unit/user_test.rb"
+     "test/rails_root/test/unit/user_test.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/init.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/install.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/acts_as_mappable.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/adapters/abstract.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/adapters/mysql.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/adapters/postgresql.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/adapters/sqlserver.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/defaults.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/geocoder_control.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/ip_geocode_lookup.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/acts_as_mappable_test.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/boot.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/ip_geocode_lookup_test.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/company.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/custom_location.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/location.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/mock_address.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/mock_family.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/mock_house.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/mock_organization.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/mock_person.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/store.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/schema.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -383,3 +516,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<muck-comments>, [">= 0"])
   end
 end
+

data/test/rails_root/config/database.yml

@@ -1,17 +1,17 @@
 development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  timeout: 5000
-
-test: &TEST
-  adapter: sqlite3
-  database: db/test.sqlite3
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  timeout: 5000
+  adapter: mysql
+  database: muck_activities_development
+  username: root
+  password:
+  host: localhost
+  encoding: utf8
+test:
+  adapter: mysql
+  database: muck_activities_test
+  username: root
+  password:
+  host: localhost
+  encoding: utf8
 
 cucumber:
   <<: *TEST

data/test/rails_root/config/environment.rb

@@ -17,10 +17,12 @@ Rails::Initializer.run do |config|
   config.time_zone = 'UTC'
   config.gem "will_paginate"
   config.gem "authlogic"
-  config.gem "binarylogic-searchlogic", :lib => 'searchlogic', :source  => 'http://gems.github.com'
+  config.gem "geokit"
+  config.gem "sanitize"
+  config.gem "searchlogic"
   config.gem "bcrypt-ruby", :lib => "bcrypt"
   config.gem "awesome_nested_set"
-  config.gem 'thoughtbot-paperclip', :lib => 'paperclip', :source => "http://gems.github.com"
+  config.gem 'paperclip'
   config.gem 'muck-engine', :lib => 'muck_engine'
   config.gem 'muck-users', :lib => 'muck_users'
   config.gem 'muck-comments', :lib => 'muck_comments'

data/test/rails_root/config/global_config.yml

@@ -5,9 +5,14 @@ default: &DEFAULT
   application_url: localhost:3000
   
   # session key information
-  session_key: _uploader_session
+  session_key: _muck_activities_session
   session_secret: ea55c4d5e105735fdfb1caec46711b3dd14ec976d0ba95b4c0f575cb046cc358bce7a335ee36eb29253fb680ef8b838d871f6baeff48220fee8e9e42ab84774b
 
+  # Geo kit configuration.
+  google_geo_key: ''
+  yahoo_geo_key: ''
+
+
   # enable_activity_file_uploads: true # Turn on file uploads in the activity feed.  Requires that uploader be installed.
   #   enable_activity_image_uploads: true # Turn on image uploads in the activity feed.  Requires that uploader and muck_albums be installed.
   #   enable_activity_video_sharing: true # Turn on video sharing in the activity feed.

data/test/rails_root/config/initializers/geokit_config.rb

@@ -0,0 +1,63 @@
+require 'geokit'
+
+if defined? Geokit
+
+	# These defaults are used in Geokit::Mappable.distance_to and in acts_as_mappable
+	Geokit::default_units = :miles
+	Geokit::default_formula = :sphere
+
+	# This is the timeout value in seconds to be used for calls to the geocoder web
+	# services.  For no timeout at all, comment out the setting.  The timeout unit
+	# is in seconds. 
+	Geokit::Geocoders::request_timeout = 3
+
+	# These settings are used if web service calls must be routed through a proxy.
+	# These setting can be nil if not needed, otherwise, addr and port must be 
+	# filled in at a minimum.  If the proxy requires authentication, the username
+	# and password can be provided as well.
+	Geokit::Geocoders::proxy_addr = nil
+	Geokit::Geocoders::proxy_port = nil
+	Geokit::Geocoders::proxy_user = nil
+	Geokit::Geocoders::proxy_pass = nil
+
+	# This is your yahoo application key for the Yahoo Geocoder.
+	# See http://developer.yahoo.com/faq/index.html#appid
+	# and http://developer.yahoo.com/maps/rest/V1/geocode.html
+	Geokit::Geocoders::yahoo = GlobalConfig.yahoo_geo_key
+    
+	# This is your Google Maps geocoder key. 
+	# See http://www.google.com/apis/maps/signup.html
+	# and http://www.google.com/apis/maps/documentation/#Geocoding_Examples
+	Geokit::Geocoders::google = GlobalConfig.google_geo_key
+    
+	# This is your username and password for geocoder.us.
+	# To use the free service, the value can be set to nil or false.  For 
+	# usage tied to an account, the value should be set to username:password.
+	# See http://geocoder.us
+	# and http://geocoder.us/user/signup
+	Geokit::Geocoders::geocoder_us = false 
+
+	# This is your authorization key for geocoder.ca.
+	# To use the free service, the value can be set to nil or false.  For 
+	# usage tied to an account, set the value to the key obtained from
+	# Geocoder.ca.
+	# See http://geocoder.ca
+	# and http://geocoder.ca/?register=1
+	Geokit::Geocoders::geocoder_ca = false
+
+	# Uncomment to use a username with the Geonames geocoder
+	#Geokit::Geocoders::geonames="REPLACE_WITH_YOUR_GEONAMES_USERNAME"
+
+	# This is the order in which the geocoders are called in a failover scenario
+	# If you only want to use a single geocoder, put a single symbol in the array.
+	# Valid symbols are :google, :yahoo, :us, and :ca.
+	# Be aware that there are Terms of Use restrictions on how you can use the 
+	# various geocoders.  Make sure you read up on relevant Terms of Use for each
+	# geocoder you are going to use.
+	Geokit::Geocoders::provider_order = [:google,:us]
+
+	# The IP provider order. Valid symbols are :ip,:geo_plugin.
+	# As before, make sure you read up on relevant Terms of Use for each
+	# Geokit::Geocoders::ip_provider_order = [:geo_plugin,:ip]
+
+end

data/test/rails_root/db/migrate/{20090602041838_create_users.rb → 20090327231918_create_users.rb}

@@ -1,5 +1,4 @@
 class CreateUsers < ActiveRecord::Migration
-
   def self.up
     create_table :users, :force => true do |t|
       t.string   :login
@@ -8,29 +7,31 @@ class CreateUsers < ActiveRecord::Migration
       t.string   :last_name
       t.string   :crypted_password
       t.string   :password_salt
-      t.string   :persistence_token
-      t.string   :single_access_token
-      t.string   :perishable_token
+      t.string   :persistence_token,   :null => false
+      t.string   :single_access_token, :null => false
+      t.string   :perishable_token,    :null => false
       t.integer  :login_count,         :null => false, :default => 0
       t.integer  :failed_login_count,  :null => false, :default => 0
       t.datetime :last_request_at                                   
-      t.datetime :last_login_at 
       t.datetime :current_login_at                                  
+      t.datetime :last_login_at                                     
       t.string   :current_login_ip                                  
       t.string   :last_login_ip
-      t.boolean  :terms_of_service,   :default => false, :null => false
-      t.string   :time_zone,          :default => "UTC"
+      t.boolean  :terms_of_service,          :default => false, :null => false
+      t.string   :time_zone,                 :default => "UTC"
       t.datetime :disabled_at
+      t.datetime :created_at
       t.datetime :activated_at
-      t.timestamps
+      t.datetime :updated_at
+      t.string   :identity_url
+      t.string   :url_key
     end
 
     add_index :users, :login
     add_index :users, :email
     add_index :users, :persistence_token
-    add_index :users, :perishable_token
-    add_index :users, :single_access_token
     add_index :users, :last_request_at
+
   end
 
   def self.down