social_stream 0.4.3 → 0.4.4

data/spec/models/tie_spec.rb

@@ -9,14 +9,16 @@ describe Tie do
     it "should be created from relation name" do
       relation = @sender.relations.first
 
-      tie = Tie.create(:sender_id => @sender.actor_id,
+      tie = Tie.create :sender_id => @sender.actor_id,
                        :receiver_id => @receiver.actor_id,
-                       :relation_name => relation.name)
+                       :relation_name => relation.name
 
       tie.should_not be_new_record
     end
 
     it "should be created from relation_name and permissions" do
+      pending "Redesign forms"
+
       tie = Tie.create :sender_id => @sender.actor_id,
                        :receiver_id => @receiver.actor_id,
                        :relation_name => "new relation",
@@ -28,6 +30,22 @@ describe Tie do
     end
   end
 
+  context "replied" do
+    before do
+      @sent = Factory(:friend)
+      @received = Factory(:friend,
+                         :sender_id => @sent.receiver_id,
+                         :receiver_id => @sent.sender_id)
+    end
+
+    it "should be found by scopes" do
+      Tie.replied.should include(@sent)
+      Tie.replied.should include(@received)
+      Tie.replying(@sent).should include(@received)
+      Tie.replying(@received).should include(@sent)
+    end
+  end
+
   describe "friend" do
     before do
       @tie = Factory(:friend)
@@ -50,12 +68,10 @@ describe Tie do
 
       it "creates activity" do
         Tie.allowing(@s, 'create', 'activity').should include(@tie)
-        Tie.allowing(@s, 'create', 'activity').should_not include(@tie.related('public'))
       end
 
       it "reads activity" do
         Tie.allowing(@s, 'read', 'activity').should include(@tie)
-        Tie.allowing(@s, 'read', 'activity').should include(@tie.related('public'))
       end
     end
 
@@ -66,12 +82,10 @@ describe Tie do
 
       it "creates activity" do
         Tie.allowing(@s, 'create', 'activity').should_not include(@tie)
-        Tie.allowing(@s, 'create', 'activity').should_not include(@tie.related('public'))
       end
 
       it "reads activity" do
         Tie.allowing(@s, 'read', 'activity').should include(@tie)
-        Tie.allowing(@s, 'read', 'activity').should include(@tie.related('public'))
       end
     end
 
@@ -82,12 +96,10 @@ describe Tie do
 
       it "creates activity" do
         Tie.allowing(@s, 'create', 'activity').should_not include(@tie)
-        Tie.allowing(@s, 'create', 'activity').should_not include(@tie.related('public'))
       end
 
       it "reads activity" do
         Tie.allowing(@s, 'read', 'activity').should_not include(@tie)
-#        Tie.allowing(@s, 'read', 'activity').should_not include(@tie.related('public'))
       end
     end
 
@@ -98,12 +110,10 @@ describe Tie do
 
       it "creates activity" do
         Tie.allowing(@s, 'create', 'activity').should_not include(@tie)
-        Tie.allowing(@s, 'create', 'activity').should_not include(@tie.related('public'))
       end
       
       it "reads activity" do
         Tie.allowing(@s, 'read', 'activity').should_not include(@tie)
-        Tie.allowing(@s, 'read', 'activity').should     include(@tie.related('public'))
       end
     end
   end
@@ -120,7 +130,6 @@ describe Tie do
 
       it "updates activity" do
         Tie.allowing(@s, 'update', 'activity').should include(@tie)
-        Tie.allowing(@s, 'update', 'activity').should include(@tie.related('public'))
       end
     end
 
@@ -131,17 +140,14 @@ describe Tie do
 
       it "creates activity" do
         Tie.allowing(@s, 'create', 'activity').should_not include(@tie)
-        Tie.allowing(@s, 'create', 'activity').should_not include(@tie.related('public'))
       end
 
        it "reads activity" do
         Tie.allowing(@s, 'read', 'activity').should include(@tie)
-        Tie.allowing(@s, 'read', 'activity').should include(@tie.related('public'))
       end
 
       it "updates activity" do
         Tie.allowing(@s, 'update', 'activity').should include(@tie)
-        Tie.allowing(@s, 'update', 'activity').should include(@tie.related('public'))
       end
     end
   end

data/spec/support/db.rb

@@ -1,15 +1,12 @@
-# Social Stream migration template
-require File.join(Rails.root, File.join('..', '..', 'lib', 'generators', 'social_stream', 'templates', 'migration'))
+require File.join(File.dirname(__FILE__), 'migrations')
 
-# Mailboxer migration template
-finder = Gem::GemPathSearcher.new
-mailboxer_spec = finder.find('mailboxer')
-mailboxer_migration =
-  finder.matching_files(mailboxer_spec,
-                        File.join('generators', 'mailboxer', 'templates', 'migration')).first
-require mailboxer_migration
+begin
+  ActsAsTaggableOnMigration.down
+rescue
+  puts "WARNING: ActsAsTaggableOnMigration failed to rollback" 
+end
 
-%w( SocialStream Mailboxer ).each do |m|
+%w(SocialStream Mailboxer).each do |m|
   begin
     "Create#{ m }".constantize.down
   rescue
@@ -19,5 +16,6 @@ end
 
 CreateMailboxer.up
 CreateSocialStream.up
+ActsAsTaggableOnMigration.up
 
 require File.expand_path("../../dummy/db/seeds", __FILE__)

data/spec/support/migrations.rb

@@ -0,0 +1,24 @@
+# Social Stream migration template
+social_stream_migration =
+  File.join(File.dirname(__FILE__), '..', '..', 'lib', 'generators', 'social_stream', 'templates', 'migration')
+
+require social_stream_migration
+
+# Adding acts_as_taggable_on
+finder = Gem::GemPathSearcher.new
+taggable_spec = finder.find('acts-as-taggable-on')
+taggable_migration = finder.matching_files(taggable_spec,
+                                           File.join("generators","acts_as_taggable_on","migration","templates","active_record","migration")).first
+
+require taggable_migration
+
+# Mailboxer migration template
+finder = Gem::GemPathSearcher.new
+mailboxer_spec = finder.find('mailboxer')
+mailboxer_migration =
+  finder.matching_files(mailboxer_spec,
+                        File.join('generators', 'mailboxer', 'templates', 'migration')).first
+
+require mailboxer_migration
+
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,45 +16,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +02:00
+date: 2011-04-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: atd-ancestry
+  name: ancestry
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nested_set
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 25
         segments: 
         - 1
-        - 5
+        - 2
         - 3
-        version: 1.5.3
+        version: 1.2.3
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: foreigner
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,11 +50,11 @@ dependencies:
         - 1
         version: 0.9.1
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: devise
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -82,11 +66,11 @@ dependencies:
         - rc
         version: 1.2.rc
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: inherited_resources
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -98,11 +82,11 @@ dependencies:
         - 2
         version: 1.1.2
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: stringex
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -114,11 +98,11 @@ dependencies:
         - 0
         version: 1.2.0
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: paperclip
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -130,11 +114,11 @@ dependencies:
         - 4
         version: 2.3.4
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: jquery-rails
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -146,27 +130,27 @@ dependencies:
         - 5
         version: 0.2.5
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: cancan
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
         - 1
         - 6
-        - 2
-        version: 1.6.2
+        - 4
+        version: 1.6.4
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: will_paginate
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -178,11 +162,11 @@ dependencies:
         - pre2
         version: 3.0.pre2
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: omniauth
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -195,11 +179,11 @@ dependencies:
         - beta5
         version: 0.2.0.beta5
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: oauth-plugin
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -212,11 +196,11 @@ dependencies:
         - pre1
         version: 0.4.0.pre1
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rails_css_themes
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -228,27 +212,27 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: mailboxer
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 63
         segments: 
         - 0
         - 0
-        - 14
-        version: 0.0.14
+        - 16
+        version: 0.0.16
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: rmagick
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -260,6 +244,22 @@ dependencies:
         - 1
         version: 2.13.1
   type: :runtime
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: acts-as-taggable-on
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        - 6
+        version: 2.0.6
+  type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -269,12 +269,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 3
         - 0
-        - 6
-        version: 3.0.6
+        - 7
+        version: 3.0.7
   type: :development
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
@@ -436,6 +436,7 @@ files:
 - app/controllers/profiles_controller.rb
 - app/controllers/representations_controller.rb
 - app/controllers/subjects_controller.rb
+- app/controllers/tags_controller.rb
 - app/controllers/ties_controller.rb
 - app/controllers/users_controller.rb
 - app/helpers/activities_helper.rb
@@ -460,8 +461,11 @@ files:
 - app/models/post.rb
 - app/models/profile.rb
 - app/models/relation.rb
+- app/models/relation/custom.rb
+- app/models/relation/public.rb
 - app/models/relation_permission.rb
 - app/models/representation.rb
+- app/models/sphere.rb
 - app/models/tie.rb
 - app/models/tie_activity.rb
 - app/models/user.rb
@@ -476,6 +480,7 @@ files:
 - app/views/activities/_walls.html.erb
 - app/views/activities/index.js.erb
 - app/views/activity_objects/_activity_object.html.erb
+- app/views/actors/_actor.html.erb
 - app/views/api/activity_atom_feed.atom.builder
 - app/views/avatars/_form.html.erb
 - app/views/avatars/_precrop.html.erb
@@ -526,6 +531,7 @@ files:
 - app/views/home/_menu.html.erb
 - app/views/home/_sidebar.html.erb
 - app/views/home/index.html.erb
+- app/views/layouts/_account.html.erb
 - app/views/layouts/_footer.html.erb
 - app/views/layouts/_header.erb
 - app/views/layouts/_representation.html.erb
@@ -643,14 +649,17 @@ files:
 - lib/generators/social_stream/templates/public/images/btn/close.png
 - lib/generators/social_stream/templates/public/images/btn/date.png
 - lib/generators/social_stream/templates/public/images/btn/edit.png
+- lib/generators/social_stream/templates/public/images/btn/error.png
 - lib/generators/social_stream/templates/public/images/btn/facebook.png
 - lib/generators/social_stream/templates/public/images/btn/flag.png
 - lib/generators/social_stream/templates/public/images/btn/flyer.png
 - lib/generators/social_stream/templates/public/images/btn/group_left.png
 - lib/generators/social_stream/templates/public/images/btn/group_right.png
 - lib/generators/social_stream/templates/public/images/btn/index_71.png
+- lib/generators/social_stream/templates/public/images/btn/info.png
 - lib/generators/social_stream/templates/public/images/btn/italic.png
 - lib/generators/social_stream/templates/public/images/btn/keynote.png
+- lib/generators/social_stream/templates/public/images/btn/like.png
 - lib/generators/social_stream/templates/public/images/btn/linkedin.png
 - lib/generators/social_stream/templates/public/images/btn/live.png
 - lib/generators/social_stream/templates/public/images/btn/message_conversation.png
@@ -661,6 +670,7 @@ files:
 - lib/generators/social_stream/templates/public/images/btn/new.png
 - lib/generators/social_stream/templates/public/images/btn/next_conference.png
 - lib/generators/social_stream/templates/public/images/btn/next_space.png
+- lib/generators/social_stream/templates/public/images/btn/nolike.png
 - lib/generators/social_stream/templates/public/images/btn/notifications.png
 - lib/generators/social_stream/templates/public/images/btn/pixel.png
 - lib/generators/social_stream/templates/public/images/btn/point_blue.png
@@ -669,12 +679,14 @@ files:
 - lib/generators/social_stream/templates/public/images/btn/shadow.png
 - lib/generators/social_stream/templates/public/images/btn/share.png
 - lib/generators/social_stream/templates/public/images/btn/subtime.png
+- lib/generators/social_stream/templates/public/images/btn/success.png
 - lib/generators/social_stream/templates/public/images/btn/tag_cloud.png
 - lib/generators/social_stream/templates/public/images/btn/time.png
 - lib/generators/social_stream/templates/public/images/btn/twitter-follow-icon.png
 - lib/generators/social_stream/templates/public/images/btn/twitter.png
 - lib/generators/social_stream/templates/public/images/btn/uno.png
 - lib/generators/social_stream/templates/public/images/btn/viewer.png
+- lib/generators/social_stream/templates/public/images/btn/warning.png
 - lib/generators/social_stream/templates/public/images/frontpage/collaborate.png
 - lib/generators/social_stream/templates/public/images/frontpage/comments.png
 - lib/generators/social_stream/templates/public/images/frontpage/green_sq.png
@@ -1008,6 +1020,7 @@ files:
 - spec/controllers/likes_controller_spec.rb
 - spec/controllers/posts_controller_spec.rb
 - spec/controllers/profiles_controller_spec.rb
+- spec/controllers/representations_controller_spec.rb
 - spec/controllers/subjects_controller.rb
 - spec/controllers/ties_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
@@ -1053,6 +1066,7 @@ files:
 - spec/models/activity_spec.rb
 - spec/models/actor_spec.rb
 - spec/models/post_spec.rb
+- spec/models/profile_spec.rb
 - spec/models/representation_spec.rb
 - spec/models/tie_activity_spec.rb
 - spec/models/tie_spec.rb
@@ -1062,6 +1076,7 @@ files:
 - spec/support/cancan.rb
 - spec/support/db.rb
 - spec/support/devise.rb
+- spec/support/migrations.rb
 has_rdoc: true
 homepage: http://social-stream.dit.upm.es/
 licenses: []