social_stream-base 2.0.4 → 2.1.0

data/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/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/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/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/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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - GING - DIT - UPM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -338,14 +338,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.1.0
+        version: 2.3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.1.0
+        version: 2.3.2.0
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -780,7 +780,6 @@ files:
 - app/helpers/layouts_helper.rb
 - app/helpers/location_helper.rb
 - app/helpers/notifications_helper.rb
-- app/helpers/permissions_helper.rb
 - app/helpers/posts_helper.rb
 - app/helpers/profiles_helper.rb
 - app/helpers/search_helper.rb
@@ -853,9 +852,9 @@ files:
 - app/views/comments/_search_result.html.erb
 - app/views/comments/create.js.erb
 - app/views/comments/destroy.js.erb
+- app/views/contacts/_button.html.erb
 - app/views/contacts/_contact.html.erb
 - app/views/contacts/_form.html.erb
-- app/views/contacts/_link_custom.html.erb
 - app/views/contacts/_link_follow.html.erb
 - app/views/contacts/_pendings.html.erb
 - app/views/contacts/_suggestions.html.erb
@@ -978,6 +977,7 @@ files:
 - app/views/objects/_show.html.erb
 - app/views/objects/_timeline_description.html.erb
 - app/views/permissions/_index.html.erb
+- app/views/permissions/_list.html.erb
 - app/views/permissions/index.js.erb
 - app/views/posts/_post.html.erb
 - app/views/posts/_quick_search_result.html.erb
@@ -1004,6 +1004,7 @@ files:
 - app/views/relation/customs/destroy.js.erb
 - app/views/relation/customs/index.html.erb
 - app/views/relation/customs/update.js.erb
+- app/views/relations/_relation.html.erb
 - app/views/repositories/_filter.html.erb
 - app/views/repositories/show.html.erb
 - app/views/search/_extended_search.html.erb
@@ -1062,7 +1063,6 @@ files:
 - lib/acts_as_taggable_on/social_stream.rb
 - lib/generators/social_stream/base/install_generator.rb
 - lib/generators/social_stream/base/templates/initializer.rb
-- lib/generators/social_stream/base/templates/relations.yml
 - lib/generators/social_stream/base/templates/social_stream.css.sass
 - lib/generators/social_stream/base/templates/sphinx.yml
 - lib/i18n-js/social_stream-base.rb

data/app/helpers/permissions_helper.rb

@@ -1,21 +0,0 @@
-module PermissionsHelper
-  DEFAULT_PERMISSIONS =
-    [
-      [ "read",    "activity" ],
-      [ "create",  "activity" ],
-      [ "follow", nil ],
-      [ "represent", nil ],
-      [ "notify", nil ]
-    ]
-
-  def default_permissions
-    @default_permissions ||=
-      DEFAULT_PERMISSIONS.map{ |p|
-        Permission.find_or_create_by_action_and_object *p
-      }
-  end
-
-  def disable_permission_edit? perm
-    (perm.action == 'represent') and (@relation.ties.size > 0) and perm.relations.include?(@relation) and (perm.relations.where(:actor_id => @relation.actor_id).find_all{|r| r.ties.size > 0}.size <= 1)
-  end
-end

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

@@ -1,39 +0,0 @@
-# Default relations for Social Stream
-#
-# Define the default relations and permissions offered by your application
-# Though subjects (user, groups, etc.) can customize their own relations,
-# these are the defaults to start up with
-#
-# Detailed information on permissions is available at:
-# http://rdoc.info/gems/social_stream-base/Permission
-#
-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 ]