social_stream-base 0.6.2 → 0.6.3

data/app/assets/javascripts/jquery.validate.js

@@ -14,7 +14,7 @@
  */
 
 /*
- * This have been modified: added telephone number validation
+ * This have been modified: added telephone number and emails validation
  */
 
 (function($) {
@@ -242,6 +242,7 @@ $.extend($.validator, {
     required: " This field is required.",
     remote: " Please fix this field.",
     email: " Please enter a valid email address.",
+    	emails: " Please enter valid email addresses.",
     url: " Please enter a valid URL.",
     date: " Please enter a valid date.",
     dateISO: " Please enter a valid date (ISO).",
@@ -717,6 +718,8 @@ $.extend($.validator, {
   classRuleSettings: {
     required: {required: true},
     email: {email: true},
+    	//ADDED
+    	emails: {emails: true},
     url: {url: true},
     date: {date: true},
     dateISO: {dateISO: true},
@@ -972,6 +975,11 @@ $.extend($.validator, {
       // contributed by Scott Gonzalez: http://projects.scottsplayground.com/email_address_validation/
       return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test(value);
     },
+    	//ADDED
+    emails: function(value, element) {
+      // contributed by Scott Gonzalez: http://projects.scottsplayground.com/email_address_validation/
+      return this.optional(element) || /^((, *)*((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)+$/i.test(value);
+    },
   
     // http://docs.jquery.com/Plugins/Validation/Methods/url
     url: function(value, element) {

data/app/assets/stylesheets/menu.css

@@ -8,7 +8,7 @@
 .toolbar_menu li ul li a, ul.menu ul.menu li ul li a {  background: #fff; border-left: 5px #2A3890 solid;
   color: #2A3890;  padding-left: 10px;}
 .toolbar_menu li ul li a:hover {  background: #DEEFF8;  border-left: 5px #2A3890 solid;  padding-left: 15px;}
-
+.toolbar_menu img { vertical-align: middle; padding-bottom: 3px;    padding-right: 3px;  padding-left: 3px; display: inline-block;}
 /*
 div.panel {    border: 1px #2A3890 solid;    padding: 5px;    margin-top: 0px;}
 ul.menu li ul li a:hover, ul.menu ul.menu li ul li a:hover {  background: #DEEFF8;  border-left: 5px #2A3890 solid;

data/app/helpers/contacts_helper.rb

@@ -7,16 +7,18 @@ module ContactsHelper
   # to create new ties to actor
   def contact_to(a)
     if user_signed_in?
-      if current_subject.ties_to?(a)
-        current_subject.ties_to(a).map(&:relation_name).join(", ")
-      else
-        link_to t("contact.new.link"),
-                edit_contact_path(current_subject.contact_to!(a)),
-                                  :title => t("contact.new.title",
-                                  :name => a.name)
-      end
+      link_to contact_status(a),
+              edit_contact_path(current_subject.contact_to!(a)),
+                                :title => t("contact.new.title",
+                                :name => a.name)
     else
       link_to t("contact.new.link"), new_user_session_path
     end
   end
+
+  def contact_status(a)
+    current_subject.ties_to?(a) ?
+      current_subject.ties_to(a).map(&:relation_name).join(", ") :
+      t("contact.new.link")
+  end
 end

data/app/helpers/toolbar_helper.rb

@@ -39,10 +39,6 @@ module ToolbarHelper
   #   <% toolbar :profile => @group, :option => :contacts %>
   #
   def toolbar(options = {}, &block)
-    old_toolbar(options,&block)
-  end
-
-  def old_toolbar(options = {}, &block)
     if options[:option] && block_given?
       menu_options[options[:option]] = capture(&block)
     end
@@ -85,7 +81,7 @@ module ToolbarHelper
   end
 
   def default_toolbar_menu
-    home_menu
+    home_toolbar_menu
   end
 
   def home_toolbar_menu
@@ -147,15 +143,34 @@ module ToolbarHelper
     return render_items items
   end
 
-  def profile_toolbar_menu(subject=current_subject)
+  def profile_toolbar_menu(subject = current_subject)
     items = Array.new
 
     if subject!=current_subject
+      #Like button
       items << {:key => :like_button,
         :name => link_like_params(subject)[0],
         :url => link_like_params(subject)[1],
         :options => {:link => link_like_params(subject)[2]}}
+        
+      if user_signed_in?
+        #Relation button
+        items << {:key => :subject_relation,
+          :name => image_tag("btn/btn_friend.png") + contact_status(subject),
+          :url => edit_contact_path(current_subject.contact_to!(subject))
+        }
+        #Send message button
+        items << {:key => :send_message,
+          :name => image_tag("btn/btn_send.png")+t('message.send'),
+          :url => new_message_path(:receiver => subject.slug)
+        }
+      end
     end
+    #Information button
+    items << {:key => :subject_info,
+      :name => image_tag("btn/btn_edit.png")+t('menu.information'),
+      :url => [subject, :profile]
+    }
     return render_items items
   end
 

data/app/mailers/invitation_mailer.rb

@@ -1,6 +1,6 @@
 class InvitationMailer < ActionMailer::Base
   
-  
+  default :from => Mailboxer.default_from
   
   def send_invitation(receiver, sender, message)
     @sender= sender

data/app/models/actor.rb

@@ -369,7 +369,7 @@ class Actor < ActiveRecord::Base
 
   # Build a new {Contact} from each that has not inverse
   def pending_contacts
-    received_contacts.pending.all.map do |c|
+    received_contacts.not_reflexive.pending.all.map do |c|
       c.inverse ||
         c.receiver.contact_to!(c.sender)
     end

data/app/models/contact.rb

@@ -50,6 +50,8 @@ class Contact < ActiveRecord::Base
 
   scope :active, where(arel_table[:ties_count].gt(0))
 
+  scope :not_reflexive, where(arel_table[:sender_id].not_eq(arel_table[:receiver_id]))
+
   validates_presence_of :sender_id, :receiver_id
   validates_uniqueness_of :sender_id, :scope => :receiver_id
   validates_uniqueness_of :receiver_id, :scope => :sender_id

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

@@ -7,6 +7,8 @@
               ),
           :html => { :class => "new_comment", :id => "new_comment"+dom_id(activity)  },
           :remote => true do |f| %>
+
+   <%= 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) %>

data/app/views/invitation_mailer/send_invitation.html.erb

@@ -1,38 +1,55 @@
 <div>
-  <div><%= @sender.name %> has invited you to <%= link_to( t('socialstream'), new_user_registration_path)%>
-    <div><%= @message%></div>
+  <div>
+    <span id="name" style="font-weight: bold;"><%= @sender.name %></span> has invited you to <%= link_to( t('socialstream'), new_user_registration_url)%>
+    <br/>
+    <table width="50%" style="border-style: solid; border-color: #2A3890; margin:10px; border-width: 2px;">
+      <tr>
+        <td><img src="http://<%= ActionMailer::Base.default_url_options[:host] +@sender.logo.url(:profile)%>" alt="<%=@sender.name%>"></td>
+        <td>"<%= @message%>"</td>
+      </tr>
+    </table>
   </div>
   <div>
     <div>
-      <%= t('frontpage.share.default')%>
+      <%= t('frontpage.share.default')%>:
     </div>
     <div>
       <ul>
-        <li><%= t('frontpage.share.sentence1') %></li>
-        <li><%= t('frontpage.share.sentence2') %></li>
+        <li>
+          <%= t('frontpage.share.sentence1') %>
+        </li>
+        <li>
+          <%= t('frontpage.share.sentence2') %>
+        </li>
       </ul>
     </div>
   </div>
-  
+
   <div>
     <div>
-      <%= t('frontpage.meet.default')%>
+      <%= t('frontpage.meet.default')%>:
     </div>
     <div>
       <ul>
-        <li><%= t('frontpage.meet.sentence1') %></li>
+        <li>
+          <%= t('frontpage.meet.sentence1') %>
+        </li>
       </ul>
     </div>
   </div>
 
   <div>
     <div>
-      <%= t('frontpage.collaborate.default')%>
+      <%= t('frontpage.collaborate.default')%>:
     </div>
     <div>
       <ul>
-        <li><%= t('frontpage.collaborate.sentence1') %></li>
-        <li><%= t('frontpage.collaborate.sentence2') %></li>
+        <li>
+          <%= t('frontpage.collaborate.sentence1') %>
+        </li>
+        <li>
+          <%= t('frontpage.collaborate.sentence2') %>
+        </li>
       </ul>
     </div>
   </div>

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

@@ -17,7 +17,7 @@
     </div>
 
     <div class="form_row">
-      <%= text_field_tag 'mails', nil, :class => "required form_tag" %>
+      <%= text_field_tag 'mails', nil, :class => "required emails form_tag" %>
     </div>  
     <div class="form_row form_label">
       <%=t('invitation.text')%>

data/app/views/toolbar/_home.html.erb

@@ -9,10 +9,6 @@
 </div>
 
 <div id="menu_lateral" class="toolbar_menu">
-    Testing SimpleNavigation
-    <br>
-    Please comment any bug
-    <hr>
     <%= yield(:toolbar_menu).empty? ? home_toolbar_menu : yield(:toolbar_menu)%>
 </div>
 

data/app/views/toolbar/_profile.html.erb

@@ -1,6 +1,6 @@
 <% content_for :headers do %>
-  <%= stylesheet_link_tag "menu", :media => "screen, projection" %>
-  <%= javascript_include_tag 'menu' %>
+<%= stylesheet_link_tag "menu", :media => "screen, projection" %>
+<%= javascript_include_tag 'menu' %>
 <% end %>
 
 <%= render :partial => 'toolbar/logo', :locals => { :subject => subject } %>
@@ -9,19 +9,7 @@
 </div>
 
 <div id="menu_lateral" class="toolbar_menu">
-  <ul>
-    <% unless subject == current_subject %>
-      <%= render :partial => "toolbar/profile_menu_tie_options", :locals => { :subject => subject } %>
-    <% end %>
-
-    <%= render :partial => "toolbar/profile_menu_basic_options", :locals => { :subject => subject } %>
-  </ul>
-  <hr>
-  Testing SimpleNavigation
-  <br>
-  Please move along
-  <hr>
-  <%= yield(:toolbar_menu).empty? ? profile_toolbar_menu(subject) : yield(:toolbar_menu) %>
+    <%= yield(:toolbar_menu).empty? ? profile_toolbar_menu(subject) : yield(:toolbar_menu) %>
 </div>
 
 <div class="block space_center">

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.6.2".freeze
+    VERSION = "0.6.3".freeze
   end
 end

data/social_stream-base.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.2.0')
   # Avatar attachments
-  s.add_runtime_dependency('avatars_for_rails', '~> 0.1.0')
+  s.add_runtime_dependency('avatars_for_rails', '~> 0.1.3')
   # jQuery
   s.add_runtime_dependency('jquery-rails', '~> 1.0.9')
   # Authorization

data/spec/controllers/comments_controller_spec.rb

@@ -21,6 +21,17 @@ describe CommentsController do
       end
 
       it_should_behave_like "Allow Creating"
+
+      it "should create with js" do
+        count = model_count
+        post :create, attributes.merge(:format => :js)
+
+        resource = assigns(model_sym)
+
+        model_count.should eq(count + 1)
+        resource.should be_valid
+        response.should be_success
+      end
     end
 
     describe "comment to friend" do

data/spec/models/actor_spec.rb

@@ -16,4 +16,13 @@ describe Actor do
   it "should generate relations" do
     assert Factory(:actor).relation_customs.present?
   end
+
+  context 'pending contacts' do
+    it 'should not include self' do
+      a = Factory(:actor)
+      c = a.contact_to!(a)
+
+      a.pending_contacts.should_not include(c)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -107,12 +107,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 29
         segments: 
         - 0
         - 1
-        - 0
-        version: 0.1.0
+        - 3
+        version: 0.1.3
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -1065,9 +1065,6 @@ files:
 - app/views/toolbar/_home.html.erb
 - app/views/toolbar/_logo.html.erb
 - app/views/toolbar/_profile.html.erb
-- app/views/toolbar/_profile_menu_basic_options.html.erb
-- app/views/toolbar/_profile_menu_options.html.erb
-- app/views/toolbar/_profile_menu_tie_options.html.erb
 - app/views/users/_groups.html.erb
 - app/views/users/_index.html.erb
 - app/views/users/_sidebar_index.html.erb

data/app/views/toolbar/_profile_menu_basic_options.html.erb

@@ -1,5 +0,0 @@
-<%= menu_options[:profile] || capture do %>
-  <li>
-    <%= link_to( image_tag("btn/btn_edit.png", :class => "menu_icon")+t('menu.information'), [subject, :profile]) %>
-  </li>
-<% end %>

data/app/views/toolbar/_profile_menu_options.html.erb

@@ -1,10 +0,0 @@
-<%= menu_options[:profile] || capture do %>
-  <li>
-    <%= link_to( image_tag("btn/btn_edit.png", :class => "menu_icon")+t('menu.information'), [subject, :profile]) %>
-  </li>
-<% end %>
-
-<%= menu_options[:uploads] || capture do %>
-  <%= render :partial =>'toolbar/home_menu_uploads'%>
-<% end %>
-

data/app/views/toolbar/_profile_menu_tie_options.html.erb

@@ -1,26 +0,0 @@
-<%= menu_options[:like] || capture do %>
-  <li>
-    <div class="verb_like" id="like_<%= dom_id(subject) %>">
-      <%= link_like(subject)%>
-    </div>
-  </li>
-<% end %>
-
-<%= menu_options[:contacts] || capture do %>
-  <!-- TODO: create helper -->
-  <% if user_signed_in? %>
-    <li >
-    <%= link_to image_tag("btn/btn_friend.png", :class => "menu_icon") +
-                current_subject.ties_to(subject).map(&:relation_name).join(", "),
-                edit_contact_path(current_subject.contact_to!(subject)) %>
-     </li>
-  <% end %>
-<% end %>
-
-<%= menu_options[:messages] || capture do %>
-  <% if user_signed_in? %>
-    <li >
-    <%= link_to(image_tag("btn/btn_send.png", :class => "menu_icon")+t('message.send'), new_message_path(:receiver => subject.slug)) %>
-    </li>
-  <% end %>
-<% end %>