social_stream 0.0.3 → 0.0.4

data/app/controllers/comments_controller.rb

@@ -0,0 +1,10 @@
+class CommentsController < InheritedResources::Base
+  respond_to :html, :xml, :js
+
+  def destroy
+    @post_activity = resource.post_activity
+
+    destroy!
+  end
+
+end

data/app/models/actor.rb

@@ -97,6 +97,11 @@ class Actor < ActiveRecord::Base
     candidates[rand(candidates.size)]
   end
 
+  # All the ties this actor has with subject that support activities
+  def active_ties_to(subject)
+    sent_ties.received_by(subject).active
+  end
+
   # The set of activities in the wall of this actor
   # TODO: authorization
   def wall

data/app/models/comment.rb

@@ -0,0 +1,3 @@
+class Comment < ActiveRecord::Base
+  validates_presence_of :text
+end

data/app/models/relation.rb

@@ -8,6 +8,11 @@
 # two actors are stronger than others.
 # When a strong tie is established, ties with weaker relations are establised as well
 #
+# == Reflexive relations
+# Some relations are set by default for actors with theirselves. This sets some ties
+# for posting in self wall at several visibility levels: only for friends, public and
+# so on
+#
 # == Inverse relations
 # A Relation can have its inverse. When a tie is established, an inverse tie will be
 # established if an inverse relation exists. An example is a relation of friendship,
@@ -20,6 +25,11 @@
 # sends a friendship_request to B. A is granting the friend relation with B, that is,
 # friendship_request grants friend relation.
 #
+# == Active relations
+# Those relations whose ties support activities. The default scope define active
+# relations as those that do not grant other relations, those that are not invitations
+# or requests.
+#
 class Relation < ActiveRecord::Base
   has_ancestry
 
@@ -32,7 +42,9 @@ class Relation < ActiveRecord::Base
   belongs_to :granted,
              :class_name => "Relation"
 
+  scope :reflexive, where(:reflexive => true)
   scope :request, where('relations.granted_id IS NOT NULL')
+  scope :active, where(:granted_id => nil)
 
   has_many :relation_permissions, :dependent => :destroy
   has_many :permissions, :through => :relation_permissions

data/app/models/tie.rb

@@ -64,6 +64,7 @@ class Tie < ActiveRecord::Base
   }
 
   scope :pending, includes(:relation) & Relation.request
+  scope :active, includes(:relation) & Relation.active
 
   scope :inverse, lambda { |t|
     sent_by(t.receiver).

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

@@ -1,8 +1,10 @@
 <div class="activity_options">
   <ul class="activity_options" >
     <li><div class="post_time_ago"><%= t('time.ago', :time => time_ago_in_words(activity.created_at)) %></div></li>
+    <% if activity.is_root? %>
     <li><div class="verb_comment"> · <%= link_to t('activity.to_comment'), "#", :class => "to_comment" %> </div></li>
+    <% end %>
     <li><div class="verb_like" id="like_<%= dom_id(activity) %>"> · <%= like_activity(activity)%></div></li>
-    <li><div class="verb_delete"> · <%= link_to t('activity.delete'), activity.direct_object , :confirm => t('activity.confirm_delete'), :method => :delete,  :remote => true %> </div></li>
+    <li><div class="verb_delete"> · <%= link_to t('activity.delete'), activity.direct_object , :confirm => t('confirm_delete', :scope => activity.direct_object.class.to_s.underscore), :method => :delete,  :remote => true %> </div></li>
   </ul>
 </div>

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

@@ -0,0 +1,3 @@
+<div class="activity_comments" id="comments_<%= dom_id(activity) %>">
+  <%= render activity.comments %>
+</div>

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

@@ -1,6 +1,6 @@
 <div id="activities_header" class="content_size">
   <%= form_for Post.new(:text => t('activity.input'),
-                        :_activity_tie_id => current_tie.id),
+                        :_activity_tie_id => current_user.active_ties_to(receiver).first.id),
                         :remote => true  do |f| %>
     <%= f.hidden_field :_activity_tie_id %>
     <%= f.text_field :text, :id => "input_activities", :size => 85 %>

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

@@ -18,24 +18,12 @@
     <%= render :partial => 'activities/activity_options',
                :locals => { :activity => root_activity } %>
 
-    <div class="activity_comments" id="comments_<%= dom_id(root_activity) %>">
-      <%= render root_activity.comments %>
-    </div>
+    <%= render :partial => 'activities/comments',
+               :locals => { :activity => root_activity } %>
+
+    <%= render :partial => 'comments/new',
+               :locals => { :activity => root_activity } %>
 
-    <div class="activity_new_comment">
-       <%= form_for Comment.new(:text => t('comment.input'),
-                                :_activity_tie_id => current_tie.id,
-                                :_activity_parent_id => root_activity.id),
-                    :remote => true do |f| %>
-         <%= f.hidden_field :_activity_tie_id %>
-         <%= f.hidden_field :_activity_parent_id %>
-         <%= f.text_field :text,   :class =>"input_new_comments" %>
-         <div class="activities_comment_btn">
-           <div class="activities_security"></div>
-           <%= image_submit_tag "buttons/btn_share.png" %>
-         </div>
-       <% end %>
-    </div>
   </div>			
   <div class="space_comments"></div>
   <div class="space_activities">

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

@@ -14,7 +14,7 @@
       </span>
     </div>
 
-    <%= render :partial => 'activities/subactivity_options',
+    <%= render :partial => 'activities/activity_options',
                :locals => { :activity => subactivity } %>
 
   </div>

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

@@ -0,0 +1 @@
+<%= comment.text %>

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

@@ -0,0 +1,15 @@
+<div class="activity_new_comment">
+   <%= form_for Comment.new(:text => t('comment.input'),
+                            :_activity_tie_id =>
+                              current_user.active_ties_to(activity.receiver).first.id,
+                            :_activity_parent_id => activity.id),
+                :remote => true do |f| %>
+     <%= f.hidden_field :_activity_tie_id %>
+     <%= f.hidden_field :_activity_parent_id %>
+     <%= f.text_field :text,   :class =>"input_new_comments" %>
+     <div class="activities_comment_btn">
+       <div class="activities_security"></div>
+       <%= image_submit_tag "buttons/btn_share.png" %>
+     </div>
+   <% end %>
+</div>

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

@@ -0,0 +1,4 @@
+//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/comments/destroy.js.erb

@@ -0,0 +1,2 @@
+//delete comments
+$("#<%= dom_id(@post_activity) %>").hide();

data/app/views/home/_activities.html.erb

@@ -5,11 +5,11 @@
 
 <div id="wrapper_activities">
   <div id="wrapper_activities_header">
-      <div id="activities_title" class="content_size">
-        <%= image_tag("buttons/btn_activities.png") %> <%=t('activity.other')%>
-      </div>
+    <div id="activities_title" class="content_size">
+      <%= image_tag("buttons/btn_activities.png") %> <%=t('activity.other')%>
+    </div>
 
-    <%= render :partial => 'activities/new' %>
+    <%= render :partial => 'activities/new', :locals => { :receiver => current_user } %>
   </div>
   <div id="wall">
   <% if current_user.wall.any? %>

data/config/locales/en.yml

@@ -10,11 +10,14 @@ en:
     unlike: Already I do not like    
   comment:
     input: "Write a comment..."
+    confirm_delete: "Delete comment?"
   home:
     one: "Home"
   location:
     message: "You are here > %{location}"
   message: "Message"
+  post:
+    confirm_delete: "Delete post?"
   tie:
     pending:
       other: Pending requests

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

@@ -13,5 +13,5 @@ SocialStream.setup do |config|
   # Type of activities managed by actors
   # Remember you must add an "activity_object_id" foreign key column to your migration!
   #
-  # config.activity_objects = [ :post ]
+  # config.activity_objects = [ :post, :comment ]
 end

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

@@ -48,6 +48,15 @@ class CreateSocialStream < ActiveRecord::Migration
     add_index "actors", ["email"], :name => "index_actors_on_email"
     add_index "actors", ["permalink"], :name => "index_actors_on_permalink", :unique => true
 
+    create_table "comments", :force => true do |t|
+      t.integer  "activity_object_id"
+      t.text     "text"
+      t.datetime "updated_at"
+      t.datetime "created_at"
+    end
+
+    add_index "comments", ["activity_object_id"], :name => "fk_commets_activity_object"
+
     create_table "permissions", :force => true do |t|
       t.string   "action"
       t.string   "object"
@@ -85,7 +94,7 @@ class CreateSocialStream < ActiveRecord::Migration
       t.string   "ancestry"
       t.integer  "inverse_id"
       t.integer  "granted_id"
-      t.boolean  "default", :default => false
+      t.boolean  "reflexive", :default => false
     end
 
     add_index "relations", ["ancestry"]
@@ -138,5 +147,19 @@ class CreateSocialStream < ActiveRecord::Migration
   end
 
   def self.down
+    drop_table :activities
+    drop_table :activity_object_activities
+    drop_table :activity_objects
+    drop_table :activity_verbs
+    drop_table :actors
+    drop_table :comments
+    drop_table :permissions
+    drop_table :posts
+    drop_table :_relation_permissions
+    drop_table :relations
+    drop_table :tags
+    drop_table :tags_activity_objects
+    drop_table :ties
+    drop_table :users
   end
 end

data/lib/generators/social_stream/templates/seeds.yml

@@ -2,28 +2,33 @@
 #
 # Define your relations and add SocialStream.seed! to db/seeds.rb
 #
-# Example
-# relations:
-#   user-friend:
-#     sender_type: User
-#     receiver_type: User
-#     name: friend
-#     permissions:
-#       - [ create,  resources, weak_set ]
-#       - [ read,    resources, group_set ]
-#       - [ update,  resources, weak_set ]
-#       - [ destroy, resources, weak_set ]
-#   user-fof:
-#     sender_type: User
-#     receiver_type: User
-#     name: friend_of_friend
-#     parent: user-friend
-#     permissions:
-#       - [ read, resources, group_set ]
-#   user-public:
-#     sender_type: User
-#     receiver_type: User
-#     name: public
-#     parent: user-fof
-#     permissions:
-#       - [ read, resources, group_set ]
+relations:
+  user-friend:
+    sender_type: User
+    receiver_type: User
+    name: friend
+    # Friendship is a reciprocal relation
+    inverse: user-friend
+    # It is set for users by default
+    reflexive: true
+    permissions:
+      - [ create,  resources, weak_set ]
+      - [ read,    resources, group_set ]
+      - [ update,  resources, weak_set ]
+      - [ destroy, resources, weak_set ]
+  user-public:
+    sender_type: User
+    receiver_type: User
+    name: public
+    # This relation is weaker than user-friend
+    parent: user-friend
+    # This relation is also reciprocal
+    inverse: user-public
+    permissions:
+      - [ read, resources, group_set ]
+  user-friend-request:
+    sender_type: User
+    receiver_type: User
+    name: friendship_request
+    # This relation is the request for user-friend
+    granted: user-friend

data/lib/social_stream/models/actor.rb

@@ -16,6 +16,7 @@ module SocialStream
                  :permalink, :permalink=,
                  :disabled, :disabled=,
                  :ties, :sent_ties, :received_ties,
+                 :active_ties_to,
                  :sender_subjects, :receiver_subjects, :suggestion,
                  :wall,
                  :to => :actor!
@@ -24,7 +25,7 @@ module SocialStream
         scope :with_sent_ties,     joins(:actor => :sent_ties)
         scope :with_received_ties, joins(:actor => :received_ties)
 
-        after_create :initialize_default_ties
+        after_create :initialize_reflexive_ties
       end
 
       module InstanceMethods
@@ -34,8 +35,8 @@ module SocialStream
 
         private
 
-        def initialize_default_ties
-          self.class.relations.where(:default => true).each do |r|
+        def initialize_reflexive_ties
+          self.class.relations.reflexive.each do |r|
             Tie.create! :sender => self.actor,
                         :receiver => self.actor,
                         :relation => r

data/lib/social_stream/rails/routes.rb

@@ -12,6 +12,8 @@ module ActionDispatch::Routing
       resources :activities do
         resource :like
       end
+      resources :posts
+      resources :comments
     end
   end
 end

data/lib/social_stream/seed.rb

@@ -24,7 +24,7 @@ module SocialStream
           find_or_create_by_sender_type_and_receiver_type_and_name(r['sender_type'],
                                                                    r['receiver_type'],
                                                                    r['name'])
-        relations[name].update_attribute(:default, r['default'])
+        relations[name].update_attribute(:reflexive, r['reflexive'])
 
         # FIXME: optimize
         relations[name].relation_permissions.destroy_all

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.0.3".freeze
+  VERSION = "0.0.4".freeze
 end

data/lib/social_stream.rb

@@ -16,7 +16,7 @@ module SocialStream
                        :rememberable, :trackable ]
 
   mattr_accessor :activity_objects
-  @@activity_objects = [ :post ]
+  @@activity_objects = [ :post, :comment ]
 
   class << self
     def setup

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Antonio Tapiador
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 +02:00
+date: 2010-10-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,9 +91,11 @@ files:
 - app/models/permission.rb
 - app/models/actor.rb
 - app/models/activity_object_activity.rb
+- app/models/comment.rb
 - app/models/activity.rb
 - app/models/relation.rb
 - app/models/activity_verb.rb
+- app/controllers/comments_controller.rb
 - app/controllers/ties_controller.rb
 - app/controllers/activities_controller.rb
 - app/controllers/home_controller.rb
@@ -102,13 +104,17 @@ files:
 - app/views/ties/_suggestion.html.erb
 - app/views/ties/_pending.html.erb
 - app/views/devise/registrations/new.html.erb
+- app/views/comments/_new.html.erb
+- app/views/comments/create.js.erb
+- app/views/comments/destroy.js.erb
+- app/views/comments/_comment.html.erb
 - app/views/posts/_post.html.erb
 - app/views/posts/create.js.erb
 - app/views/posts/destroy.js.erb
 - app/views/activities/_activity.html.erb
 - app/views/activities/_activity_options.html.erb
-- app/views/activities/_subactivity_options.html.erb
 - app/views/activities/_jquery.html.erb
+- app/views/activities/_comments.html.erb
 - app/views/activities/_new.html.erb
 - app/views/activities/_root_activity.html.erb
 - app/views/activities/_subactivity.html.erb

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

@@ -1,7 +0,0 @@
-<div class="activity_options">
-  <ul class="activity_options" >
-    <li><div class="post_time_ago"><%= t('time.ago', :time => time_ago_in_words(activity.created_at)) %></div></li>
-    <li><div class="verb_like" id="like_<%= dom_id(activity) %>"> · <%= like_activity(activity)%></div></li>
-    <li><div class="verb_delete"> · <%= link_to t('activity.delete'), activity.direct_object , :confirm => t('activity.confirm_delete'), :method => :delete,  :remote => true %> </div></li>
-  </ul>
-</div>