social_stream-base 2.1.0 → 2.2.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - GING - DIT - UPM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.10.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.10.3
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
@@ -444,20 +444,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -528,6 +514,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.5
+- !ruby/object:Gem::Dependency
+  name: pry-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.5
 description: |-
   Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.
 
@@ -561,8 +561,12 @@ files:
 - app/assets/images/cleditor/toolbar.gif
 - app/assets/images/facebook.png
 - app/assets/images/fiware.png
+- app/assets/images/flags/de.png
 - app/assets/images/flags/en.png
 - app/assets/images/flags/es.png
+- app/assets/images/flags/fr.png
+- app/assets/images/flags/hu.png
+- app/assets/images/flags/nl.png
 - app/assets/images/flags/pt.png
 - app/assets/images/group.png
 - app/assets/images/header-logo-index.png
@@ -590,6 +594,7 @@ files:
 - app/assets/images/user.png
 - app/assets/javascripts/social_stream-base.js
 - app/assets/javascripts/social_stream/action.js
+- app/assets/javascripts/social_stream/actor.js
 - app/assets/javascripts/social_stream/audience.js
 - app/assets/javascripts/social_stream/callback.js
 - app/assets/javascripts/social_stream/comment.js
@@ -597,7 +602,6 @@ files:
 - app/assets/javascripts/social_stream/conversation.js
 - app/assets/javascripts/social_stream/explore.js
 - app/assets/javascripts/social_stream/flash.js
-- app/assets/javascripts/social_stream/follow.js
 - app/assets/javascripts/social_stream/group.js
 - app/assets/javascripts/social_stream/message.js.erb
 - app/assets/javascripts/social_stream/notification.js
@@ -745,6 +749,7 @@ files:
 - app/assets/stylesheets/social_stream/fonts/opensans/opensans-regular.ttf
 - app/controllers/activities_controller.rb
 - app/controllers/activity_actions_controller.rb
+- app/controllers/actors_controller.rb
 - app/controllers/api_controller.rb
 - app/controllers/audience_controller.rb
 - app/controllers/authentications_controller.rb
@@ -752,7 +757,6 @@ files:
 - app/controllers/contacts_controller.rb
 - app/controllers/conversations_controller.rb
 - app/controllers/explore_controller.rb
-- app/controllers/followers_controller.rb
 - app/controllers/frontpage_controller.rb
 - app/controllers/groups_controller.rb
 - app/controllers/home_controller.rb
@@ -775,7 +779,6 @@ files:
 - app/helpers/activity_actions_helper.rb
 - app/helpers/contacts_helper.rb
 - app/helpers/explore_helper.rb
-- app/helpers/followers_helper.rb
 - app/helpers/groups_helper.rb
 - app/helpers/layouts_helper.rb
 - app/helpers/location_helper.rb
@@ -809,6 +812,7 @@ files:
 - app/models/relation.rb
 - app/models/relation/custom.rb
 - app/models/relation/follow.rb
+- app/models/relation/owner.rb
 - app/models/relation/public.rb
 - app/models/relation/reject.rb
 - app/models/relation/single.rb
@@ -852,10 +856,13 @@ files:
 - app/views/comments/_search_result.html.erb
 - app/views/comments/create.js.erb
 - app/views/comments/destroy.js.erb
+- app/views/contacts/_add_button.html.erb
 - app/views/contacts/_button.html.erb
+- app/views/contacts/_button_multiple.html.erb
+- app/views/contacts/_button_simple.html.erb
 - app/views/contacts/_contact.html.erb
 - app/views/contacts/_form.html.erb
-- app/views/contacts/_link_follow.html.erb
+- app/views/contacts/_new_modal.html.erb
 - app/views/contacts/_pendings.html.erb
 - app/views/contacts/_suggestions.html.erb
 - app/views/contacts/destroy.js.erb
@@ -902,10 +909,6 @@ files:
 - app/views/explore/_timeline.html.erb
 - app/views/explore/_trending.html.erb
 - app/views/explore/index.html.erb
-- app/views/followers/destroy.js.erb
-- app/views/followers/index.html.erb
-- app/views/followers/update.js.erb
-- app/views/frontpage/_characteristics.html.erb
 - app/views/frontpage/_presentation.html.erb
 - app/views/frontpage/_presentation_default.html.erb
 - app/views/frontpage/_sponsor.html.erb
@@ -987,13 +990,20 @@ files:
 - app/views/posts/destroy.js.erb
 - app/views/posts/show.html.erb
 - app/views/profiles/_avatar.html.erb
+- app/views/profiles/_avatar_edit.html.erb
 - app/views/profiles/_comunication-info.html.erb
+- app/views/profiles/_comunication-info_edit.html.erb
 - app/views/profiles/_edit_icon.html.erb
 - app/views/profiles/_empty.html.erb
 - app/views/profiles/_experience.html.erb
+- app/views/profiles/_experience_edit.html.erb
 - app/views/profiles/_personal.html.erb
+- app/views/profiles/_personal_edit.html.erb
 - app/views/profiles/_profile.html.erb
+- app/views/profiles/_profile_edit.html.erb
 - app/views/profiles/_tags.html.erb
+- app/views/profiles/_tags_edit.html.erb
+- app/views/profiles/edit.html.erb
 - app/views/profiles/show.html.erb
 - app/views/profiles/update.js.erb
 - app/views/relation/customs/_custom.html.erb
@@ -1047,11 +1057,19 @@ files:
 - app/views/users/show.html.erb
 - app/views/users/show.js.erb
 - app/views/users/show.xml.builder
+- config/locales/de.yml
 - config/locales/devise.es.yml
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/fr.yml
+- config/locales/hu.yml
+- config/locales/nl.yml
 - config/locales/pt.yml
+- config/locales/rails.de.yml
 - config/locales/rails.es.yml
+- config/locales/rails.fr.yml
+- config/locales/rails.hu.yml
+- config/locales/rails.nl.yml
 - config/locales/rails.pt.yml
 - config/locales/zh.yml
 - config/routes.rb
@@ -1059,6 +1077,8 @@ files:
 - db/migrate/20130125100112_sites_as_actor.rb
 - db/migrate/20130212092035_main_activity_object_properties.rb
 - db/migrate/20130305101231_move_avatars.rb
+- db/migrate/20130708152633_set_group_owners.rb
+- db/migrate/20130723133530_actor_notification_settings.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
@@ -1110,6 +1130,7 @@ files:
 - lib/social_stream/base/engine.rb
 - lib/social_stream/base/thinking-sphinx.rb
 - lib/social_stream/base/version.rb
+- lib/social_stream/controllers/authorship.rb
 - lib/social_stream/controllers/cancan_devise_integration.rb
 - lib/social_stream/controllers/helpers.rb
 - lib/social_stream/controllers/i18n_integration.rb
@@ -1128,9 +1149,8 @@ files:
 - lib/social_stream/population/actor.rb
 - lib/social_stream/population/power_law.rb
 - lib/social_stream/population/timestamps.rb
-- lib/social_stream/routing/constraints/custom.rb
-- lib/social_stream/routing/constraints/follow.rb
 - lib/social_stream/routing/constraints/resque.rb
+- lib/social_stream/routing/mapper.rb
 - lib/social_stream/search.rb
 - lib/social_stream/test_helpers.rb
 - lib/social_stream/test_helpers/controllers.rb
@@ -1146,7 +1166,6 @@ files:
 - spec/controllers/comments_controller_spec.rb
 - spec/controllers/contacts_controller_spec.rb
 - spec/controllers/explore_controller_spec.rb
-- spec/controllers/followers_controller_spec.rb
 - spec/controllers/frontpage_controller_spec.rb
 - spec/controllers/groups_controller_spec.rb
 - spec/controllers/home_controller_spec.rb

data/app/assets/javascripts/social_stream/follow.js

@@ -1,28 +0,0 @@
-//= require social_stream/callback
-
-SocialStream.Follow = (function(SS, $, undefined){
-  var callback = new SS.Callback();
-
-  var initButtons = function(){
-    $(".following-button").mouseenter(function(){
-      $(this).hide();
-      $(this).siblings(".unfollow-button").show();
-    });
-
-    $(".unfollow-button").mouseleave(function(){
-      $(this).hide();
-      $(this).siblings(".following-button").show();
-    });
-
-    $(".unfollow-button").hide();
-  }
-
-  callback.register('index', initButtons);
-
-  $(function(){
-    SocialStream.Follow.index();
-  });
-
-  return callback.extend({
-  });
-})(SocialStream, jQuery);

data/app/controllers/followers_controller.rb

@@ -1,34 +0,0 @@
-class FollowersController < ApplicationController
-  before_filter :authenticate_user!, :except => :index
-
-  respond_to :html, :js
-
-  def index
-    @followings = current_subject.following_actor_objects.includes(:actor)
-    @followers = current_subject.followers
-
-    respond_to do |format|
-      format.html
-      format.json { render :text => to_json(@followers) }
-    end
-  end
-
-  def update
-    current_contact.relation_ids = Array.wrap(Relation::Follow.instance.id)
-
-    respond_to :js
-  end
-
-  def destroy
-    current_contact.relation_ids = Array.new
-
-    respond_to :js
-  end
-
-  private
-
-  def current_contact
-    @contact ||=
-      current_subject.sent_contacts.find params[:id]
-  end
-end

data/app/helpers/followers_helper.rb

@@ -1,5 +0,0 @@
-module FollowersHelper
-  def follow_link_class(contact)
-    "follow-link-#{ dom_id contact }"
-  end
-end

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

@@ -1,16 +0,0 @@
-<div class="<%= follow_link_class contact %>">
-  <% if contact.sent? %>
-    <div class="following-button">
-      <%= t 'contact.following' %>
-    </div>
-    <div class="unfollow-button">
-      <%= form_tag follower_path(contact), :method => :delete, :remote => true do |f| %>
-        <%= submit_tag t('contact.unfollow') %>
-      <% end %>
-    </div>
-  <% else %>
-    <%= form_tag follower_path(contact), :method => :put, :remote => true do |f| %>
-      <%= submit_tag t('contact.follow') %>
-    <% end %>
-  <% end %>
-</div>

data/app/views/followers/destroy.js.erb

@@ -1 +0,0 @@
-$(".<%= follow_link_class @contact %>").html("<%= escape_javascript render(:partial => "contacts/link_follow", :locals => { :contact => @contact.reload } )%>");

data/app/views/followers/index.html.erb

@@ -1,30 +0,0 @@
-<section id="followers">
-  <%= render partial: 'toolbar/profile', locals: { :subject => current_subject } %>
-
-  <section class="followers tabbable">
-    <ul class="nav nav-tabs">
-      <li class="active">
-      <a data-toggle="tab" href="#following"><%=t('follow.followings')%></a>
-      </li>
-      <li class="">
-      <a data-toggle="tab" href="#follower"><%=t('follow.followers')%></a>
-      </li>
-    </ul>
-    <div class="tab-content">
-      <div id="following" class="tab-pane active offset1">
-        <%= render @followings.
-          page(params[:page]).
-          per(20).
-          map { |f| current_subject.contact_to!(f) } %>
-      </div>
-      <div id="follower" class="tab-pane offset1 ">
-        <%= render @followers.
-          page(params[:page]).
-          per(20).
-          map { |f| current_subject.contact_to!(f) } %>
-      </div>
-    </div>
-  </section>
-
-  <%= render partial: 'sidebar/show' %>
-</section>

data/app/views/followers/update.js.erb

@@ -1,3 +0,0 @@
-$(".<%= follow_link_class @contact %>").html("<%= escape_javascript render(:partial => "contacts/link_follow", :locals => { :contact => @contact.reload } )%>");
-
-SocialStream.Follow.index();

data/app/views/frontpage/_characteristics.html.erb

@@ -1,23 +0,0 @@
-<article id="characteristics">
-  <ul class="list">
-    <li class="list participants">
-        <%= t('frontpage.elements.participants') %>
-    </li>
-    <li class="list organizers">
-        <%= t('frontpage.elements.organizers') %>
-    </li>
-    <li class="list groups">
-        <%= t('frontpage.elements.groups') %>
-    </li>
-    <li class="list comments">
-        <%= t('frontpage.elements.comments') %>
-    </li>
-    <li class="list tags">
-        <%= t('frontpage.elements.tags') %>
-    </li>
-    <li class="list networks">
-        <%= t('frontpage.elements.networks') %>
-    </li>
-  </ul>
-</article>
-

data/lib/social_stream/routing/constraints/custom.rb

@@ -1,11 +0,0 @@
-module SocialStream
-  module Routing
-    module Constraints
-      class Custom
-        def matches?(request)
-          SocialStream.relation_model == :custom
-        end
-      end
-    end
-  end
-end

data/lib/social_stream/routing/constraints/follow.rb

@@ -1,11 +0,0 @@
-module SocialStream
-  module Routing
-    module Constraints
-      class Follow
-        def matches?(request)
-          SocialStream.relation_model == :follow
-        end
-      end
-    end
-  end
-end

data/spec/controllers/followers_controller_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe FollowersController do
-  include SocialStream::TestHelpers::Controllers
-
-  render_views
-
-  describe "with followers" do
-    before do
-      @user = Factory(:user)
-
-      @follow = Factory(:follow, :contact => Factory(:contact, :sender => @user.actor))
-
-      sign_in @user
-    end
-
-    it "should render index" do
-      get :index
-
-      response.should be_success
-    end
-
-    describe "with post" do
-      before do
-        Factory(:self_post, :author_id => @user.actor_id)
-      end
-
-      it "should render index" do
-        get :index
-
-        response.should be_success
-      end
-    end
-  end
-end
-
-