social_stream 2.0.0.beta2 → 2.0.0.beta3

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "2.0.0.beta2".freeze
+    VERSION = "2.0.0.beta3".freeze
   end
 end

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

@@ -6,6 +6,16 @@ module SocialStream
           @demo ||=
             ::Actor.where(slug: "demo").first
         end
+
+        def available
+          load_available.dup
+        end
+
+        private
+
+        def load_available
+          @load_available ||= ::Actor.all
+        end
       end
     end
   end

data/base/lib/social_stream/search.rb

@@ -104,12 +104,21 @@ module SocialStream
         options[:mode] ||= :extended
 
         models = models(options[:mode], options[:key])
-        relation_ids = Relation.ids_shared_with(subject)
+
+        with = {}
+
+        if options[:owner].present?
+          with[:owner_id] = Actor.normalize_id(options[:owner])
+        end
+
+        if subject != options[:owner] || options[:owner].blank?
+          with[:relation_ids] = Relation.ids_shared_with(subject)
+        end
 
         [
           query,
           :classes => models,
-          :with => { :relation_ids => relation_ids }
+          :with => with
         ]
       end
     end

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

@@ -78,16 +78,6 @@ namespace :db do
         puts 'Groups population (' + @GROUPS.to_s + ' groups)'
         groups_start = Time.now
 
-        def set_tags(klass)
-          klass.all.each do |el|
-            el.tag_list = Forgery::LoremIpsum.words(1,:random => true)+", "+
-                          Forgery::LoremIpsum.words(1,:random => true)+", "+
-                          Forgery::LoremIpsum.words(1,:random => true)
-            el.save!
-          end
-        end
-
-
         @GROUPS.times do
           founder = @available_actors[rand(@available_actors.size)]
 
@@ -97,8 +87,6 @@ namespace :db do
                         :user_author_id => founder.id
         end
 
-        set_tags(Group)
-
         # Reload actors to include groups
         @available_actors = Actor.all
 
@@ -106,6 +94,60 @@ namespace :db do
         puts '   -> ' +  (groups_end - groups_start).round(4).to_s + 's'
       end
 
+      desc "Populate profiles"
+
+      task :profiles => :read_environment do
+        puts "Profiles population"
+        time = Time.now
+
+        SocialStream::Population::Actor.available.each do |a|
+          p = a.profile
+
+          if rand < 0.2
+            a.tag_list = Forgery::LoremIpsum.words(3, random: true).gsub(' ', ',')
+          end
+
+          if rand < 0.2
+            p.organization = Forgery::Name.company_name
+          end
+
+          if rand < 0.2
+            p.birthday = Time.at(Time.now.to_i - (18.years + rand(60.years)))
+          end
+
+          if rand < 0.2
+            p.city = Forgery::Address.city
+          end
+
+          if rand < 0.2
+            p.country = Forgery::Address.country
+          end
+
+          if rand < 0.2
+            p.description = Forgery::LoremIpsum.sentences(2, random: true)
+          end
+
+          if rand < 0.2
+            p.phone = Forgery::Address.phone
+          end
+
+          if rand < 0.2
+            p.address = Forgery::Address.street_address
+          end
+
+          if rand < 0.2
+            p.website = "http://#{ Forgery::Internet.domain_name }"
+          end
+
+          if rand < 0.2
+            p.experience = Forgery::LoremIpsum.sentences(3, random: true)
+          end
+
+          p.save!
+        end
+
+        puts '   -> ' + (Time.now - time).round(4).to_s + 's'
+      end
 
       # TIES
       desc "Create ties"
@@ -113,8 +155,7 @@ namespace :db do
         puts 'Ties population'
         ties_start = Time.now
 
-        @available_actors.each do |a|
-          actors = @available_actors.dup
+        SocialStream::Population::Actor.available.each do |a|
           actors.delete(a)
 
           relations = a.relation_customs + [ Relation::Reject.instance ]
@@ -145,8 +186,8 @@ namespace :db do
         puts 'Ties population (Cheesecake version)'
         ties_start = Time.now
 
-        @available_actors.each do |a|
-          actors = @available_actors.dup - Array(a)
+        SocialStream::Population::Actor.available.each do |a|
+          actors = SocialStream::Population::Actor.available - Array(a)
           relations = a.relation_customs + Array.wrap(Relation::Reject.instance)
           break if actors.size==0
           actor = Actor.first

data/base/social_stream-base.gemspec

@@ -57,7 +57,7 @@ Gem::Specification.new do |s|
   # Syntactically Awesome Stylesheets
   s.add_runtime_dependency('sass-rails', '>= 3.1.0')
   # Bootstrap for Sass
-  s.add_runtime_dependency('bootstrap-sass', '~> 2.2.2.0')
+  s.add_runtime_dependency('bootstrap-sass', '~> 2.3.1.0')
   # Customize ERB views
   s.add_runtime_dependency('deface', '~> 0.9.1')
   # Autolink text blocks

data/base/spec/views/profiles_spec.rb

@@ -14,7 +14,9 @@ describe 'profiles/show' do
                                         email: "other-user@test.com",
                                         language: 'en',
                                         to_param: "other-user",
-                                        contact_to!: stub_model(Contact, { id: 3 })
+                                        actor: stub_model(Actor, { contact_to!: stub_model(Contact, { id: 3 })}),
+                                        contact_to!: stub_model(Contact, { id: 3 }),
+                                        suggestions: []
                                  })
              }
 
@@ -27,8 +29,6 @@ describe 'profiles/show' do
                                    to_param: "test-group" } ) }
 
   before do
-    view.stub(:sidebar)
-
     assign :profile, profile
   end
 
@@ -59,6 +59,7 @@ describe 'profiles/show' do
       before do
         view.stub(:current_subject).and_return(other_user)
         view.stub(:current_user).and_return(other_user)
+        view.stub(:current_actor).and_return(other_user.actor)
         view.stub(:profile_or_current_subject).and_return(other_user)
         view.stub(:user_signed_in?).and_return(true)
         view.stub(:can?).and_return(false)
@@ -76,6 +77,7 @@ describe 'profiles/show' do
       before do
         view.stub(:current_subject).and_return(other_user)
         view.stub(:current_user).and_return(other_user)
+        view.stub(:current_actor).and_return(other_user.actor)
         view.stub(:profile_or_current_subject).and_return(other_user)
         view.stub(:user_signed_in?).and_return(true)
         view.stub(:can?).and_return(false)

data/documents/app/assets/javascripts/social_stream/audio.js.erb

@@ -5,20 +5,20 @@ SocialStream.Audio = (function(SS, $, undefined){
 
   var initJplayer = function(){
     $(".jp-audio .jp-jplayer").each(function() {
+      var container = $(this).closest('.audio-container');
+
       $(this).jPlayer({
         ready: function () {
           $(this).jPlayer("setMedia", {
-            webma: $(this).closest(".audio").find(".audio-webma").attr("href"), // Defines the webm url
+            webma: container.attr("data-url-webma")
           });
         },
       preload: "none",
       supplied: "webma",
-      swfPath: "<%= asset_path "" %>",
-      cssSelectorAncestor: "#" + $(this).closest(".audio-full").attr("id")
+      swfPath: container.attr('data-url-swfplayer'),
+      cssSelectorAncestor: "#" + container.attr("id")
       })
     });
-
-    $(".format-links").hide();
   }
 
   callback.register('show', initJplayer);

data/documents/app/assets/javascripts/social_stream/documents.timeline.js

@@ -2,10 +2,28 @@
 //= require social_stream/audio
 //= require social_stream/video
 
-SocialStream.Timeline.callbackRegister('show',
-                                       SocialStream.Audio.show,
-                                       SocialStream.Video.show);
+SocialStream.Documents.Timeline = (function(SS, $, undefined) {
+  var initVideos = function() {
+    $(".video-container").hide();
 
-SocialStream.Timeline.callbackRegister('update',
-                                       SocialStream.Audio.show,
-                                       SocialStream.Video.show);
+    $(".video .play_over").click(function(){
+      var video = $(this).closest(".video");
+
+      video.find(".thumb").hide();
+      video.find(".text").hide();
+      video.find(".jp-video-play").hide();
+      video.find(".video-container").show();
+      video.find(".jp-jplayer").jPlayer("play", 0);
+    });
+  };
+
+  SocialStream.Timeline.callbackRegister('show',
+                                         SocialStream.Audio.show,
+                                         SocialStream.Video.show,
+                                         initVideos);
+
+  SocialStream.Timeline.callbackRegister('update',
+                                         SocialStream.Audio.show,
+                                         SocialStream.Video.show,
+                                         initVideos);
+})(SocialStream, jQuery);

data/documents/app/assets/javascripts/social_stream/documents.wall.js

@@ -1,48 +1,53 @@
 //= require social_stream/wall
 
-SocialStream.Wall.callbackRegister('show', function(){
-  $('.wall_input button.new_document').click(function(event){
-    event.preventDefault();
-
-    $(this).addClass("selected");
-
-    // build document form
-    if ($('.wall_input input[name^=document]').length === 0) {
-      $('<label/>', {
-        "for": 'document_title',
-        text: I18n.t('activerecord.attributes.document.title')
-        }).insertBefore($('#post_text'));
-
-      $('<textarea/>', {
-        name: 'document[description]',
-        'class': 'document_description',
-        placeholder: I18n.t('document.description.input')
-      }).insertAfter($('#post_text'));
-
-      $('.wall_input textarea.document_description').val($('#post_text').val());
+SocialStream.Documents.Wall = (function(SS, $, undefined) {
+  var initWall = function() {
+    $('<label/>', {
+      "for": 'new_document_title',
+      style: 'display: none;',
+      text: I18n.t('activerecord.attributes.document.title')
+    }).insertBefore($('#post_text'));
+
+    $('<textarea/>', {
+      name: 'document[description]',
+      id: 'new_document_description',
+      'class': 'document_description',
+      style: 'display: none;',
+      placeholder: I18n.t('document.description.input')
+    }).insertAfter($('#post_text'));
+
+    $('.wall_input form').
+      attr('enctype', 'multipart/form-data'); // this is ignored if done after creating the file input
+
+    $('<input>', {
+      name: 'document[file]',
+      type: 'file',
+      style: 'visibility: hidden; position: absolute'
+    }).insertAfter('.wall_input textarea.document_description');
+
+    $('.wall_input button.new_document').click(function(event){
+      event.preventDefault();
+
+      $('label[for="new_document_title"]').show();
 
       $('#post_text').
         attr('name', 'document[title]').
         attr('placeholder', I18n.t('document.title.input'));
 
-      $('<input>', {
-        name: 'document[file]',
-        type: 'file',
-        style: 'display: none;'
-      }).insertAfter('.wall_input textarea.document_description');
+      $('#new_document_description').show().val($('#post_text').val());
 
       SocialStream.Wall.changeAction($(this).attr('data-path'));
-      $('.wall_input form').
-        attr('enctype', 'multipart/form-data'); // this is ignored if done after creating the file input
 
-      $('.wall_input input[name="post[owner_id]"]').attr('name', 'document[owner_id');
+      SocialStream.Wall.changeOwner('document');
       SocialStream.Wall.changeRelationSelect('document');
-    }
 
-    $('.wall_input input[type=file]').trigger('click');
+      $('.wall_input input[type=file]').trigger('click');
+    });
 
     $('.wall_input input[type=file]').change(function(){
       $("#post_text").val($(this).val().replace(/C:\\fakepath\\/i, ''));
     });
-  });
-});
+  };
+
+  SS.Wall.callbackRegister('show', initWall);
+})(SocialStream, jQuery);

data/documents/app/assets/javascripts/social_stream/video.js

@@ -0,0 +1,33 @@
+//= require social_stream/callback
+
+SocialStream.Video = (function(SS, $, undefined){
+  var callback = new SS.Callback();
+
+  var initJplayer = function(){
+    $(".jp-video .jp-jplayer").each(function() {
+      var container = $(this).closest('.video-container');
+
+      $(this).jPlayer({
+        ready: function () {
+          $(this).jPlayer("setMedia", {
+            webmv: container.attr("data-url-webm"),
+            flv:   container.attr("data-url-flv"),
+            mp4:   container.attr("data-url-mp4"),
+            poster: container.attr("data-url-poster")
+          });
+        },
+      solution:"flash, html",
+      preload: "none",
+      supplied: "webmv, flv, mp4",
+      swfPath: container.attr('data-url-swfplayer'),
+      cssSelectorAncestor: "#" + container.attr("id")
+      })
+    });
+  }
+
+  callback.register('show', initJplayer);
+
+  return callback.extend({
+  });
+
+})(SocialStream, jQuery);

data/documents/app/assets/stylesheets/social_stream/documents/create/layout/_new.css.sass

@@ -2,6 +2,9 @@
   .modal-body
     max-height: 520px  
     padding: 0 15px 15px 15px
+    .tags
+      .select2-container
+        width: 98.5%
     form.new_site_client
       margin-left: 0px
       width: 100%

data/documents/app/assets/stylesheets/social_stream/documents/documents/layout/_documents.css.sass

@@ -14,18 +14,17 @@ section.repository
     display: inline
   input
     &[type="text"]
-      width: 22% !important
+      width: 24% !important
       display: inline
-      margin-top: 3px
-      float: right
+      margin-top: 20px
+      float: left
+      margin-left: 20px
    
   .btn
-    @include btn-secundary
     float: right
-    width: 90px
+    width: auto
     display: inline-block
-    margin: 3px 16px 0 -14px
-    padding: 5px 12px
+    margin: 23px 16px 0 -14px
   .tab-content
     @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
     padding-bottom: 100px
@@ -54,3 +53,9 @@ section.repository
 
 .documents
   clear: both
+#new_document-modal
+  .modal-body
+    input
+      &[type="text"]
+        width: 94% !important
+        float: none

data/documents/app/assets/stylesheets/social_stream/documents/responsive/_responsive-1200px-min.css.sass

@@ -23,4 +23,11 @@
   #documents
     .details
       .tab-content
-        margin-top: -1px
+        margin-top: -1px
+
+  #repository
+    .counters
+      font-size: 14px
+    .event
+      .frequency
+        line-height: 20px