social_stream-base 0.22.4 → 0.23.0

data/spec/models/post_spec.rb

@@ -125,6 +125,4 @@ describe Post do
       Post.authored_by(post.author).should include(post)
     end
   end
-
-
 end

data/spec/models/relation_spec.rb

@@ -74,5 +74,27 @@ describe Relation do
       end
     end
   end
+
+  describe 'with follow permission' do
+    before do
+      @relation = Relation.create!
+      @relation.permissions << Permission.find_or_create_by_action('follow')
+    end
+
+    it 'should follow?' do
+      @relation.follow?.should be_true
+    end
+  end
+
+  describe 'without follow permission' do
+    before do
+      @relation = Relation.create!
+    end
+
+    it 'should follow?' do
+      @relation.follow?.should be_false
+    end
+  end
+
 end
 

data/spec/social_stream_activity_streams_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe SocialStream::ActivityStreams do
+  it "should find by type" do
+    SocialStream::ActivityStreams.model(:person).should == User
+  end
+
+  it "should return Post as default model" do
+    SocialStream::ActivityStreams.model!(:_test).should == Post
+  end
+
+  it "should find by model" do
+    SocialStream::ActivityStreams.type(User).should == :person
+  end
+end
+

data/spec/social_stream_spec.rb

@@ -4,4 +4,4 @@ describe SocialStream do
   it "should be valid" do
     SocialStream.should be_a(Module)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.22.4
+  version: 0.23.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -44,6 +44,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rails_engine_decorators
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ancestry
   requirement: !ruby/object:Gem::Requirement
@@ -685,8 +701,6 @@ files:
 - app/assets/images/loading.gif
 - app/assets/images/logo.png
 - app/assets/images/logos/actor/group.png
-- app/assets/images/logos/actor/remote_subject.png
-- app/assets/images/logos/actor/remote_user.png
 - app/assets/images/logos/actor/user.png
 - app/assets/images/logos/contact/group.png
 - app/assets/images/logos/contact/user.png
@@ -792,7 +806,6 @@ files:
 - app/controllers/relation/customs_controller.rb
 - app/controllers/search_controller.rb
 - app/controllers/settings_controller.rb
-- app/controllers/subjects_controller.rb
 - app/controllers/tags_controller.rb
 - app/controllers/ties_controller.rb
 - app/controllers/users_controller.rb
@@ -848,6 +861,7 @@ files:
 - app/views/activities/_options.html.erb
 - app/views/activities/_root.html.erb
 - app/views/activities/_wall.html.erb
+- app/views/activities/index.atom.builder
 - app/views/activities/index.html.erb
 - app/views/activities/index.js.erb
 - app/views/activity_actions/_follow_form.html.erb
@@ -855,10 +869,10 @@ files:
 - app/views/activity_actions/_update.js.erb
 - app/views/activity_actions/create.js.erb
 - app/views/activity_actions/update.js.erb
+- app/views/activity_objects/_activity_object.atom.erb
 - app/views/activity_objects/_activity_object.html.erb
 - app/views/actors/_actor.html.erb
 - app/views/actors/_actor_cheesecake.html.erb
-- app/views/api/activity_atom_feed.atom.builder
 - app/views/audience/_list.html.erb
 - app/views/audience/index.js.erb
 - app/views/avatars/index.html.erb
@@ -915,7 +929,6 @@ files:
 - app/views/frontpage/_caracteristics.html.erb
 - app/views/frontpage/_social_networks.html.erb
 - app/views/frontpage/_sponsor.html.erb
-- app/views/frontpage/host_meta.xml.builder
 - app/views/frontpage/index.html.erb
 - app/views/groups/_group.html.erb
 - app/views/groups/_group_focus_search.html.erb
@@ -1102,6 +1115,9 @@ files:
 - lib/social_stream-base.rb
 - lib/social_stream/ability.rb
 - lib/social_stream/ability/base.rb
+- lib/social_stream/activity_streams.rb
+- lib/social_stream/activity_streams/subtype.rb
+- lib/social_stream/activity_streams/supertype.rb
 - lib/social_stream/base/dependencies.rb
 - lib/social_stream/base/engine.rb
 - lib/social_stream/base/thinking-sphinx.rb
@@ -1137,6 +1153,7 @@ files:
 - lib/tasks/workers.rake
 - lib/thinking-sphinx/social_stream.rb
 - social_stream-base.gemspec
+- spec/controllers/activities_controller_spec.rb
 - spec/controllers/audience_controller_spec.rb
 - spec/controllers/comments_controller_spec.rb
 - spec/controllers/contacts_controller_spec.rb
@@ -1201,18 +1218,20 @@ files:
 - spec/integration/navigation_spec.rb
 - spec/integration/resque_access_spec.rb
 - spec/models/activity_action_spec.rb
-- spec/models/activity_authorization_spec.rb
 - spec/models/activity_spec.rb
+- spec/models/activity_wall_spec.rb
 - spec/models/actor_spec.rb
 - spec/models/contact_spec.rb
 - spec/models/group_spec.rb
 - spec/models/like_spec.rb
+- spec/models/post_authorization_spec.rb
 - spec/models/post_spec.rb
 - spec/models/profile_spec.rb
 - spec/models/relation_follow_spec.rb
 - spec/models/relation_spec.rb
 - spec/models/tie_spec.rb
 - spec/models/user_spec.rb
+- spec/social_stream_activity_streams_spec.rb
 - spec/social_stream_spec.rb
 - spec/spec_helper.rb
 - spec/support/cancan.rb

data/app/controllers/subjects_controller.rb

@@ -1,7 +0,0 @@
-class SubjectsController < ApplicationController
-  def lrdd
-    actor = Actor.find_by_webfinger!(params[:id])
-
-    redirect_to polymorphic_path(actor.subject, :format => :xrd)
-  end
-end

data/app/views/api/activity_atom_feed.atom.builder

@@ -1,40 +0,0 @@
-atom_feed({'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/'}) do |feed|
-  feed.title(@subject.name + ' public stream') 
-  feed.updated(@activities.first.updated_at)
-  feed.author do
-    feed.name(@subject.name)
-  end
-    
-  for activity in @activities
-    feed.entry(activity) do |entry|
-      if activity.class.name != "Tie" and activity.activity_verb.name == "post"
-      #Atom compliant for not ActivityStream readers
-      entry.title('Activity')
-      entry.summary(activity.direct_object.text)
-            
-      #ActivityStream compliant
-            
-      entry.author do |a|
-        a.name(activity.sender_subject.name)
-        a.tag!('activity:object-type','person')
-      end
-            
-      entry.tag!('activity:verb',activity.activity_verb.name)
-            
-      entry.tag!('activity:object') do |act_ob|
-        act_ob.title('Activity')
-        act_ob.tag!('activity:object-type','status')
-        act_ob.publised(activity.created_at)
-      end
-            
-      entry.content(activity.direct_object.text,:type=>'text/html')
-      end
-    end
-  end
-    
-  feed.link :rel => 'self',     :href=>request.url
-  feed.link :rel => 'next',     :href=>api_my_home_url+'?page='+(params[:page].to_i+1).to_s  
-  if params[:page].to_i != 1
-    feed.link :rel => 'previous', :href=>api_my_home_url+'?page='+(params[:page].to_i-1).to_s
-  end 
-end

data/app/views/frontpage/host_meta.xml.builder

@@ -1,11 +0,0 @@
-xml.instruct!
-xml.XRD :xmlns     => 'http://docs.oasis-open.org/ns/xri/xrd-1.0',
-        "xmlns:hm" => 'http://host-meta.net/ns/1.0' do
-
-  xml.tag! "hm:Host", request.host_with_port
-
-  xml.Link :rel      => "lrdd",
-           :template => "#{ root_url }subjects/lrdd/{uri}",
-           :type     => "application/xrd+xml"
-
-end

data/spec/models/activity_authorization_spec.rb

@@ -1,354 +0,0 @@
-require 'spec_helper'
-
-module ActivityTestHelper
-  def create_activity(contact, relations)
-    @activity = Factory(:post,
-                        :author_id => contact.sender.id,
-                        :owner_id  => contact.receiver.id,
-                        :user_author_id => contact.sender.id,
-                        :relation_ids => Array(Relation.normalize_id(relations))).post_activity
-  end
-
-  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, @activity)
-    end
-  end
-  
-  shared_examples_for "Allows Reading" do
-    it "should allow read" do
-      @ability.should be_able_to(:read, @activity)
-    end
-  end
-  
-  shared_examples_for "Allows Updating" do
-    it "should allow update" do
-      @ability.should be_able_to(:update, @activity)
-    end
-  end
-  
-  shared_examples_for "Allows Destroying" do
-    it "should allow destroy" do
-      @ability.should be_able_to(:destroy, @activity)
-    end
-  end
-
-  shared_examples_for "Denies Creating" do
-    it "should deny create" do
-      @ability.should_not be_able_to(:create, @activity)
-    end
-  end
-  
-  shared_examples_for "Denies Reading" do
-    it "should deny read" do
-      @ability.should_not be_able_to(:read, @activity)
-    end
-  end
-  
-  shared_examples_for "Denies Updating" do
-    it "should deny update" do
-      @ability.should_not be_able_to(:update, @activity)
-    end
-  end
-  
-  shared_examples_for "Denies Destroying" do
-    it "should deny destroy" do
-      @ability.should_not be_able_to(:destroy, @activity)
-    end
-  end
-  
-end
-
-describe Activity do
-  include ActivityTestHelper
-
-  context "user" do
-    before(:all) do
-      @subject = @user = Factory(:user)
-    end
-
-    context "with public activity" do
-      before do
-        contact = @user.contact_to!(@user)
-        create_activity(contact, Relation::Public.instance)
-      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
-        @tie = create_related_tie(:friend)
-        create_activity(@tie.contact.inverse!, @tie.relation)
-      end
-
-      describe "accessed by sender" do
-        before do
-          create_ability_accessed_by(@tie.receiver_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 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 "belonging to user's friend relation" do
-      before do
-        create_activity(@user.contact_to!(@user), @user.relation_custom('friend'))
-      end
-
-      describe "accessed by the sender" do
-        before do
-          create_ability_accessed_by(@user)
-        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 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 "belonging to user's public relation" do
-
-      before do
-        create_activity(@user.contact_to!(@user), Relation::Public.instance)
-      end
-
-      describe "accessed by the sender" do
-        before do
-          create_ability_accessed_by(@user)
-        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 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 "belonging to other user's public relation" do
-
-      before do
-        @tie = Factory(:public)
-        create_activity @tie.contact, Relation::Public.instance
-        create_ability_accessed_by @tie.receiver_subject
-      end
-      
-      it_should_behave_like "Denies Creating"
-    end
-
-    describe "build to non replied contact" do
-      before do
-        @tie = Factory(:friend, :contact => Factory(:contact, :sender => @user.actor))
-        partner = @tie.receiver
-        @activity = Activity.new :author => @user.actor,
-                                 :user_author => @user.author,
-                                 :owner => partner
-
-        create_ability_accessed_by @tie.sender_subject
-      end
-
-      it_should_behave_like "Denies Creating"
-    end
-  end
-
-  context "group" do
-    before(:all) do
-      @subject = @group = Factory(:group)
-    end
-
-    describe "belonging to member tie" do
-      before do
-        @tie = create_related_tie(:member)
-        create_activity @tie.contact.inverse!, @tie.relation
-      end
-
-      describe "accessed by same member" do
-        before do
-          create_ability_accessed_by @tie.receiver_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 "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
-  end
-end
-
-