social_stream-base 0.9.0 → 0.9.1

data/app/assets/javascripts/activities.js.erb

@@ -9,6 +9,20 @@ $(function() {
   $('#security').chosen();
 });
 
+
+$(document).ready(function() {
+  $('#new_post').submit(function() {
+    $("#input_activities").blur();
+    $("#masterSubmitButton").val("<%= I18n.t('activity.sending') %>...");
+    $('#new_post').attr("disabled", true);   
+    $('#masterSubmitButton').attr("disabled", true);   
+    $('#input_activities').attr('readonly', true);     
+    return true;
+  });
+});
+
+
+
 //clicks form selector
 $('.activity_form_selector').live('click',function(){
 	$('.activity_form_selector').removeClass('selected');
@@ -34,18 +48,8 @@ $('#masterSubmitButton').live('click',function(){
 
 //javascript for main activities input
 $(function() {
-  activity_input = "<%= I18n.t('activity.input') %>";
   $("#input_activities").click(function(){
-    if(this.value == activity_input){
-      this.value = "";
       $("#masterSubmitButton").show();
-    }
-  });
-  event_input = "<%= I18n.t('event.input') %>";
-  $("#event_name").click(function(){
-    if(this.value == event_input){
-      this.value = "";
-    }
   });
 });
 
@@ -53,7 +57,8 @@ $(function() {
 //javascript for comments
 $(function() {
   //"write new comment..." text in every text field for comments
-  $(".input_new_comments").val("<%= I18n.t('comment.input') %>");
+  $("#input_activities").Watermark("<%= I18n.t('activity.input') %>","#666");
+  $(".input_new_comments").Watermark("<%= I18n.t('comment.input') %>","#666");
   
   //show only the text fields for new comment if there are any comment to the post
   $(".activity_new_comment").each(function(){
@@ -84,42 +89,18 @@ showAllComments = function(id){
 
 //usa livequery para usar el javascript luego de una accion con  AJAX
 $(".input_new_comments").live("click",function(){
-	if(this.value == "<%= I18n.t('comment.input') %>"){
-		$(this).val("");
-	}
 	$(".activities_comment_btn").hide();
 	$(this).parent(".new_comment").children(".activities_comment_btn").show();
 });
 
-/* this function works but it finishes and no other event is done
- * I mean: when you click in other button the blur happens but the click is not done
-$(".input_new_comments").live("blur",function(){
-	if(this.value == ""){
-		$(".activities_comment_btn").hide();
-        $(this).val("<%= I18n.t('comment.input') %>");
-	}
-	return true;
-});
-*/
-
 //javascript for tocomment option
 $(".to_comment").live("click", function(){
   $(this).parents(".activity_content").find(".activity_new_comment").show();
-  $(".input_new_comments").val("<%= I18n.t('comment.input') %>");
   $(this).parents(".activity_content").find(".input_new_comments").click();  
   $(this).parents(".activity_content").find(".input_new_comments").focus();
 	return false;
 });
 
-
-
-
-
-
-
-
-
-
 //move he last list item before the first item. The purpose of this is if the user clicks to slide left he will be able to see the last item.
 $('#carousel_ul li:first').before($('#carousel_ul li:last'));
 

data/app/assets/stylesheets/activities.css

@@ -60,7 +60,7 @@
 	border: thin solid #D4E4E4; width:100%;  padding-top: 3px;  padding-bottom: 3px;display:none;}
 .actor_logo_subactivity {	width: 40px;	padding: 5px 3px 5px 2px;	display: inline-block;
 	vertical-align: top;}
-.input_new_comments{	border:1px solid #BDC7D8;	width:98%;	padding: 2px;}
+.input_new_comments{	border:1px solid #BDC7D8;	width:98%;	padding: 2px; color:#2A3890;}
 .subactivity{  font-size: 11px;  padding: 0px 0px 0px 5px;  background: #deeff8;
   border: thin solid #D4E4E4; width: 100%; }
 .space_comments {	padding-top: 1px;	padding-bottom: 1px;}

data/app/assets/stylesheets/base.css

@@ -67,7 +67,7 @@ textarea.new_contact_text_area{ height: 100px; color: #2A3890;}
       color-stop(0.16, rgb(0,122,193)), color-stop(0.58, rgb(56,148,209)), color-stop(0.79, rgb(168,222,249)) );
   background-image: -moz-linear-gradient(center bottom,
       rgb(0,122,193) 16%, rgb(56,148,209) 58%, rgb(168,222,249) 79%);
-  border-radius: 0.2em;  color: #fff; width: 60px;  height: 22px;  border: none;}
+  border-radius: 0.2em;  color: #fff; padding: 0 10px;  height: 22px;  border: none;}
 .myButtonBlue span {  display: block;  line-height: 14px;  padding: 3px 0 3px 10px;}
 .myButtonBlue:active {  background-position: bottom right;  color: #000;  outline: none; }
 .myButtonBlue:active span {  background-position: bottom left;  padding: 3px 0 2px 18px; }

data/app/assets/stylesheets/frontpage.css

@@ -14,9 +14,11 @@
 span.find{  padding-right:5px;}
 
 /************** sub structure Frontpage **************/
+#devise_links {padding: 5px 0 5px 0;}
+#devise_links a{font-weight: bold;line-height: 15px; }
 #login{  padding-top: 5px;}
-#welcome{  margin-top:50px;  margin-left:300px;  width:330px;  padding:20px;  border: thin solid #2A3890;
-  position: absolute;  text-align:center;}
+#welcome{  margin: 50px auto 50px auto;  width:330px;  padding:20px;  border: thin solid #2A3890;
+  text-align:center;}
 #wrapper_left{  vertical-align:top;  width:49%;  display:inline-block;    padding-left: 20px;}
 #wrapper_right{ vertical-align:top;  width:48%;  display:inline-block;}
 

data/app/assets/stylesheets/search.css

@@ -46,7 +46,7 @@
   height: 35px;
   background: whiteSmoke;
   overflow: hidden;
-  text-align: left;
+  text-align: center;
 }
 #global_search_display  li .logo{
   float:left;
@@ -62,4 +62,15 @@
   background: #CFDEFF;
   color: #2A3890;
 }
+
+
+#global_search_display  span{
+  float:left;
+  margin-top: 10px;  
+}
+
+#global_search_display  .warning{
+  width:100%; 
+}
+
 /******************** Search box css END ***********************/

data/app/controllers/notifications_controller.rb

@@ -32,13 +32,15 @@ class NotificationsController < ApplicationController
         @actor.unread @notification
       end
     end
-    redirect_to notifications_path(:page => params[:page])
+    @notifications = @mailbox.notifications.not_trashed.page(params[:page]).per(10)
+    render :action => :index
   end
   
   def update_all
     @notifications= @mailbox.notifications.all
     @actor.read @notifications
-    redirect_to notifications_path(:page => params[:page])
+    @notifications = @mailbox.notifications.not_trashed.page(params[:page]).per(10)
+    render :action => :index
   end
 
   def destroy

data/app/helpers/contacts_helper.rb

@@ -1,6 +1,6 @@
 module ContactsHelper
-  def contact_brief(contact)
-    "N contacts in common"
+  def contact_brief(subject)
+    t 'contact.in_common', :count => current_subject.common_contacts_count(subject)
   end
 
   def contact_link(c)

data/app/models/actor.rb

@@ -268,7 +268,8 @@ class Actor < ActiveRecord::Base
   end
 
   def sent_active_contact_ids
-    sent_contacts.active.map(&:receiver_id)
+    @sent_active_contact_ids ||=
+      load_sent_active_contact_ids
   end
   
   # By now, it returns a suggested {Contact} to another {Actor} without any current {Tie}
@@ -359,6 +360,11 @@ class Actor < ActiveRecord::Base
         c.receiver.contact_to!(c.sender)
     end
   end
+
+  # Count the contacts in common between this {Actor} and subject
+  def common_contacts_count(subject)
+    (sent_active_contact_ids & subject.sent_active_contact_ids).size
+  end
   
   # The set of {Activity activities} in the wall of this {Actor}.
   #
@@ -480,4 +486,9 @@ class Actor < ActiveRecord::Base
 
     ties + second_grade_ties
   end
+
+  # Calculate {#sent_active_contact_ids}
+  def load_sent_active_contact_ids
+    sent_contacts.active.map(&:receiver_id)
+  end
 end

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

@@ -11,7 +11,7 @@
 <div id="activity_form_select">
   <% SocialStream.activity_forms.each do |element| %>
     <div id="select_<%= element %>" class="activity_form_selector">
-      <%= image_tag "btn/#{ element }.png", :title => t("#{ element }.form.title") %>
+      <%= t("#{ element }.form.title") %>
     </div>
   <% end %> 	
 </div>
@@ -21,6 +21,6 @@
 <% end %>
 
 <div id="activities_share_btn">
-  <%= submit_tag(t('share'), :class => "myButtonBlue", :id => "masterSubmitButton") %>
+  <%= submit_tag(t('share'), :class => "myButtonBlue submitActivity", :id => "masterSubmitButton") %>
 </div>
 <% end %>

data/app/views/comments/_new.html.erb

@@ -11,12 +11,25 @@
    <%= f.hidden_field :_contact_id %>
    <%= f.hidden_field :_activity_parent_id %>
 
-   <%= f.text_field :text,   :class =>"input_new_comments" , :id => "comment_text_"+dom_id(activity) %>
+   <%= f.text_field :text, :class =>"input_new_comments", :id => "comment_text_"+dom_id(activity) %>
 
    <div class="activities_comment_btn">
      <div class="activities_security"></div>
-     <%= f.submit t('share'), :class =>"myButtonBlue", :id => "comment_submit"+dom_id(activity) %>
+     <%= f.submit t('share'), :class =>"myButtonBlue submitActivity", :id => "comment_submit_"+dom_id(activity) %>
    </div>
  <% end %>
     </div>
 <% end %>
+
+<%= javascript_tag do %>
+$(document).ready(function() {
+  $('#new_comment<%= dom_id(activity) %>').submit(function() {
+    $('#comment_text_<%= dom_id(activity) %>').blur();
+    $('#comment_submit_<%= dom_id(activity) %>').val("<%= I18n.t('activity.sending') %>...");
+    $('#new_comment<%= dom_id(activity) %>').attr("disabled", true);   
+    $('#comment_submit_<%= dom_id(activity) %>').attr("disabled", true);   
+    $('#comment_text_<%= dom_id(activity) %>').attr('readonly', true); 
+    return true;
+  });
+});
+<% end %>

data/app/views/comments/create.js.erb

@@ -1,4 +1,10 @@
+$(".submitActivity").val("<%= I18n.t('share') %>");
+$('.input_new_comments').val("");   
+$('.input_new_comments').blur();   
+$(".submitActivity").removeAttr("disabled");   
+$('.input_new_comments').removeAttr('readonly'); 
+$('.new_comment').removeAttr("disabled");   
+
 //Display the new comment
 $("#comments_activity_<%= @comment.post_activity.parent.id %>").append("<%= escape_javascript(render @comment.post_activity) %>");
-$(".input_new_comments").val("<%= t('comment.input') %>");
 $(".activities_comment_btn").hide();

data/app/views/devise/registrations/edit.html.erb

@@ -1,19 +1,26 @@
 <% toolbar :profile => current_subject %>
 
 <%= location(image_tag("btn/btn_account.png", :class => "menu_icon")+t('account.one'), 
-  link_to (t('account.edit'), edit_user_registration_path)
+  link_to(t('account.edit'), edit_user_registration_path)
 ) %>
 
 <%= devise_error_messages! %>
 
+<% content_for :javascript do %>
+  $(".user_edit").validate();
+<%end%>
+
 <div class="space_center"></div>
 <h2><%= t('account.edit') %></h2>
 <div class="space_center"></div>
 
 <div class="block" id="password_form">
   <div class="header">
-    Change password
+    <div class="header_text">
+      <%=t("account.password.change")%>
+    </div>
   </div>
+  <div class="space_center"></div>
   <div >
     <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
     <div class="form_row">
@@ -51,8 +58,11 @@
 </div>
 <div class="block" id="email_form">
   <div class="header">
-    Change email address
+    <div class="header_text">
+      <%=t("account.email.change")%>
+    </div>
   </div>
+  <div class="space_center"></div>
   <div >
     <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
     <div class="form_row">
@@ -60,7 +70,7 @@
         <%= f.label :email %>
       </div>
       <div class="form_field">
-        <%= f.email_field :email, :class => "form_tag" %>
+        <%= f.email_field :email, :class => "required form_tag" %>
       </div>
     </div>
     <div class="form_row">
@@ -82,9 +92,13 @@
 </div>
 <div class="block" id="cancel_account">
   <div class="header">
-    Cancel account
+    <div class="header_text">
+      <%=t("account.cancel")%>
+    </div>
   </div>
+  <div class="space_center"></div>
   <div class="form_row">
     Unhappy? <b><%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</b>
   </div>
 </div>
+<div class="space_center"></div>

data/app/views/devise/sessions/new.html.erb

@@ -9,21 +9,22 @@
       <%= devise_error_messages! %>
       <div class="form_row">
         <div class="form_label"><%= f.label :email %></div>
-        <div class="form_field"><%= f.email_field :email %></div>
+        <div class="form_field"><%= f.email_field :email, :class => "form_tag" %></div>
       </div>
       <div class="form_row">
         <div class="form_label"><%= f.label :password %></div>
-        <div class="form_field"><%= f.password_field :password %></div>
+        <div class="form_field"><%= f.password_field :password, :class => "form_tag" %></div>
       </div>
 
-      <div class="form_row">
+      
+      <div id="devise_links">
         <% if devise_mapping.rememberable? -%>
-          <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
+          <%= f.check_box :remember_me %> <%= f.label :remember_me %>
         <% end -%>
+        <div class="space_center"></div>
+        <%= render :partial => "devise/shared/links" %>
       </div>
 
-      <%= render :partial => "devise/shared/links" %>
-
       <div class="btn_login">
         <%= f.submit t('action.send'), :class =>"myButton" %>
       </div>

data/app/views/layouts/_account.html.erb

@@ -10,7 +10,7 @@
                     <%= link_to t('account.edit'), edit_user_registration_path %>
                 </li>
                 <li class="btn_menu_exit">
-                    <%= link_to t('sign_out'), destroy_user_session_path, :id => "btn_menu_account_logout"  %>
+                <%= link_to t('sign_out'), destroy_user_session_path, :method => :delete, :id => "btn_menu_account_logout"  %>
                 </li>
             </ul>
         </li>

data/app/views/layouts/_search.html.erb

@@ -28,11 +28,11 @@ $(document).ready(function() {
       $("#global_search_display").hide();
     }
     else if(searchstring.length < 2) {
-      $("#global_search_display").hide();
+      $("#global_search_display").html("<ul><li><%= escape_javascript(content_tag(:span,I18n.t('search.at_least'), :class => :warning)) %></li></ul>").show();
     } else {
       if (last_search!=searchstring){
         last_search=searchstring;
-        $("#global_search_display").html("<%= escape_javascript(image_tag('loading.gif', :class => :loading)) %>").show();
+        $("#global_search_display").html("<ul><li><%= escape_javascript(image_tag('loading.gif', :class => :loading)) %></li></ul>").show();
         $.ajax({
           type : "GET",
           url : "<%= search_url %>?id=" + searchstring + "&mode=header_search",

data/app/views/notifications/activities/_like_body.html.erb

@@ -1,4 +1,4 @@
-<% if activity.direct_object.is_a? Actor %>
+<% if activity.direct_object.is_a? Actor or activity.direct_object.respond_to? :actor %>
   %{look}
 <% else %>
   "%{object.text}" 

data/app/views/notifications/activities/_like_subject.html.erb

@@ -1,5 +1,5 @@
-<% if activity.direct_object.is_a? Actor %>
+<% if activity.direct_object.is_a? Actor or activity.direct_object.respond_to? :actor %>
 %{sender} is now %{whose} fan.
 <% else %>
-%{sender} likes %{whose} %{object.name}
+%{sender} likes %{whose} %{object.name}%>
 <% end %>

data/app/views/notifications/index.js.erb

@@ -2,4 +2,6 @@ $("#content").html("<%=escape_javascript(render :partial => 'index') %>");
 
 <%= location(link_to(image_tag("btn/btn_notification.png", :class => "menu_icon")+t('notification.other'), notifications_path,:remote => true)) %>
 
+<%= toolbar  %>
+
 $('.pagination a').attr('data-remote', 'true');

data/app/views/posts/create.js.erb

@@ -1,5 +1,10 @@
-//set a new value to input field with javascript
-$("#input_activities").val("<%= t('activity.input') %>");
+$(".submitActivity").val("<%= I18n.t('share') %>");
+$('#input_activities').val("");   
+$('#input_activities').blur();   
+$(".submitActivity").removeAttr("disabled");   
+$('#input_activities').removeAttr('readonly'); 
+$('#new_post').removeAttr("disabled");   
+    
 //Display the new post
 $("#wall").prepend("<%= escape_javascript(render @post.post_activity) %>");
 

data/app/views/search/_header_search.html.erb

@@ -8,3 +8,8 @@
     <% end %>
 <% end %>
 </ul>
+
+
+<% if search_result.empty? %>
+<ul><li><%= content_tag(:span,I18n.t('search.actor.none'), :class => :warning) %></li></ul>
+<% end %>

data/config/locales/en.yml

@@ -5,9 +5,13 @@ en:
     send: "Send"
     accept: "Accept"
   account:
-    edit: "Edit user"
+    cancel: "Cancel account"
+    edit: "Edit account"
+    email: 
+      change: "Change email address"
     one: "Account"
     password:
+      change: "Change password"
       new: "New password"
       retype: "Retype new password"
     privacy: "Privacy"
@@ -22,6 +26,7 @@ en:
     like: "I like"
     one: "Activity"
     other: "Activities"
+    sending: "Sending"
     title: "Activities"
     to_comment: "Comment"
     unlike: "I do not like anymore"
@@ -90,6 +95,9 @@ en:
     edit:
       title: "Edit contact to %{name}"
       submit: "Edit Contact"
+    in_common:
+      one: "1 contact in common"
+      other: "%{count} contacts in common"
     new:
       link: "+ Add contact"
       title: "Add %{name} to your contacts"
@@ -311,6 +319,10 @@ en:
   relation_public:
     name: "Public"
   required: "(*) These fields are required"
+  search:
+    actor:
+      none: "Nothing found"
+    at_least: "Write at least two characters"
   settings:
     error: "Some errors raised when saving your changes"
     for: "Settings for"

data/lib/generators/social_stream/base/install_generator.rb

@@ -29,6 +29,10 @@ class SocialStream::Base::InstallGenerator < Rails::Generators::Base #:nodoc:
     copy_file 'relations.yml', 'config/relations.yml'
   end
 
+  def create_config_sphinx_file
+    copy_file 'sphinx.yml', 'config/sphinx.yml'
+  end
+
   def remove_public_index
     remove_file 'public/index.html'
   end

data/lib/generators/social_stream/base/templates/sphinx.yml

@@ -0,0 +1,9 @@
+development:
+  enable_star: 1
+  min_infix_len: 2
+test:
+  enable_star: 1
+  min_infix_len: 2
+production:
+  enable_star: 1
+  min_infix_len: 2

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.0".freeze
+    VERSION = "0.9.1".freeze
   end
 end

data/social_stream-base.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   # SQL foreign keys
   s.add_runtime_dependency('foreigner', '~> 0.9.1')
   # Authentication
-  s.add_runtime_dependency('devise', '~> 1.4.3')
+  s.add_runtime_dependency('devise', '~> 1.4.5')
   # CRUD controllers
   s.add_runtime_dependency('inherited_resources', '~> 1.3.0')
   # Slug generation

data/spec/controllers/notifications_controller_spec.rb

@@ -20,13 +20,13 @@ describe NotificationsController do
   it "should update read" do
     put :update, :id => @receipt.notification.to_param, :read => "Read"
     @receipt.notification.is_unread?(@actor).should==false
-    response.should redirect_to notifications_path
+    assert_response :success
   end
 
   it "should update unread" do
     put :update, :id => @receipt.notification.to_param, :read => "Unread"
     @receipt.notification.is_unread?(@actor).should==true
-    response.should redirect_to notifications_path
+    assert_response :success
   end
 
   it "should update all" do
@@ -34,7 +34,7 @@ describe NotificationsController do
     put :update_all
     @receipt.notification.is_unread?(@actor).should==false
     @receipt2.notification.is_unread?(@actor).should==false
-    response.should redirect_to notifications_path
+    assert_response :success
   end
   
   it "should send to trash" do

data/spec/dummy/config/initializers/devise.rb

@@ -2,8 +2,9 @@
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|
   # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in DeviseMailer.
-  config.mailer_sender = "please-change-me@config-initializers-devise.com"
+  # Configure the e-mail address which will be shown in Devise::Mailer,
+  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
+  config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
 
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"
@@ -34,7 +35,12 @@ Devise.setup do |config|
   # Configure which authentication keys should be case-insensitive.
   # These keys will be downcased upon creating or modifying a user and when used
   # to authenticate or find a user. Default is :email.
-  # config.case_insensitive_keys = [ :email ]
+  config.case_insensitive_keys = [ :email ]
+
+  # Configure which authentication keys should have whitespace stripped.
+  # These keys will have whitespace before and after removed upon creating or
+  # modifying a user and when used to authenticate or find a user. Default is :email.
+  config.strip_whitespace_keys = [ :email ]
 
   # Tell if authentication through request.params is enabled. True by default.
   # config.params_authenticatable = true
@@ -48,10 +54,22 @@ Devise.setup do |config|
   # The realm used in Http Basic Authentication. "Application" by default.
   # config.http_authentication_realm = "Application"
 
+  # It will change confirmation, password recovery and other workflows
+  # to behave the same regardless if the e-mail provided was right or wrong.
+  # Does not affect registerable.
+  # config.paranoid = true
+
   # ==> Configuration for :database_authenticatable
   # For bcrypt, this is the cost for hashing the password and defaults to 10. If
   # using other encryptors, it sets how many times you want the password re-encrypted.
-  config.stretches = 10
+  #
+  # Limiting the stretches to just one in testing will increase the performance of
+  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+  # a value less than 10 in other environments.
+  config.stretches = Rails.env.test? ? 1 : 10
+
+  # Setup a pepper to generate the encrypted password.
+  # config.pepper = "6bcafeb00da5bc1cd324c5155e7ddfc9c611ae53faf8f534a0603480a6a8a5e3ad1ce172123dfda4f5f8fb81d81e1bdfa119be34333baf2406304d2ae6355377"
 
   # ==> Configuration for :confirmable
   # The time you want to give your user to confirm his account. During this time
@@ -62,6 +80,9 @@ Devise.setup do |config|
   # (ie 2 days).
   # config.confirm_within = 2.days
 
+  # Defines which key will be used when confirming an account
+  # config.confirmation_keys = [ :email ]
+
   # ==> Configuration for :rememberable
   # The time the user will be remembered without asking for credentials again.
   # config.remember_for = 2.weeks
@@ -76,12 +97,18 @@ Devise.setup do |config|
   # to false if you are not using database authenticatable.
   config.use_salt_as_remember_token = true
 
+  # Options to be passed to the created cookie. For instance, you can set
+  # :secure => true in order to force SSL only cookies.
+  # config.cookie_options = {}
+
   # ==> Configuration for :validatable
-  # Range for password length. Default is 6..20.
-  # config.password_length = 6..20
+  # Range for password length. Default is 6..128.
+  # config.password_length = 6..128
 
-  # Regex to use to validate the email address
-  # config.email_regexp = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i
+  # Email regex used to validate email formats. It simply asserts that
+  # an one (and only one) @ exists in the given string. This is mainly
+  # to give user feedback and not to assert the e-mail validity.
+  # config.email_regexp = /\A[^@]+@[^@]+\z/
 
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this
@@ -94,6 +121,9 @@ Devise.setup do |config|
   # :none            = No lock strategy. You should handle locking by yourself.
   # config.lock_strategy = :failed_attempts
 
+  # Defines which key will be used when locking and unlocking an account
+  # config.unlock_keys = [ :email ]
+
   # Defines which strategy will be used to unlock an account.
   # :email = Sends an unlock link to the user email
   # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
@@ -108,6 +138,16 @@ Devise.setup do |config|
   # Time interval to unlock the account if :time is enabled as unlock_strategy.
   # config.unlock_in = 1.hour
 
+  # ==> Configuration for :recoverable
+  #
+  # Defines which key will be used when recovering the password for an account
+  # config.reset_password_keys = [ :email ]
+
+  # Time interval you can reset your password with a reset password key.
+  # Don't put a too small interval or your users won't have the time to
+  # change their passwords.
+  config.reset_password_within = 2.hours
+
   # ==> Configuration for :encryptable
   # Allow you to use another encryption algorithm besides bcrypt (default). You can use
   # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
@@ -116,9 +156,6 @@ Devise.setup do |config|
   # REST_AUTH_SITE_KEY to pepper)
   # config.encryptor = :sha512
 
-  # Setup a pepper to generate the encrypted password.
-  # config.pepper = "6efecaefd488a07abded679d45be30dc97935d74c44825b647149a6fa30ee8cd5e05bb3a426ce8a87fcd75b04079b1bac68a079acdcc175800c4131dde7961f0"
-
   # ==> Configuration for :token_authenticatable
   # Defines name of the authentication token params key
   # config.token_authentication_key = :auth_token
@@ -150,11 +187,12 @@ Devise.setup do |config|
   # If you have any extra navigational formats, like :iphone or :mobile, you
   # should add them to the navigational formats lists.
   #
-  # The :"*/*" format below is required to match Internet Explorer requests.
-  # config.navigational_formats = [:"*/*", :html]
+  # The :"*/*" and "*/*" formats below is required to match Internet
+  # Explorer requests.
+  # config.navigational_formats = [:"*/*", "*/*", :html]
 
-  # The default HTTP method used to sign out a resource. Default is :get.
-  # config.sign_out_via = :get
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  config.sign_out_via = :delete
 
   # ==> OmniAuth
   # Add a new OmniAuth provider. Check the wiki for more information on setting
@@ -163,7 +201,13 @@ Devise.setup do |config|
   config.omniauth :linked_in, "ekxfXU8nueVSMQ9fc5KJAryBkyztUlCBYMW3DoQPzbE79WhivvzhQloRNHCHgPeB", "WYiHFT-KKFgjd45W3-pEAficmXRHmN6_6DGwj1C_ZILJlSO1gBvv6VNYXU9tybGY"
                       
   config.omniauth :facebook, "129571360447856","eef39dce5e20e76f77495c59623bdb38"
- 
+                      
+  #config.omniauth :twitter, "wgTxO0fTpjTeSnjKC9ZHA","JepulVWwLcuAnGfWjwCu47yEP0TcJJfKtvISPBsilI"
+                      
+  config.token_authentication_key = :auth_token
+                      
+  config.stateless_token = true
+
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or
   # change the failure app, you can configure them inside the config.warden block.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-12 00:00:00 +02:00
+date: 2011-09-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,12 +75,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 13
         segments: 
         - 1
         - 4
-        - 3
-        version: 1.4.3
+        - 5
+        version: 1.4.5
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -887,6 +887,7 @@ files:
 - lib/generators/social_stream/base/templates/initializer.rb
 - lib/generators/social_stream/base/templates/navigation.rb
 - lib/generators/social_stream/base/templates/relations.yml
+- lib/generators/social_stream/base/templates/sphinx.yml
 - lib/mailboxer/notification_decoder.rb
 - lib/paperclip/social_stream.rb
 - lib/social_stream-base.rb