social_stream 0.4.5 → 0.4.6

data/app/controllers/permissions_controller.rb

@@ -1,10 +1,15 @@
 class PermissionsController < InheritedResources::Base
   before_filter :authenticate_user!
-  load_and_authorize_resource
 
   respond_to :js
 
   actions :index
 
   belongs_to :relation
+
+  def index
+    authorize! :read, parent
+
+    index!
+  end
 end

data/app/controllers/relation/customs_controller.rb

@@ -5,4 +5,12 @@ class Relation::CustomsController < InheritedResources::Base
   respond_to :js
 
   belongs_to :sphere, :optional => true
+
+  def index
+    # Must authorize index, because Cancan does not filter collection with conditions.
+    # See https://github.com/ryanb/cancan/wiki/checking-abilities
+    authorize! :read, parent.customs.new
+
+    index!
+  end
 end

data/app/models/actor.rb

@@ -75,11 +75,11 @@ class Actor < ActiveRecord::Base
   scope :distinct_initials, select('DISTINCT SUBSTR(actors.name,1,1) as initial').order("initial ASC")
 
   scope :contacted_to, lambda { |a|
-    joins(:sent_ties).merge(Tie.received_by(a))
+    joins(:sent_ties).merge(Tie.received_by(a).intended)
   }
 
   scope :contacted_from, lambda { |a|
-    joins(:received_ties).merge(Tie.sent_by(a))
+    joins(:received_ties).merge(Tie.sent_by(a).intended)
   }
  
   after_create :create_initial_relations
@@ -250,7 +250,7 @@ class Actor < ActiveRecord::Base
   
   # Set of ties sent by this actor received by a
   def ties_to(a)
-    sent_ties.received_by(a)
+    sent_ties.received_by(a).intended
   end
 
   # Get the first of the ties created to a, or create a new one with the {Relation::Public}

data/app/models/tie.rb

@@ -45,6 +45,8 @@
 #                        integer, array
 # replied:: ties having at least another tie in the other way, a tie from a to b
 #           is replied if there is a tie from b to a
+# intended:: ties can be desactivated by subjects when they change their connections.
+#            This scope gathers the active ones
 #
 class Tie < ActiveRecord::Base
   # Facilitates relation assigment along with find_relation callback
@@ -107,6 +109,8 @@ class Tie < ActiveRecord::Base
     joins(:relation).where('relations.type' => 'Relation::Public')
   }
 
+  scope :intended, where(:intended => true)
+
   validates_presence_of :sender_id, :receiver_id, :relation
 
   before_validation :find_or_build_relation

data/app/views/contacts/_form.html.erb

@@ -55,9 +55,14 @@
                             </div>
                           </li>
                         <% end %>
-                        <% end %>
-                      </ul>
-                    </dd>
+                        </li>
+                      <% end %>
+                      <li class="new_sphere"><span class="sphere_name"><%= link_to t('contact.type.new'), spheres_path %></span></li>
+
+                    </ul>
+
+                  </dd>
+
                   </div>
                 </div>
               </div>

data/app/views/layouts/_account.html.erb

@@ -3,13 +3,13 @@
     <a href="#" class="sf-with-ul" id="btn_menu_config"><%= t('account.one') %><span class="sf-sub-indicator"> »</span></a>
     <ul>
       <li>
-        <%= link_to 'Configurations', '#' %>
+        <%= link_to t('account.settings'), edit_user_registration_path %>
       </li>
       <li>
-        <%= link_to 'Notifications', '#' %>
+        <%= link_to t('account.notifications'), '#' %>
       </li>
       <li class="current">
-        <%= link_to 'Privacy', spheres_path %>
+        <%= link_to t('account.privacy'), spheres_path %>
       </li>
     </ul>
   </li>

data/app/views/toolbar/_profile_menu_tie_options.html.erb

@@ -12,13 +12,13 @@
     <% if current_subject.ties_to(subject).present? %>
       <li >
       <%= link_to image_tag("btn/btn_friend.png", :class => "menu_icon") +
-                  t('tie.edit.contact', :type => current_subject.ties_to(subject).map(&:relation_name).join(", ")),
+                  current_subject.ties_to(subject).map(&:relation_name).join(", "),
                   edit_contact_path(subject.actor_id) %>
      </li>
     <% else %>
       <li >
       <%= link_to image_tag("btn/btn_friend.png", :class => "menu_icon") +
-                  t('tie.add.contact'),
+                  t('contact.new.title'),
                   edit_contact_path(subject.actor_id),
                   :id => 'contacts_menu' %>
       </li>

data/config/locales/en.yml

@@ -6,6 +6,9 @@ en:
     accept: "Accept"
   account:
     one: "Account"
+    notifications: "Notifications"
+    privacy: "Privacy"
+    settings: "Settings"
   activity:
     confirm_delete: "Delete activity?"
     delete: "Delete"
@@ -91,6 +94,8 @@ en:
       one: "Suggestion"
       other: "Suggestions"
       all: "All"
+    type:
+      new: "New type"
   copyright: "2010 Copyright - All rights reserved"
   days: Days
   delete:

data/lib/generators/social_stream/templates/public/stylesheets/default/contacts.css

@@ -69,13 +69,13 @@ span.ui-radio-state-checked-hover {
 }
 
 
-li.sphere_name {
+li.sphere_name, li.new_sphere {
 	background-color: #1F4A75;
 	padding: 5px;
 	text-align: left;
 }
 
-span.sphere_name{
+span.sphere_name, span.sphere_name a{
 	color: white;
 }
 

data/lib/social_stream/ability.rb

@@ -78,7 +78,6 @@ module SocialStream
       # Privacy
       can [:create, :read, :update, :destroy], Sphere, :actor_id => subject.try(:actor_id)
       can [:create, :read, :update, :destroy], Relation::Custom, :sphere => { :actor_id => subject.try(:actor_id) }
-      can :read, Permission
     end
   end
 end

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.4.5".freeze
+  VERSION = "0.4.6".freeze
 end

data/social_stream.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   # Pagination
   s.add_runtime_dependency('will_paginate', '~> 3.0.pre2')
   # OAuth client
-  s.add_runtime_dependency('omniauth','~> 0.2.5')	
+  s.add_runtime_dependency('omniauth','~> 0.2.6')
   # OAuth provider
   s.add_runtime_dependency('oauth-plugin','~> 0.4.0.pre1')	
   # Theme support

data/spec/controllers/permissions_controller_spec.rb

@@ -31,8 +31,6 @@ describe PermissionsController do
       end
 
       it "should not render index" do
-        pending
-
         begin
           get :index, :relation_id => @relation.id, :format => "js"
 

data/spec/controllers/relation_customs_controller_spec.rb

@@ -75,11 +75,14 @@ describe Relation::CustomsController do
       end
 
       it "should not render index" do
-        pending
+	begin
+          get :index, :sphere_id => @sphere.id, :format => "js"
 
-        get :index, :sphere_id => @sphere.id, :format => "js"
-
-        assert false
+	  # Should not get here
+          assert false
+        rescue CanCan::AccessDenied
+          assigns(:customs).should be_blank
+        end
       end
 
       context "a new relation" do

data/spec/models/tie_spec.rb

@@ -15,19 +15,6 @@ describe Tie do
 
       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",
-                       :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 "follower_count" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 +02:00
+date: 2011-06-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -188,12 +188,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 27
         segments: 
         - 0
         - 2
-        - 5
-        version: 0.2.5
+        - 6
+        version: 0.2.6
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency