muck-auth 3.5.2 → 3.5.3

data/VERSION

@@ -1 +1 @@
-3.5.2
+3.5.3

data/app/controllers/muck/authentications_controller.rb

@@ -27,7 +27,7 @@ class Muck::AuthenticationsController < ApplicationController
       @user = User.new
       @user.apply_omniauth(@omniauth)
       @user.generate_password
-      if @user.save
+      if @user.save        
         UserSession.create(@user)
         flash[:notice] = t('muck.users.thanks_sign_up')
         status = :new_signup_success

data/lib/muck-auth/models/authentication.rb

@@ -5,7 +5,12 @@ module MuckAuth
       extend ActiveSupport::Concern
     
       included do
-        belongs_to :authenticatable, :polymorphic => true        
+        belongs_to :authenticatable, :polymorphic => true
+        scope :by_newest, order("authentications.created_at DESC")
+        scope :by_oldest, order("authentications.created_at ASC")
+        scope :by_latest, order("authentications.updated_at DESC")
+        scope :newer_than, lambda { |*args| where("authentications.created_at > ?", args.first || DateTime.now) }
+        scope :older_than, lambda { |*args| where("authentications.created_at < ?", args.first || 1.day.ago.to_s(:db)) }        
       end
       
       def access_token

data/lib/muck-auth/models/user.rb

@@ -7,6 +7,9 @@ module MuckAuth
       included do
         has_many :authentications, :as => :authenticatable, :dependent => :destroy
         accepts_nested_attributes_for :authentications, :allow_destroy => true
+        
+        after_create :set_profile_from_authentications
+        
       end
       
       def apply_omniauth(omniauth)
@@ -21,21 +24,35 @@ module MuckAuth
         self.last_name = names[1] if self.last_name.blank?
         
         self.login = omniauth['user_info']['nickname'] if self.login.blank?
+        self.login = self.first_name.downcase if Float(self.login) rescue false # If the login is a number then try the first name
+        
         # Some providers don't provide a valid nickname so try the first name
         self.login = self.first_name if !self.valid? && self.errors[:login].any?
         
-        self.authentications.build(:provider => omniauth['provider'], :uid => omniauth['uid'], :raw_auth => omniauth.to_json,
-                              :token => omniauth['credentials']['token'], :secret => omniauth['credentials']['secret'] )
-                                             
+        # Remove the email if it's invalid
+        self.email = '' if self.errors[:email].any?
+        
+        self.authentications.build(:provider => omniauth['provider'], 
+                                   :uid => omniauth['uid'], 
+                                   :raw_auth => omniauth.to_json,
+                                   :token => omniauth['credentials']['token'], 
+                                   :secret => omniauth['credentials']['secret'] )   
+      end
+      
+      def set_profile_from_authentications
+        return unless self.respond_to?(:profile)
+        if authentication = self.authentications.by_newest.first
+          self.profile_from_omniauth(JSON.parse(authentication.raw_auth))
+        end
       end
       
       def profile_from_omniauth(omniauth)
         if self.respond_to?(:profile)
+          self.build_profile if self.profile.blank? # in case profile doesn't yet exist
           self.profile.location = omniauth['user_info']['location'] if self.profile.location.blank?
           self.profile.about = omniauth['user_info']['description'] if self.profile.about.blank?
-          
-          # TODO figure out how to get their profile image
-          # self.profile.image = omniauth['user_info']['image'] if self.profile.image.blank?
+          self.profile.photo_url = omniauth['user_info']['image'] if self.profile.photo.original_filename.blank?
+          self.profile.save
         end
       end
       

data/muck-auth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-auth}
-  s.version = "3.5.2"
+  s.version = "3.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2011-07-12}
+  s.date = %q{2011-07-13}
   s.description = %q{A simple wrapper for the omniauth gem so that it is faster to include oauth in muck based applications.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -181,6 +181,9 @@ Gem::Specification.new do |s|
     "test/db/migrate/20101117172951_add_name_to_access_code_requests.rb",
     "test/db/migrate/20110216045051_create_authentications.rb",
     "test/db/migrate/20110226174321_add_cached_slugs.rb",
+    "test/db/migrate/20110303183433_add_sent_to_to_access_codes.rb",
+    "test/db/migrate/20110420153714_add_provided_by_to_access_codes.rb",
+    "test/db/migrate/20110713040718_add_photo_url.rb",
     "test/db/schema.rb",
     "test/db/seeds.rb",
     "test/features/step_definitions/common_steps.rb",
@@ -700,6 +703,8 @@ Gem::Specification.new do |s|
     "test/public/javascripts/muck.js",
     "test/public/javascripts/muck_activities.js",
     "test/public/javascripts/muck_admin.js",
+    "test/public/javascripts/muck_countries.js",
+    "test/public/javascripts/muck_services-src.js",
     "test/public/javascripts/muck_services.js",
     "test/public/javascripts/muck_time/en.js",
     "test/public/javascripts/prototype.js",
@@ -2236,6 +2241,21 @@ Gem::Specification.new do |s|
     "test/public/stylesheets/swfupload.css",
     "test/public/stylesheets/tinymce.css",
     "test/public/stylesheets/uploadify.css",
+    "test/public/system/photos/32/icon/GettyImages_79495526-1-0_bigger.jpg",
+    "test/public/system/photos/32/medium/GettyImages_79495526-1-0_bigger.jpg",
+    "test/public/system/photos/32/original/GettyImages_79495526-1-0_bigger.jpg",
+    "test/public/system/photos/32/thumb/GettyImages_79495526-1-0_bigger.jpg",
+    "test/public/system/photos/32/tiny/GettyImages_79495526-1-0_bigger.jpg",
+    "test/public/system/photos/33/icon/GettyImages_79495526-1-0_bigger.jpg",
+    "test/public/system/photos/33/medium/GettyImages_79495526-1-0_bigger.jpg",
+    "test/public/system/photos/33/original/GettyImages_79495526-1-0_bigger.jpg",
+    "test/public/system/photos/33/thumb/GettyImages_79495526-1-0_bigger.jpg",
+    "test/public/system/photos/33/tiny/GettyImages_79495526-1-0_bigger.jpg",
+    "test/public/system/photos/34/icon/GettyImages_79495526-1-0_bigger.jpg",
+    "test/public/system/photos/34/medium/GettyImages_79495526-1-0_bigger.jpg",
+    "test/public/system/photos/34/original/GettyImages_79495526-1-0_bigger.jpg",
+    "test/public/system/photos/34/thumb/GettyImages_79495526-1-0_bigger.jpg",
+    "test/public/system/photos/34/tiny/GettyImages_79495526-1-0_bigger.jpg",
     "test/script/rails",
     "test/spec/controllers/authentications_controller_spec.rb",
     "test/spec/models/authentication_spec.rb",

data/test/db/migrate/20110303183433_add_sent_to_to_access_codes.rb

@@ -0,0 +1,9 @@
+class AddSentToToAccessCodes < ActiveRecord::Migration
+  def self.up
+    add_column :access_codes, :sent_to, :string
+  end
+
+  def self.down
+    remove_column :access_codes, :sent_to
+  end
+end

data/test/db/migrate/20110420153714_add_provided_by_to_access_codes.rb

@@ -0,0 +1,9 @@
+class AddProvidedByToAccessCodes < ActiveRecord::Migration
+  def self.up
+    add_column :access_codes, :provided_by_id, :integer
+  end
+
+  def self.down
+    remove_column :access_codes, :provided_by_id
+  end
+end

data/test/db/migrate/20110713040718_add_photo_url.rb

@@ -0,0 +1,9 @@
+class AddPhotoUrl < ActiveRecord::Migration
+  def self.up
+    add_column :profiles, :photo_remote_url, :string
+  end
+
+  def self.down
+    remove_column :profiles, :photo_remote_url
+  end
+end

data/test/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110226174321) do
+ActiveRecord::Schema.define(:version => 20110713040718) do
 
   create_table "access_code_requests", :force => true do |t|
     t.string   "email"
@@ -24,12 +24,14 @@ ActiveRecord::Schema.define(:version => 20110226174321) do
 
   create_table "access_codes", :force => true do |t|
     t.string   "code"
-    t.integer  "uses",       :default => 0,     :null => false
-    t.boolean  "unlimited",  :default => false, :null => false
+    t.integer  "uses",           :default => 0,     :null => false
+    t.boolean  "unlimited",      :default => false, :null => false
     t.datetime "expires_at"
-    t.integer  "use_limit",  :default => 1,     :null => false
+    t.integer  "use_limit",      :default => 1,     :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "sent_to"
+    t.integer  "provided_by_id"
   end
 
   add_index "access_codes", ["code"], :name => "index_access_codes_on_code"
@@ -448,6 +450,7 @@ ActiveRecord::Schema.define(:version => 20110226174321) do
     t.integer  "language_id"
     t.integer  "profile_views"
     t.text     "policy"
+    t.string   "photo_remote_url"
   end
 
   add_index "profiles", ["lat", "lng"], :name => "index_profiles_on_lat_and_lng"

data/test/public/javascripts/muck-users.js

@@ -1,16 +1,12 @@
 jQuery(document).ready(function() {
 	jQuery("#user_login").blur(function(){
-	  jQuery.post("/users/is_login_available",{ user_login:jQuery(this).val(), format:'js' },function(data){
-	    jQuery("#username-availibility").html(data);
-	  });
+	  jQuery.post("/users/is_login_available",{ user_login:jQuery(this).val(), format:'js' },function(data){});
 	});
 	jQuery("#user_login").keydown(function() {
 	  jQuery("#username-availibility").html('');
 	});
 	jQuery("#user_email").blur(function(){
-	  jQuery.post("/users/is_email_available",{ user_email:jQuery(this).val(), format:'js' },function(data){
-	    jQuery("#email-availibility").html(data);
-	  });
+	  jQuery.post("/users/is_email_available",{ user_email:jQuery(this).val(), format:'js' },function(data){});
 	});
 	jQuery("#user_email").keydown(function() {
 	  jQuery("#email-availibility").html('');
@@ -21,5 +17,4 @@ jQuery(document).ready(function() {
 		autoFill: true,
 		mustMatch: false
 	});
-	jQuery('a.fancy-access-request').fancybox({'hideOnContentClick':false, 'overlayShow':true, 'width':375, 'height':300 });
 });

data/test/public/javascripts/muck.js

@@ -1,5 +1,149 @@
-jQuery(document).ajaxSend(function(a,b,c){add_headers(b);if(!(c.type.toUpperCase()=="GET"||typeof AUTH_TOKEN=="undefined")){c.data=c.data||"";if(typeof AUTH_TOKEN!="undefined")c.data+=(c.data?"&":"")+"authenticity_token="+encodeURIComponent(AUTH_TOKEN)}});function apply_ajax_forms(){jQuery("form.ajax").ajaxForm({dataType:"script",beforeSend:add_headers});jQuery("form.ajax").append('<input type="hidden" name="format" value="js" />')}
-function add_headers(a){a.setRequestHeader("Accept","text/javascript");a.setRequestHeader("X-Requested-With","XMLHttpRequest")}
-jQuery(document).ready(function(){jQuery("a.ajax-delete").live("click",function(){var a=jQuery(this).attr("title"),b=true;if(a.length>0)b=confirm(a);b&&jQuery.post(this.href,{_method:"delete",format:"js"},null,"script");return false});jQuery("a.ajax-update").live("click",function(){jQuery.post(this.href,{_method:"put",format:"js"},null,"script");return false});jQuery(".submit-form").click(function(){jQuery(this).parent("form").submit()});apply_ajax_forms();jQuery("a.dialog-pop").live("click",function(){var a=
-jQuery('<div class="dialog"></div>').appendTo("body");a.dialog({modal:true,autoOpen:false,width:"auto",title:jQuery(this).attr("title")});a.load(jQuery(this).attr("href"),"",function(){a.dialog("open");apply_ajax_forms()});return false});jQuery(".submit-delete").live("click",function(){jQuery(this).parents(".delete-container").fadeOut();var a=jQuery(this).parents("form");jQuery.post(a.attr("action")+".json",a.serialize(),function(b){b=eval("("+b+")");b.success||jQuery.jGrowl.info(b.message)});return false});
-jQuery(".submit-delete-js").live("click",function(){jQuery(this).parents(".delete-container").fadeOut();var a=jQuery(this).parents("form");jQuery.post(a.attr("action")+".js",a.serialize(),function(){});return false});jQuery(document).ready(function(){jQuery(".waiting").hide();jQuery(".wait-button").click(function(){jQuery(".waiting").show();jQuery(this).hide()})})});
+// compress with http://closure-compiler.appspot.com/home
+//jQuery.noConflict();
+jQuery(document).ajaxSend(function(event, request, settings) {
+  add_headers(request);
+  if (settings.type.toUpperCase() == 'GET' || typeof(AUTH_TOKEN) == "undefined") return; // for details see: http://www.justinball.com/2009/07/08/jquery-ajax-get-in-firefox-post-in-internet-explorer/
+  // settings.data is a serialized string like "foo=bar&baz=boink" (or null)
+  settings.data = settings.data || "";
+ 	if (typeof(AUTH_TOKEN) != "undefined")
+  	settings.data += (settings.data ? "&" : "") + "authenticity_token=" + encodeURIComponent(AUTH_TOKEN);
+});
+
+function apply_ajax_forms() {
+  jQuery('form.ajax').ajaxForm({
+    dataType: 'script',
+    beforeSend: add_headers
+  });
+	jQuery('form.ajax').append('<input type="hidden" name="format" value="js" />');
+}
+
+function add_headers(xhr){
+	xhr.setRequestHeader("Accept", "text/javascript");
+	xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+}
+
+jQuery(document).ready(function() {
+
+  jQuery('a.ajax-delete').live('click', function() {
+    var title = jQuery(this).attr('title');
+    var do_delete = true;
+    if(title.length > 0){
+      do_delete = confirm(title);
+    }
+    if (do_delete){
+      jQuery.post(this.href, { _method: 'delete', format: 'js' }, null, "script");
+    }
+    return false;
+  });
+
+  jQuery('a.ajax-update').live('click', function() {
+    jQuery.post(this.href, { _method: 'put', format: 'js' }, null, "script");
+    return false;
+  });
+
+  jQuery(".submit-form").click(function() {
+    jQuery(this).parent('form').submit();
+  });
+	
+	//jQuery("ul.drop-menu").menu();
+	
+  apply_ajax_forms();
+
+  jQuery('a.dialog-pop').live('click', function() {
+    var d = jQuery('<div class="dialog"></div>').appendTo("body");
+    d.dialog({ modal: true, autoOpen: false, width: 'auto', title: jQuery(this).attr('title') });
+    d.load(jQuery(this).attr('href'), '', function(){
+      d.dialog("open");
+      apply_ajax_forms();
+    });
+    return false;
+  });
+
+  jQuery(".submit-delete").live('click', function() {
+    jQuery(this).parents('.delete-container').fadeOut();
+    var form = jQuery(this).parents('form');
+    jQuery.post(form.attr('action') + '.json', form.serialize(),
+      function(data){
+        var json = eval('(' + data + ')');
+        if(!json.success){
+          jQuery.jGrowl.info(json.message);
+        }
+      });
+    return false;
+  });
+  
+  jQuery(".submit-delete-js").live('click', function() {
+    jQuery(this).parents('.delete-container').fadeOut();
+    var form = jQuery(this).parents('form');
+    jQuery.post(form.attr('action') + '.js', form.serialize(),
+      function(data){
+      });
+    return false;
+  });
+
+  jQuery(document).ready(function() {
+    jQuery('.waiting').hide();
+    jQuery(".wait-button").live('click', function() {
+      jQuery(this).siblings('.waiting').show();
+      jQuery(this).hide();
+    });
+  });
+
+});
+
+// String list methods. These are handy for dealing with comma delimited lists
+// in text boxes such as a list of emails or tags.
+// Given a comma delimited string add a new item if it isn't in the string
+function add_to_list(items_string, new_item){
+  var items = split_list(items_string);
+  var add = true;
+  for(i=0;i<items.length;i++){
+    if(items[i] == new_item){ add = false; }
+  }
+  if(add){ 
+    items.push(new_item);
+  }
+  return items.join(', ');
+}
+
+// Given a comma delimited list remove an item from the string
+function remove_from_list(items_string, remove_item){
+  var items = split_list(items_string);
+  var cleaned = [];
+  for(i=0;i<items.length;i++){
+    if(items[i] != remove_item){
+      cleaned.push(items[i]);
+    }
+  }
+  return cleaned.join(', ');
+}
+
+// Split a string on commas
+function split_list(items_string){
+  if(undefined != items_string && items_string.length > 0){
+    var items = items_string.split(',');
+  } else {
+    var items = [];
+  }
+  var cleaned = [];
+  for(i=0;i<items.length;i++){
+    var cleaned_item = jQuery.trim(items[i]);
+    if(cleaned_item.length > 0){ 
+      cleaned.push(cleaned_item); 
+    }
+  }
+  return cleaned;
+}
+
+function isEncodedHtml(str) { 
+  if(str.search(/&amp;/g) != -1 || str.search(/&lt;/g) != -1 || str.search(/&gt;/g) != -1) 
+    return true; 
+  else 
+    return false; 
+}; 
+ 
+function decodeHtml(str){ 
+    if(isEncodedHtml(str)) 
+      return str.replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>'); 
+    return str; 
+}

data/test/public/javascripts/muck_admin.js

@@ -1,13 +0,0 @@
- jQuery(function(){
-	// BUTTONS
-	jQuery('.fg-button').hover(
-		function(){ jQuery(this).removeClass('ui-state-default').addClass('ui-state-focus'); },
-		function(){ jQuery(this).removeClass('ui-state-focus').addClass('ui-state-default'); }
-	);
-	jQuery('.flat').each(function() {
-		jQuery(this).menu({ 
-			content: jQuery(this).next().html(), // grab content from this page
-			showSpeed: 200 
-		});
-	});
-});

data/test/public/javascripts/muck_countries.js

@@ -0,0 +1,50 @@
+function setup_country(force_load){
+
+	var country_id = jQuery("#countries").val();
+	var state_id = jQuery("#states").val();
+
+	if (country_id == undefined){ 
+		return; 
+	}
+
+	if (country_id == '-1'){
+		jQuery("#states").val('-1');
+		jQuery("#counties").val('-1');
+	}
+
+	if (country_id == '-1' || country_id == ''){
+		jQuery("#states-container").hide();
+		jQuery("#counties-container").hide();
+		return;
+	}
+
+	if(force_load || state_id == '' || state_id == null || state_id == -1) {
+		jQuery.getJSON("/load_states_for_country/" + country_id + ".json", function(data){
+			var options = '';
+			jQuery("#counties-container").hide();
+			jQuery('#states-container label').html(data.label);
+			states = data.states;
+			if(states.length > 0){
+				for (var i = 0; i < states.length; i++) {
+					var state_id = states[i].state.id;
+					if(state_id == undefined) { state_id = ''; }
+					options += '<option value="' + state_id + '">' + states[i].state.name + '</option>';
+				}
+				jQuery("#states-container").show();
+				jQuery("select#states").html(options);
+			} else {
+				jQuery("#states-container").hide();
+			}
+		});
+	}
+}
+
+jQuery(document).ready(function() {
+  jQuery("#countries-container select").change(function() {
+		setup_country(true);
+  });
+	if(jQuery("#states").val() == '' || jQuery("#states").val() == null) {
+		jQuery("#states-container").hide();
+	}
+	setup_country(false);
+});

data/test/public/javascripts/muck_services-src.js

@@ -0,0 +1,134 @@
+function apply_add_feed(){
+	jQuery('.add-identity').bind('submit', function(){
+    jQuery('#submit_add_feed').hide();
+    jQuery('#finding_uri_message').show();
+    jQuery(this).ajaxSubmit({
+  		dataType: 'script',
+      beforeSend: add_headers
+  	});
+  	return false;
+  });
+}
+
+function apply_delete_feed(){
+  jQuery('.identity-feed-delete').bind('submit', function(){
+		jQuery(this).replaceWith(jQuery(jQuery('#muck_ajax_delete_control_message').html()).show());		
+    jQuery(this).ajaxSubmit({
+  		dataType: 'script',
+      beforeSend: add_headers
+  	});
+  	return false;
+  });	
+}
+
+function apply_delete_hover(){
+  jQuery('ul#my-services-list li form').hide();
+  jQuery('ul#my-services-list li').hover(function(){ 
+    jQuery(this).children('form').show(); }, function(){ 
+      jQuery(this).children('form').hide(); });
+}
+
+function apply_show_entry_content(){
+  jQuery('.combined-feed-list .feed-item .feed-title').hover(
+    function () {
+      jQuery(this).next('.combined-feed-list .feed-item .feed-content').show();
+    },
+    function () {
+      jQuery(this).next('.combined-feed-list .feed-item .feed-content').hide();
+    }
+  );
+  jQuery('.combined-feed-list .feed-item .feed-content').hover(
+    function () {
+      jQuery(this).show();
+    },
+    function () {
+      jQuery(this).hide();
+    }
+  );
+}
+
+function show_tool(tool) {
+  jQuery('.tool').hide();
+  jQuery('#content_iframe').width('75%');
+  jQuery('#' + tool + '_tool').show();
+  jQuery('#recs_panel').css("left", jQuery("#content_iframe").width() - 252);
+  maximize_space();
+  return false;
+}
+function maximize_space() {
+  var container = jQuery(".tools_container");
+  var spacer = jQuery('#comments_tools_close_wrapper').height() + 5;
+  container.height(jQuery(window).height() - (jQuery('#toolbar').height() + spacer));
+}
+function setup_entry_comment_submit(){
+	jQuery(".entry-comment-submit").click(function() {
+		jQuery(this).siblings('textarea').hide();
+		jQuery(".entry-comment-submit").hide();
+		jQuery(this).parent().append('<p class="entry-comment-loading"><img src="/images/spinner.gif" alt="loading..." /> ' + ADD_COMMENT_MESSAGE + '</p>');
+		var form = jQuery(this).parents('form');
+    jQuery.post(form.attr('action'), form.serialize() + '&format=json',
+      function(data){
+        var json = eval('(' + data + ')');
+        if(!json.success){
+          jQuery.jGrowl.info(json.message);
+        } else {
+					jQuery('.entry-comment-loading').remove();
+					jQuery('#comments_tool').find('textarea').show();
+					jQuery('#comments_tool').find('textarea').val('');
+					jQuery(".entry-comment-submit").show();
+					jQuery("#comments_container").animate({ scrollTop: jQuery("#comments_tool").attr("scrollHeight") }, 3000);
+					var contents = jQuery(json.html)
+					contents.hide();
+					jQuery('#comments_wrapper').append(contents);
+					contents.fadeIn("slow");
+					apply_frame_comment_hover();
+				}
+      });
+    return false;
+  });
+}
+function apply_frame_comment_hover(){
+	jQuery('.comment_holder').hover(
+     function () { jQuery(this).addClass('comment-hover'); },
+     function () { jQuery(this).removeClass('comment-hover'); } );
+}
+function setup_share_submit(){
+  jQuery('#share_submit_share_new').click(function() {
+		jQuery(this).parent().append('<p class="share-loading"><img src="/images/spinner.gif" alt="loading..." /> ' + ADD_SHARE_MESSAGE + '</p>');
+		jQuery('#share_submit_share_new').hide();
+		var form = jQuery(this).parents('form');
+    jQuery.post(form.attr('action'), form.serialize() + '&format=json',
+      function(data){
+        var json = eval('(' + data + ')');
+        jQuery('.share-loading').remove();
+        jQuery('#share_submit_share_new').show();
+        if(!json.success){
+          jQuery.jGrowl.info(json.message);
+        } else {
+          jQuery.jGrowl.info(json.message);
+        }
+      });
+    return false;
+  });
+}
+
+jQuery(document).ready(function() {
+  jQuery("#content_iframe").load(maximize_iframe_height);
+  jQuery(window).bind('resize', function() {
+    maximize_iframe_height();
+  });
+});
+
+function maximize_iframe_height() {
+  var frame = jQuery("#content_iframe");
+  frame.height(jQuery(window).height() - jQuery('#toolbar').height());
+  jQuery('#recs_panel').css("left", jQuery("#content_iframe").width() - 252);
+}
+
+function initRecsPanel() {
+    var panel = jQuery("#recs_panel");
+    panel.append("<div id='rec_close_box' title='Close'>x</div>");
+    jQuery("#rec_close_box").click(function() {jQuery("#recs_panel").hide();jQuery("#show_recommendations_link").show();return false;});
+    panel.css("left", jQuery("#toolbar").width() - 250);
+    if (panel.draggable) panel.draggable();
+}

data/test/public/stylesheets/admin.css

@@ -40,18 +40,6 @@ ul.admin-list li a{font-size:1.2em;}
 .adminTable tr{background-color:#fff;}
 .adminTable table{border:2px solid #c4ad63;}
 .adminTable tr td{font-size:1.1em;font-weight:bold;padding:5px;border-bottom:1px solid #eee;}
-/* menu styles*/
-.hidden { position:absolute; top:0; left:-9999px; width:1px; height:1px; overflow:hidden; }
-.fg-button { font-size:11px; clear:left; padding: .4em 1em; text-decoration:none !important; cursor:pointer; position: relative; text-align: center; zoom: 1; }
-.fg-button .ui-icon { position: absolute; top: 50%; margin-top: -8px; left: 50%; margin-left: -8px; }
-a.fg-button { float:left;  }
-button.fg-button { width:auto; overflow:visible; } /* removes extra button width in IE */
-.fg-button-icon-left { padding-left: 2.1em; }
-.fg-button-icon-right { padding-right: 2.1em; }
-.fg-button-icon-left .ui-icon { right: auto; left: .2em; margin-left: 0; }
-.fg-button-icon-right .ui-icon { left: auto; right: .2em; margin-left: 0; }
-.fg-button-icon-solo { display:block; width:8px; text-indent: -9999px; }	 /* solo icon buttons must have block properties for the text-indent to work */	
-.fg-button.ui-state-loading .ui-icon { background: url(spinner_bar.gif) no-repeat 0 0;}
 /*tabs*/
 .tabs{font-size:1.2em;border-bottom:solid 2px #000;position:relative;}
 .tabs ul{list-style-type:none;}
@@ -59,4 +47,29 @@ button.fg-button { width:auto; overflow:visible; } /* removes extra button width
 .tabs ul li a{color:#000;text-decoration:none;}
 .tabs ul li a:hover{color:#333;}
 .tabs ul li a.active{background-position:0 bottom;color:#fff;}
-.tabs ul li a.active span{background-position:right bottom;}
+.tabs ul li a.active span{background-position:right bottom;}
+/* forms */
+input{margin:0 10px 5px 0;padding:4px;font-size:1.3em;}
+input[type="text"],input[type="password"]{border:1px solid #8f8685;}
+input[type="checkbox"]{border:none;margin-bottom:0px;}
+input[type="radio"]{border:none;}
+textarea{font-size:1.4em;margin:0 10px 0 0;padding:4px;border:1px solid #8f8685;}
+label{font-size:1.2em;font-weight:bold;margin:0 10px 5px 0;padding:0px;display:block;}
+form em{color:#b61e12;font-style:normal;font-size:90%;}
+form hr{border:1px solid #e3e0c3;height:1px;margin:15px 0;}
+fieldset span.var{margin:2px 5px 5px 18px;display:block;}
+fieldset{border:none;margin:0;padding:0;}
+form fieldset{margin:0 0 2px;padding:0px;}
+form fieldset input[type="text"],form fieldset input[type="password"]{width:500px;}
+.form-help{font-size:12px;}
+
+.checkbox-label{display:inline-block;}
+.checklist{padding:0px;margin:0px 0 0 10px;}
+.checklist input[type="checkbox"]{float:left;clear:left;}
+.checklist label{display:inline;}
+
+.user-active{}
+.user-inactive{color:#ccc;}
+.drop-menu ul{list-style-type:none;}
+
+.ui-autocomplete-loading { background: white url('/images/spinner.gif') right center no-repeat; }

data/test/public/stylesheets/muck-users.css

@@ -5,4 +5,6 @@
 /*register*/
 #registration{width:400px;}
 span#email-availibility span.available { color:green; }
-span#email-availibility span.unavailable { color:#B61E12; }
+span#email-availibility span.unavailable { color:#B61E12; }
+
+#access-code-not-found-msg a{text-decoration:underline;}

data/test/spec/models/authentication_spec.rb

@@ -5,7 +5,13 @@ describe Authentication do
     @authentication = Factory(:authentication, :provider => 'twitter')
     @user = @authentication.authenticatable
   end
+  
   it { should belong_to :authenticatable }
+  it { should scope_by_latest }
+  it { should scope_by_newest }
+  it { should scope_by_oldest }
+  it { should scope_newer_than }
+  it { should scope_older_than }
   
   describe "access_token" do
     it "should get the access_token for twitter" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-auth
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 3
   - 5
-  - 2
-  version: 3.5.2
+  - 3
+  version: 3.5.3
 platform: ruby
 authors: 
 - Justin Ball
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 -06:00
+date: 2011-07-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -262,6 +262,9 @@ files:
 - test/db/migrate/20101117172951_add_name_to_access_code_requests.rb
 - test/db/migrate/20110216045051_create_authentications.rb
 - test/db/migrate/20110226174321_add_cached_slugs.rb
+- test/db/migrate/20110303183433_add_sent_to_to_access_codes.rb
+- test/db/migrate/20110420153714_add_provided_by_to_access_codes.rb
+- test/db/migrate/20110713040718_add_photo_url.rb
 - test/db/schema.rb
 - test/db/seeds.rb
 - test/features/step_definitions/common_steps.rb
@@ -781,6 +784,8 @@ files:
 - test/public/javascripts/muck.js
 - test/public/javascripts/muck_activities.js
 - test/public/javascripts/muck_admin.js
+- test/public/javascripts/muck_countries.js
+- test/public/javascripts/muck_services-src.js
 - test/public/javascripts/muck_services.js
 - test/public/javascripts/muck_time/en.js
 - test/public/javascripts/prototype.js
@@ -2317,6 +2322,21 @@ files:
 - test/public/stylesheets/swfupload.css
 - test/public/stylesheets/tinymce.css
 - test/public/stylesheets/uploadify.css
+- test/public/system/photos/32/icon/GettyImages_79495526-1-0_bigger.jpg
+- test/public/system/photos/32/medium/GettyImages_79495526-1-0_bigger.jpg
+- test/public/system/photos/32/original/GettyImages_79495526-1-0_bigger.jpg
+- test/public/system/photos/32/thumb/GettyImages_79495526-1-0_bigger.jpg
+- test/public/system/photos/32/tiny/GettyImages_79495526-1-0_bigger.jpg
+- test/public/system/photos/33/icon/GettyImages_79495526-1-0_bigger.jpg
+- test/public/system/photos/33/medium/GettyImages_79495526-1-0_bigger.jpg
+- test/public/system/photos/33/original/GettyImages_79495526-1-0_bigger.jpg
+- test/public/system/photos/33/thumb/GettyImages_79495526-1-0_bigger.jpg
+- test/public/system/photos/33/tiny/GettyImages_79495526-1-0_bigger.jpg
+- test/public/system/photos/34/icon/GettyImages_79495526-1-0_bigger.jpg
+- test/public/system/photos/34/medium/GettyImages_79495526-1-0_bigger.jpg
+- test/public/system/photos/34/original/GettyImages_79495526-1-0_bigger.jpg
+- test/public/system/photos/34/thumb/GettyImages_79495526-1-0_bigger.jpg
+- test/public/system/photos/34/tiny/GettyImages_79495526-1-0_bigger.jpg
 - test/script/rails
 - test/spec/controllers/authentications_controller_spec.rb
 - test/spec/models/authentication_spec.rb