social_stream-base 0.19.2 → 0.20.0

data/app/models/group.rb

@@ -34,6 +34,8 @@ class Group < ActiveRecord::Base
 
   # Creates the ties from the founder to the group
   def create_ties_from_founder
+=begin
+    # FIXME: need to define a proper relation for this case. Maybe a system defined relation
     author.sent_contacts.create! :receiver_id  => actor_id,
                                  :relation_ids => _relation_ids
 
@@ -41,6 +43,7 @@ class Group < ActiveRecord::Base
       user_author.sent_contacts.create! :receiver_id  => actor_id,
                                         :relation_ids => _relation_ids
     end
+=end
   end
   
   # Creates the ties from the group to the participants

data/app/models/post.rb

@@ -5,9 +5,7 @@ class Post < ActiveRecord::Base
   validates_presence_of :text
 
   define_index do
-    indexes activity_object.description
-
-    has created_at
+    activity_object_index
   end
 
   def title

data/app/models/relation.rb

@@ -67,6 +67,11 @@ class Relation < ActiveRecord::Base
     where(:type => positive_names)
   }
 
+  scope :allowing, lambda { |action, object|
+    joins(:permissions).
+      merge(Permission.where(:action => action).where(:object => object))
+  }
+
   before_create :initialize_sender_type
 
   class << self

data/app/models/relation/follow.rb

@@ -4,11 +4,10 @@
 # Use this model setting <tt>config.relation_model = :follow</tt> in your
 # <tt>config/initializers/social_stream.rb</tt>
 class Relation::Follow < Relation::Single
-  class << self
-    def instance
-      first ||
-        create(:permissions => Array(Permission.find_or_create_by_action('follow')))
-    end
-  end
+  PERMISSIONS = 
+    [
+      [ 'create', 'activity' ],
+      [ 'read',   'activity' ],
+      [ 'follow', nil ]
+    ]
 end
-

data/app/models/relation/public.rb

@@ -1,4 +1,9 @@
 class Relation::Public < Relation::Single
+  PERMISSIONS =
+    [
+      [ 'read', 'activity' ]
+    ]
+
   # A {Relation::Public public relation} is always the weakest
   def <=>(relation)
     1

data/app/models/relation/single.rb

@@ -4,11 +4,21 @@
 # these {Relation relations}.
 #
 class Relation::Single < Relation
+  PERMISSIONS = []
+
   class << self
     def instance
       @instance ||=
-        first || create!
+        first ||
+          create!(:permissions => permissions)
+    end
+
+    def permissions
+      self::PERMISSIONS.map{ |p|
+        Permission.find_or_create_by_action_and_object p.first, p.last
+      }
     end
+
   end
 
   # The name of public relation

data/app/views/activities/_new.html.erb

@@ -32,7 +32,7 @@
       }
       //For security with check "var default_security_width = '100px';" in activities.js.erb
     <% end %>
-    <%= select_tag :_relation_ids, options_for_select(current_subject.activity_relations(receiver).sort.map{ |r| [ r.name, r.id ] }), :id => 'security', :multiple => true, :title => t("activity.privacy.myself.contacts.#{ receiver.class.to_s.underscore }") %>
+    <%= select_tag :relation_ids, options_for_select(current_subject.activity_relations(receiver).sort.map{ |r| [ r.name, r.id ] }), :id => 'security', :multiple => true, :title => t("activity.privacy.myself.contacts.#{ receiver.class.to_s.underscore }") %>
   <% else %>
     <div id="security_chzn" class="chzn-container chzn-container-multi">
       <ul class="chzn-choices">

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

@@ -1,9 +1,13 @@
 <div class="<%= follow_link_class contact %>">
   <% if contact.sent? %>
-    <%= t 'contact.following' %>
-    <%= form_tag follower_path(contact), :method => :delete, :remote => true do |f| %>
-      <%= submit_tag t('contact.unfollow') %>
-    <% end %>
+    <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') %>

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

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

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

@@ -1,6 +1,6 @@
 <div id="header_search">      
   <form action="<%=search_path%>" method="get" id="header_search_form">
-    <%= text_field_tag :search_query, nil,:autocomplete => :off, :id => :header_search_input %>
+    <%= text_field_tag :q, nil,:autocomplete => :off, :id => :header_search_input %>
   </form>
   <div id="header_search_display">
     <ul><li class="loading"><%= image_tag('loading.gif', :class => :loading) %></li></ul>
@@ -44,7 +44,7 @@ $(document).ready(function() {
         $("#header_search_display").html("<ul><li class=\"loading\"><%= escape_javascript(image_tag('loading.gif', :class => :loading)) %></li></ul>").show();
         $.ajax({
           type : "GET",
-          url : "<%= search_url %>?search_query=" + searchstring + "&mode=header_search",
+          url : "<%= search_url %>?q=" + searchstring + "&mode=header_search",
           success : function(html) {      
             if ($("#header_search_input").val()==searchstring){ //Only show if input value is still the same
               $("#header_search_display").html(html);

data/app/views/search/_extended_search.html.erb

@@ -1,19 +1,19 @@
 <% if @search_result.empty? %>
-<div class="model_with_details">
-  <%= I18n.t('search.nothing') %>
-</div>
+  <div class="model_with_details">
+    <%= I18n.t('search.nothing') %>
+  </div>
 <% else %>
-<% @search_result.each do |model|%>
-<% if @search_class_sym.nil? %>
-<div class="subject_search_results block left">
-  <%= render_global_search_for model %>
-</div>
-<% else %>
-<div class="subject_search_results block left <%= model.class.name.downcase %>">
-  <%= render_focus_search_for model %>
-</div>
-<% end %>
-<% end %>
-<br class="clearfloat">
-<%= paginate @search_result %>
-<% end %> 
+  <% @search_result.each do |model|%>
+    <% if @search_class_sym.nil? %>
+      <div class="subject_search_results block left">
+        <%= render_global_search_for model %>
+      </div>
+    <% else %>
+      <div class="subject_search_results block left <%= model.class.name.downcase %>">
+        <%= render_focus_search_for model %>
+      </div>
+    <% end %>
+  <% end %>
+  <br class="clearfloat">
+  <%= paginate @search_result %>
+<% end %> 

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

@@ -1,20 +1,20 @@
 <%= form_tag search_path, :method => :get,
                           :remote => true,
                           :id => "search_form" do %>
-  <%= hidden_field_tag :focus, params[:focus] %>
+  <%= hidden_field_tag :type, params[:type] %>
   <div class="block">
     <div class="error" id="too_short_error" <%= 'style=display:block;' if too_short_query? %>><%= t('search.at_least') %></div>
 
     <div class="form_row search_row">
-      <%= text_field_tag :search_query, params[:search_query], :autocomplete => :off, :id => :global_search_input %>
+      <%= text_field_tag :q, params[:q], :autocomplete => :off, :id => :global_search_input %>
     </div>
 
     <div  id="focus_options" class="form_row search_row">
       <ul class="menu_plain_list">
         <li><%= link_to content_tag(:span,
                                     t('search.show_all'),
-                                    :class => "global #{ params[:focus].blank? && 'selected' }"),
-                        search_path(:search_query => params[:search_query]),
+                                    :class => "global #{ params[:type].blank? && 'selected' }"),
+                        search_path(:q => params[:q]),
                                     :remote => true %></li>
         <% SocialStream.extended_search_models.each do |model_sym| %>
           <li>

data/app/views/search/_header_search.html.erb

@@ -10,7 +10,7 @@
   <%= link_to raw('<li class="more">' + 
                   t("search.global.first_result.#{ total == 1 ? 'one' : 'more' }", :count => total) +
                   '<br>' +
-                  t('search.global.query', :query => truncate(h(params[:search_query]),:length => 20)) + 
+                  t('search.global.query', :query => truncate(h(params[:q]),:length => 20)) + 
                   '</li>'), 
-              search_path(:search_query => params[:search_query]) %>
+              search_path(:q => params[:q]) %>
 </ul>

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

@@ -1,5 +1,5 @@
 <% content_for :title do %>
-<%= t('search.name')%> <%= params[:search_query].present? ? ": #{params[:search_query]}" : ""%>
+<%= t('search.name')%> <%= params[:q].present? ? ": #{params[:q]}" : ""%>
 <% end %>
 
 <% sidebar %>

data/app/views/search/index.js.erb

@@ -3,13 +3,13 @@
   
   $('#focus_options ul li a span').removeClass('selected');
   
-  <% if params[:focus].present? %>
-  $('#focus_options ul li a span.<%= params[:focus].pluralize.downcase %>').addClass('selected');
+  <% if params[:type].present? %>
+  $('#focus_options ul li a span.<%= params[:type].pluralize.downcase %>').addClass('selected');
   <% else %>
   $('#focus_options ul li a span.global').addClass('selected');
   <% end %>
   
-  $('title').text('<%= t('search.name')%> <%= escape_javascript(params[:search_query].present? ? ": #{params[:search_query]}" : "")%>');
+  $('title').text('<%= t('search.name')%> <%= escape_javascript(params[:q].present? ? ": #{params[:q]}" : "")%>');
   
   <% if too_short_query? %>
   $('#too_short_error').show();
@@ -19,4 +19,4 @@
   
   $('#global_search_input').removeClass("searching");
 
-  setActivityPrivacyTooltips();
+  setActivityPrivacyTooltips();

data/db/migrate/20120403175913_create_activity_object_audiences.rb

@@ -0,0 +1,34 @@
+# This migration comes from social_stream_base_engine (originally 20120403175913)
+class CreateActivityObjectAudiences < ActiveRecord::Migration
+  def change
+    create_table :activity_object_audiences do |t|
+      t.references :activity_object
+      t.references :relation
+
+      t.timestamps
+    end
+
+    add_foreign_key :activity_object_audiences, :activity_objects, :name => 'activity_object_audiences_on_activity_object_id'
+    add_foreign_key :activity_object_audiences, :relations, :name => 'activity_object_audiences_on_relation_id'
+
+
+    ActivityObject.all.each do |ao|
+      post_activity = ao.post_activity
+      next if post_activity.blank?
+
+      ao.relation_ids = post_activity.relation_ids
+    end
+
+    ActivityObjectAudience.record_timestamps = false
+
+    ActivityObject.all.each do |ao|
+      ao.activity_object_audiences.each do |aud|
+        aud.created_at = aud.updated_at = ao.created_at
+        aud.save!
+      end
+    end
+
+    ActivityObjectAudience.record_timestamps = true
+    ActivityObject.reset_column_information
+  end
+end

data/db/migrate/20120411132550_add_visit_count_to_activity_object.rb

@@ -0,0 +1,9 @@
+class AddVisitCountToActivityObject < ActiveRecord::Migration
+  def up
+    add_column :activity_objects, :visit_count, :integer, :default => 0
+  end
+
+  def down
+    remove_column :activity_objects, :visit_count
+  end
+end

data/db/migrate/20120411151413_relation_public_permissions.rb

@@ -0,0 +1,8 @@
+class RelationPublicPermissions < ActiveRecord::Migration
+  def up
+    Relation::Public.instance.permissions = Relation::Public.permissions if Relation::Public.instance.permissions.blank?
+  end
+
+  def down
+  end
+end

data/lib/generators/social_stream/base/templates/initializer.rb

@@ -41,3 +41,6 @@ SocialStream.setup do |config|
   # Cleditor controls. It is used in new message editor, for example
   # config.cleditor_controls = "bold italic underline strikethrough subscript superscript | size style | bullets | image link unlink"
 end
+
+# You can customize toolbar, sidebar and location bar from here
+# See https://github.com/ging/social_stream/wiki/How-to-customize-the-toolbar,-sidebar-and-location

data/lib/social_stream-base.rb

@@ -35,7 +35,8 @@ module SocialStream
   end
 
   module Views
-    autoload :List, 'social_stream/views/list'
+    autoload :List,     'social_stream/views/list'
+    autoload :Location, 'social_stream/views/location'
 
     module Settings
       autoload :Base, 'social_stream/views/settings/base'

data/lib/social_stream/ability/base.rb

@@ -13,20 +13,26 @@ module SocialStream
         (SocialStream.objects - [ :actor, :comment ]).map{ |obj|
           obj.to_s.classify.constantize
         }.each do |klass|
-          can :create, klass do |k| # can :create, Post do |post|
-            k.build_post_activity.allow?(subject, 'create')
+          can :create, klass do |object| # can :create, Post do |post|
+            object.author.present? &&
+              object.owner.present? &&
+              object.author == Actor.normalize(subject) &&
+              ( object.author == object.owner ||
+                object.owner.allow?(subject, 'create', 'activity') )
           end
 
-          can :read, klass do |k| # can :read, Post do |post|
-            k.post_activity.allow?(subject, 'read')
+          can :read, klass do |object| # can :read, Post do |post|
+            object.authored_or_owned_by?(subject) ||
+              object.relation_ids.include?(Relation::Public.instance.id) ||
+              subject.present? && (object.relation_ids & subject.received_relation_ids).any?
           end
 
-          can :update, klass do |k| # can :update, Post do |post|
-            [k.author_id, k.owner_id].include?(Actor.normalize_id(subject))
+          can :update, klass do |object| # can :update, Post do |post|
+            object.authored_or_owned_by?(subject)
           end
 
-          can :destroy, klass do |k| # can :destroy, Post do |post|
-            [k.author_id, k.owner_id].include?(Actor.normalize_id(subject))
+          can :destroy, klass do |object| # can :destroy, Post do |post|
+            object.authored_or_owned_by?(subject)
           end
         end
 

data/lib/social_stream/base/dependencies.rb

@@ -40,6 +40,7 @@ require 'resque/server'
 require 'modernizr-rails'
 # Sphinx search engine
 require 'thinking-sphinx'
+require 'thinking-sphinx/social_stream'
 # Syntactically Awesome Stylesheets
 require 'sass-rails'
 # Autolink text blocks

data/lib/social_stream/base/thinking-sphinx.rb

@@ -0,0 +1,18 @@
+module SocialStream
+  module Base
+    module ThinkingSphinx
+      module Index
+        module Builder
+          def activity_object_index
+            indexes activity_object.title,       :as => :title
+            indexes activity_object.description, :as => :description
+            indexes activity_object.tags.name,   :as => :tags
+
+            has created_at
+            has activity_object.author_action(:actor_id), :as => :author_id
+          end
+        end
+      end
+    end
+  end
+end

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.19.2".freeze
+    VERSION = "0.20.0".freeze
   end
 end

data/lib/social_stream/controllers/objects.rb

@@ -8,6 +8,8 @@ module SocialStream
 
         before_filter :set_author_ids, :only => [ :new, :create, :update ]
 
+	after_filter :increment_visit_count, :only => :show
+
         load_and_authorize_resource :except => :index
 
         respond_to :html, :js
@@ -27,6 +29,10 @@ module SocialStream
 
       protected
 
+      def increment_visit_count
+        resource.activity_object.increment!(:visit_count) if request.format == 'html'
+      end
+
       def set_author_ids
         resource_params.first[:author_id] = current_subject.try(:actor_id)
         resource_params.first[:user_author_id] = current_user.try(:actor_id)

data/lib/social_stream/test_helpers/controllers.rb

@@ -34,7 +34,7 @@ module SocialStream
 
       def model_assigned_to contact, relation_ids
         model_attributes[:owner_id]  = contact.receiver.id
-        model_attributes[:_relation_ids] = Array(relation_ids).map(&:id)
+        model_attributes[:relation_ids] = Array(relation_ids).map(&:id)
       end
 
       shared_examples_for "Allow Creating" do

data/lib/social_stream/views/location.rb

@@ -0,0 +1,48 @@
+module SocialStream
+  module Views
+    module Location
+      # Renders the location stack for your view. You can add as many stack levels as you wish.
+      #
+      # Usage:  
+      # <%= location(level1,leve2,level3,level4,....) %> 
+      #
+      # Output: 
+      # base > level1 > level2 > level3 > level 4
+      #
+      # Default configuration:
+      # base => "You are here" ("location.base" on config/locales)
+      # separator => ">" ("location.separator" on config/locales)
+      #
+      # Styles and HTML wrapping:
+      # partial => location/_location.html.erb 
+      #
+      # Example:  
+      # 	Render a location with two leves depth:
+      #
+      #   	<%= location(link_to(leve1.name, level1.url),link_to(leve2.name, level2.url)) %>
+      #
+      def location(*stack)
+        
+        location_body = render :partial => "location/location_body", :locals=>{:stack => stack}
+        
+        location_div = capture do
+          render :partial => "location/location", :locals=>{:location_body => location_body}
+        end
+        
+        case request.format
+          when Mime::JS
+          response = <<-EOJ
+
+              $('#map_location').html("#{ escape_javascript(location_div) }");
+              EOJ
+          
+          response.html_safe
+        else
+          content_for(:location) do
+            location_div
+          end
+        end
+      end
+    end
+  end
+end