social_stream 0.23.4 → 0.24.0

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

@@ -38,9 +38,7 @@ module SocialStream
 
       # Build the post activity when this object is not saved
       def build_post_activity
-        Activity.new :author       => author,
-                     :user_author  => user_author,
-                     :owner        => owner,
+        Activity.new :channel      => channel!,
                      :relation_ids => Array(_relation_ids)
       end
 

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

@@ -1,21 +1,12 @@
 module SocialStream #:nodoc:
   module Models
     # Common methods for models that have a {SocialStream::Models::Supertype}
+    #
+    # Examples of subtypes are {User} and {Group}, which have {Actor} as supertype,
+    # or {Post} and {Comment}, which have {ActivityObject} as supertype
+    #
+    # Methods are documented taking User as example of {SocialStream::Models::Subtype}
     module Subtype
-      # Add the class method {#subtype_of} to ActiveRecord::Base
-      module ActiveRecord
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-          # This class is a subtype. Its supertype class is name
-          def subtype_of name, options = {}
-            @supertype_name = name
-            @supertype_options = options
-            include SocialStream::Models::Subtype
-          end
-        end
-      end
-
       extend ActiveSupport::Concern
 
       included do
@@ -23,29 +14,30 @@ module SocialStream #:nodoc:
           attr_reader :supertype_name, :supertype_options
         end
 
-        belongs_to supertype_name, {
-                    :validate  => true,
-                    :autosave  => true,
-                    :dependent => :destroy
-                  }.merge(supertype_options[:belongs] || {})
+        belongs_to supertype_name, {                          # belongs_to :actor, {
+                    :validate  => true,                       #   :validate => true
+                    :autosave  => true,                       #   :autosave => true
+                    :dependent => :destroy                    #   :dependent => :destroy
+                  }.merge(supertype_options[:belongs] || {})  #   }.merge(supertype_options[:belongs] || {})
 
         class_eval <<-EOS
-          def #{ supertype_name }!                                      # def actor!
-            #{ supertype_name } ||                                      #   actor ||
+          def #{ supertype_name }!                                              # def actor!
+            #{ supertype_name } ||                                              #   actor ||
               # FIXME: ruby1.9 remove .inspect
               build_#{ supertype_name }(#{ supertype_options[:build].inspect }) #     build_actor(:subject_type => "User")
-          end                                                           # end
+          end                                                                   # end
 
         EOS
 
-        alias_method :supertype!, "#{ supertype_name }!"
+        alias_method :supertype!, "#{ supertype_name }!" # alias_method :supertype!, :actor!
 
-        before_validation :supertype!
+        # Load the supertype to ensure it is saved along with this instance
+        before_validation :supertype! # before_validation :actor!
       end
 
       module ClassMethods
         def supertype_foreign_key
-          "#{ supertype_name }_id"
+          "#{ supertype_name }_id" # "actor_id"
         end 
       end
 
@@ -77,6 +69,20 @@ module SocialStream #:nodoc:
 
         ! exceptions.include?(method)
       end
+
+      # Add the class method {#subtype_of} to ActiveRecord::Base
+      module ActiveRecord
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          # This class is a subtype. Its supertype class is name
+          def subtype_of name, options = {}
+            @supertype_name = name
+            @supertype_options = options
+            include SocialStream::Models::Subtype
+          end
+        end
+      end
     end
   end
 end

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

@@ -2,36 +2,58 @@ module SocialStream #:nodoc:
   module Models
     # Common methods for models having many {SocialStream::Models::Subtype subtypes}.
     # Currently, there are two {SocialStream::Models::Supertype supertypes}:
-    # * {Actor}: participates in the social network and has {Tie Ties} with other actors. Its subtypes are {SocialStream::Models::Subject subjects}, such as {User} or {Group}
-    # * {ActivityObject}: created and managed by {Actor Actors} in {Activity Activities}. Its subtypes are {SocialStream::Models::Object objects}, like {Post} or {Comment}
+    # * {Actor}: participates in the social network and has {Tie Ties} with other actors.
+    #   Its subtypes are {SocialStream::Models::Subject subjects}, such as {User} or {Group}
+    # * {ActivityObject}: created and managed by {Actor Actors} in {Activity Activities}.
+    #   Its subtypes are {SocialStream::Models::Object objects}, like {Post} or {Comment}
+    #
+    # Methods are documented for the case of {Actor} supertype
     module Supertype
-      # Include the class method {#supertype_of} to ActiveRecord::Base
-      module ActiveRecord
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-          # This class is a supertype. Subtype classes are known as name
-          def supertype_of name
-            @subtypes_name = name
-            include SocialStream::Models::Supertype
-          end
-        end
-      end
       extend ActiveSupport::Concern
 
       included do
-        subtypes.each do |s|
-          has_one s, :dependent => :destroy
-        end
+        subtypes.each do |s|                # [ :user, :group ].each do |s|
+          has_one s, :dependent => :destroy #   has_one s, :dependent => :destroy
+        end                                 # end
       end
 
       module ClassMethods
-        def subtypes_name
+        def subtypes_name # :subject
           @subtypes_name
         end
 
         def subtypes
-          SocialStream.__send__ subtypes_name.to_s.tableize # SocialStream.subjects # in Actor
+          SocialStream.__send__ subtypes_name.to_s.tableize # SocialStream.subjects # => [:user, :group ]
+        end
+
+        # Get the supertype id from an object, if possible
+        def normalize_id(a)
+          case a
+          when Integer
+            a
+          when Array
+            a.map{ |e| normalize_id(e) }
+          else
+            normalize(a).id
+          end
+        end
+
+        # Get supertype from object, if possible
+        def normalize(a)
+          case a
+          when self
+            a
+          when Integer
+            find a
+          when Array
+            a.map{ |e| normalize(e) }
+          else
+            begin
+              a.supertype!
+            rescue
+              raise "Unable to normalize #{ self } #{ a.inspect }"
+            end
+          end
         end
       end 
 
@@ -41,6 +63,19 @@ module SocialStream #:nodoc:
           __send__ object_class.constantize.base_class.to_s.underscore  #   __send__ "document"
                      end                                                # end
       end
+
+      # Include the class method {#supertype_of} to ActiveRecord::Base
+      module ActiveRecord
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          # This class is a supertype. Subtype classes are known as name
+          def supertype_of name
+            @subtypes_name = name
+            include SocialStream::Models::Supertype
+          end
+        end
+      end
     end
   end
 end

data/base/lib/social_stream/views/toolbar/base.rb

@@ -0,0 +1,143 @@
+module SocialStream
+  module Views
+    module Toolbar
+      module Base
+        def toolbar_items type, options = {}
+          SocialStream::Views::List.new.tap do |items|
+            case type
+            when :home, :messages
+              items << {
+                :key => :subject,
+                :html => render(:partial => 'toolbar/subject')
+              }
+
+              items << {
+                :key => :menu,
+                :html => toolbar_menu(type, options)
+              }
+            when :profile
+              subject = options[:subject]
+              raise "Need a subject options for profile toolbar" if subject.blank?
+
+              items << {
+                :key => :logo,
+                :html => render(:partial => 'toolbar/logo', :locals => { :subject => subject })
+              }
+
+              items << {
+                :key => :menu,
+                :html => toolbar_menu(type, options)
+              }
+            end
+          end
+        end
+
+        def toolbar_menu_items type, options = {}
+          SocialStream::Views::List.new.tap do |items|
+            case type
+            when :home
+              #Contacts
+              items << {
+                :key => :contacts,
+                :html => link_to(image_tag("btn/btn_friend.png")+t('contact.other'), "#", :id => 'toolbar_menu-contacts'),
+                :items => [
+                  {
+                    :key => :current,
+                    :html => link_to(image_tag("btn/btn_friend.png")+t('contact.current'), contacts_path)
+                  },
+                  {
+                    :key => :contacts_graph,
+                    :html => link_to(image_tag("btn/btn_friend.png")+t('contact.graph.one'), ties_path)
+                  },
+                  {
+                    :key => :pending,
+                    :html => link_to(image_tag("btn/btn_friend.png")+t('contact.pending.other'), pending_contacts_path)
+                  },
+                  {
+                    :key => :invitations,
+                    :html => link_to(image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), new_invitation_path)
+                  }
+                ]
+              }
+
+              # Groups
+              items << {
+                :key  => :groups,
+                :html => link_to(image_tag("btn/btn_group.png") + t('group.other'), '#', :id => "toolbar_menu-groups"),
+                :items => [
+                  {
+                  :key => :new_group ,
+                  :html => link_to(image_tag("btn/btn_group.png")+t('group.new.action'), new_group_path)
+                  }
+                ]
+              }
+            when :profile
+              subject = options[:subject]
+              raise "Need a subject options for profile toolbar" if subject.blank?
+
+              #Information button
+              items << {
+                :key => :subject_info,
+                :html => link_to(image_tag("btn/btn_edit.png")+t('menu.information'), [subject, :profile])
+              }
+
+              if subject != current_subject
+                #Like button
+                items << {
+                  :key => :like_button,
+                  :html => link_to(link_like_params(subject)[0],
+                                   link_like_params(subject)[1],
+                                   :id => link_like_params(subject)[2])
+                }
+
+                if user_signed_in?
+                  #Relation button
+                  items << {
+                    :key => :subject_relation,
+                    :html => link_to(image_tag("btn/btn_friend.png") + current_subject.contact_to!(subject).status,
+                                     edit_contact_path(current_subject.contact_to!(subject)))
+                  }
+
+                  #Send message button
+                  items << {
+                    :key => :send_message,
+                    :html => link_to(image_tag("btn/btn_send.png")+t('message.send'),
+                                     new_message_path(:receiver => subject.slug))
+                  }
+                end
+              end
+            when :messages
+              # Messages
+              items << {
+                :key => :message_new,
+                :html => link_to(image_tag("btn/message_new.png")+ t('message.new'),
+                                 new_message_path,
+                                 :remote=> false)
+              }
+
+              items << {
+                :key => :message_inbox,
+                :html => link_to(image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.unread_messages_count.to_s + ')',
+                                 conversations_path,
+                                 :remote=> false)
+              }
+
+              items << {
+                :key => :message_sentbox,
+                :html => link_to(image_tag("btn/message_sentbox.png")+t('message.sentbox'),
+                                 conversations_path(:box => :sentbox),
+                                 :remote=> false)
+              }
+
+              items << {
+                :key => :message_trash,
+                :html => link_to(image_tag("btn/message_trash.png")+t('message.trash'),
+                                 conversations_path(:box => :trash))
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/base/lib/tasks/db/populate.rake

@@ -266,7 +266,7 @@ namespace :db do
           if avatar.present? && File.exists?(avatar)
             Avatar.copy_to_temp_file(avatar)
             dimensions = Avatar.get_image_dimensions(avatar)
-            l = Avatar.new(:actor => i.actor,:logo => File.open(avatar), :name => File.basename(avatar), :crop_x => 0, :crop_y => 0, :crop_w => dimensions[:width], :crop_h => dimensions[:height] )
+            l = Avatar.new(:actor => i.actor, :name => File.basename(avatar), :crop_x => 0, :crop_y => 0, :crop_w => dimensions[:width], :crop_h => dimensions[:height] )
             l.active = true
             l.save!
           end

data/base/social_stream-base.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.3.0')
   # Avatar attachments
-  s.add_runtime_dependency('avatars_for_rails', '~> 0.2.2')
+  s.add_runtime_dependency('avatars_for_rails', '~> 0.2.5')
   # jQuery
   s.add_runtime_dependency('jquery-rails', '>= 1.0.9')
   # Authorization
@@ -45,8 +45,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('acts-as-taggable-on','~> 2.2.2')
   # HTML Forms
   s.add_runtime_dependency('formtastic','~> 1.2.3')
-  # Simple navigation for menu
-  s.add_runtime_dependency('simple-navigation', '~> 3.5.1')
   # Background jobs
   s.add_runtime_dependency('resque','~> 1.20.0')
   # Modernizr.js javascript library

data/base/spec/dummy/config/initializers/social_stream.rb

@@ -20,6 +20,13 @@ SocialStream.setup do |config|
   # You can write your own activity objects
   #
   # config.activity_forms = [ :post, :document, :foo, :bar ]
+
+  # Config the relation model of your network
+  #
+  # :custom - users define their own relation types, and post with privacy, like Google+
+  # :follow - user just follow other users, like Twitter
+  #
+  # config.relation_model = :custom
   
   # Quick search (header) and Extended search models and its order. Remember to create
   # the indexes with thinking-sphinx if you are using customized models.

data/base/spec/models/activity_action_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe ActivityAction do
+  context "a following contact" do
+    before do
+      @tie = Factory(:friend)
+    end
+
+    it "should create follow action" do
+      action = @tie.sender.action_to(@tie.receiver)
+
+      action.should be_present
+      action.should be_follow
+    end
+
+    it "should remove follow action" do
+      action = @tie.sender.action_to(@tie.receiver)
+
+      action.should be_present
+
+      @tie.destroy
+
+      action.reload.should_not be_follow
+    end
+  end
+end

data/base/spec/models/tie_spec.rb

@@ -13,8 +13,8 @@ describe Tie do
                           merge(Permission.follow).
                           first
 
-      Tie.create :contact_id => sender.contact_to!(receiver).id,
-                 :relation_id => follower_relation.id
+      Tie.create! :contact_id => sender.contact_to!(receiver).id,
+                  :relation_id => follower_relation.id
 
       receiver.reload.follower_count.should eq(count + 1)
     end

data/documents/app/views/common_documents/_headers.html.erb

@@ -15,7 +15,7 @@
   ) %>
 <%end%>
 
-<% toolbar :profile => profile_subject %>
+<% toolbar :profile, :subject => profile_subject %>
 <br class="clearfloat" />
 <div class="space_center"></div>
 <div id="repository_filter">

data/documents/lib/social_stream-documents.rb

@@ -1,8 +1,10 @@
 require 'social_stream/documents/dependencies'
 
 module SocialStream
-  module ToolbarConfig
-    autoload :Documents, 'social_stream/toolbar_config/documents'
+  module Views
+    module Toolbar
+      autoload :Documents, 'social_stream/views/toolbar/documents'
+    end
   end
 
   module Documents