social_stream 0.4.2 → 0.4.3

data/lib/social_stream.rb

@@ -52,7 +52,7 @@ module SocialStream
     #
     # Maybe Rails provides some method to do this, in this case, please tell!!
     def require_model(m)
-      path = $:.find{ |f| f =~ Regexp.new(File.join('social_stream', 'app', 'models')) }
+      path = $:.find{ |f| f =~ Regexp.new(File.join('social_stream.*', 'app', 'models')) }
 
       raise "Can't find social_stream path" if path.blank?
 

data/lib/social_stream/ability.rb

@@ -24,6 +24,7 @@ module SocialStream
         end
       end
 
+      # Activities
       can :create, Activity do |a|
         a.tie.allows?(user, 'create', 'activity')
       end
@@ -39,6 +40,25 @@ module SocialStream
       can :destroy, Activity do |a|
         a.tie.allows?(user, 'destroy', 'activity')
       end
+
+      # Groups
+      can :read, Group
+
+      can :create, Group do |g|
+        user.present? &&
+          ( g._founder == user.slug ||
+            Actor.find_by_slug!(g._founder).sent_ties.received_by(user).with_permissions('represent', nil).any? )
+      end
+
+      can :update, Group do |g|
+        user.present? &&
+          g.sent_ties.received_by(user).with_permissions('represent', nil).any?
+      end
+
+      can :destroy, Group do |g|
+        user.present? &&
+          g.sent_ties.received_by(user).with_permissions('represent', nil).any?
+      end
     end
   end
 end

data/lib/social_stream/models/subject.rb

@@ -63,10 +63,14 @@ module SocialStream
           slug
         end
 
-        # Delegate missing methods to {Actor}, if they are defined there
+        # Delegate missing methods to {Actor}, if they exist there
         def method_missing(method, *args, &block)
           super
         rescue NameError => subject_error 
+          # These methods must be raised to avoid loops (the :actor association calls here again)
+          exceptions = [ :_actor_id ]
+          raise subject_error if exceptions.include?(method)
+
           actor!.__send__ method, *args, &block
         end
 

data/lib/social_stream/test_helpers/controllers.rb

@@ -23,6 +23,10 @@ module SocialStream
         { model_sym => model_attributes }
       end
 
+      def updating_attributes
+        attributes.merge({ :id => @current_model.to_param })
+      end
+
       # Post.count
       def model_count
         model_class.count
@@ -59,6 +63,57 @@ module SocialStream
           resource.should be_new_record
         end
       end
+
+      shared_examples_for "Allow Updating" do
+        it "should update" do
+          put :update, updating_attributes
+
+          resource = assigns(model_sym)
+
+          resource.should_receive(:update_attributes).with(attributes)
+          assert resource.valid?
+          response.should redirect_to(resource)
+        end
+      end
+
+      shared_examples_for "Deny Updating" do
+        it "should not update" do
+          begin
+            put :update, updating_attributes
+          rescue CanCan::AccessDenied
+          end
+
+          resource = assigns(model_sym)
+
+          resource.should_not_receive(:update_attributes)
+        end
+      end
+
+      shared_examples_for "Allow Destroying" do
+        it "should destroy" do
+          count = model_count
+          delete :destroy, :id => @current_model.to_param
+
+          resource = assigns(model_sym)
+
+          model_count.should eq(count - 1)
+        end
+      end
+
+      shared_examples_for "Deny Destroying" do
+        it "should not destroy" do
+          count = model_count
+          begin
+            delete :destroy, :id => @current_model.to_param
+          rescue CanCan::AccessDenied
+          end
+
+          resource = assigns(model_sym)
+
+          model_count.should eq(count)
+        end
+      end
+
     end
   end
 end

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.4.2".freeze
+  VERSION = "0.4.3".freeze
 end

data/social_stream.gemspec

@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
 
 
   # Development Gem dependencies
-  s.add_development_dependency('rails', '~> 3.0.5')
+  s.add_development_dependency('rails', '~> 3.0.6')
   # Integration testing
   s.add_development_dependency('capybara', '~> 0.3.9')
   # Testing database

data/spec/controllers/comments_controller_spec.rb

@@ -0,0 +1,38 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe CommentsController do
+  include SocialStream::TestHelpers::Controllers
+
+  render_views
+
+  describe "authorizing" do
+    before do
+      @user = Factory(:user)
+      sign_in @user
+    end
+
+    describe "comment from user" do
+      before do
+        model_assigned_to @user.sent_ties.received_by(@user).related_by(@user.relations.sort.first).first
+      end
+
+      it_should_behave_like "Allow Creating"
+    end
+
+    describe "comment from friend" do
+      before do
+        model_assigned_to Factory(:friend, :receiver => @user.actor)
+      end
+
+      it_should_behave_like "Allow Creating"
+    end
+
+    describe "post from acquaintance" do
+      before do
+        model_assigned_to Factory(:acquaintance, :receiver => @user.actor)
+      end
+
+      it_should_behave_like "Deny Creating"
+    end
+  end
+end

data/spec/controllers/groups_controller_spec.rb

@@ -1,6 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe GroupsController do
+  include SocialStream::TestHelpers::Controllers
+
   render_views
 
   describe "when Anonymous" do
@@ -15,6 +17,33 @@ describe GroupsController do
 
       assert_response :success
     end
+
+    it "should not render new" do
+      begin
+        get :new
+
+        assert false
+      rescue CanCan::AccessDenied 
+        assert true
+      end
+    end
+
+    context "faking a new group" do
+      before do
+        model_attributes[:_founder] = Factory(:user).slug
+      end
+
+      it_should_behave_like "Deny Creating"
+    end
+
+    context "an existing group" do
+      before do
+        @current_model = Factory(:group)
+      end
+
+      it_should_behave_like "Deny Updating"
+      it_should_behave_like "Deny Destroying"
+    end
   end
 
   describe "when authenticated" do
@@ -43,13 +72,54 @@ describe GroupsController do
       assert_response :success
     end
 
-    it "should update contact group" do
-      @group = Factory(:member, :receiver => @user.actor).sender_subject
-      put :update, :id => @group.to_param,
-                   "group" => { "profile_attributes" => { "organization" => "Social Stream" } }
+    it "should render new" do
+      get :new, 'group' => { '_founder' => @user.to_param }
+
+      assert_response :success
+    end
 
-      response.should redirect_to(@group)
+    context "a new own group" do
+      before do
+        model_attributes[:_founder] = @user.slug
+      end
+
+      it_should_behave_like "Allow Creating"
+    end
+
+    context "a new fake group" do
+      before do
+        model_attributes[:_founder] = Factory(:user).slug
+      end
+
+      it_should_behave_like "Deny Creating"
+    end
+
+    context "a external group" do
+      before do
+        @current_model = Factory(:group)
+      end
+
+      it_should_behave_like "Deny Updating"
+      it_should_behave_like "Deny Destroying"
     end
+
+
+    context "a existing own group" do
+      before do
+        @current_model = Factory(:member, :receiver => @user.actor).sender_subject
+      end
+
+      it "should update contact group" do
+        put :update, :id => @current_model.to_param,
+                     "group" => { "profile_attributes" => { "organization" => "Social Stream" } }
+
+        response.should redirect_to(@current_model)
+      end
+
+      # it_should_behave_like "Allow Updating"
+      it_should_behave_like "Allow Destroying"
+    end
+
   end
 end
 

data/spec/factories/comment.rb

@@ -0,0 +1,4 @@
+Factory.define :comment do |p|
+  p.sequence(:text)  { |n| "Comment #{ n }" }
+  p._activity_tie_id { |q| q.association(:friend) }
+end

data/spec/models/tie_spec.rb

@@ -1,22 +1,32 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Tie do
-  it "should create from relation name" do
-    relation = Relation.first
-    sender = Factory(relation.sender_type.underscore)
-
-    receiver_type = relation.receiver_type.present? ?
-                      relation.receiver_type :
-                      relation.sender_type
-                   
-    receiver = Factory(receiver_type.underscore)
-
-    tie = Factory(:tie, :sender_id => sender.actor.id,
-                        :receiver_id => receiver.actor.id,
-                        :relation_name => relation.name)
-    tie.should be_valid
-  end
+  context "between 2 users" do
+    before do
+      @sender, @receiver = 2.times.map{ Factory(:user) }
+    end
+
+    it "should be created from relation name" do
+      relation = @sender.relations.first
+
+      tie = Tie.create(:sender_id => @sender.actor_id,
+                       :receiver_id => @receiver.actor_id,
+                       :relation_name => relation.name)
 
+      tie.should_not be_new_record
+    end
+
+    it "should be created from relation_name and permissions" do
+      tie = Tie.create :sender_id => @sender.actor_id,
+                       :receiver_id => @receiver.actor_id,
+                       :relation_name => "new relation",
+                       :relation_permissions => [ Permission.first.id, Permission.last.id ]
+
+      puts tie.errors
+      tie.should_not be_new_record
+      tie.relation.should_not be_new_record
+    end
+  end
 
   describe "friend" do
     before do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 +02:00
+date: 2011-04-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -269,12 +269,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 3
         - 0
-        - 5
-        version: 3.0.5
+        - 6
+        version: 3.0.6
   type: :development
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
@@ -434,7 +434,6 @@ files:
 - app/controllers/omniauth_callbacks_controller.rb
 - app/controllers/posts_controller.rb
 - app/controllers/profiles_controller.rb
-- app/controllers/pshb_controller.rb
 - app/controllers/representations_controller.rb
 - app/controllers/subjects_controller.rb
 - app/controllers/ties_controller.rb
@@ -560,14 +559,15 @@ files:
 - app/views/subjects/_toolbar_profile_menu.html.erb
 - app/views/subjects/_toolbar_profile_menu_basic_options.html.erb
 - app/views/subjects/_toolbar_profile_menu_tie_options.html.erb
+- app/views/ties/_edit.html.erb
 - app/views/ties/_form.html.erb
 - app/views/ties/_new.html.erb
 - app/views/ties/_pendings.html.erb
 - app/views/ties/_suggestions.html.erb
 - app/views/ties/_tie.html.erb
 - app/views/ties/create.js.erb
+- app/views/ties/edit.html.erb
 - app/views/ties/new.html.erb
-- app/views/ties/new.js.erb
 - app/views/ties/suggestion.html.erb
 - app/views/ties/suggestion.js.erb
 - app/views/users/_groups.html.erb
@@ -593,6 +593,7 @@ files:
 - lib/generators/social_stream/templates/public/images/boxy/boxy-sw.png
 - lib/generators/social_stream/templates/public/images/btn/1-facebook.png
 - lib/generators/social_stream/templates/public/images/btn/_notes/btn_certificates.png.mno
+- lib/generators/social_stream/templates/public/images/btn/arrowBlue.png
 - lib/generators/social_stream/templates/public/images/btn/arrows-ffffff.png
 - lib/generators/social_stream/templates/public/images/btn/bold.png
 - lib/generators/social_stream/templates/public/images/btn/btn_activities.png
@@ -665,6 +666,7 @@ files:
 - lib/generators/social_stream/templates/public/images/btn/point_blue.png
 - lib/generators/social_stream/templates/public/images/btn/point_gray.png
 - lib/generators/social_stream/templates/public/images/btn/search.png
+- 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/tag_cloud.png
@@ -706,7 +708,9 @@ files:
 - lib/generators/social_stream/templates/public/images/title_background.png
 - lib/generators/social_stream/templates/public/images/w3c_css.png
 - lib/generators/social_stream/templates/public/images/w3c_xhtml.png
+- lib/generators/social_stream/templates/public/javascripts/addContact.js
 - lib/generators/social_stream/templates/public/javascripts/ajax.paginate.js
+- lib/generators/social_stream/templates/public/javascripts/avatars.js
 - lib/generators/social_stream/templates/public/javascripts/ckeditor/.htaccess
 - lib/generators/social_stream/templates/public/javascripts/ckeditor/adapters/jquery.js
 - lib/generators/social_stream/templates/public/javascripts/ckeditor/ckeditor.js
@@ -917,6 +921,7 @@ files:
 - lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/v2/skin.js
 - lib/generators/social_stream/templates/public/javascripts/ckeditor/skins/v2/templates.css
 - lib/generators/social_stream/templates/public/javascripts/ckeditor/themes/default/theme.js
+- lib/generators/social_stream/templates/public/javascripts/hoverIntent.js
 - lib/generators/social_stream/templates/public/javascripts/jqcloud-0.1.3.min.js
 - lib/generators/social_stream/templates/public/javascripts/jquery-ui-1.8.4.custom.min.js
 - lib/generators/social_stream/templates/public/javascripts/jquery-ui-personalized-1.5.2.packed.js
@@ -937,6 +942,8 @@ files:
 - lib/generators/social_stream/templates/public/javascripts/superfish.js
 - lib/generators/social_stream/templates/public/javascripts/ui.dropdownchecklist.js
 - lib/generators/social_stream/templates/public/stylesheets/default/activities.css
+- lib/generators/social_stream/templates/public/stylesheets/default/addContact.css
+- lib/generators/social_stream/templates/public/stylesheets/default/avatars.css
 - lib/generators/social_stream/templates/public/stylesheets/default/base.css
 - lib/generators/social_stream/templates/public/stylesheets/default/carousel.css
 - lib/generators/social_stream/templates/public/stylesheets/default/fcbkComplete.css
@@ -988,12 +995,12 @@ files:
 - lib/social_stream/models/supertype.rb
 - lib/social_stream/populate.rb
 - lib/social_stream/rails.rb
-- lib/social_stream/relations.rb
 - lib/social_stream/test_helpers.rb
 - lib/social_stream/test_helpers/controllers.rb
 - lib/social_stream/version.rb
 - lib/tasks/db/populate.rake
 - social_stream.gemspec
+- spec/controllers/comments_controller_spec.rb
 - spec/controllers/contacts_controller_spec.rb
 - spec/controllers/frontpage_controller_spec.rb
 - spec/controllers/groups_controller_spec.rb
@@ -1037,6 +1044,7 @@ files:
 - spec/dummy/script/rails
 - spec/factories/activity.rb
 - spec/factories/actor.rb
+- spec/factories/comment.rb
 - spec/factories/group.rb
 - spec/factories/post.rb
 - spec/factories/tie.rb