social_stream 0.4.4 → 0.4.5

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

@@ -11,17 +11,17 @@ user:
   friend:
     name: friend
     permissions:
-      - [ follow ]                       # follow the activities of the friend
-      - [ create,  activity ]            # let the friend create activities
-      - [ read,    activity, star_ties ] # friend can read activities from the other friends
-      - [ update,  activity ]            # update her activities
-      - [ destroy, activity ]            # destroy her activities
+      - [ follow ]                            # follow the activities of the friend
+      - [ create,  activity ]                 # let the friend create activities
+      - [ read,    activity, weak_star_ties ] # friend can read activities from the other friends and below
+      - [ update,  activity ]                 # update her activities
+      - [ destroy, activity ]                 # delete her activities
     sphere: personal
   acquaintance:
     name: acquaintance
     parent: friend # friend relation is stronger than acquaintance
     permissions:
-      - [ read,    activity, star_ties ]
+      - [ read,    activity, weak_star_ties ]
     sphere: personal
 
 group:
@@ -29,15 +29,15 @@ group:
     name: member
     permissions:
       - [ represent ]                         # let the member act as the group
-      - [ create,  activity, weak_ties ]      # let them member create activities at the level of member, partner and public
-      - [ read,    activity, star_ties ]      # read activities from other members
-      - [ update,  activity, weak_star_ties ] # update and destroy activities to members,
-      - [ destroy, activity, weak_star_ties ] # acquaintance and public
+      - [ create,  activity ]                 # let them member create activities
+      - [ read,    activity, weak_star_ties ] # read activities from other members
+      - [ update,  activity ]                 # update her activities
+      - [ destroy, activity ]                 # delete her activities
       - [ read,    tie,      weak_star_ties ]
     sphere: organization
   partner:
     name: partner
     parent: member # member is stronger than partner
     permissions:
-      - [ read,    activity, star_ties ]
-    sphere: organization
+      - [ read,    activity, weak_star_ties ]
+    sphere: external_relations

data/lib/social_stream.rb

@@ -35,7 +35,8 @@ module SocialStream
     end
 
     def objects
-      @@objects | [ :actor ]
+      @@objects.push(:actor) unless @@objects.include?(:actor)
+      @@objects
     end
 
     # Load models for rewrite in application

data/lib/social_stream/ability.rb

@@ -2,6 +2,7 @@ module SocialStream
   class Ability
     include CanCan::Ability
 
+    # Create a new ability for this user, who is currently representing subject
     def initialize(subject)
 
       # Activity Objects
@@ -74,10 +75,10 @@ module SocialStream
         p.subject.represented_by?(subject)
       end
 
-      # Representation
-      can :create, Representation do |r|
-        r.subject.represented_by?(subject)
-      end
+      # Privacy
+      can [:create, :read, :update, :destroy], Sphere, :actor_id => subject.try(:actor_id)
+      can [:create, :read, :update, :destroy], Relation::Custom, :sphere => { :actor_id => subject.try(:actor_id) }
+      can :read, Permission
     end
   end
 end

data/lib/social_stream/controllers/helpers.rb

@@ -32,6 +32,7 @@ module SocialStream
         # Current subject represented by the user. Defaults to the own user
         def current_subject
           @current_subject ||=
+            current_subject_from_params  ||
             current_subject_from_session ||
               current_user
         end
@@ -43,6 +44,11 @@ module SocialStream
 
           @current_subject = instance
         end
+          
+        def current_actor
+            return current_subject.actor
+        end
+          
 
         # Override Cancan#current_ability method to use {#current_subject}
         def current_ability
@@ -52,6 +58,19 @@ module SocialStream
 
         private
 
+        # Get represented subject from params[:s]
+        def current_subject_from_params
+          return unless params[:s].present?
+
+          subject = Actor.find_by_slug!(params[:s]).subject
+
+          unless subject.represented_by?(current_user)
+            raise CanCan::AccessDenied.new("Not authorized!", :represent, subject.name)
+          end
+
+          self.current_subject = subject
+        end
+
         # Get represented subject from session
         def current_subject_from_session
           return unless session[:subject_type].present? && session[:subject_id].present?

data/lib/social_stream/models/object.rb

@@ -13,7 +13,9 @@ module SocialStream
         belongs_to :activity_object, :dependent => :destroy, :autosave => true
         has_many   :activity_object_activities, :through => :activity_object
 
-        delegate :post_activity, :to => :activity_object
+        delegate :post_activity,
+                 :like_count,
+                 :to => :activity_object
 
         alias_method_chain :create_activity_object, :type
         before_create :create_activity_object

data/lib/social_stream/models/subject.rb

@@ -18,7 +18,8 @@ module SocialStream
     # alphabetic:: sort subjects by name
     # search:: simple search by name
     # distinct_initials:: get only the first letter of the name
-    # popular:: sort by most incoming {Tie ties}
+    # followed:: sort by most following incoming {Tie ties}
+    # liked:: sort by most likes
     #
     module Subject
       extend ActiveSupport::Concern
@@ -52,12 +53,24 @@ module SocialStream
 
         scope :distinct_initials, joins(:actor).merge(Actor.distinct_initials)
 
-        scope :popular, lambda { 
-          joins(:actor => :received_ties).
-            select("DISTINCT #{ table_name }.*, COUNT(#{ table_name}.id) AS popularity").
-            group("#{ table_name }.id").
-            order("popularity DESC")
+        scope :followed, lambda { 
+          joins(:actor).
+            order("actors.follower_count DESC")
         }
+
+        scope :liked, lambda { 
+          joins(:actor => :activity_object).
+            order('activity_objects.like_count DESC')
+        }
+
+        scope :most, lambda { |m|
+          types = %w( followed liked )
+
+          if types.include?(m)
+            __send__ m
+          end
+        }
+
       end
       
       module InstanceMethods

data/lib/social_stream/rails.rb

@@ -19,6 +19,7 @@ require 'has_scope'
 # Logo attachments
 require 'paperclip'
 require 'paperclip/social_stream'
+require 'avatars_for_rails'
 # Pagination
 require 'will_paginate'
 # Oauth
@@ -27,6 +28,10 @@ require 'omniauth/oauth'
 require 'rails_css_themes'
 #Tags
 require 'acts-as-taggable-on'
+#Files
+#require 'social_stream-files'
+# HTML forms
+require 'formtastic'
 
 module SocialStream
   class Engine < ::Rails::Engine #:nodoc:
@@ -42,8 +47,12 @@ module SocialStream
       # https://rails.lighthouseapp.com/projects/8994/tickets/1905-apphelpers-within-plugin-not-being-mixed-in
       ApplicationController.helper ActivitiesHelper
       ApplicationController.helper SubjectsHelper
-      ApplicationController.helper TiesHelper
       ApplicationController.helper LocationHelper
+      ApplicationController.helper ToolbarHelper
+      ApplicationController.helper ProfilesHelper
+      ApplicationController.helper PermissionsHelper
+      ApplicationController.helper NotificationsHelper
+      ApplicationController.helper ContactsHelper
       
       ActsAsTaggableOn::TagsHelper
     end
@@ -63,5 +72,18 @@ module SocialStream
         include SocialStream::Controllers::Helpers
       end
     end
+
+    initializer "social_stream.avatars_for_rails" do
+      AvatarsForRails.setup do |config|
+        config.avatarable_model = :actor
+        config.current_avatarable_object = :current_actor
+        config.avatarable_filters = [:authenticate_user!]
+        config.avatarable_styles = { :representation => "20x20>",
+                                     :contact        => "30x30>",
+                                     :actor          => '35x35>',
+                                     :profile        => '94x94'}
+      end
+    end
+
   end
 end

data/lib/social_stream/test_helpers/controllers.rb

@@ -44,7 +44,7 @@ module SocialStream
           resource = assigns(model_sym)
 
           model_count.should eq(count + 1)
-          assert resource.valid?
+          resource.should be_valid
           response.should redirect_to(resource)
         end
       end

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.4.4".freeze
+  VERSION = "0.4.5".freeze
 end

data/lib/tasks/db/populate.rake

@@ -12,18 +12,15 @@ namespace :db do
       
       LOGOS_PATH = File.join(Rails.root, 'lib', 'logos')
       
+      Mailboxer.setup do |config|
+        config.uses_emails = false
+      end
+      
       def set_logos(klass)
         klass.all.each do |i|
           logo = Dir[File.join(LOGOS_PATH, klass.to_s.tableize, "#{ i.id }.*")].first
           avatar = Dir[File.join(LOGOS_PATH, klass.to_s.tableize, "#{ i.id }.*")].first
-=begin          
-          if logo.present? && File.exists?(logo)
-            Logo.copy_to_temp_file(logo)
-            dimensions = Logo.get_image_dimensions(logo)
-            l = Logo.new(:actor => i.actor,:logo => File.open(logo), :name => File.basename(logo), :crop_x => 0, :crop_y => 0, :crop_w => dimensions[:width], :crop_h => dimensions[:height] )
-            l.save(false)
-          end
-=end          
+        
           if avatar.present? && File.exists?(avatar)
             Avatar.copy_to_temp_file(avatar)
             dimensions = Avatar.get_image_dimensions(avatar)
@@ -100,7 +97,7 @@ namespace :db do
       # = Ties
       available_actors.each do |a|
         actors = available_actors.dup - Array(a)
-        relations = a.relations
+        relations = a.relation_customs
         
         Forgery::Basic.number(:at_most => actors.size).times do
           actor = actors.delete_at((rand * actors.size).to_i)

data/social_stream.gemspec

@@ -19,11 +19,12 @@ Gem::Specification.new do |s|
   # Authentication
   s.add_runtime_dependency('devise', '~> 1.2.rc')
   # CRUD controllers
-  s.add_runtime_dependency('inherited_resources', '~> 1.1.2')
+  s.add_runtime_dependency('inherited_resources', '~> 1.2.2')
   # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.2.0')
   # Avatar attachments
   s.add_runtime_dependency('paperclip', '~> 2.3.4')
+  s.add_runtime_dependency('avatars_for_rails', '~> 0.0.9')
   # jQuery
   s.add_runtime_dependency('jquery-rails', '~> 0.2.5')
   # Authorization
@@ -31,18 +32,20 @@ Gem::Specification.new do |s|
   # Pagination
   s.add_runtime_dependency('will_paginate', '~> 3.0.pre2')
   # OAuth client
-  s.add_runtime_dependency('omniauth','~> 0.2.0.beta5')	
+  s.add_runtime_dependency('omniauth','~> 0.2.5')	
   # OAuth provider
   s.add_runtime_dependency('oauth-plugin','~> 0.4.0.pre1')	
   # Theme support
   s.add_runtime_dependency('rails_css_themes','~> 1.0.0')	
   # Messages
-  s.add_runtime_dependency('mailboxer','~> 0.0.16')
+  s.add_runtime_dependency('mailboxer','~> 0.1.4')
   # Avatar manipulation
   s.add_runtime_dependency('rmagick','~> 2.13.1')
   # Tagging
   s.add_runtime_dependency('acts-as-taggable-on','~> 2.0.6')
-
+  # HTML Forms
+  s.add_runtime_dependency('formtastic','~> 1.2.3')
+ 
   # Development Gem dependencies
   s.add_development_dependency('rails', '~> 3.0.7')
   # Integration testing

data/spec/controllers/comments_controller_spec.rb

@@ -13,7 +13,7 @@ describe CommentsController do
 
     describe "comment from user" do
       before do
-        model_assigned_to @user.sent_ties.received_by(@user).related_by(@user.relations.sort.first).first
+        model_assigned_to @user.sent_ties.received_by(@user).related_by(@user.relation_customs.sort.first).first
       end
 
       it_should_behave_like "Allow Creating"

data/spec/controllers/contacts_controller_spec.rb

@@ -15,4 +15,27 @@ describe ContactsController do
     end
   end
 
+  describe "when authenticated" do
+    before do
+      @user = Factory(:user)
+
+      sign_in @user
+    end
+
+    it "should render edit" do
+      get :edit, :id => Factory(:user).actor_id
+
+      assert_response :success
+    end
+
+    it "should render update" do
+      contact = Factory(:user)
+
+      put :update, :id => contact.actor_id,
+                   :contact => { "relation_ids" => [ "gotcha", @user.relations.first.id ] }
+
+      response.should redirect_to(contact)
+      @user.sent_ties.received_by(contact).first.relation.should == @user.relations.first
+    end
+  end
 end

data/spec/controllers/groups_controller_spec.rb

@@ -81,9 +81,20 @@ describe GroupsController do
     context "a new own group" do
       before do
         model_attributes[:_founder] = @user.slug
+        model_attributes[:_participants] = [Factory(:user).slug]
       end
 
-      it_should_behave_like "Allow Creating"
+      it "should allow creating" do
+        count = Group.count
+        post :create, attributes
+
+        group = assigns(:group)
+
+        Group.count.should eq(count + 1)
+        group.should be_valid
+        assigns(:current_subject).should eq(group)
+        response.should redirect_to(:home)
+      end
     end
 
     context "a new fake group" do

data/spec/controllers/permissions_controller_spec.rb

@@ -0,0 +1,48 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe PermissionsController do
+  include SocialStream::TestHelpers::Controllers
+
+  render_views
+
+  describe "when authenticated" do
+    before do
+      @user = Factory(:user)
+
+      sign_in @user
+    end
+
+    context "with an existing relation" do
+      before do
+        @sphere = Factory(:sphere, :actor_id => @user.actor_id)
+        @relation = Factory(:relation_custom, :sphere_id => @sphere.id)
+      end
+
+      it "should render index" do
+        get :index, :relation_id => @relation.id, :format => "js"
+
+        response.should be_success
+      end
+    end
+
+    context "a external relation" do
+      before do
+        @relation = Factory(:relation_custom)
+      end
+
+      it "should not render index" do
+        pending
+
+        begin
+          get :index, :relation_id => @relation.id, :format => "js"
+
+          assert false
+        rescue CanCan::AccessDenied
+          assigns(:permissions).should be_nil
+        end
+      end
+    end
+  end
+end
+
+

data/spec/controllers/posts_controller_spec.rb

@@ -16,7 +16,7 @@ describe PostsController do
     describe "posts to user" do
       describe "with first relation" do
         before do
-          tie = @user.sent_ties.received_by(@user).related_by(@user.relations.sort.first).first
+          tie = @user.sent_ties.received_by(@user).related_by(@user.relation_customs.sort.first).first
           model_assigned_to tie
           @current_model = Factory(:post, :_activity_tie_id => tie)
         end
@@ -27,7 +27,7 @@ describe PostsController do
 
       describe "with last relation" do
         before do
-          tie = @user.sent_ties.received_by(@user).related_by(@user.relations.sort.last).first
+          tie = @user.sent_ties.received_by(@user).related_by(@user.relation_customs.sort.last).first
           model_assigned_to tie
           @current_model = Factory(:post, :_activity_tie_id => tie)
         end
@@ -92,7 +92,7 @@ describe PostsController do
 
         describe "with first relation" do
           before do
-            tie = @group.sent_ties.received_by(@group).related_by(@group.relations.sort.first).first
+            tie = @group.sent_ties.received_by(@group).related_by(@group.relation_customs.sort.first).first
             model_assigned_to tie
             @current_model = Factory(:post, :_activity_tie_id => tie)
           end
@@ -103,7 +103,7 @@ describe PostsController do
 
         describe "with last relation" do
           before do
-            tie = @group.sent_ties.received_by(@group).related_by(@group.relations.sort.last).first
+            tie = @group.sent_ties.received_by(@group).related_by(@group.relation_customs.sort.last).first
             model_assigned_to tie
             @current_model = Factory(:post, :_activity_tie_id => tie)
           end