social_stream 0.26.0 → 0.26.1

data/base/lib/social_stream/{populate.rb → population/power_law.rb}

@@ -1,14 +1,13 @@
 module SocialStream
-  module Populate
-
-    class << self
+  module Population
+    class PowerLaw
       # Yields each element of array y times given by 
       # {power law distribution}[http://en.wikipedia.org/wiki/Power_law]
       # y = ax**k + e
       # 
       # Options: Each constant in the function
       #
-      def power_law(array, options = {})
+      def initialize(array, options = {})
         options[:a] ||= array.size
         options[:k] ||= -2.5
         options[:e] ||= 1

data/base/lib/social_stream/population/timestamps.rb

@@ -0,0 +1,12 @@
+module SocialStream
+  module Population
+    class Timestamps
+      attr_reader :created, :updated
+
+      def initialize
+        @updated = Time.at(rand(Time.now.to_i))
+        @created = Time.at(rand(@updated.to_i))
+      end
+    end
+  end
+end

data/base/lib/social_stream/search.rb

@@ -0,0 +1,107 @@
+module SocialStream
+  module Search
+    class << self
+      def keys(search_type)
+        case search_type
+        when :quick
+          SocialStream.quick_search_models
+        when :extended
+          extended_search_models.keys
+        end
+      end
+
+      def models(search_type, key = nil)
+        case search_type
+        when :quick
+          quick_search_models
+        when :extended
+          if key.present?
+            if extended_search_models.keys.include?(key.to_sym)
+              extended_search_models[key.to_sym]
+            else
+              if extended_search_models.values.flatten.map{ |k| k.to_s }.include?(key.to_s.classify)
+                [key.to_s.classify.constantize]
+              else
+                raise "Unknown search key #{ key }"
+              end
+            end
+          else
+            extended_search_models.values.flatten
+          end
+        else
+          raise "Unknown search type #{ search_type }"
+        end
+      end
+
+      def search(query, subject, options = {})
+        ThinkingSphinx.search *args_for_search(query, subject, options)
+      end
+
+      def count(query, subject, options = {})
+        ThinkingSphinx.count *args_for_search(query, subject, options)
+      end
+
+
+      private
+
+      def quick_search_models
+        @quick_search_models ||=
+          parse_quick_search_models
+      end
+
+      def parse_quick_search_models
+        SocialStream.quick_search_models.map{ |m|
+          m.to_s.classify.constantize
+        }
+      end
+
+      def extended_search_models
+        @extended_search_models ||=
+          parse_extended_search_models 
+      end
+
+      # Get a normalized hash from the configuration. Converts this:
+      #
+      #   [ :excursion, :user, { :resource => [ :post, :comment, :picture ] }
+      #
+      # into this:
+      #
+      #   {
+      #     :excursion => [ Excursion ],
+      #     :user => [ User ],
+      #     :resource => [ Post, Comment, Picture ]
+      #   }
+      #
+      def parse_extended_search_models
+          SocialStream.extended_search_models.inject({}) do |hash, entry|
+            case entry
+            when Hash
+              hash.update entry.inject({}){ |h, e|
+                h[e.first] = Array.wrap(e.last).map{ |f| f.to_s.classify.constantize }
+                h
+              }
+            when Symbol
+              hash[entry] = Array.wrap(entry.to_s.classify.constantize)
+            else
+              raise "Unknown entry in config.extended_search_models #{ entry }"
+            end
+
+            hash
+          end
+      end
+
+      def args_for_search(query, subject, options = {})
+        options[:mode] ||= :extended
+
+        models = models(options[:mode], options[:key])
+        relation_ids = Relation.ids_shared_with(subject)
+
+        [
+          query,
+          :classes => models,
+          :with => { :relation_ids => relation_ids }
+        ]
+      end
+    end
+  end
+end

data/base/lib/tasks/db/populate.rake

@@ -17,8 +17,9 @@ namespace :db do
     task :read_environment => :environment do
       require 'forgery'
 
-      @LOGOS_PATH = File.join(Rails.root, 'lib', 'logos')
-      @LOGOS_TOTAL = (ENV["LOGOS_TOTAL"] || 10).to_i
+      @SS_BASE_PATH = Gem::Specification.find_by_name('social_stream-base').full_gem_path
+      @LOGOS_PATH = File.join(@SS_BASE_PATH, 'lib', 'logos')
+      @LOGOS_TOTAL = (ENV["LOGOS_TOTAL"] || 12).to_i
       @USERS = (ENV["USERS"] || 9).to_i
       @GROUPS = (ENV["GROUPS"] || 10).to_i
       if ENV["HARDCORE"].present?
@@ -122,6 +123,13 @@ namespace :db do
         end
       end
 
+      Activity.includes(:activity_verb).merge(ActivityVerb.verb_name(["follow", "make-friend"])).each do |a|
+        t = SocialStream::Population::Timestamps.new
+
+        a.update_attributes :created_at => t.created,
+                            :updated_at => t.updated
+      end
+
       ties_end = Time.now
       puts '   -> ' +  (ties_end - ties_start).round(4).to_s + 's'
     end
@@ -159,31 +167,10 @@ namespace :db do
     # POSTS
     desc "Create posts"
     task :create_posts => :read_environment do
-      puts 'Post population'
-      posts_start = Time.now
-
-      SocialStream::Populate.power_law(Tie.positive.all) do |t|
-        updated = Time.at(rand(Time.now.to_i))
-
-        author = t.sender
-        owner  = t.receiver
-        user_author = ( t.sender.subject_type == "User" ? t.sender : t.sender.user_author )
-
-        p = Post.create :text =>
-                      "This post should be for #{ t.relation.name } of #{ t.sender.name }.\n#{ Forgery::LoremIpsum.paragraph(:random => true) }",
-                        :created_at => Time.at(rand(updated.to_i)),
-                        :updated_at => updated,
-                        :author_id  => author.id,
-                        :owner_id   => owner.id,
-                        :user_author_id => user_author.id,
-                        :relation_ids => Array(t.relation_id)
-
-        p.post_activity.update_attributes(:created_at => p.created_at,
-                                          :updated_at => p.updated_at)
+      SocialStream::Population::ActivityObject.new Post do |p|
+        p.text =
+          "This post should be for #{ p.relations.map(&:name).join(", ") } of #{ p.owner.name }.\n#{ Forgery::LoremIpsum.paragraph(:random => true) }"
       end
-
-      posts_end = Time.now
-      puts '   -> ' +  (posts_end - posts_start).round(4).to_s + 's'
     end
 
 

data/base/social_stream-base.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |s|
   #
   # Do not forget to require the file at lib/social_stream/base/dependencies !
   #
+  # Deep Merge support for Hashes
+  s.add_runtime_dependency('deep_merge')
   # Rails
   s.add_runtime_dependency('rails', '>= 3.1.0')
   # Activity and Relation hierarchies
@@ -70,7 +72,7 @@ Gem::Specification.new do |s|
   if RUBY_VERSION < '1.9'
     s.add_development_dependency('ruby-debug')
   else
-    s.add_development_dependency('ruby-debug19')
+    s.add_development_dependency('debugger')
   end
   # Specs
   s.add_development_dependency('rspec-rails', '~> 2.6.1')

data/base/spec/models/post_spec.rb

@@ -104,6 +104,18 @@ describe Post do
         post.post_activity.relations.should include(tie.relation)
       end
     end
+
+    describe "a new post" do
+      before do
+        @user = Factory(:user)
+        @post = Post.create!(:text => "test",
+                             :author_id => @user.actor_id)
+      end
+
+      it "should be shared with user relations" do
+        @post.relation_ids.sort.should eq(@user.relation_ids.sort)
+      end
+    end
   end
 
   describe "authored_by" do
@@ -113,4 +125,6 @@ describe Post do
       Post.authored_by(post.author).should include(post)
     end
   end
+
+
 end

data/documents/app/controllers/documents_controller.rb

@@ -1,21 +1,19 @@
 class DocumentsController < ApplicationController
-  include ActionView::Helpers::SanitizeHelper
   include SocialStream::Controllers::Objects
 
-  belongs_to_subjects :optional => true
-
   before_filter :profile_subject!, :only => :index
 
-  PER_PAGE=20
-  
   def index
-    super do |format|
-      format.json { render :json => collection.map{|a| a.activity_objects.first.document} }
-      if params[:no_layout].present?
-        format.html { render :action => :index, :layout => false }      
-      else  
-        format.html { render :action => :index }
-      end
+    respond_to do |format|
+      format.html {
+        collection
+
+        if params[:no_layout].present?
+          render :layout => false
+        end
+      }
+
+      format.json { render :json => collection }
     end
   end
   
@@ -64,31 +62,9 @@ class DocumentsController < ApplicationController
 
   private
 
-  def collection
-    @activities = profile_subject.wall(:profile,
-                                       :for => current_subject,
-                                       :object_type => Array(self.class.index_object_type))
-    if params[:q].present? 
-      @activities = @activities.joins(:activity_objects).where('activity_objects.title LIKE ? OR activity_objects.description LIKE ?', get_search_query, get_search_query)
-    end
-    @activities = @activities.page(params[:page]).per(PER_PAGE)
-  end
-
   class << self
     def index_object_type
       [ :Audio, :Video, :Picture, :Document ]
     end
   end
-  
-  def get_search_query
-    search_query = ""
-    param = strip_tags(params[:q]) || ""
-    bare_query = param unless bare_query.html_safe?
-    search_query_words = bare_query.strip.split
-    search_query_words.each_index do |i|
-      search_query+= search_query_words[i] + " " if i < (search_query_words.size - 1)
-      search_query+= "%" + search_query_words[i] + "% " if i == (search_query_words.size - 1)
-    end
-    return search_query.strip
-  end
 end

data/documents/app/controllers/pictures_controller.rb

@@ -1,2 +1,8 @@
 class PicturesController < DocumentsController
+  before_filter :default_style
+
+  protected
+  def default_style
+    params[:style] ||= 'original'
+  end
 end  

data/documents/app/models/document.rb

@@ -6,6 +6,8 @@ class Document < ActiveRecord::Base
   has_attached_file :file, 
                     :url => '/:class/:id.:extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style/:filename.:extension'
+
+  paginates_per 20
   
   validates_attachment_presence :file
   validates_presence_of :title
@@ -18,8 +20,6 @@ class Document < ActiveRecord::Base
     activity_object_index
 
     indexes file_file_name, :as => :file_name
-    
-    where "type IS NULL"
   end
   
   class << self 

data/documents/app/views/audios/index.html.erb

@@ -1 +1 @@
-<%=render(:partial => 'common_documents/index') %>
+<%= render :partial => 'common_documents/index', :locals => { :documents => @audios } %>

data/documents/app/views/common_documents/_headers.html.erb

@@ -1,25 +1,30 @@
 <% content_for :title do %>
-<%= profile_subject.name + ": " + t('repository.title') %>
+  <%= "#{ profile_subject && profile_subject.name + ': ' }#{ t('repository.title') }" %>
 <% end %>
 
 <% sidebar %>
 
-<%if profile_subject_is_current?%>
-<%= location(
-  link_to(t('repository.title'), polymorphic_path(controller.controller_name),:remote => true)
-  ) %>
-<%else%>
-<%= location(
-  link_to(profile_subject.name, polymorphic_path(profile_subject),:remote => true),
-  link_to(t('repository.title'), polymorphic_path([profile_subject, controller.controller_name]),:remote => true)
-  ) %>
-<%end%>
+<% if profile_subject %>
+  <%= location(
+    link_to(profile_subject.name, polymorphic_path(profile_subject),:remote => true),
+    link_to(t('repository.title'), polymorphic_path([profile_subject, controller.controller_name]),:remote => true)
+    ) %>
+<% else %>
+  <%= location(
+    link_to(t('repository.title'), polymorphic_path(controller.controller_name),:remote => true)
+    ) %>
+<% end %>
+
+<% if profile_subject %>
+  <% toolbar :profile, :subject => profile_subject %>
+<% elsif user_signed_in? %>
+  <% toolbar %>
+<% end %>
 
-<% toolbar :profile, :subject => profile_subject %>
 <br class="clearfloat" />
 <div class="space_center"></div>
 <div id="repository_filter">
-    <%= text_field_tag :filter_query, nil,:autocomplete => :off, :id => :repository_filter_input %>
+    <%= text_field_tag :q, nil,:autocomplete => :off, :id => :repository_filter_input %>
   <div id="order_by"><%= t('repository.order.by') %>: <%= t('repository.order.last_modified') %> · <%= t('repository.order.most_popular') %>  </div>
 </div>
 <div class="space_center"></div>
@@ -38,7 +43,7 @@ $(document).ready(function() {
       $("#documents_grid").html("<center><%= escape_javascript(image_tag('loading.gif', :class => :loading)) %></center>");
         $.ajax({
           type : "GET",
-          url : "<%= polymorphic_url([current_subject, Document.new]) %>?no_layout=true",
+          url : "<%= polymorphic_path([ profile_subject, Document.new ], :action => :search) %>",
           success : function(html) {      
             if ($("#repository_filter_input").val()==searchstring){ //Only show if input value is still the same
               $("#documents_grid").html(html);
@@ -54,7 +59,7 @@ $(document).ready(function() {
         $("#documents_grid").html("<center><%= escape_javascript(image_tag('loading.gif', :class => :loading)) %></center>");
         $.ajax({
           type : "GET",
-          url : "<%= polymorphic_url([current_subject, Document.new]) %>?q=" + searchstring + "&no_layout=true",
+          url : "<%= polymorphic_path([ profile_subject, Document.new ], :action => :search) %>?q=" + searchstring,
           success : function(html) {      
             if ($("#repository_filter_input").val()==searchstring){ //Only show if input value is still the same
               $("#documents_grid").html(html);

data/documents/app/views/common_documents/_index.html.erb

@@ -1,14 +1,13 @@
-<% unless params[:no_layout].present? %>
+<% if params[:no_layout].blank? %>
   <%= render :partial => "common_documents/headers" %>
   <div id="documents_grid">
 <% end %> 
 
-<% @activities.each do |a| %>
-<% document = a.activity_objects.first.document %>
+<% documents.each do |document| %>
 <div class="attachment_tile" id="<%= dom_id(document)%>">
   <div class="attachment_tile_thumb">
     <%= link_to thumb_for(document,48),
-                document_path(document),
+                document,
                 :type => document.type,
                 :title => document.file_file_name,
                 :path => document_path(document) %>
@@ -57,10 +56,10 @@ $(document).ready(function(){
 <% end %>
 <% end %> 
 
-<% if @activities.size == DocumentsController::PER_PAGE %>
+<% unless documents.last_page? %>
   <% next_url = url_for(:no_layout => true, 
                         :page => params[:page].present? ? params[:page].to_i + 1 : 2,
-                        :query => params[:query].present? ? params[:query] : "") %>
+                        :q => params[:q]) %>
   <%= content_tag(:span, "", :class => "screw screw-after", :rel => next_url)%>
 <% end %>
 

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

@@ -1 +1 @@
-<%=render(:partial => 'common_documents/index') %>
+<%= render :partial => 'common_documents/index', :locals => { :documents => collection } %>

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

@@ -0,0 +1,3 @@
+<% params[:no_layout] = true %>
+<%= render :partial => 'common_documents/index',
+           :locals => { :documents => @documents } %>

data/documents/app/views/pictures/index.html.erb

@@ -1 +1 @@
-<%=render(:partial => 'common_documents/index') %>
+<%= render :partial => 'common_documents/index', :locals => { :documents => @pictures } %>