social_stream-base 0.6.3 → 0.6.5

data/spec/factories/relation_custom.rb

@@ -1,4 +1,4 @@
 Factory.define(:relation_custom, :class => Relation::Custom) do |c|
   c.sequence(:name) { |n| "Relation custom #{ n }" }
-  c.association :sphere
+  c.association :actor
 end

data/spec/factories/tie.rb

@@ -33,3 +33,7 @@ Factory.define :partner, :parent => :g2g_tie do |t|
   t.after_build { |u| u.relation = u.sender.relation_custom('partner') }
 end
 
+Factory.define :group_public, :parent => :g2g_tie do |t|
+  t.after_build { |u| u.relation = u.sender.relation_public }
+end
+

data/spec/models/activity_spec.rb

@@ -263,7 +263,7 @@ describe Activity do
           create_ability_accessed_by_related :friend
         end
 
-       it_should_behave_like "Denies Creating"
+        it_should_behave_like "Denies Creating"
         it_should_behave_like "Allows Reading"
         it_should_behave_like "Denies Updating"
         it_should_behave_like "Denies Destroying"
@@ -274,7 +274,6 @@ describe Activity 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"
@@ -462,4 +461,14 @@ describe Activity do
       end
     end
   end
+
+  context "without relations" do
+    it "should allow create to friend" do
+      tie = Factory(:friend)
+
+      activity = Activity.new :contact_id => tie.contact.inverse!.id
+
+      assert activity.allow?(tie.receiver, 'create')
+    end
+  end
 end

data/spec/models/user_spec.rb

@@ -1,22 +1,81 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe User do
+  before do
+    @user = Factory(:user)
+  end
+
   it "should find by slug" do
-    user = Factory(:user)
+    assert @user.should == User.find_by_slug(@user.slug)
+  end
+
+  context "member of a group" do
+    before do
+      tie = Factory(:member, :contact => Factory(:group_contact, :receiver => @user.actor))
+      @group = tie.sender_subject
+    end
+
+    context "without accept the group" do
+      it "should not represent" do
+        @user.represented.should_not include(@group)
+      end
+    end
+
+    context "accepting the group" do
+      before do
+        Factory(:friend, :contact => @user.contact_to!(@group))
+      end
+
+      it "should represent" do
+        @user.represented.should include(@group)
+      end
+    end
+  end
+
+  context "partner of a group" do
+    before do
+      tie = Factory(:partner, :contact => Factory(:group_contact, :receiver => @user.actor))
+      @group = tie.receiver_subject
+    end
+
+    context "without accept the group" do
+      it "should not represent" do
+        @user.represented.should_not include(@group)
+      end
+    end
+
+    context "accepting the group" do
+      before do
+        Factory(:friend, :contact => @user.contact_to!(@group))
+      end
 
-    assert user.should == User.find_by_slug(user.slug)
+      it "should not represent" do
+        @user.represented.should_not include(@group)
+      end
+    end
   end
 
-  it "should represent" do
-    tie =   Factory(:member)
-    group = tie.sender_subject
-    user =  tie.receiver_subject
+  context "public of a group" do
+    before do
+      tie = Factory(:group_public, :contact => Factory(:group_contact, :receiver => @user.actor))
+      @group = tie.receiver_subject
+    end
 
-    assert user.represented.should include(group)
+    context "without accept the group" do
+      it "should not represent" do
+        @user.represented.should_not include(@group)
+      end
+    end
 
-    tie = Factory(:partner, :receiver => user.actor)
+    context "accepting the group" do
+      before do
+        Factory(:friend, :contact => @user.contact_to!(@group))
+      end
 
-    assert ! user.represented.include?(tie.sender_subject)
+      it "should not represent" do
+        @user.represented.should_not include(@group)
+      end
+    end
   end
 
   it "should have activity object" do

data/spec/spec_helper.rb

@@ -21,9 +21,6 @@ ActiveRecord::Migration.verbose = false
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-# Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
-
 # Load Factories
 require 'factory_girl'
 Dir["#{File.dirname(__FILE__)}/factories/*.rb"].each {|f| require f}

data/spec/support/db.rb

@@ -14,7 +14,16 @@ end
   end
 end
 
+begin
+  ActiveRecord::Migrator.migrate File.expand_path("../../dummy/db/migrate/", __FILE__), 0
+rescue
+  puts "WARNING: Social Stream Base failed to rollback" 
+end
+
 CreateMailboxer.up
 ActsAsTaggableOnMigration.up
 
+# Run any available migration
+ActiveRecord::Migrator.migrate File.expand_path("../../dummy/db/migrate/", __FILE__)
+
 require File.expand_path("../../dummy/db/seeds", __FILE__)

data/spec/support/migrations.rb

@@ -1,19 +1,10 @@
-class MigrationFinder
-  def initialize gem, path
-    finder = Gem::GemPathSearcher.new
-    taggable_spec = finder.find(gem)
-    taggable_migration = finder.matching_files(taggable_spec,
-                                               File.join(*path)).first
-
-    require taggable_migration
-  end
-end
+require 'social_stream/migration_finder'
 
 # acts-as-taggable-on
-MigrationFinder.new 'acts-as-taggable-on',
+SocialStream::MigrationFinder.new 'acts-as-taggable-on',
                    ["generators", "acts_as_taggable_on", "migration", "templates", "active_record", "migration"]
 
 # Mailboxer
-MigrationFinder.new 'mailboxer',
+SocialStream::MigrationFinder.new 'mailboxer',
                     ['generators', 'mailboxer', 'templates', 'migration']
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 +02:00
+date: 2011-07-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -205,12 +205,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 23
         segments: 
         - 0
+        - 3
         - 2
-        - 4
-        version: 0.2.4
+        version: 0.3.2
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -345,14 +345,12 @@ dependencies:
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 3
         segments: 
         - 0
-        - 10
-        - 3
-        version: 0.10.3
+        version: "0"
   type: :development
   version_requirements: *id021
 - !ruby/object:Gem::Dependency 
@@ -847,6 +845,7 @@ files:
 - app/assets/stylesheets/jquery.ui.slidertheme.css
 - app/assets/stylesheets/menu.css
 - app/assets/stylesheets/messages.css
+- app/assets/stylesheets/relation_customs.css
 - app/assets/stylesheets/settings.css
 - app/assets/stylesheets/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
 - app/assets/stylesheets/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
@@ -863,7 +862,6 @@ files:
 - app/assets/stylesheets/smoothness/images/ui-icons_cd0a0a_256x240.png
 - app/assets/stylesheets/smoothness/jquery-ui-1.7.3.custom.css
 - app/assets/stylesheets/smoothness/jquery-ui-1.8.4.custom.css
-- app/assets/stylesheets/spheres.css
 - app/controllers/activities_controller.rb
 - app/controllers/api_controller.rb
 - app/controllers/authentications_controller.rb
@@ -883,7 +881,6 @@ files:
 - app/controllers/profiles_controller.rb
 - app/controllers/relation/customs_controller.rb
 - app/controllers/settings_controller.rb
-- app/controllers/spheres_controller.rb
 - app/controllers/subjects_controller.rb
 - app/controllers/tags_controller.rb
 - app/controllers/users_controller.rb
@@ -917,7 +914,6 @@ files:
 - app/models/relation/custom.rb
 - app/models/relation/public.rb
 - app/models/relation_permission.rb
-- app/models/sphere.rb
 - app/models/tie.rb
 - app/models/user.rb
 - app/views/activities/_activity.html.erb
@@ -946,6 +942,7 @@ files:
 - app/views/contacts/_pendings.html.erb
 - app/views/contacts/_suggestions.html.erb
 - app/views/contacts/_suggestions_and_pendings.html.erb
+- app/views/contacts/destroy.js.erb
 - app/views/contacts/edit.html.erb
 - app/views/contacts/index.html.erb
 - app/views/contacts/index.js.erb
@@ -1045,21 +1042,16 @@ files:
 - app/views/profiles/show.html.erb
 - app/views/profiles/update.js.erb
 - app/views/relation/customs/_form.html.erb
-- app/views/relation/customs/_index.html.erb
+- app/views/relation/customs/_jquery.erb
 - app/views/relation/customs/_list.html.erb
 - app/views/relation/customs/create.js.erb
-- app/views/relation/customs/index.js.erb
+- app/views/relation/customs/index.html.erb
 - app/views/relation/customs/update.js.erb
 - app/views/settings/_api_key.html.erb
 - app/views/settings/_index.html.erb
 - app/views/settings/_notifications.html.erb
 - app/views/settings/index.html.erb
 - app/views/settings/index.js.erb
-- app/views/spheres/_form.html.erb
-- app/views/spheres/_jquery.erb
-- app/views/spheres/_list.html.erb
-- app/views/spheres/create.js.erb
-- app/views/spheres/index.html.erb
 - app/views/subjects/_contacts.html.erb
 - app/views/subjects/_tabs.html.erb
 - app/views/toolbar/_home.html.erb
@@ -1079,10 +1071,13 @@ files:
 - config/routes.rb
 - db/migrate/20110610112023_create_social_stream.rb
 - db/migrate/20110705103202_empty_ties_count.rb
+- db/migrate/20110712090343_remove_spheres.rb
+- db/migrate/20110712142140_remove_permission_function.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
 - lib/acts_as_taggable_on/social_stream.rb
 - lib/generators/social_stream/base/install_generator.rb
 - lib/generators/social_stream/base/templates/initializer.rb
+- lib/generators/social_stream/base/templates/mailboxer_custom.rb
 - lib/generators/social_stream/base/templates/navigation.rb
 - lib/generators/social_stream/base/templates/relations.yml
 - lib/paperclip/social_stream.rb
@@ -1091,12 +1086,14 @@ files:
 - lib/social_stream/base.rb
 - lib/social_stream/base/version.rb
 - lib/social_stream/controllers/helpers.rb
+- lib/social_stream/migration_finder.rb
 - lib/social_stream/models/object.rb
 - lib/social_stream/models/subject.rb
 - lib/social_stream/models/supertype.rb
 - lib/social_stream/populate.rb
 - lib/social_stream/test_helpers.rb
 - lib/social_stream/test_helpers/controllers.rb
+- lib/social_stream/toolbar_config.rb
 - lib/tasks/db/populate.rake
 - lib/tasks/resque.rake
 - social_stream-base.gemspec
@@ -1112,7 +1109,6 @@ files:
 - spec/controllers/profiles_controller_spec.rb
 - spec/controllers/relation_customs_controller_spec.rb
 - spec/controllers/representations_spec.rb
-- spec/controllers/spheres_controller_spec.rb
 - spec/controllers/subjects_controller.rb
 - spec/controllers/users_controller_spec.rb
 - spec/dummy/.gitignore
@@ -1155,7 +1151,6 @@ files:
 - spec/factories/group.rb
 - spec/factories/post.rb
 - spec/factories/relation_custom.rb
-- spec/factories/sphere.rb
 - spec/factories/tie.rb
 - spec/factories/user.rb
 - spec/integration/navigation_spec.rb
@@ -1166,7 +1161,6 @@ files:
 - spec/models/like_spec.rb
 - spec/models/post_spec.rb
 - spec/models/profile_spec.rb
-- spec/models/relation_custom_spec.rb
 - spec/models/relation_spec.rb
 - spec/models/tie_spec.rb
 - spec/models/user_spec.rb

data/app/controllers/spheres_controller.rb

@@ -1,12 +0,0 @@
-class SpheresController < InheritedResources::Base
-  before_filter :authenticate_user!
-  load_and_authorize_resource
-
-  respond_to :html, :js
-
-  protected
-
-  def begin_of_association_chain
-    current_subject
-  end
-end

data/app/models/sphere.rb

@@ -1,9 +0,0 @@
-class Sphere < ActiveRecord::Base
-  belongs_to :actor
-  
-  has_many :customs, :class_name => "Relation::Custom"
-
-  validates_presence_of :name
-  validates_uniqueness_of :name, :scope => :actor_id
-
-end

data/app/views/relation/customs/_index.html.erb

@@ -1,28 +0,0 @@
-<%= javascript_include_tag 'jquery-ui'%>
-
-<p class="sectionTitle"><%= raw t('relation_custom.in_sphere.choose', :name => h(@sphere.name)) %> </p>
-
-
-<div class="privacy_add_element">
-  <div id="new_relation_custom_title_block"> 
-    <a href="#"><span id="new_relation_custom_title" class="privacy_span_new"><%= t 'relation_custom.new' %></span></a>
-  </div> 
-  <div id="new_relation_custom_input_block"> 
-    <%= render :partial => 'relation/customs/form' %>
-  </div>
-</div>
-
-<div id="relation_custom_list">
-  <%= render :partial => 'relation/customs/list', :object => @customs %>
-</div>
-
-<%= javascript_tag do %>
-  $(function() {
-    $("#new_relation_custom_input_block").hide();
-
-    $("#new_relation_custom_title").click(function() {
-      $("#new_relation_custom_title_block").hide();
-      $("#new_relation_custom_input_block").show();
-    });
-  })
-<% end %>

data/app/views/relation/customs/index.js.erb

@@ -1,2 +0,0 @@
-$('#relations').html("<%= escape_javascript render(:partial => 'index') %>");
-$('#relations').show();

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

@@ -1,28 +0,0 @@
-<% @sphere ||= Sphere.new %>
-
-<%= form_for @sphere, :remote => true do |f| %>
-
-  <% if @sphere.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@sphere.errors.count, "error") %> prohibited this sphere from being saved:</h2>
-
-      <ul>
-      <% @sphere.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <p><%= f.text_field :name, :class => "privacy_input_new", :size => 20 %></p>
-  <%= f.submit nil, :class => "button" %>
-  <button class="button" id="cancel_new_sphere" ><%= t('button.cancel') %></button>
-<% end %>
-
-<%= javascript_tag do %>
-  $("#cancel_new_sphere").click(function() {   
-    $("#new_sphere_input_block").hide();
-    $("#new_sphere_title_block").show();
-    return false;
-  });
-<% end %>