social_stream 0.15.4 → 0.15.5

data/base/app/models/actor.rb

@@ -1,14 +1,18 @@
-# An {Actor} is a social entity. This includes individuals, but also groups, departments,
+# An {Actor} represents a social entity. This includes individuals, but also groups, departments,
 # organizations even nations or states.
 #
-# Actors are the nodes of a social network. Two actors are linked by a {Tie}. The
-# type of a {tie} is a {Relation}. Each actor can define and customize their relations.
+# Actors are the nodes of a social network. Two actors are linked by {Tie Ties}. The
+# type of a {Tie} is a {Relation}. Each actor can define and customize their relations own
+# {Relation Relations}.
+#
+# Every {Actor} has an Avatar, a {Profile} with personal o group information, contact data, etc.
 #
 # = Actor subtypes
 # An actor subtype is called a {SocialStream::Models::Subject Subject}.
-# {SocialStream} provides 2 actor subtypes, {User} and {Group}, but the
+# {SocialStream} provides two actor subtypes, {User} and {Group}, but the
 # application developer can define as many actor subtypes as required.
-# Actors subtypes are added to +config/initializers/social_stream.rb+
+# Actor subtypes are added to +config/initializers/social_stream.rb+
+#
 #
 class Actor < ActiveRecord::Base
   @subtypes_name = :subject

data/base/app/models/contact.rb

@@ -1,8 +1,15 @@
-# The link between two {Actor actors}
+# A {Contact} is an ordered pair of {Actor Actors},
+# and therefore two {SocialStream::Models::Subject Subjects}.
 #
-# Each {Contact} has many {Tie ties}, which determine the kind of the link through {Relation relations}
+# {Contact Contacts} are created at convenience (in the case of {Actor#suggestions suggestions},
+# for instance), and they do not mean that there is a real link between those two
+# {SocialStream::Models::Subject Subjects}. Link existance is stored as {Tie Ties}.
 #
 # = {Contact Contacts} and {Activity activities}
+#
+# WARNING: This will be change soon to direct references to author, owner and user_author,
+# in the same way as {ActivityObject}
+#
 # Each {Activity} is attached to a {Contact}. When _Alice_ post in _Bob_'s wall,
 # the {Activity} is attached to the {Contact} from _Alice_ to _Bob_
 #

data/base/app/models/relation.rb

@@ -1,26 +1,43 @@
-# A relation defines a type of {Tie tie}. Relations are affective (friendship, liking, 
-# respect), formal or biological (authority, kinship), transfer of material 
-# resources (transactions, lending and borrowing), messages or conversations, 
-# physical connection and affiliation to same organizations.
+# A relation defines a type of {Tie} between two {Actor Actors}. From social literature, 
+# {Relation Relations} can be affective (friendship, liking, respect), formal or biological
+# (authority, kinship), transfer of material resources (transactions, lending and borrowing),
+# messages or conversations, physical connection and affiliation to same organizations.
 #
-# = Strength hierarchies
+# = Relation types defined in {SocialStream Social Stream}
 #
-# Relations are arranged in strength hierarchies, denoting that some ties between
-# two actors are stronger than others. For example, a "friend" relation is stronger than 
-# an "acquaintance" relation.
+# All the above cases could be supported in {SocialStream Social Stream}.
+# Nevertheless, the following {Relation Relations} are defined. All of them inherit from the
+# {Relation} class:
 #
-# When a strong tie is established, ties with weaker relations are establised as well
+# {Relation::Custom}:: user-defined {Relation}. Every {SocialStream::Models::Subject Subject}
+#                      is able to define their own {Relation::Custom Custom relation},
+#                      giving them a custom name 
+#                      (for instance: friend, colleague, partner, buddy) and {Permission Permissions}.
+# {Relation::Public}:: default {Relation} for ocassional {Tie Ties}.
+# {Relation::Reject}:: the {SocialStream::Models::Subject Subject} does not want to add the other
+#                      as a contact. A new {Tie} is created using this {Relation}
+#
+# You can define new {Relation Relations} in your application. Just create a new class and
+# inherit from {Relation}. This class already supports
+# {http://api.rubyonrails.org/classes/ActiveRecord/Base.html#label-Single+table+inheritance Single Table Inheritance (STI)}.
+#
+# = Relations and link building
+#
+# When a {SocialStream::Models::Subject Subject} creates a new link to other
+# {SocialStream::Models::Subject Subject}, she must specify one or serveral {Relation Relations}
+# for that link. (friend, colleague, {Relation::Public} or {Relation::Reject}.
+# A new {Tie} will be created for each {Relation}
 #
 # = Permissions
 #
-# {SocialStream::Models::Subject Subjects} assign {Permission permissions} to relations.
+# {SocialStream::Models::Subject Subjects} assign {Permission permissions} to {Relation Relations}.
 # This way, when establishing {Tie ties}, they are granting permissions to their contacts.
 #
 # See the documentation of {Permission} for more details on permission definition.
 #
-# = {Activity Activities} and {Relation relations}
+# = {Activity Activities} and {Relation Relations}
+#
 # Each {Activity} can be attached to one or more {Relation relations}.
-# The {Relation} sets up the mode in which the {Activity} is shared.
 # It sets the {Audience} that has access to it, and the {Permission Permissions} that rule that access.
 #
 class Relation < ActiveRecord::Base

data/base/app/models/tie.rb

@@ -1,25 +1,17 @@
-# A {Tie} is a link between two {Actor Actors} ({Contact}) with a {Relation}.
-#
-# The first {Actor} is the sender of the {Tie}. The second {Actor}
-# is the receiver of the {Tie}.
-#
-# = Tie strengh
-#
-# Because each {Tie} belongs to a {Relation} and {Relation Relations} have strength
-# hierarchies, {Tie Ties} also have them. A {Tie} is stronger than other if its
-# {Relation} is stronger than the other's. For example, if _Alice_ has a _friend_ {Tie}
-# with _Bob_, and an _acquaintance_ {Tie} with _Charlie_, given that _friend_ {Relation}
-# is stronger than _acquaintance_, the {Tie} with _Bob_ is stronger than the {Tie} with
-# _Charlie_.
+# A {Tie} is a link between two {Actor Actors},
+# and therefore, two {SocialStream::Models::Subject Subjects}.
 #
+# It is made up with a {Contact} and a {Relation}. The {Contact} defines the sender
+# or {Actor} that declares the link, and the receiver or {Actor} that is pointed by
+# the declaration. The {Relation} defines the type of link (friend, colleague,
+# {Relation::Reject}, etc)
+
 # = Authorization
 # When an {Actor} establishes a {Tie} with other, she is granting a set of
 # {Permission Permissions} to them (posting to her wall, reading her posts, etc..)
 # The set of {Permission Permissions} granted are associated with the {Relation} of
 # the {Tie}.
 #
-# Usually, stronger ties (and relations) have more permissions than weaker ones.
-#
 # = Scopes
 # There are several scopes defined:
 #
@@ -28,6 +20,7 @@
 # sent_or_received_by(actor):: the union of the former
 # related_by(relation):: ties with this relation. Accepts relation, relation_name,
 #                        integer, array
+#
 class Tie < ActiveRecord::Base
 
   belongs_to :contact, :counter_cache => true

data/base/app/views/groups/_new.html.erb

@@ -9,6 +9,14 @@
 		newel: false,
 		height: 6
   });
+  $("#group_actor_tag_list").fcbkcomplete({
+		json_url: "<%= tags_path(:format => :json) %>",
+		cache: false,
+		filter_case: true,
+		filter_hide: true,
+		newel: false,
+		height: 6
+  });
 <% end %>
 
 <%= location(
@@ -52,6 +60,16 @@
 				<%= f.select :_participants, [], :class => "form_tag" %>
 			</div>
 		</div>
+		<div class="form_row">
+			<div class="form_label" id="form_tags">
+				<%= f.label t('group.tags')%>
+			</div>
+			<div class="form_field">
+				<%= f.fields_for :actor do |actor_form| %>
+					<%= actor_form.select :tag_list, [], :class => "form_tag" %>
+				<%end%>
+			</div>
+		</div>
 		<div class="form_row form_label">
 			<%= f.label :description %>
 		</div>

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

@@ -6,6 +6,7 @@
     <title><%= yield(:title).empty? ? t('site.name') : yield(:title)%></title>
     <meta name="keywords" content="<%= t('profile.tags.default') %><%= yield(:keywords) %>" >
     <meta name="description" content= "<%= yield(:description).empty? ? t('frontpage.main_title') : yield(:description) %>" >
+    <meta name="generator" content="SocialStream" />
 
     <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "application" %>

data/base/app/views/profiles/edit.html.erb

@@ -166,6 +166,16 @@ end %>
         <%= f.text_field :address, :class => "form_tag" %>
       </div>
     </div>
+    <%= f.fields_for :actor do |actor_form| %>
+    <div class="form_row">
+      <div class="form_label">
+        <%= actor_form.label t('profile.email')%>
+      </div>
+      <div class="form_field">
+        <%= actor_form.text_field :email, :class => "email form_tag" %>
+      </div>
+    </div>
+    <%end%>
     <div class="form_row">
       <div class="form_label">
         <%= f.label t('profile.website')%>

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.10.7".freeze
+    VERSION = "0.10.8".freeze
   end
 end

data/base/lib/social_stream/models/subject.rb

@@ -2,15 +2,11 @@ require 'active_support/concern'
 
 module SocialStream
   module Models
-    # {Subject Subjects} are subtypes of {Actor}. {SocialStream} provides two
+    # {Subject Subjects} are subtypes of {Actor Actors}. {SocialStream Social Stream} provides two
     # {Subject Subjects}, {User} and {Group}
     #
-    # Each {Subject} is defined in +config/initializers/social_stream.rb+
-    #
-    # This module provides additional features for models that are subjects,
-    # extending them. Including the module in each {Subject} model is not required!
-    # After declared in +config/initializers/social_stream.rb+, {SocialStream} is
-    # responsible for adding subject features to each model.
+    # Each {Subject} must defined in +config/initializers/social_stream.rb+ in order to be
+    # included in the application.
     #
     # = Scopes
     # There are several scopes available for subjects 

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.15.4".freeze
+  VERSION = "0.15.5".freeze
 end

data/linkser/app/assets/stylesheets/linkser.css.scss

@@ -15,6 +15,14 @@
   margin: auto;
   margin-top: 50px;
 }
+#link_preview img.link_error{
+  margin: auto;
+  margin-top: 40px;
+}
+#link_preview div.link_error{
+  margin: auto;
+  margin-top: 5px;
+}
 .link {
   position: relative;
   padding: 10px;

data/linkser/app/controllers/linkser_controller.rb

@@ -2,14 +2,19 @@ class LinkserController < ApplicationController
   def index
     if params[:url].present?
       url = params[:url]
-      o = Linkser.parse url, {:max_images => 1}
-      if o.is_a? Linkser::Objects::HTML
-        link = Link.new
-        link.fill o
-        render :partial => "links/link_preview", :locals => {:link => link}
-        return
+      begin
+        o = Linkser.parse url, {:max_images => 1}
+        if o.is_a? Linkser::Objects::HTML
+          link = Link.new
+          link.fill o
+          render :partial => "links/link_preview", :locals => {:link => link}
+          return
+        end
+      rescue
+        render :partial => "links/error", :locals => {:message => I18n.t("link.errors.loading") + " " + url.to_s}     
+        return   
       end
     end    
-        render :text => I18n.t("link.errors.only_web")
+    render :partial => "links/error", :locals => {:message => I18n.t("link.errors.only_webs")}
   end
 end

data/linkser/app/models/link.rb

@@ -32,9 +32,12 @@ class Link < ActiveRecord::Base
 
   def check_loaded
     if !self.loaded.eql? "true" and self.title.nil? and self.description.nil? and self.image.nil?
-      o = Linkser.parse self.url, {:max_images => 1}
-      if o.is_a? Linkser::Objects::HTML
-        self.fill o
+      begin
+        o = Linkser.parse self.url, {:max_images => 1}
+        if o.is_a? Linkser::Objects::HTML
+          self.fill o
+        end
+      rescue
       end
     end
   end

data/linkser/app/views/links/_error.html.erb

@@ -0,0 +1,4 @@
+<%= image_tag "btn/error.png", :class => "link_error" %>   
+<div class="link_error">
+  <%= message %>
+</div>

data/linkser/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.0.4".freeze
+    VERSION = "0.0.5".freeze
   end
 end

data/linkser/social_stream-linkser.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.10.7')
+  s.add_runtime_dependency('social_stream-base', '~> 0.10.8')
   s.add_runtime_dependency('linkser', '~> 0.0.7')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

data/presence/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+rsa_keys/*

data/presence/app/controllers/xmpp_controller.rb

@@ -1,5 +1,7 @@
 class XmppController < ApplicationController
   
+  before_filter :authorization, :only => [:setConnection, :unsetConecction, :setPresence, :unsetPresence, :resetConnection, :synchronizePresence ]
+  
   #Mapping XMPP Standar Status to Social Stream Chat Status
   STATUS = {
   '' => 'available', 
@@ -10,14 +12,12 @@ class XmppController < ApplicationController
   }
    
    
-  #API METHODS
+  ############################## 
+  ########## REST API ##########
+  ##############################
   
-  def setConnection  
-    unless authorization
-      render :text => "Authorization error"
-      return
-    end
-    
+  def setConnection
+    params = @dparams
     user = User.find_by_slug(params[:name])
     
     if user && !user.connected
@@ -28,16 +28,12 @@ class XmppController < ApplicationController
        return
     end
     
-    render :text => "Error"
+    render :text => "Ok: The user was already connected"
   end
   
   
   def unsetConecction
-    unless authorization
-      render :text => "Authorization error"
-      return
-    end
-    
+    params = @dparams
     user = User.find_by_slug(params[:name])
     
     if user && user.connected
@@ -47,16 +43,12 @@ class XmppController < ApplicationController
        return
     end
     
-    render :text => "User not connected"
+    render :text => "Ok: The user was already disconnected"
   end
   
   
-  def setPresence  
-    unless authorization
-      render :text => "Authorization error"
-      return
-    end
-    
+  def setPresence 
+    params = @dparams
     user = User.find_by_slug(params[:name])
     status = params[:status]
     
@@ -65,20 +57,16 @@ class XmppController < ApplicationController
         user.connected = true
         user.save!
       end
-      render :text => 'Status changed'
+      render :text => "Ok: Status changed"
     else
-      render :text => 'Status not changed'
+      render :text => "Ok: Status not changed"
     end
     
   end
   
   
-  def unsetPresence  
-    unless authorization
-      render :text => "Authorization error"
-      return
-    end
-    
+  def unsetPresence
+    params = @dparams
     user = User.find_by_slug(params[:name])
     
     if user && user.connected
@@ -88,44 +76,36 @@ class XmppController < ApplicationController
        return
     end
     
-    render :text => "User not connected"
+    render :text => "Ok: The user was already disconnected"
   end
   
   
   def resetConnection
-    unless authorization
-      render :text => "Authorization error"
-      return
-    end
-    
     SocialStream::Presence::XmppServerOrder::resetPresence
-    
     render :text => "Ok" 
   end
   
   
-  def synchronizePresence  
-    unless authorization
-      render :text => "Authorization error"
+  def synchronizePresence
+    params = @dparams
+    
+    #Work without encrypted params
+    if params[:name] == nil or params[:name].empty? or params[:name]==""
+      render :text => "Ok: No users received"
       return
-    end 
-     
-    #Actual connected users
-    user_slugs = params[:name]  
+    end
     
+    #Actual connected users
+    user_slugs = params[:name].split(",")
     SocialStream::Presence::XmppServerOrder::synchronizePresenceForSlugs(user_slugs)
-    
-    render :text => "ok"
-  end
- 
- 
-  def authorization
-    return params[:password] == SocialStream::Presence.xmpp_server_password
+    render :text => "Ok"
   end
   
   
-  def chatWindow
-    
+  
+  #OPEN METHODS
+  
+  def chatWindow 
     if current_user and current_user.chat_enabled and (params[:userConnected]=="true")
       render :partial => 'chat/contacts'
     elsif current_user and current_user.chat_enabled
@@ -183,7 +163,7 @@ class XmppController < ApplicationController
   private
   
   def setStatus(user,status)
-    if user and status and user.status != status and validStatus(status)  
+    if user and status and validStatus(status) and user.status != STATUS[status]
       user.status = STATUS[status]
       user.save!
       return true
@@ -195,4 +175,13 @@ class XmppController < ApplicationController
     return STATUS.keys.include?(status)
   end
   
+  
+  #Authorization to use REST API
+  def authorization
+    unless SocialStream::Presence::XmppServerOrder::authorization(params)
+      render :text => "Authorization error"
+    end
+    @dparams = SocialStream::Presence::XmppServerOrder::decryptParams(params)
+  end
+  
 end