git ignore

.gitignore

@@ -12,6 +12,10 @@ vendor/bundle
 .rvmrc
 .project
 *.tmproj
+
 db/sphinx/*
 db/sphinx
 config/development.sphinx.conf
+config/development.sphinx.conf
+db/sphinx/*	
+db/sphinxconfig/development.sphinx.conf

Gemfile

@@ -16,14 +16,25 @@ gem 'GeoRuby'
 gem 'spatial_adapter'
 gem 'formtastic'
 gem 'haml'
-gem 'rails_email_validator'
+# pagination
 gem 'kaminari'
+# file uploads
 gem 'paperclip'
 gem 'fog'
+# markdown
 gem 'redcarpet'
 gem 'countries'
-gem 'memcache-client'
+
+# for managing cron job
+gem 'whenever'
+
+# cache in memcache - varnish isnt availiable on cedar apps
+gem 'rack-cache'
+gem 'dalli'
+
+# search via sphinx deamon
 gem 'thinking-sphinx', '2.0.10'
+gem 'flying-sphinx',   '0.6.1'
 
 # social
 gem 'koala'

Gemfile.lock

@@ -34,7 +34,7 @@ GEM
     ansi (1.4.1)
     arel (2.2.1)
     bcrypt-ruby (3.0.1)
-    bourbon (1.3.0)
+    bourbon (1.3.5)
       sass (>= 3.1)
     bson (1.5.2)
     bson_ext (1.5.2)
@@ -49,6 +49,7 @@ GEM
       xpath (~> 0.1.4)
     childprocess (0.3.0)
       ffi (~> 1.0.6)
+    chronic (0.6.6)
     cocaine (0.2.1)
     coffee-rails (3.1.1)
       coffee-script (>= 2.2.0)
@@ -71,6 +72,7 @@ GEM
       cucumber (>= 1.1.3)
       nokogiri (>= 1.5.0)
     currencies (0.4.0)
+    dalli (1.1.4)
     database_cleaner (0.7.1)
     devise (1.5.3)
       bcrypt-ruby (~> 3.0)
@@ -82,16 +84,25 @@ GEM
     excon (0.9.5)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    factory_girl (2.4.2)
+    factory_girl (2.5.0)
       activesupport
-    factory_girl_rails (1.5.0)
-      factory_girl (~> 2.4.0)
+    factory_girl_rails (1.6.0)
+      factory_girl (~> 2.5.0)
       railties (>= 3.0.0)
-    faraday (0.7.5)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
-      rack (>= 1.1.0, < 2)
+    faraday (0.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)
+    faraday_middleware (0.7.0)
+      faraday (~> 0.7.3)
     ffi (1.0.11)
+    flying-sphinx (0.6.1)
+      faraday_middleware (~> 0.7.0)
+      multi_json (~> 1.0.1)
+      net-ssh (>= 2.0.23)
+      rash (~> 0.3.0)
+      riddle (>= 1.5.0)
+      thinking-sphinx
     fog (1.1.2)
       builder
       excon (~> 0.9.0)
@@ -107,7 +118,7 @@ GEM
     formatador (0.2.1)
     formtastic (2.0.2)
       rails (~> 3.0)
-    gherkin (2.7.3)
+    gherkin (2.7.6)
       json (>= 1.4.6)
     haml (3.1.4)
     hashie (1.2.0)
@@ -136,11 +147,10 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    memcache-client (1.8.5)
     mime-types (1.17.2)
     mongo (1.5.2)
       bson (= 1.5.2)
-    mongoid (2.4.1)
+    mongoid (2.4.2)
       activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
@@ -194,8 +204,6 @@ GEM
       activesupport (= 3.1.3)
       bundler (~> 1.0)
       railties (= 3.1.3)
-    rails_email_validator (0.1.4)
-      activemodel (>= 3.0.0)
     railties (3.1.3)
       actionpack (= 3.1.3)
       activesupport (= 3.1.3)
@@ -204,9 +212,11 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
+    rash (0.3.2)
+      hashie (~> 1.2.0)
     rdoc (3.12)
       json (~> 1.4)
-    redcarpet (2.0.1)
+    redcarpet (2.1.0)
     riddle (1.5.1)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
@@ -268,6 +278,9 @@ GEM
       multi_json (>= 1.0.2)
     warden (1.1.0)
       rack (>= 1.0)
+    whenever (0.7.2)
+      activesupport (>= 2.3.4)
+      chronic (~> 0.6.3)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -282,10 +295,12 @@ DEPENDENCIES
   coffee-rails (~> 3.1.1)
   countries
   cucumber-rails
+  dalli
   database_cleaner
   devise
   dynamic_models
   factory_girl_rails
+  flying-sphinx (= 0.6.1)
   fog
   foreigner
   formtastic
@@ -298,15 +313,14 @@ DEPENDENCIES
   kaminari
   koala
   launchy
-  memcache-client
   mongoid
   mysql2
   newrelic_rpm
   omniauth-facebook
   omniauth-twitter
   paperclip
+  rack-cache
   rails (= 3.1.3)
-  rails_email_validator
   redcarpet
   rspec-rails
   ruby_parser
@@ -316,3 +330,4 @@ DEPENDENCIES
   turn
   twitter
   uglifier (>= 1.0.3)
+  whenever

app/assets/javascripts/affiliate_event_application.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/application.js

@@ -1,32 +1,49 @@
 // =require common
 
+// =require application/newsletter
+// =require application/contact
+
+// =require application/modernizr.min.js
 // =require application/global.js
-// =require application/modernizr-1.7.min.js
 // =require application/jquery.nivo.slider.pack.js
 // =require application/fancybox/jquery.fancybox-1.3.4.pack.js
+// =require application/kohtweets.js
+// =require application/mustache.js
+// =require application/underscore.js
+// =require application/pretty.js
 
 // all pages on the front end of the website have the dynamic account links lazy loaded, this allows for the rest of the page to be cached by varnish, squid etc. and results in extremely fasy user experience
 $(document).ready(function(){
 
+  Modernizr.load();
+
   $.get('/account_links', function(data) {
 
     if( data.admin ) {
       $('#admin_link').show();
     }
 
+    if( data.newsletter ) {
+      $('#subscribe_to_newsletter').hide();
+      subscribe_to_newsletter
+    }
+
     if( data.signed_in ) {
       $('#nav_user').show();
-
+      // dont ask for email or name when prompting for newsletter
+      // we use remove, so they are subsequently ignored when checking for required fields
+      $('#subscribe_to_newsletter input[type="text"]').remove();
+      $('#subscribe_to_newsletter input[type="email"]').remove();
+
+
     } else {
       $('#gn_register').show();
       $('#gn_login').show();
       $('#users_full_name').html(data.full_name);
-
-      if( data.connected_to_facebook ) {
-        $('#connect_to_facebook').hide();
-
-      }
-
+    }
+
+    if( data.connected_to_facebook ) {
+      $('.facebook_connect').hide();
     }
 
   }, 'JSON');

app/assets/javascripts/application/contact.js

@@ -2,7 +2,7 @@ $(document).ready(function(){
 
   // dont submit the contact form unless all the fields have been used
   // -------------------------------------------------------------------
-  $('body#application_page.contact form.contact').submit(function(){
+  $('body#application_page.contact form.contact').live('submit', function(){
 
     $(this).find(':input').closest('li').removeClass('error');
     $missing = [];