social_stream 2.0.4 → 2.1.0

data/base/lib/generators/social_stream/base/install_generator.rb

@@ -23,10 +23,6 @@ class SocialStream::Base::InstallGenerator < Rails::Generators::Base #:nodoc:
     copy_file 'initializer.rb', 'config/initializers/social_stream.rb'
   end
 
-  def create_config_relations_file
-    copy_file 'relations.yml', 'config/relations.yml'
-  end
-
   def create_config_sphinx_file
     copy_file 'sphinx.yml', 'config/sphinx.yml'
   end

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

@@ -20,6 +20,30 @@ SocialStream.setup do |config|
   #
   # config.relation_model = :custom
 
+  # Config the default relations that will be created and customized by actors
+  # config.custom_relations = {
+  #  user: {
+  #    friend: {
+  #      name: "friend",
+  #      permissions: [
+  #        [ 'follow' ],
+  #        [ 'create',  'activity' ],
+  #        [ 'read',    'activity' ]
+  #      ]
+  #    },
+  #  group: {
+  #    member: {
+  #      name: "member",
+  #      permissions: [
+  #        [ 'represent' ],
+  #        [ 'create', 'activity' ],
+  #        [ 'read',   'activity' ],
+  #        [ 'read',   'tie' ]
+  #      ]
+  #    },
+  #  'site/current' => {}
+  # }
+
   # Configure the type of actors that are suggested in the sidebar
   #
   # config.suggested_models = [ :user, :group ]

data/base/lib/social_stream/base.rb

@@ -25,6 +25,76 @@ module SocialStream
   mattr_accessor :single_relations
   @@single_relations = [ :public, :follow, :reject ]
 
+  mattr_accessor :custom_relations
+  @@custom_relations = {
+    'user' => {
+      'friend' => {
+        'name' => 'friend',
+        'permissions' => [
+          [ 'follow' ],
+          [ 'create',  'activity' ],
+          [ 'read',    'activity' ]
+        ]
+      },
+      'acquaintance' => {
+        'name' => 'acquaintance',
+        'permissions' => [
+          [ 'read', 'activity' ]
+        ]
+      },
+      'colleague' => {
+        'name' => 'colleague',
+        'permissions' => [
+          [ 'follow' ],
+          [ 'create',  'activity' ],
+          [ 'read',    'activity' ]
+        ]
+      }
+    },
+    'group' => {
+      'member' => {
+        'name' => 'member',
+        'permissions' => [
+          [ 'represent' ],
+          [ 'create', 'activity' ],
+          [ 'read',   'activity' ],
+          [ 'read',   'tie' ]
+        ]
+      },
+      'partner' => {
+        'name' => 'partner',
+        'permissions' => [
+          [ 'read', 'activity' ]
+        ]
+      }
+    },
+    'site/current' => {}
+  }
+
+  mattr_accessor :list_relations
+  @@list_relations = {
+    user: [],
+    group: []
+  }
+
+  mattr_accessor :available_permissions
+  @@available_permissions = {
+    'user' => [
+      [ "read",    "activity" ],
+      [ "create",  "activity" ],
+      [ "follow", nil ],
+      [ "represent", nil ],
+      [ "notify", nil ]
+    ],
+    'group' => [
+      [ "read",    "activity" ],
+      [ "create",  "activity" ],
+      [ "follow", nil ],
+      [ "represent", nil ],
+      [ "notify", nil ]
+    ]
+  }
+
   mattr_accessor :suggested_models
   @@suggested_models = [ :user, :group ]
 

data/base/lib/social_stream/base/ability.rb

@@ -59,6 +59,13 @@ module SocialStream
             a.audience.include?(subject.actor) 
         end
 
+        can :read, Contact
+
+        can :manage, Contact do |c|
+          c.sender == subject.actor ||
+            c.sender.allow?(subject, 'manage', 'contact')
+        end
+
         # Users
         can :read, User
 
@@ -90,7 +97,12 @@ module SocialStream
         end
 
         # Privacy
-        can [:create, :read, :update, :destroy], ::Relation::Custom, :actor_id => subject.try(:actor_id)
+        can :manage, ::Relation::Custom do |r|
+          subject.present? && (
+            r.actor_id == subject.actor_id ||
+            r.actor.allow?(subject, 'manage', 'relation/custom')
+          )
+        end
       end
     end
   end

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "2.0.4".freeze
+    VERSION = "2.1.0".freeze
   end
 end

data/base/lib/social_stream/test_helpers/controllers.rb

@@ -13,6 +13,12 @@ module SocialStream
           model_class.to_s.underscore.to_sym
       end
 
+      # :client for Site::ClientsController
+      def demodulized_model_sym
+        @demodulized_model_sym ||=
+          model_class.to_s.demodulize.underscore.to_sym
+      end
+
       # Factory.attributes_for(:post) for PostsController
       def model_attributes
         @model_attributes ||=
@@ -42,7 +48,7 @@ module SocialStream
           count = model_count
           post :create, attributes
 
-          resource = assigns(model_sym)
+          resource = assigns(demodulized_model_sym)
 
           model_count.should eq(count + 1)
           resource.should be_valid
@@ -58,7 +64,7 @@ module SocialStream
           rescue CanCan::AccessDenied
           end
 
-          resource = assigns(model_sym)
+          resource = assigns(demodulized_model_sym)
 
           model_count.should eq(count)
           resource.should be_new_record
@@ -88,7 +94,7 @@ module SocialStream
         it "should update" do
           put :update, updating_attributes
 
-          resource = assigns(model_sym)
+          resource = assigns(demodulized_model_sym)
 
           resource.should_receive(:update_attributes).with(attributes)
           assert resource.valid?
@@ -103,7 +109,7 @@ module SocialStream
           rescue CanCan::AccessDenied
           end
 
-          resource = assigns(model_sym)
+          resource = assigns(demodulized_model_sym)
 
           resource.should_not_receive(:update_attributes)
         end
@@ -114,7 +120,7 @@ module SocialStream
           count = model_count
           delete :destroy, :id => @current_model.to_param
 
-          resource = assigns(model_sym)
+          resource = assigns(demodulized_model_sym)
 
           model_count.should eq(count - 1)
         end
@@ -128,7 +134,7 @@ module SocialStream
           rescue CanCan::AccessDenied
           end
 
-          resource = assigns(model_sym)
+          resource = assigns(demodulized_model_sym)
 
           model_count.should eq(count)
         end

data/base/social_stream-base.gemspec

@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
   # Syntactically Awesome Stylesheets
   s.add_runtime_dependency('sass-rails', '>= 3.1.0')
   # Bootstrap for Sass
-  s.add_runtime_dependency('bootstrap-sass', '~> 2.3.1.0')
+  s.add_runtime_dependency('bootstrap-sass', '~> 2.3.2.0')
   # Customize ERB views
   s.add_runtime_dependency('deface', '~> 0.9.1')
   # Autolink text blocks

data/base/spec/controllers/permissions_controller_spec.rb

@@ -30,13 +30,9 @@ describe PermissionsController do
       end
 
       it "should not render index" do
-        begin
+        expect {
           get :index, :relation_id => @relation.id, :format => "html"
-
-          assert false
-        rescue ActiveRecord::RecordNotFound
-          assigns(:permissions).should be_nil
-        end
+        }.to raise_error(CanCan::AccessDenied)
       end
     end
   end

data/documents/app/assets/stylesheets/social_stream-documents.css.sass

@@ -1,3 +1,5 @@
+@import "social_stream/documents/mixins/mixins"
+
 @import "social_stream/documents/responsive/responsive-1200px-min"
 @import "social_stream/documents/responsive/responsive-768px-979px"
 @import "social_stream/documents/responsive/responsive-767px-max"

data/documents/app/assets/stylesheets/social_stream/documents/explore/_explore-documents.css.sass

@@ -5,8 +5,7 @@
   .audio,
   .video,
   .document
-    .author
-      font-size: 13px
+    @mixin docs-style
   .actions
     color: $gray
     font-size: 12px

data/documents/app/assets/stylesheets/social_stream/documents/explore/layout/_explore-documents.css.sass

@@ -6,16 +6,5 @@
   .audio,
   .video,
   .document
-    display: inline
-    @include makeColumn(3, 0)
-    margin-left: 19px
-    margin-bottom: 14px
-    .thumb
-      @include makeColumnoMargin(1, 0)
-      display: inline
-      margin-top: 14px
-    .brifing
-      @include makeColumnoMargin(2, 0)
-      display: inline-block
-    .author
-      margin-top: -10px
+    @include docs-layout
+    @include docs-style

data/documents/app/assets/stylesheets/social_stream/documents/mixins/_mixins.css.sass

@@ -0,0 +1,19 @@
+@mixin docs-style
+  .author
+    font-size: 13px
+
+    
+@mixin docs-layout
+  display: inline
+  @include makeColumn(3, 0)
+  margin-left: 19px
+  margin-bottom: 14px
+  .thumb
+    @include makeColumnoMargin(1, 0)
+    display: inline
+    margin-top: 14px
+  .brifing
+    @include makeColumnoMargin(2, 0)
+    display: inline-block
+  .author
+    margin-top: -10px

data/documents/lib/social_stream-documents.rb

@@ -5,9 +5,7 @@ module SocialStream
     module Models
       autoload :ActivityObject, 'social_stream/documents/models/activity_object'
     end
-  end
 
-  module Documents
     # Picture thumbnails
     mattr_accessor :picture_styles
     @@picture_styles = {

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "2.0.4".freeze
+    VERSION = "2.1.0".freeze
   end
 end

data/documents/social_stream-documents.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', '~> 2.0.4')
+  s.add_runtime_dependency('social_stream-base', '~> 2.1.0')
 
   s.add_runtime_dependency('paperclip','~> 3.3.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.9.0')

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "2.0.2".freeze
+    VERSION = "2.1.0".freeze
   end
 end

data/events/social_stream-events.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', '~> 2.0.4')
+  s.add_runtime_dependency('social_stream-base', '~> 2.1.0')
   s.add_runtime_dependency('rails-scheduler', '~> 0.1.2')
 
   # Development Gem dependencies

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "2.0.4".freeze
+  VERSION = "2.1.0".freeze
 end

data/linkser/app/assets/javascripts/social_stream/linkser.wall.js

@@ -1,6 +1,8 @@
+//= require social_stream/callback
 //= require social_stream/wall
 
 SocialStream.Linkser.Wall = (function(SS, $) {
+  var callback = new SS.Callback();
   var regexp = /^(http|ftp|https):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&;:\/~+#-]*[\w@?^=%&;\/~+#-])?$/
 
   var urlDetect = function() {
@@ -47,20 +49,16 @@ SocialStream.Linkser.Wall = (function(SS, $) {
     } else {
       if ($('#post_text').data('link')) {
         $('#post_text').data('link', false);
-        resetWallInput({ postText: false });
+        resetWallInput();
       }
     }
   };
 
-  var resetWallInput = function(options) {
+  var resetWallInput = function() {
     $("#link_preview").hide().html('');
     $("#link_url").val("");
     SS.Wall.changeAction();
     SS.Wall.changeParams('post');
-
-    if (options.postText) {
-      $('#post_text').val('');
-    }
   };
 
   var showLoading = function() {
@@ -82,14 +80,13 @@ SocialStream.Linkser.Wall = (function(SS, $) {
   };
 
 
-  var create = function() {
-    resetWallInput({ postText: true });
-  };
+  SS.Wall.callbackRegister('show', init);
 
-  SocialStream.Wall.callbackRegister('show', init);
-
-  return {
-    create: create
-  };
+  callback.register('new_',
+                    SS.Wall.new_,
+                    resetWallInput);
+  
+  return callback.extend({
+  });
 
 })(SocialStream, jQuery);

data/linkser/app/views/links/create.js.erb

@@ -1,6 +1,5 @@
 //Display the new post
-$(".timeline").prepend("<%= escape_javascript(render @link.post_activity) %>");
+$(".timeline").prepend("<%= escape_javascript render(@link.post_activity) %>");
 
-SocialStream.Timeline.update();
-
-SocialStream.Linkser.Wall.create();
+SocialStream.Timeline.update("<%= escape_javascript dom_id(@link.post_activity) %>");
+SocialStream.Linkser.Wall.new_();

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "2.0.0".freeze
+    VERSION = "2.1.0".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', '~> 2.0.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.1.0')
   s.add_runtime_dependency('linkser', '~> 0.0.12')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')