social_stream 0.28.4 → 0.29.0

data/base/lib/rails/social_stream.rb

@@ -5,7 +5,7 @@ class ActionDispatch::Http::UploadedFile
   def initialize_with_magic(*args, &block)
     initialize_without_magic(*args, &block)
 
-    if (unix_file = `which file`.chomp).present? && File.exists?(unix_file)
+    if (unix_file = `which file`.try(:chomp)).present? && File.exists?(unix_file)
       `#{ unix_file } -v 2>&1` =~ /^file-(.*)$/
       version = $1
 

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

@@ -37,40 +37,28 @@ module SocialStream
         end
 
         can :create, Comment do |c|
-          c._activity_parent.allow?(subject, 'read')
+          can? :read, c.parent_post
         end
 
         can :read, Comment do |c|
-          c.post_activity.allow?(subject, 'read')
+          can? :read, c.parent_post
         end
 
         can :update, Comment do |c|
-          c.post_activity.allow?(subject, 'update')
+          can? :update, c.parent_post
         end
 
         can :destroy, Comment do |c|
-          c.post_activity.allow?(subject, 'destroy')
+          can? :destroy, c.parent_post
         end
 
         # Activities
-        can :create, Activity do |a|
-          a.allow?(subject, 'create')
-        end
-
         can :read, Activity do |a|
           a.public? ||
             subject.present? &&
             a.audience.include?(subject.actor) 
         end
 
-        can :update, Activity do |a|
-          a.allow?(subject, 'update')
-        end
-
-        can :destroy, Activity do |a|
-          a.allow?(subject, 'destroy')
-        end
-
         # Users
         can :read, User
 

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

@@ -0,0 +1,11 @@
+module SocialStream
+  module ActivityStreams
+    module Subtype
+      # The {ActivityStreams}[http://activitystrea.ms/specs/atom/1.0/] object type for
+      # this subtype
+      def as_object_type
+        SocialStream::ActivityStreams.type(self.class)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module SocialStream
+  module ActivityStreams
+    module Supertype
+      # The {ActivityStreams}[http://activitystrea.ms/specs/atom/1.0/] object type for
+      # this object
+      def as_object_type
+        subtype_instance.as_object_type
+      end
+
+    end
+  end
+end

data/base/lib/social_stream/activity_streams.rb

@@ -0,0 +1,39 @@
+module SocialStream
+  # Maintains a list of the equivalences between SocialStream's models
+  # and ActivityStreams' object types
+  #
+  # http://activitystrea.ms/specs/json/schema/activity-schema.html#object-types
+  module ActivityStreams
+    DEFAULT_TYPE = :note
+
+    class << self
+      @@register = {}
+
+      # Register a new ActivityStreams type along with the model
+      def register(object_type, klass = nil)
+        klass ||= object_type
+
+        @@register[object_type] = klass
+      end
+
+      # Get the SocialStream's model, given a ActivityStreams' object type
+      def model(type)
+        model = @@register[type]
+        model && model.to_s.classify.constantize
+      end
+
+      # Get the SocialStream's model, given a ActivityStreams' object type
+      # or the default model
+      def model!(type)
+        model(type) || model(SocialStream::ActivityStreams::DEFAULT_TYPE)
+      end
+
+      # Get the ActivityStreams' object type, given a SocialStream's model
+      def type(klass)
+        klass = klass.to_s.underscore.to_sym unless klass.is_a?(Symbol)
+
+        @@register.invert[klass]
+      end
+    end
+  end
+end

data/base/lib/social_stream/base/dependencies.rb

@@ -2,6 +2,8 @@
 require 'deep_merge'
 # Monkey patch Ruby on Rails
 require 'rails/social_stream'
+# Rails Engine Decorators
+require 'rails_engine_decorators'
 # Database foreign keys
 require 'foreigner'
 # jQuery

data/base/lib/social_stream/base/engine.rb

@@ -29,6 +29,12 @@ module SocialStream
         SocialStream.single_relations.each{ |r| "Relation::#{ r.to_s.classify }".constantize }
       end
 
+      initializer "social_stream-base.model.register_activity_streams" do
+        SocialStream::ActivityStreams.register :person, :user
+        SocialStream::ActivityStreams.register :group
+        SocialStream::ActivityStreams.register :note,   :post
+      end
+
       initializer "social_stream-base.controller.helpers" do
         ActiveSupport.on_load(:action_controller) do
           include SocialStream::Controllers::Helpers

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.22.4".freeze
+    VERSION = "0.23.0".freeze
   end
 end

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

@@ -48,6 +48,11 @@ module SocialStream
             merge(ActivityObject.followed_by(subject))
         }
       end
+
+      module ClassMethods
+        # Nothing here by the moment, but methods are added by other
+        # SocialStream's components, such as Ostatus
+      end
     end
   end
 end

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

@@ -17,7 +17,7 @@ module SocialStream
     #
     module Subject
       extend ActiveSupport::Concern
-      
+
       included do
         subtype_of :actor,
                    :build => { :subject_type => to_s }

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

@@ -9,6 +9,8 @@ module SocialStream #:nodoc:
     module Subtype
       extend ActiveSupport::Concern
 
+      include SocialStream::ActivityStreams::Subtype
+
       included do
         class << self
           attr_reader :supertype_name, :supertype_options

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

@@ -11,6 +11,8 @@ module SocialStream #:nodoc:
     module Supertype
       extend ActiveSupport::Concern
 
+      include SocialStream::ActivityStreams::Supertype
+
       included do
         subtypes.each do |s|                # [ :user, :group ].each do |s|
           has_one s, :dependent => :destroy #   has_one s, :dependent => :destroy

data/base/lib/social_stream-base.rb

@@ -4,6 +4,11 @@ require 'social_stream/base/dependencies'
 # Provides your Rails application with social network and activity stream support
 module SocialStream
   autoload :Ability,   'social_stream/ability'
+  autoload :ActivityStreams, 'social_stream/activity_streams'
+  module ActivityStreams
+    autoload :Supertype, 'social_stream/activity_streams/supertype'
+    autoload :Subtype,   'social_stream/activity_streams/subtype'
+  end
   autoload :D3,        'social_stream/d3'
   autoload :Populate,  'social_stream/populate'
   autoload :Relations, 'social_stream/relations'

data/base/social_stream-base.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('deep_merge')
   # Rails
   s.add_runtime_dependency('rails', '>= 3.1.0')
+  # Rails Engine Decorators
+  s.add_runtime_dependency('rails_engine_decorators')
   # Activity and Relation hierarchies
   s.add_runtime_dependency('ancestry', '~> 1.2.3')
   # SQL foreign keys

data/base/spec/controllers/activities_controller_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe ActivitiesController do
+  describe "show" do
+    it "should redirecto to activity object" do
+      id = 3
+      activity = double("activity")
+      post = Factory(:post)
+
+      activity.should_receive(:direct_object) { post }
+
+      Activity.should_receive(:find).with(id.to_s) { activity }
+
+      get :show, id: id
+    end
+  end
+end
+

data/base/spec/controllers/frontpage_controller_spec.rb

@@ -7,10 +7,5 @@ describe FrontpageController do
     get :index
     assert_response :success
   end
-
-  it "should render host_meta" do
-    get :host_meta, :format => :all
-    assert_response :success
-  end
 end
 

data/base/spec/models/activity_wall_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+describe Activity do
+
+  context "user" do
+    before(:all) do
+      @subject = @user = Factory(:user)
+    end
+
+    context "with public activity" do
+      before do
+        @activity = Factory(:self_activity, :relation_ids => [Relation::Public.instance.id])
+      end
+
+      describe "sender home" do
+        it "should include activity" do
+          @activity.sender.wall(:home).should include(@activity)
+        end
+      end
+
+      describe "sender profile" do
+        context "accessed by alien" do
+          it "should include activity" do
+            @activity.sender.wall(:profile,
+                                  :for => Factory(:user)).should include(@activity)
+          end
+        end
+
+        context "accessed by anonymous" do
+          it "should include activity" do
+            @activity.sender.wall(:profile,
+                                  :for => nil).should include(@activity)
+          end
+        end
+      end
+    end
+
+    describe "belonging to friend" do
+      before do
+        @activity = Factory(:activity)
+      end
+
+      describe "sender home" do
+        it "should include activity" do
+          @activity.sender.wall(:home).should include(@activity)
+        end
+      end
+
+      describe "sender profile" do
+        context "accessed by friend" do
+          it "should include activity" do
+            @activity.sender.wall(:profile,
+                                  :for => @activity.receiver).should include(@activity)
+          end
+        end
+
+        context "accessed by alien" do
+          it "should not include activity" do
+            @activity.sender.wall(:profile,
+                                  :for => Factory(:user)).should_not include(@activity)
+          end
+        end
+
+        context "accessed by anonymous" do
+          it "should not include activity" do
+            @activity.sender.wall(:profile,
+                                  :for => nil).should_not include(@activity)
+          end
+        end
+      end
+
+      describe "receiver profile" do
+        context "accessed by receiver" do
+          it "should include activity" do
+            @activity.receiver.wall(:profile,
+                                    :for => @activity.receiver).should include(@activity)
+          end
+        end
+
+        context "accessed by alien" do
+          it "should not include activity" do
+            @activity.receiver.wall(:profile,
+                                    :for => Factory(:user)).should_not include(@activity)
+          end
+        end
+
+        context "accessed by anonymous" do
+          it "should not include activity" do
+            @activity.receiver.wall(:profile,
+                                    :for => nil).should_not include(@activity)
+          end
+        end
+      end
+    end
+  end
+end

data/base/spec/models/post_authorization_spec.rb

@@ -0,0 +1,370 @@
+require 'spec_helper'
+
+module PostAuthorizationTestHelper
+  def create_ability_accessed_by(subject)
+    @ability = Ability.new(subject)
+  end
+
+  def create_ability_accessed_by_related(tie_type)
+    @tie = create_related_tie(tie_type)
+    @related = @tie.receiver_subject
+    @ability = Ability.new(@related)
+  end
+
+  def create_ability_accessed_publicly
+    u = Factory(:user)
+    @ability = Ability.new(u)
+  end
+
+  def create_related_tie(tie_type)
+    Factory(tie_type, :contact => Factory(:contact, :sender => Actor.normalize(@subject)))
+  end
+
+  shared_examples_for "Allows Creating" do
+    it "should allow create" do
+      @ability.should be_able_to(:create, @post)
+    end
+  end
+
+  shared_examples_for "Allows Reading" do
+    it "should allow read" do
+      @ability.should be_able_to(:read, @post)
+    end
+  end
+
+  shared_examples_for "Allows Updating" do
+    it "should allow update" do
+      @ability.should be_able_to(:update, @post)
+    end
+  end
+
+  shared_examples_for "Allows Destroying" do
+    it "should allow destroy" do
+      @ability.should be_able_to(:destroy, @post)
+    end
+  end
+
+  shared_examples_for "Denies Creating" do
+    it "should deny create" do
+      @ability.should_not be_able_to(:create, @post)
+    end
+  end
+
+  shared_examples_for "Denies Reading" do
+    it "should deny read" do
+      @ability.should_not be_able_to(:read, @post)
+    end
+  end
+
+  shared_examples_for "Denies Updating" do
+    it "should deny update" do
+      @ability.should_not be_able_to(:update, @post)
+    end
+  end
+
+  shared_examples_for "Denies Destroying" do
+    it "should deny destroy" do
+      @ability.should_not be_able_to(:destroy, @post)
+    end
+  end
+end
+
+describe Post do
+  include PostAuthorizationTestHelper
+
+  before :all do
+    @ss_relation_model = SocialStream.relation_model
+  end
+
+  after :all do
+    SocialStream.relation_model = @ss_relation_model
+  end
+
+  context "in custom relation model" do
+    before :all do
+      SocialStream.relation_model = :custom
+    end
+
+    before :all do
+      @subject = @user = Factory(:user)
+    end
+
+    context "with friend tie" do
+      before :all do
+        @tie = create_related_tie(:friend)
+      end
+
+      describe "posting for all contacts" do
+        before :all do
+          @post = Factory(:post,
+                          :author => @tie.receiver,
+                          :owner  => @tie.sender)
+        end
+
+        describe "accesed by author" do
+          before do
+            create_ability_accessed_by(@post.author_subject)
+          end
+
+          it_should_behave_like "Allows Creating"
+          it_should_behave_like "Allows Reading"
+          it_should_behave_like "Allows Updating"
+          it_should_behave_like "Allows Destroying"
+        end
+
+        describe "accesed by owner" do
+          before do
+            create_ability_accessed_by(@post.owner_subject)
+          end
+
+          it_should_behave_like "Denies Creating"
+          it_should_behave_like "Allows Reading"
+          it_should_behave_like "Allows Updating"
+          it_should_behave_like "Allows Destroying"
+        end
+
+        describe "accessed by different friend" do
+          before do
+            create_ability_accessed_by_related :friend
+          end
+
+          it_should_behave_like "Denies Creating"
+          it_should_behave_like "Allows Reading"
+          it_should_behave_like "Denies Updating"
+          it_should_behave_like "Denies Destroying"
+        end
+
+        describe "accessed by acquaintance" do
+          before do
+            create_ability_accessed_by_related :acquaintance
+          end
+          it_should_behave_like "Denies Creating"
+          it_should_behave_like "Allows Reading"
+          it_should_behave_like "Denies Updating"
+          it_should_behave_like "Denies Destroying"
+        end
+
+        describe "accessed publicly" do
+          before do
+            create_ability_accessed_publicly
+          end
+
+          it_should_behave_like "Denies Creating"
+          it_should_behave_like "Denies Reading"
+          it_should_behave_like "Denies Updating"
+          it_should_behave_like "Denies Destroying"
+        end
+      end
+
+      describe "posting only to friends" do
+        before :all do
+          @post = Factory(:post,
+                          :author => @tie.receiver,
+                          :owner  => @tie.sender,
+                          :relation_ids => [@tie.relation_id])
+
+        end
+
+        describe "accessed by author" do
+          before do
+            create_ability_accessed_by(@post.author_subject)
+          end
+
+          it_should_behave_like "Allows Creating"
+          it_should_behave_like "Allows Reading"
+          it_should_behave_like "Allows Updating"
+          it_should_behave_like "Allows Destroying"
+        end
+
+        describe "accesed by owner" do
+          before do
+            create_ability_accessed_by(@post.owner_subject)
+          end
+
+          it_should_behave_like "Denies Creating"
+          it_should_behave_like "Allows Reading"
+          it_should_behave_like "Allows Updating"
+          it_should_behave_like "Allows Destroying"
+        end
+
+        describe "accessed by a friend" do
+          before do
+            create_ability_accessed_by_related :friend
+          end
+
+          it_should_behave_like "Denies Creating"
+          it_should_behave_like "Allows Reading"
+          it_should_behave_like "Denies Updating"
+          it_should_behave_like "Denies Destroying"
+        end
+
+        describe "accessed by acquaintance" do
+          before do
+            create_ability_accessed_by_related :acquaintance
+          end
+
+          it_should_behave_like "Denies Creating"
+          it_should_behave_like "Denies Reading"
+          it_should_behave_like "Denies Updating"
+          it_should_behave_like "Denies Destroying"
+        end
+
+        describe "accessed publicly" do
+          before do
+            create_ability_accessed_publicly
+          end
+
+          it_should_behave_like "Denies Creating"
+          it_should_behave_like "Denies Reading"
+          it_should_behave_like "Denies Updating"
+          it_should_behave_like "Denies Destroying"
+        end
+      end
+
+      describe "posting to public relation" do
+
+        before do
+          @post = Factory(:post,
+                          :author => @tie.receiver,
+                          :owner  => @tie.sender,
+                          :relation_ids => [Relation::Public.instance.id])
+        end
+
+        describe "accessed by author" do
+          before do
+            create_ability_accessed_by(@post.author_subject)
+          end
+
+          it_should_behave_like "Allows Creating"
+          it_should_behave_like "Allows Reading"
+          it_should_behave_like "Allows Updating"
+          it_should_behave_like "Allows Destroying"
+        end
+
+        describe "accessed by owner" do
+          before do
+            create_ability_accessed_by(@post.owner_subject)
+          end
+
+          it_should_behave_like "Denies Creating"
+          it_should_behave_like "Allows Reading"
+          it_should_behave_like "Allows Updating"
+          it_should_behave_like "Allows Destroying"
+        end
+
+        describe "accessed by a friend" do
+          before do
+            create_ability_accessed_by_related :friend
+          end
+
+          it_should_behave_like "Denies Creating"
+          it_should_behave_like "Allows Reading"
+          it_should_behave_like "Denies Updating"
+          it_should_behave_like "Denies Destroying"
+        end
+
+        describe "accessed by acquaintance" do
+          before do
+            create_ability_accessed_by_related :acquaintance
+          end
+
+          it_should_behave_like "Denies Creating"
+          it_should_behave_like "Allows Reading"
+          it_should_behave_like "Denies Updating"
+          it_should_behave_like "Denies Destroying"
+        end
+
+        describe "accessed publicly" do
+          before do
+            create_ability_accessed_publicly
+          end
+
+          it_should_behave_like "Denies Creating"
+          it_should_behave_like "Allows Reading"
+          it_should_behave_like "Denies Updating"
+          it_should_behave_like "Denies Destroying"
+        end
+      end
+
+      describe "posting by not replied" do
+        before :all do
+          @post = Factory(:post,
+                          :author => @tie.sender,
+                          :owner  => @tie.receiver)
+        end
+
+        describe "accessed by author" do
+          before do
+            create_ability_accessed_by(@post.author_subject)
+          end
+
+          it_should_behave_like "Denies Creating"
+        end
+      end
+    end
+
+    context "group" do
+      before(:all) do
+        @subject = @group = Factory(:group)
+      end
+
+      describe "with member tie" do
+        before :all do
+          @tie = create_related_tie(:member)
+        end
+
+        describe "posting from member all contacts" do
+          before :all do
+            @post = Factory(:post,
+                            :author => @tie.receiver,
+                            :owner  => @tie.sender)
+          end
+
+          describe "accessed by author" do
+            before do
+              create_ability_accessed_by @post.author_subject
+            end
+
+            it_should_behave_like "Allows Creating"
+            it_should_behave_like "Allows Reading"
+            it_should_behave_like "Allows Updating"
+            it_should_behave_like "Allows Destroying"
+          end
+
+          describe "accessed by different member" do
+            before do
+              create_ability_accessed_by_related :member
+            end
+
+            it_should_behave_like "Denies Creating"
+            it_should_behave_like "Allows Reading"
+            it_should_behave_like "Denies Updating"
+            it_should_behave_like "Denies Destroying"
+          end
+
+          describe "accessed by partner" do
+            before do
+              create_ability_accessed_by_related :partner
+            end
+
+            it_should_behave_like "Denies Creating"
+            it_should_behave_like "Allows Reading"
+            it_should_behave_like "Denies Updating"
+            it_should_behave_like "Denies Destroying"
+          end
+
+          describe "accessed publicly" do
+            before do
+              create_ability_accessed_publicly
+            end
+
+            it_should_behave_like "Denies Creating"
+            it_should_behave_like "Denies Reading"
+            it_should_behave_like "Denies Updating"
+            it_should_behave_like "Denies Destroying"
+          end
+        end
+      end
+    end
+  end
+end