social_stream 0.2.2 → 0.2.3

data/app/controllers/likes_controller.rb

@@ -4,11 +4,11 @@ class LikesController < ApplicationController
 
   # POST /activities/1/like.js
   def create
-    @like = activity!.children.new :verb => "like"
+    @like = activity!.children.new :verb => "like",
+                                   :_tie => tie!
 		
     respond_to do |format|
       if @like.save
-        tie!.activities << @like
         format.js
       else
         format.js

data/app/controllers/users_controller.rb

@@ -25,11 +25,14 @@ class UsersController < ApplicationController
     respond_to do |format|
       if @user.update_attributes(params[:user])
         #format.html { redirect_to(@user, :notice => 'User was successfully updated.') }
-        format.html { render :action => "edit", :notice => 'User was successfully updated.' }
+        #format.html { render :action => "edit", :notice => 'User was successfully updated.' }
+        format.html { render :partial => "right_show", :notice => 'User was successfully updated.' }
         format.xml  { head :ok }
+        format.js 
       else
         format.html { render :action => "edit" }
         format.xml  { render :xml => @user.errors, :status => :unprocessable_entity }
+        format.js
       end
     end
   end

data/app/models/activity.rb

@@ -12,18 +12,16 @@ class Activity < ActiveRecord::Base
 
   belongs_to :activity_verb
 
-  belongs_to :tie,
-             :include => [ :sender ]
-
-  has_one :sender,
-          :through => :tie
-  has_one :receiver,
-          :through => :tie
-  has_one :relation,
-          :through => :tie
-
-  delegate :sender_subject,
-           :receiver_subject,
+  has_many :tie_activities, :dependent => :destroy
+  has_many :ties, :through => :tie_activities
+
+  has_one :tie,
+          :through => :tie_activities,
+          :conditions => { 'tie_activities.original' => true },
+          :include => [ :sender ]
+
+  delegate :sender, :receiver, :relation,
+           :sender_subject, :receiver_subject,
            :to => :tie
 
   has_many :activity_object_activities,
@@ -34,10 +32,15 @@ class Activity < ActiveRecord::Base
   scope :wall, lambda { |ties|
     select("DISTINCT activities.*").
       roots.
-      where(:tie_id => ties).
+      joins(:tie_activities).
+      where('tie_activities.tie_id' => ties).
       order("created_at desc")
   }
 
+  # After an activity is created, it is associated to ties
+  attr_accessor :_tie
+  after_create :assign_to_ties
+
   # The name of the verb of this activity
   def verb
     activity_verb.name
@@ -59,7 +62,7 @@ class Activity < ActiveRecord::Base
   end
 
   def liked_by(user) #:nodoc:
-    likes.includes(:tie) & Tie.sent_by(user)
+    likes.joins(:ties).where('tie_activities.original' => true) & Tie.sent_by(user)
   end
 
   # Does user like this activity?
@@ -72,4 +75,13 @@ class Activity < ActiveRecord::Base
     activity_objects.first.try(:object)
   end
 
+  private
+
+  def assign_to_ties
+    original = tie_activities.create!(:tie => _tie)
+    _tie.activity_receivers.each do |t|
+      tie_activities.create!(:tie => t,
+                             :original => false)
+    end
+  end
 end

data/app/models/tie.rb

@@ -41,7 +41,8 @@ class Tie < ActiveRecord::Base
 
   belongs_to :relation
 
-  has_many :activities
+  has_many :tie_activities, :dependent => :destroy
+  has_many :activities, :through => :tie_activities
 
   scope :recent, order("#{ quoted_table_name }.created_at DESC")
 
@@ -68,7 +69,7 @@ class Tie < ActiveRecord::Base
   scope :inverse, lambda { |t|
     sent_by(t.receiver).
       received_by(t.sender).
-      where(:relation_id => t.relation.inverse_id)
+      where(:relation_id => t.relation.inverse.try(:id))
   }
 
   validates_presence_of :sender_id, :receiver_id, :relation_id
@@ -121,6 +122,10 @@ class Tie < ActiveRecord::Base
     Tie.inverse(self).first
   end
 
+  def activity_receivers
+    Array(inverse)
+  end
+
   # = Access Control
   #
   # Access control enforcement in ties come from the permissions assigned to other ties through relations.

data/app/models/tie_activity.rb

@@ -0,0 +1,4 @@
+class TieActivity < ActiveRecord::Base
+  belongs_to :activity
+  belongs_to :tie
+end

data/app/models/user.rb

@@ -2,7 +2,8 @@ require 'devise/orm/active_record'
 
 class User < ActiveRecord::Base
   devise *SocialStream.devise_modules
-  has_one :profile
+
+  has_one :profile, :dependent => :destroy
   accepts_nested_attributes_for :profile
   
   # Setup accessible (or protected) attributes for your model
@@ -26,9 +27,9 @@ class User < ActiveRecord::Base
   
    
   def age
-    return nil if self.birthday.blank? 
+    return nil if profile.birthday.blank? 
     now = Time.now.utc.to_date
-    now.year - self.birthday.year - (self.birthday.to_date.change(:year => now.year) > now ? 1 : 0)
+    now.year - profile.birthday.year - (profile.birthday.to_date.change(:year => now.year) > now ? 1 : 0)
   end
   
   after_create :create_profile

data/app/views/groups/index.html.erb

@@ -10,7 +10,7 @@
 <div id="map_location" class="content_size">
 		Your are here ><img src="images/btn/btn_browse.png" class="btn_config"%> <%=t('browse')%>: <span id="name_group"><%= t('group.other')%></span>
 </div>
-<div id="by_options" class="content_size"><%=link_to ( t('user.by'),users_path )%> </div>
+<div id="by_options" class="content_size"><%= link_to(t('user.by'), users_path) %> </div>
 <br class="clearfloat" />
 <div class="space_center">
 </div>

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

@@ -18,15 +18,13 @@
         <%= stylesheet_link_tag "carousel", :media => "screen, projection" %>
         <%= stylesheet_link_tag "smoothness/jquery-ui-1.8.4.custom", :media => "screen, projection" %>
         <%= stylesheet_link_tag "ui.dropdownchecklist", :media => "screen, projection" %>
-				<!-- datepicker css -->
-        <link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>
-        <%= stylesheet_link_tag "edit_user", :media => "screen, projection" %> 
-
+				<%= stylesheet_link_tag "jquery-ui.css", :media => "screen, projection" %>
 
+        <%= stylesheet_link_tag "edit_user", :media => "screen, projection" %> 
         <%= javascript_include_tag :defaults %>
        
         <%= javascript_include_tag 'jquery', 'jquery-ui.min', 'jquery.livequery',
-                                   'jquery.boxy', 'menu','ui.dropdownchecklist' %>
+                                   'jquery.boxy', 'menu','ui.dropdownchecklist','jquery.form', 'jquery.validate' %>
 
 
         <% if protect_against_forgery? %>
@@ -46,6 +44,13 @@
             <%= render :partial => "layouts/header" %>
             <div id="wrapper_body">
                 <div id="content">
+                	
+                	<% flash.each do |name, msg| %>
+                    <div id="<%= name %>">
+                    <%= msg %>
+                    </div>
+                  <% end %>
+				
                 	<%= yield %>
                 </div>
                 <div id="middle">

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

@@ -21,7 +21,7 @@
                     <div class="banner_busqueda">
                         <div id="espacio_busqueda">
                             <% flash.each do |name, msg| %>
-                            <div class="<%= name %>">
+                            <div id="<%= name %>">
                                 <%= msg %>
                             </div>
                             <% end %>

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

@@ -1,7 +1,7 @@
 <div class="dialog_add_tie" id="new_tie">
     <div class="content_add_user" >
       <div class="tie_logo">
-        <%= link_to image_tag(@tie.receiver_subject.logo.url(tie),
+        <%= link_to image_tag(@tie.receiver_subject.logo.url(:profile),
                               :size => "100x100",
                               :alt => @tie.receiver_subject.name),
                      @tie.receiver_subject %>

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

@@ -28,7 +28,7 @@
 										BirthDay:
 								</div>
 								<div class="info_right">
-										<%=h @user.birthday.to_s() %>
+										<%=h @user.profile.birthday.to_s() %>
 								</div>
 						</div>
 						<div class="info_post">
@@ -78,6 +78,14 @@
 												<a href="<%=h @user.profile.website %>"><%=h @user.profile.website %></a>
 										</div>
 								</div>
+								<div class="info_post">
+                    <div>
+                        E-mail
+                    </div>
+                    <div class="contact_link">
+                        <%=h @user.email %>
+                    </div>
+                </div>
 						</div>
 				</div>
 		  </div>

data/app/views/users/edit.html.erb

@@ -6,8 +6,9 @@
         <%= render :partial => 'middle_show' %>
         <% end %>
 				
+       
 				
-        <%= form_for(@user) do |f| %>
+        <%= form_for(@user, :remote => true) do |f| %>
         <% if @user.errors.any? %>
         <div id="error_explanation">
             <h2><%= pluralize(@user.errors.count, "error") %>prohibited this user from being saved:</h2>
@@ -29,7 +30,10 @@
 									$("#personal_info").addClass('section_normal');
 									$("#contacts").addClass('section_normal');
 									$(".space_profile").addClass('section_normal');
-              });
+									
+                  $("#edit_user_1").validate();
+                
+              }); 
         </script>
         <div class="field">
             <% if !params[:section].present? or params[:section].eql?("about_me") %>
@@ -39,28 +43,31 @@
             <br/>
             <%= f.label :name %>
             <br/>
-            <%= f.text_field :name %>
+
+            <%= f.text_field :name, :class => "required" %>
+
             <br/>
 						<script type="text/javascript">
 
 							$(function() {
-                 $( "#user_birthday" ).datepicker({ yearRange: '1900:<%= Time.now.utc.to_date.year%>', 
+                  $( "#user_profile_attributes_birthday" ).datepicker({ yearRange: '1900:<%= Time.now.utc.to_date.year%>', 
 								                                    changeYear: true, maxDate: '+0d', defaultDate: '-30y'});
 									
 									$("#personal_info").removeClass('section_normal');
 									$("#personal_info").addClass('section_highlight');
-              });
+									
+							});
 
 					  </script>
-						
+						<%= f.fields_for :profile do |profile_form| %>
 						<div class="editField">
-              <%= f.label :birthday %>
+              <%= profile_form.label :birthday %>
               <br/>
 						</div>
-            <%= f.text_field :birthday %>
+            <%= profile_form.text_field :birthday , :class => "date" %>
             <br/>
 						
-            <%= f.fields_for :profile do |profile_form| %>
+            
 						<div class="editField">
               <%= profile_form.label :organization %>
               <br/>
@@ -83,7 +90,7 @@
               <%= profile_form.label "About me" %>
               <br/>
 						</div>
-            <%= profile_form.text_area :description, :rows =>6 %>
+            <%= profile_form.text_area :description, :rows =>6, :maxlength => 400 %>
             <br/>
             <br/>
             <% end %>
@@ -107,19 +114,19 @@
               <%= profile_form.label :phone %>
               <br/>
 						</div>
-            <%= profile_form.text_field :phone %>
+            <%= profile_form.text_field :phone, :class => "digits" %>
             <br/>
 						<div class="editField">
               <%= profile_form.label :mobile %>
               <br/>
 						</div>
-            <%= profile_form.text_field :mobile %>
+            <%= profile_form.text_field :mobile, :class => "digits" %>
             <br/>
 						<div class="editField">
               <%= profile_form.label :fax %>
               <br/>
 						</div>
-            <%= profile_form.text_field :fax %>
+            <%= profile_form.text_field :fax, :class => "digits" %>
             <br/>
 						<div class="editField">
               <%= profile_form.label :address %>
@@ -131,7 +138,7 @@
               <%= profile_form.label :website %>
               <br/>
 						</div>
-            <%= profile_form.text_field :website %>
+            <%= profile_form.text_field :website, :class => "url" %>
             <br/>
             <br/>
             <% end %>
@@ -151,7 +158,7 @@
 	            </div>
 							<%= f.fields_for :profile do |profile_form| %>
 	            <br/>
-	            <%= profile_form.text_area :experience, :rows =>6 %>
+	            <%= profile_form.text_area :experience, :rows =>6, :maxlength => 500 %>
 	            <br/>
 	            <br/>
 	            <% end %>

data/app/views/users/update.js.erb

@@ -0,0 +1,20 @@
+
+<% if @user.valid? %>
+
+
+  if ($("#notice").length == 0){
+	  
+    $("#content").prepend('<div id="notice"></div>');
+		
+  }  
+  $("#notice").html("<h2>Form Submitted!</h2>");
+
+  $("#middleContent").replaceWith("<%= escape_javascript(render(:partial => 'middle_show'))%>");
+	
+<% else %>
+
+  $("#flash_error").html("<h2>Fail!</h2>"); 
+
+<% end %>
+
+

data/bin/social_stream

@@ -0,0 +1,57 @@
+#!/bin/bash
+#Social_stream complete install
+#Arguments:
+#$1 --> Name of the folder to create the social_stream project
+EXPECTED_ARGS=1
+
+if [ $# -ne $EXPECTED_ARGS ]
+then
+  echo "Usage: `basename $0` path/to/your/application"
+  exit 1 
+fi
+
+
+#Linux packages
+echo 'Installing Linux packages'
+PACKAGES_COMMON='ruby ruby-dev rdoc irb libopenssl-ruby wget make curl aspell-es aspell-en libxml2-dev libxslt-dev libmagickcore-dev libmagickwand-dev libsqlite3-dev libmysqlclient-dev mysql-server rake'
+PACKAGES_PRODUCTION='awstats logrotate nfs-common'
+sudo apt-get install $PACKAGES_COMMON
+sudo apt-get install $PACKAGES_PRODUCTION
+echo 'Done'
+
+#Rubygems
+RUBY_GEMS_VERSION='1.3.7'
+RUBY_GEMS_PACKAGE="rubygems-"${RUBY_GEMS_VERSION}".tgz"
+RUBY_GEMS_DOWNLOAD="http://rubyforge.org/frs/download.php/70696/"${RUBY_GEMS_PACKAGE}
+
+echo 'Installing Rubygems $RUBY_GEMS_VERSION'
+
+cd /tmp && wget $RUBY_GEMS_DOWNLOAD
+cd /tmp && tar zxf $RUBY_GEMS_PACKAGE
+cd /tmp/rubygems-$RUBY_GEMS_VERSION && sudo /usr/bin/ruby setup.rb
+
+sudo ln -s /usr/bin/gem1.8 /usr/bin/gem
+echo 'Done'
+
+#Gems
+echo 'Installing Initial Gems'
+sudo gem install rails 
+sudo gem install bundler 
+echo 'Done'
+
+#Social Stream 
+echo 'Creating and Setting up your Social Stream basic application'
+export PATH=$PATH:/var/lib/gems/1.8/bin
+echo 'Creating rails project'
+rails new $1 
+cd $1
+echo 'gem "social_stream"' >> Gemfile
+echo 'Updating bundle'
+bundle update
+echo 'Setting up the application'
+rails generate social_stream:install -y
+rake db:migrate
+rake db:seed
+echo 'Done'
+
+echo 'Instalation complete. Run "rails server" in the application folder to start the server'

data/lib/generators/social_stream/templates/migration.rb

@@ -2,14 +2,12 @@ class CreateSocialStream < ActiveRecord::Migration
   def self.up
     create_table "activities", :force => true do |t|
       t.integer  "activity_verb_id"
-      t.integer  "tie_id"
       t.datetime "created_at"
       t.datetime "updated_at"
       t.string   "ancestry"
     end
 
     add_index "activities", "activity_verb_id"
-    add_index "activities", "tie_id"
 
     create_table "activity_object_activities", :force => true do |t|
       t.integer  "activity_id"
@@ -99,6 +97,7 @@ class CreateSocialStream < ActiveRecord::Migration
 
     create_table "profiles", :force => true do |t|
       t.integer  "user_id"
+      t.date     "birthday"
       t.datetime "created_at"
       t.datetime "updated_at"
       t.string   "organization", :limit => 45
@@ -161,6 +160,17 @@ class CreateSocialStream < ActiveRecord::Migration
     add_index "tags_activity_objects", "activity_object_id"
     add_index "tags_activity_objects", "tag_id"
 
+    create_table "tie_activities", :force => true do |t|
+      t.integer "tie_id"
+      t.integer "activity_id"
+      t.boolean "read"
+      t.boolean "deleted"
+      t.boolean "original", :default => true
+    end
+
+    add_index "tie_activities", "tie_id"
+    add_index "tie_activities", "activity_id"
+
     create_table "ties", :force => true do |t|
       t.integer  "sender_id"
       t.integer  "receiver_id"
@@ -198,7 +208,6 @@ class CreateSocialStream < ActiveRecord::Migration
     # add_index :users, :unlock_token,       :unique => true
 
     add_foreign_key "activities", "activity_verbs", :name => "index_activities_on_activity_verb_id"
-    add_foreign_key "activities", "ties", :name => "index_activities_on_tie_id"
 
     add_foreign_key "activity_object_activities", "activities", :name => "index_activity_object_activities_on_activity_id"
     add_foreign_key "activity_object_activities", "activity_objects", :name => "activity_object_activities_on_activity_object_id"
@@ -219,6 +228,9 @@ class CreateSocialStream < ActiveRecord::Migration
     add_foreign_key "tags_activity_objects", "activity_objects", :name => "tags_activity_objects_on_activity_object_id"
     add_foreign_key "tags_activity_objects", "tags", :name => "tags_activity_objects_on_tag_id"
 
+    add_foreign_key "tie_activities", "ties",       :name => "tie_activities_on_tie_id"
+    add_foreign_key "tie_activities", "activities", :name => "tie_activities_on_activity_id"
+
     add_foreign_key "ties", "actors", :name => "ties_on_receiver_id", :column => "receiver_id"
     add_foreign_key "ties", "actors", :name => "ties_on_relation_id", :column => "sender_id"
     add_foreign_key "ties", "relations", :name => "ties_on_sender_id"
@@ -227,13 +239,43 @@ class CreateSocialStream < ActiveRecord::Migration
   end
 
   def self.down
+    remove_foreign_key "activities", :name => "index_activities_on_activity_verb_id"
+
+    remove_foreign_key "activity_object_activities", :name => "index_activity_object_activities_on_activity_id"
+    remove_foreign_key "activity_object_activities", :name => "activity_object_activities_on_activity_object_id"
+
+    remove_foreign_key "actors", :name => "actors_on_activity_object_id"
+
+    remove_foreign_key "comments", :name => "comments_on_activity_object_id"
+
+    remove_foreign_key "groups", :name => "groups_on_actor_id"
+
+    remove_foreign_key "posts", :name => "posts_on_activity_object_id"
+
+    remove_foreign_key "profiles", :name => "profiles_on_user_id"
+
+    remove_foreign_key "relation_permissions", :name => "relation_permissions_on_relation_id"
+    remove_foreign_key "relation_permissions", :name => "relation_permissions_on_permission_id"
+
+    remove_foreign_key "tags_activity_objects", :name => "tags_activity_objects_on_activity_object_id"
+    remove_foreign_key "tags_activity_objects", :name => "tags_activity_objects_on_tag_id"
+
+    remove_foreign_key "tie_activities", :name => "tie_activities_on_tie_id"
+    remove_foreign_key "tie_activities", :name => "tie_activities_on_activity_id"
+
+    remove_foreign_key "ties", :name => "ties_on_receiver_id", :column => "receiver_id"
+    remove_foreign_key "ties", :name => "ties_on_relation_id", :column => "sender_id"
+    remove_foreign_key "ties", :name => "ties_on_sender_id"
+
+    remove_foreign_key "users", :name => "users_on_actor_id"
+
     drop_table :activities
     drop_table :activity_object_activities
     drop_table :activity_objects
     drop_table :activity_verbs
     drop_table :actors
     drop_table :comments
-    drop_table :group
+    drop_table :groups
     drop_table :permissions
     drop_table :posts
     drop_table :private_messages