social_stream-base 0.8.2 → 0.9.0

data/app/assets/javascripts/layouts.js

@@ -1,6 +1,6 @@
-//= require search
 //= require hoverIntent
 //= require superfish
+//= require jquery.watermarkinput
 //
 $(function() {
     jQuery('ul.sf-menu').superfish({

data/app/assets/stylesheets/search.css

@@ -0,0 +1,65 @@
+/******************** Search box css ***********************/
+#header_search {
+  float: left;
+  padding: 1px 10px 0 10px;
+  z-index:2001;
+}
+
+#global_search_input {
+  width: 150px;
+  height: 16px;
+  border: solid 1px #dedede;
+  padding:0 3px 0 22px;
+  background: url('btn/search_icon.png') 5px 50% no-repeat white;
+  font-size: 11px;
+  color: #2A3890;
+}
+#global_search_display {
+  width: 175px;
+  display: none;
+  float: right;
+  margin-right: 35px;
+  border-left: solid 1px #B9B9B9;
+  border-right: solid 1px #B9B9B9;
+  border-bottom: solid 1px #B9B9B9;
+  overflow: hidden;
+  position: absolute;
+  z-index: 2000;
+  background: whiteSmoke;
+  text-align: center;
+}
+
+#global_search_display a {  
+  color: #2A3890;
+  text-decoration: none;
+}
+#global_search_display a:hover {
+  color: #2A3890;
+  text-decoration: none;  
+  font-weight: bold;
+}
+
+#global_search_display  li {
+  padding: 4px;
+  border-top: solid 1px #B9B9B9;
+  font-size: 10px;
+  height: 35px;
+  background: whiteSmoke;
+  overflow: hidden;
+  text-align: left;
+}
+#global_search_display  li .logo{
+  float:left;
+  margin-right: 5px;  
+}
+
+#global_search_display  li .name {
+  float:left;
+}
+
+
+#global_search_display  li:hover {
+  background: #CFDEFF;
+  color: #2A3890;
+}
+/******************** Search box css END ***********************/

data/app/controllers/contacts_controller.rb

@@ -41,7 +41,7 @@ class ContactsController < ApplicationController
   def destroy
     @contact = current_subject.sent_contacts.find params[:id]
 
-    @contact.relation_ids = [current_subject.relation_public.id]
+    @contact.relation_ids = [current_subject.relation_reject.id]
 
     respond_to do |format|
       format.js

data/app/controllers/search_controller.rb

@@ -0,0 +1,15 @@
+class SearchController < ApplicationController
+  
+  #before_filter :authenticate_user! #??
+  
+  def index
+    if params[:mode].eql? "header_search"
+      @search_result = Actor.search "*#{params[:id]}*", :page => 1, :per_page => 10
+      render :partial => "header_search", :locals =>{:search_result => @search_result}
+      return
+    else
+      @search_result = ThinkingSphinx.search "*#{params[:id]}*"      
+    end
+  end
+
+end

data/app/models/actor.rb

@@ -195,7 +195,12 @@ class Actor < ActiveRecord::Base
   def relation_public
     Relation::Public.of(self)
   end
-  
+
+  # The {Relation::Reject} for this {Actor} 
+  def relation_reject
+    Relation::Reject.of(self)
+  end
+ 
   # All the {Actor actors} this one has relation with
   #
   # Options:
@@ -229,7 +234,7 @@ class Actor < ActiveRecord::Base
     if options[:relations].present?
       as = as.merge(Tie.related_by(options[:relations]))
     else
-      as = as.merge(Relation.where(:type => 'Relation::Custom'))
+      as = as.merge(Relation.where(:type => ['Relation::Custom', 'Relation::Public']))
     end
     
     as
@@ -447,6 +452,7 @@ class Actor < ActiveRecord::Base
   def create_initial_relations
     Relation::Custom.defaults_for(self)
     Relation::Public.default_for(self)
+    Relation::Reject.default_for(self)
   end
 
   # After create callback

data/app/models/contact.rb

@@ -116,12 +116,13 @@ class Contact < ActiveRecord::Base
   # Is this {Contact} +new+ or +edit+ for {SocialStream::Models::Subject subject} ?
   #
   # action is +new+ when, despite of being created, it has not {Tie ties} or it has a {Tie} with a
-  # {Relation::Public public relation}. 
+  # {Relation::Reject reject relation}. 
   #
-  # The contact's action is +edit+ when it has any {Tie} with a {Relation::Custom custom relation}
+  # The contact's action is +edit+ when it has any {Tie} with a {Relation::Custom custom relation} or
+  # a {Relation::Public public relation}
   #
   def action
-    if ties_count > 0 && relations.where(:type => 'Relation::Custom').any?
+    if ties_count > 0 && relations.where(:type => ['Relation::Custom', 'Relation::Public']).any?
       'edit'
     else
       'new'

data/app/models/relation.rb

@@ -35,6 +35,12 @@ class Relation < ActiveRecord::Base
   has_many :audiences, :dependent => :destroy
   has_many :activities, :through => :audiences
 
+  validates_presence_of :actor_id
+
+  scope :actor, lambda { |a|
+    where(:actor_id => Actor.normalize_id(a))
+  }
+
   scope :mode, lambda { |st, rt|
     where(:sender_type => st, :receiver_type => rt)
   }

data/app/models/relation/public.rb

@@ -1,31 +1,9 @@
-class Relation::Public < Relation
-  scope :actor, lambda { |a|
-    where(:actor_id => Actor.normalize_id(a))
-  }
-
-  validates_presence_of :actor_id
-
-  class << self
-    def default_for(actor)
-      create! :actor => actor
-    end
-
-    # The {Relation::Public} belonging to actor
-    def of(actor)
-      actor(actor).first
-    end
-  end
-
+class Relation::Public < Relation::Single
   # A {Relation::Public public relation} is always the weakest
   def <=>(relation)
     1
   end
 
-  # The name of public relation
-  def name
-    I18n.t('relation_public.name')
-  end
-
   # Are we supporting custom permissions for {Relation::Public}? Not by the moment.
   def allow?(user, action, object)
     action == 'read' && object == 'activity'

data/app/models/relation/reject.rb

@@ -0,0 +1,3 @@
+class Relation::Reject < Relation::Single
+end
+

data/app/models/relation/single.rb

@@ -0,0 +1,22 @@
+# Common methods for single relations, like {Relation::Public} and {Relation::Reject}
+#
+# Unlike {Relation::Custom}, {SocialStream::Models::Subject subjects} have only one of
+# these {Relation relations}.
+#
+class Relation::Single < Relation
+  class << self
+    def default_for(actor)
+      create! :actor => actor
+    end
+
+    # The {Relation::Public} belonging to actor
+    def of(actor)
+      actor(actor).first
+    end
+  end
+
+  # The name of public relation
+  def name
+    I18n.t("relation_#{ self.class.name }.name")
+  end
+end

data/app/models/tie.rb

@@ -88,7 +88,7 @@ class Tie < ActiveRecord::Base
   #
   # Create contact activity if this is the first tie
   def create_activity
-    return if contact.reload.ties_count != 1 || relation.is_a?(Relation::Public)
+    return if contact.reload.ties_count != 1 || relation.is_a?(Relation::Reject)
 
     Activity.create! :contact => contact,
                      :relation_ids => contact.relation_ids,

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

@@ -4,39 +4,63 @@
   link_to (t('account.edit'), edit_user_registration_path)
 ) %>
 
+<%= devise_error_messages! %>
+
+<div class="space_center"></div>
+<h2><%= t('account.edit') %></h2>
 <div class="space_center"></div>
 
-<div class="block" id="account_form">
-  <div class="form_row">
-    <h2><%= t('account.edit') %></h2>
+<div class="block" id="password_form">
+  <div class="header">
+    Change password
   </div>
-  
-  <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
-    <%= devise_error_messages! %>
-  
+  <div >
+    <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
     <div class="form_row">
       <div class="form_label">
-        <%= f.label :email %>
+        <%= f.label t('account.password.new') %>
       </div>
       <div class="form_field">
-        <%= f.email_field :email, :class => "form_tag" %>
+        <%= f.password_field :password, :class => "form_tag" %>
       </div>
     </div>
     <div class="form_row">
       <div class="form_label">
-        <%= f.label :password %>
+        <%= f.label t('account.password.retype') %>
       </div>
       <div class="form_field">
-        <%= f.password_field :password, :class => "form_tag" %><br/>
-        <span class="form_comment">(Leave blank if you don't want to change it)</span>
+        <%= f.password_field :password_confirmation, :class => "form_tag" %>
       </div>
     </div>
     <div class="form_row">
       <div class="form_label">
-        <%= f.label :password_confirmation %>
+        <%= f.label :current_password %>
       </div>
       <div class="form_field">
-        <%= f.password_field :password_confirmation, :class => "form_tag" %>
+        <%= f.password_field :current_password, :class => "form_tag" %>
+      </div>
+    </div>
+    <div class="form_row space_center">
+      <%= f.submit t('button.update'), :class => "button" %>
+      <button class="button" onclick="window.location.href='<%= polymorphic_path(current_subject) %>';">
+        <%= t('button.cancel')%>
+      </button>
+    </div>
+    <% end%>
+  </div>
+</div>
+<div class="block" id="email_form">
+  <div class="header">
+    Change email address
+  </div>
+  <div >
+    <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+    <div class="form_row">
+      <div class="form_label">
+        <%= f.label :email %>
+      </div>
+      <div class="form_field">
+        <%= f.email_field :email, :class => "form_tag" %>
       </div>
     </div>
     <div class="form_row">
@@ -44,8 +68,7 @@
         <%= f.label :current_password %>
       </div>
       <div class="form_field">
-        <%= f.password_field :current_password, :class => "form_tag" %><br/>
-        <span class="form_comment">(We need your current password to confirm your changes)</span>
+        <%= f.password_field :current_password, :class => "required form_tag" %>
       </div>
     </div>
     <div class="form_row space_center">
@@ -54,15 +77,14 @@
         <%= t('button.cancel')%>
       </button>
     </div>
-  <% end %>
-<div>
-<div class="block">  
-  <div class="content">
-    <h3>Cancel my account</h3>
+    <% end%>
+  </div>
+</div>
+<div class="block" id="cancel_account">
+  <div class="header">
+    Cancel account
+  </div>
+  <div class="form_row">
+    Unhappy? <b><%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</b>
   </div>
-  
-  <p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
-  
-  <%= link_to "Back", :back %>
-
 </div>

data/app/views/layouts/_header.erb

@@ -8,12 +8,11 @@
         <div class="menu_list menu_white" id="menu_home">
           <ul>
             <li class="btn_menu_profile"><%= link_to(t('profile.one'), current_subject)%></li>
-            <li class="pipe">|</li>
-            <li class="btn_menu_browse"><%=link_to(t('browse'),users_path) %></li>
           </ul>
         </div>
       <% end %>
     </div>
+    <%= render :partial => 'layouts/search' %>
     <div id="header_right">
        <% if user_signed_in? %>
         <%= render :partial => 'layouts/representation' %>

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

@@ -0,0 +1,53 @@
+<div id="header_search">      
+  <form action="#" method="post">
+    <input id="global_search_input" name="search" type="text" autocomplete="off" />
+  </form>
+  <div id="global_search_display">
+    <%= image_tag('loading.gif', :class => :loading) %>
+  </div>
+</div>
+<%= javascript_tag do %>
+$(document).ready(function() {
+  var last_search = "";
+  
+  $(document).click(function() {
+    $("#global_search_display").hide();
+  });
+  $('#global_search_input').click(function(e) {
+    e.stopPropagation();
+  });
+  $('#global_search_display').click(function(e) {
+    e.stopPropagation();
+  });
+  
+  $("#global_search_input").Watermark("Search");
+
+  $("#global_search_input").keyup(function() {
+    var searchstring = $(this).val();
+    if((searchstring=="")){
+      $("#global_search_display").hide();
+    }
+    else if(searchstring.length < 2) {
+      $("#global_search_display").hide();
+    } else {
+      if (last_search!=searchstring){
+        last_search=searchstring;
+        $("#global_search_display").html("<%= escape_javascript(image_tag('loading.gif', :class => :loading)) %>").show();
+        $.ajax({
+          type : "GET",
+          url : "<%= search_url %>?id=" + searchstring + "&mode=header_search",
+          success : function(html) {      
+            if ($("#global_search_input").val()==searchstring){ //Only show if input value is still the same
+              $("#global_search_display").html(html);
+            }          
+          },
+          error: function(){
+            $("#global_search_display").html("Something went wrong with search engine");
+         }
+        });
+      }
+    }
+    return false;
+  });  
+})
+<% end %>

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

@@ -0,0 +1,10 @@
+<ul>
+<% search_result.each do |actor| %>
+  <%= link_to actor.subject do %>
+    <li>
+      <%= image_tag(actor.logo.url(:actor), :class => :logo) %> 
+      <%= content_tag(:span, actor.name, :class => :name) %>         
+    </li>
+    <% end %>
+<% end %>
+</ul>

data/config/locales/en.yml

@@ -7,6 +7,9 @@ en:
   account:
     edit: "Edit user"
     one: "Account"
+    password:
+      new: "New password"
+      retype: "Retype new password"
     privacy: "Privacy"
   activity:
     audience:

data/config/routes.rb

@@ -65,6 +65,8 @@ Rails.application.routes.draw do
     resource :like
   end
   
+  match 'search' => 'search#index', :as => :search
+  
   match 'ties' => 'ties#index', :as => :ties
   
   # Social Stream objects configured in config/initializers/social_stream.rb

data/db/migrate/20110912074426_add_reject_relation.rb

@@ -0,0 +1,29 @@
+class AddRejectRelation < ActiveRecord::Migration
+  def up
+    Actor.all.each do |a|
+      Relation::Reject.default_for(a)
+    end
+
+    Tie.
+      includes(:relation, :contact, :sender).
+      merge(Relation.where(:type => 'Relation::Public')).
+      each do |t|
+        if t.contact.ties_count != 1
+          logger.warn "Public contact #{ t.contact_id } has #{ contact.ties_count }, when expecting 1"
+        end
+
+        t.update_attribute :relation_id, t.sender.relation_reject.id
+      end
+  end
+
+  def down
+    Tie.
+      includes(:relation, :contact).
+      merge(Relation.where(:type => 'Relation::Reject')).
+      each do |t|
+        t.update_attribute :relation_id, t.sender.relation_public.id
+      end
+
+    Relation::Reject.destroy_all
+  end
+end

data/lib/mailboxer/notification_decoder.rb

@@ -6,7 +6,7 @@ module Mailboxer
       notification_text = notification_text.gsub(/\%\{sender\}/, link_to(truncate_name(activity.sender.name),
                                                                       url_for(:controller=> activity.sender.subject.class.to_s.underscore.pluralize,
                                                                               :action=> :show, :id=> activity.sender.subject.slug, :only_path => false)))
-      notification_text = notification_text.gsub(/\%\{confirm\}/,link_to(t('notification.confirm'),edit_contact_url(activity.receiver.contact_to!(activity.sender), :s => activity.sender.slug)))
+      notification_text = notification_text.gsub(/\%\{confirm\}/,link_to(t('notification.confirm'),edit_contact_url(activity.receiver.contact_to!(activity.sender), :s => activity.receiver.slug)))
       notification_text = notification_text.gsub(/\%\{look\}/,link_to(t('notification.look'),
                                                                       url_for(:controller=> activity.sender.subject.class.to_s.underscore.pluralize,
                                                                               :action=> :show, :id=> activity.sender.subject.slug, :only_path => false)))

data/lib/social_stream/base/version.rb

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

data/spec/factories/tie.rb

@@ -16,6 +16,10 @@ Factory.define :public, :parent => :tie do |t|
   t.after_build { |u| u.relation = u.sender.relation_public }
 end
 
+Factory.define :reject, :parent => :tie do |t|
+  t.after_build { |u| u.relation = u.sender.relation_reject }
+end
+
 # Group ties
 Factory.define :g2u_tie, :parent => :tie do |t|
   t.contact { |c| Factory(:group_contact) }

data/spec/models/tie_spec.rb

@@ -59,13 +59,24 @@ describe Tie do
   end
 
   describe "with public relation" do
-    it "should not create activity" do
+    it "should create activity" do
       count = Activity.count
 
       Factory(:public)
 
+      Activity.count.should eq(count + 1)
+    end
+  end
+
+  describe "with reject relation" do
+    it "should not create activity" do
+      count = Activity.count
+
+      Factory(:reject)
+
       Activity.count.should eq(count)
     end
   end
+
 end
 

data/vendor/assets/javascripts/jquery.watermarkinput.js

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2007 Josh Bush (digitalbush.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE. 
+ */
+ 
+/*
+ * Version: Beta 1
+ * Release: 2007-06-01
+ */ 
+(function($) {
+	var map=new Array();
+	$.Watermark = {
+		ShowAll:function(){
+			for (var i=0;i<map.length;i++){
+				if(map[i].obj.val()==""){
+					map[i].obj.val(map[i].text);					
+					map[i].obj.css("color",map[i].WatermarkColor);
+				}else{
+				    map[i].obj.css("color",map[i].DefaultColor);
+				}
+			}
+		},
+		HideAll:function(){
+			for (var i=0;i<map.length;i++){
+				if(map[i].obj.val()==map[i].text)
+					map[i].obj.val("");					
+			}
+		}
+	}
+	
+	$.fn.Watermark = function(text,color) {
+		if(!color)
+			color="#aaa";
+		return this.each(
+			function(){		
+				var input=$(this);
+				var defaultColor=input.css("color");
+				map[map.length]={text:text,obj:input,DefaultColor:defaultColor,WatermarkColor:color};
+				function clearMessage(){
+					if(input.val()==text)
+						input.val("");
+					input.css("color",defaultColor);
+				}
+
+				function insertMessage(){
+					if(input.val().length==0 || input.val()==text){
+						input.val(text);
+						input.css("color",color);	
+					}else
+						input.css("color",defaultColor);				
+				}
+
+				input.focus(clearMessage);
+				input.blur(insertMessage);								
+				input.change(insertMessage);
+				
+				insertMessage();
+			}
+		);
+	};
+})(jQuery);

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 8
-  - 2
-  version: 0.8.2
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-07 00:00:00 +02:00
+date: 2011-09-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -554,6 +554,7 @@ files:
 - app/assets/images/btn/point_gray.png
 - app/assets/images/btn/post.png
 - app/assets/images/btn/search.png
+- app/assets/images/btn/search_icon.png
 - app/assets/images/btn/shadow.png
 - app/assets/images/btn/share.png
 - app/assets/images/btn/subtime.png
@@ -589,6 +590,7 @@ files:
 - app/assets/images/icons/favicon.ico
 - app/assets/images/left.png
 - app/assets/images/loader.gif
+- app/assets/images/loading.gif
 - app/assets/images/logo.png
 - app/assets/images/logos/actor/group.png
 - app/assets/images/logos/actor/remote_subject.png
@@ -614,7 +616,6 @@ files:
 - app/assets/javascripts/posts.js
 - app/assets/javascripts/profiles.js
 - app/assets/javascripts/relation_customs.js
-- app/assets/javascripts/search.js
 - app/assets/javascripts/settings.js
 - app/assets/javascripts/social_stream-base.js
 - app/assets/javascripts/ties.js
@@ -650,6 +651,7 @@ files:
 - app/assets/stylesheets/messages.css
 - app/assets/stylesheets/profiles.css
 - app/assets/stylesheets/relation_customs.css
+- app/assets/stylesheets/search.css
 - app/assets/stylesheets/settings.css
 - app/assets/stylesheets/social_stream-base.css
 - app/assets/stylesheets/ties.css
@@ -673,6 +675,7 @@ files:
 - app/controllers/posts_controller.rb
 - app/controllers/profiles_controller.rb
 - app/controllers/relation/customs_controller.rb
+- app/controllers/search_controller.rb
 - app/controllers/settings_controller.rb
 - app/controllers/subjects_controller.rb
 - app/controllers/tags_controller.rb
@@ -708,6 +711,8 @@ files:
 - app/models/relation.rb
 - app/models/relation/custom.rb
 - app/models/relation/public.rb
+- app/models/relation/reject.rb
+- app/models/relation/single.rb
 - app/models/relation_permission.rb
 - app/models/tie.rb
 - app/models/user.rb
@@ -787,6 +792,7 @@ files:
 - app/views/layouts/_footer.html.erb
 - app/views/layouts/_header.erb
 - app/views/layouts/_representation.html.erb
+- app/views/layouts/_search.html.erb
 - app/views/layouts/_settings.html.erb
 - app/views/layouts/application.html.erb
 - app/views/layouts/frontpage.html.erb
@@ -843,6 +849,7 @@ files:
 - app/views/relation/customs/create.js.erb
 - app/views/relation/customs/index.html.erb
 - app/views/relation/customs/update.js.erb
+- app/views/search/_header_search.html.erb
 - app/views/settings/_api_key.html.erb
 - app/views/settings/_index.html.erb
 - app/views/settings/_notifications.html.erb
@@ -873,6 +880,7 @@ files:
 - db/migrate/20110705103202_empty_ties_count.rb
 - db/migrate/20110712090343_remove_spheres.rb
 - db/migrate/20110712142140_remove_permission_function.rb
+- db/migrate/20110912074426_add_reject_relation.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
 - lib/acts_as_taggable_on/social_stream.rb
 - lib/generators/social_stream/base/install_generator.rb
@@ -988,6 +996,7 @@ files:
 - vendor/assets/javascripts/jquery.livequery.js
 - vendor/assets/javascripts/jquery.scrollTo.min.js
 - vendor/assets/javascripts/jquery.validate.js
+- vendor/assets/javascripts/jquery.watermarkinput.js
 - vendor/assets/javascripts/menu.js
 - vendor/assets/javascripts/superfish.js
 - vendor/assets/javascripts/ui.checkbox.js

data/app/assets/javascripts/search.js

@@ -1 +0,0 @@
-