social_stream 0.10.4 → 0.11.0

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

@@ -20,4 +20,10 @@ SocialStream.setup do |config|
   # You can write your own activity objects
   #
   # config.activity_forms = [ :post, :document, :foo, :bar ]
+  
+  # Quick search (header) and Extended search models and its order. Remember to create
+  # the indexes with thinking-sphinx if you are using customized models.
+  # 
+  # config.quick_search_models = [:user, :group]
+  # config.extended_search_models = [:user, :group]
 end

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.14".freeze
+    VERSION = "0.9.15".freeze
   end
 end

data/base/lib/social_stream/models/object.rb

@@ -16,7 +16,9 @@ module SocialStream
 
         delegate :post_activity,
                  :like_count,
-                 :to => :activity_object
+                 :tag_list, :tag_list=,
+                 :tagged_with, :tag_counts,
+                 :to => :activity_object!
 
         before_create :create_activity_object_with_type
 
@@ -29,6 +31,10 @@ module SocialStream
       end
 
       module InstanceMethods
+        def activity_object!
+          activity_object || build_activity_object(:object_type => self.class.to_s)
+        end
+
         # All the activities with this object
         def activities
           Activity.

data/base/lib/social_stream-base.rb

@@ -37,6 +37,8 @@ require 'simple-navigation'
 require 'modernizr-rails'
 # Sphinx search engine
 require 'thinking-sphinx'
+# Syntactically Awesome Stylesheets
+require 'sass-rails'
 
 # Provides your Rails application with social network and activity stream support
 module SocialStream
@@ -77,6 +79,12 @@ module SocialStream
   mattr_accessor :activity_forms
   @@activity_forms = [ :post, :group ]
   
+  mattr_accessor :quick_search_models
+  @@quick_search_models = [ :user, :group ]
+  
+  mattr_accessor :extended_search_models
+  @@extended_search_models = [ :user, :group ]
+  
   class << self
     def setup
       yield self

data/base/social_stream-base.gemspec

@@ -51,6 +51,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('modernizr-rails', '~> 2.0.6')
   # Sphinx search engine
   s.add_runtime_dependency('thinking-sphinx', '~> 2.0.7')
+  #Syntactically Awesome Stylesheets
+  s.add_runtime_dependency('sass-rails', '~> 3.1.0')
 
   # Development gem dependencies
   #

data/base/spec/controllers/invitations_controller_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe InvitationsController do
+  render_views
+
+  context "without authentication" do
+    it "should redirect to login" do
+      get :new
+
+      response.should redirect_to(new_user_session_path)
+    end
+  end
+
+  context "authenticated" do
+    before do
+      @user = Factory(:user)
+
+      sign_in @user
+    end
+
+    it "should render new" do
+      get :new
+
+      response.should be_success
+    end
+
+    it "should send invitation" do
+      post :create, :mails => "test@test.com, bla@bla.com", :message => "Testing"
+
+      response.should be_success
+
+    end
+  end
+end

data/base/spec/dummy/config/initializers/social_stream.rb

@@ -20,4 +20,10 @@ SocialStream.setup do |config|
   # You can write your own activity objects
   #
   # config.activity_forms = [ :post, :document, :foo, :bar ]
+  
+  # Quick search (header) and Extended search models and its order. Remember to create
+  # the indexes with thinking-sphinx if you are using customized models.
+  # 
+  # config.quick_search_models = [:user, :group]
+  # config.extended_search_models = [:user, :group]
 end

data/base/spec/support/thinking-sphinx.rb

@@ -0,0 +1,10 @@
+ThinkingSphinx::AbstractAdapter.class_eval do
+  class << self
+    def detect_with_rescue(*args)
+      detect_without_rescue(*args)
+    rescue
+    end
+
+    alias_method_chain :detect, :rescue
+  end
+end

data/documents/app/models/audio.rb

@@ -5,7 +5,16 @@ class Audio < Document
                     :styles => {:webma => {:format => 'webm'}                                
                     },:processors => [:ffmpeg]
   
-  process_in_background :file     
+  process_in_background :file    
+  
+  define_index do
+    indexes title
+    indexes file_file_name, :as => :file_name
+    indexes description
+    indexes activity_object.tags.name, :as => :tags
+    
+    has created_at
+  end 
               
   # Thumbnail file
   def thumb(size, helper)

data/documents/app/models/document.rb

@@ -13,6 +13,17 @@ class Document < ActiveRecord::Base
   
   validates_attachment_presence :file
   
+  define_index do
+    indexes title
+    indexes file_file_name, :as => :file_name
+    indexes description
+    indexes activity_object.tags.name, :as => :tags
+    
+    where "type IS NULL"
+    
+    has created_at
+  end
+  
   class << self 
     def new(*args)
       if !(self.name == "Document")

data/documents/app/models/picture.rb

@@ -4,7 +4,16 @@ class Picture < Document
                     :path => ':rails_root/documents/:class/:id_partition/:style.:extension',
                     :styles => {:thumb  => ["48x48#"],
                                 :thumb0 => ["130x80#"]
-                               }                                  
+                               }                              
+                               
+  define_index do
+    indexes title
+    indexes file_file_name, :as => :file_name
+    indexes description
+    indexes activity_object.tags.name, :as => :tags
+    
+    has created_at
+  end    
   # Thumbnail file
   def thumb(size, helper)
     case size

data/documents/app/models/video.rb

@@ -9,6 +9,15 @@ class Video < Document
                     },:processors => [:ffmpeg]
                     
   process_in_background :file
+  
+  define_index do
+    indexes title
+    indexes file_file_name, :as => :file_name
+    indexes description
+    indexes activity_object.tags.name, :as => :tags
+    
+    has created_at
+  end
                       
   # Thumbnail file
   def thumb(size, helper)

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

@@ -0,0 +1,3 @@
+<%= render :partial => 'documents/document_with_details',
+           :locals => {:document => audio} %>
+

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

@@ -0,0 +1,13 @@
+<div class="model_with_details">
+  <div class="logo">
+    <%= link_to thumb_for(document, 48), document  %>
+  </div>
+  <div class="sub-block">
+    <div class="name black" >
+      <%= link_to truncate_name(document.file_file_name), document %>
+    </div>
+    <div class="brief">
+      <%= t 'like.n',     :count => document.like_count %>
+    </div>
+   </div>
+</div>

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

@@ -0,0 +1,2 @@
+<%= render :partial => 'documents/document_with_details',
+           :locals => {:document => picture} %>

data/documents/app/views/videos/_video_with_details.html.erb

@@ -0,0 +1,2 @@
+<%= render :partial => 'documents/document_with_details',
+           :locals => {:document => video} %>

data/documents/config/locales/en.yml

@@ -6,13 +6,6 @@ en:
     msg: "Uploaded an audio:"
     not_mine: "Audios"
     processing: "Processing audio clip"
-  conference:
-    all: "All conferences"
-    confirm_delete: "Delete conference?"
-    title: "Conferences"
-    mine: "My conferences"
-    msg: "Uploaded a conference:"
-    not_mine: "Conferences"
   document:
     all: "All documents"  
     confirm_delete: "Delete document?"

data/documents/config/locales/es.yml

@@ -0,0 +1,38 @@
+es:
+  audio:
+    confirm_delete: "¿Borrar audios?"
+    title: "Audios"
+    mine: "Mis audios"
+    msg: "Subió un audio:"
+    not_mine: "Audios"
+    processing: "Procesando fichero de audio..."
+  document:
+    all: "Todos los documentos"
+    confirm_delete: "¿Borrar documento?"
+    form:
+      title: "Fichero"
+    mine: "Mis documentos"
+    msg: "Subió un documento:"
+    not_mine: "Documentos"
+    simple_all: "Todos"
+    title: "Documentos"
+  picture:
+    confirm_delete: "¿Borrar imagen?"
+    title: "Imágenes"
+    mine: "Mis imágenes"
+    msg: "Subió una imagen:"
+    not_mine: "Imágenes"
+  resource:
+    all: "Todos los recursos"
+    confirm_delete: "¿Borrar recursos?"
+    title: "Recursos"
+    mine: "Mis recursos"
+    msg: "Subió un recurso:"
+    not_mine: "Recursos"
+  video:
+    confirm_delete: "¿Borrar vídeo?"
+    title: "Vídeos"
+    mine: "Mis vídeos"  
+    msg: "Subió un vídeo:"
+    not_mine: "Vídeos"
+    processing: "Procesando vídeo..."

data/documents/db/migrate/20111005112707_add_title_and_description_to_document.rb

@@ -0,0 +1,11 @@
+class AddTitleAndDescriptionToDocument < ActiveRecord::Migration
+    def self.up
+      add_column :documents, :title, :string
+      add_column :documents, :description, :text
+    end
+    
+    def self.down
+      remove_column :documents, :title
+      remove_column :documents, :description
+    end
+end

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.2.8".freeze
+    VERSION = "0.3.0".freeze
   end
 end

data/documents/social_stream-documents.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.8')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.15')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','2.3.11')
   s.add_runtime_dependency('delayed_paperclip','>= 0.7.2')

data/events/app/views/events/_new_activity_fields.html.erb

@@ -3,3 +3,8 @@
 <%= f.hidden_field :founder_id, :value => current_subject.id %>
 <%= f.text_field :name, :size => 85, :value => t('event.input')  %>
 
+<%= javascript_tag do %>
+  $(function() {
+    $("#event_name").Watermark("<%= I18n.t('event.input') %>","#666");
+  });
+<% end %>

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.0.7".freeze
+    VERSION = "0.0.8".freeze
   end
 end

data/events/social_stream-events.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.13')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.15')
   s.add_runtime_dependency('conference_manager-ruby', '~> 0.0.3')
 
   # Development Gem dependencies

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.10.4".freeze
+  VERSION = "0.11.0".freeze
 end

data/social_stream.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.14')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.2.8')
-  s.add_runtime_dependency('social_stream-events', '~> 0.0.7')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.15')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.3.0')
+  s.add_runtime_dependency('social_stream-events', '~> 0.0.8')
  
   # Development Gem dependencies
   #

data/spec/support/components.rb

@@ -1,5 +1,5 @@
 {
-  :base => [ :cancan, :devise, :mock ]
+  :base => [ :cancan, :devise, :mock, 'thinking-sphinx' ]
 }.each_pair do |component, files|
   files.each do |file|
     require File.expand_path("../../../#{ component }/spec/support/#{ file }.rb", __FILE__)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 51
   prerelease: 
   segments: 
   - 0
-  - 10
-  - 4
-  version: 0.10.4
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 +02:00
+date: 2011-10-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 37
         segments: 
         - 0
         - 9
-        - 14
-        version: 0.9.14
+        - 15
+        version: 0.9.15
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 19
         segments: 
         - 0
-        - 2
-        - 8
-        version: 0.2.8
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 15
         segments: 
         - 0
         - 0
-        - 7
-        version: 0.0.7
+        - 8
+        version: 0.0.8
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -365,14 +365,15 @@ files:
 - base/app/assets/javascripts/toolbar.js
 - base/app/assets/javascripts/users.js
 - base/app/assets/stylesheets/0_devise_sign.css
-- base/app/assets/stylesheets/activities.css
-- base/app/assets/stylesheets/base.css
-- base/app/assets/stylesheets/contacts.css
+- base/app/assets/stylesheets/_colors.scss
+- base/app/assets/stylesheets/activities.css.scss
+- base/app/assets/stylesheets/base.css.scss
+- base/app/assets/stylesheets/contacts.css.scss
 - base/app/assets/stylesheets/conversations.css
-- base/app/assets/stylesheets/footer.css
-- base/app/assets/stylesheets/frontpage.css
+- base/app/assets/stylesheets/footer.css.scss
+- base/app/assets/stylesheets/frontpage.css.scss
 - base/app/assets/stylesheets/groups.css
-- base/app/assets/stylesheets/header.css
+- base/app/assets/stylesheets/header.css.scss
 - base/app/assets/stylesheets/home.css
 - base/app/assets/stylesheets/images/add-policy.png
 - base/app/assets/stylesheets/images/fcbkcomplete/close.gif
@@ -484,6 +485,7 @@ files:
 - base/app/views/contacts/_contact.html.erb
 - base/app/views/contacts/_form.html.erb
 - base/app/views/contacts/_index.html.erb
+- base/app/views/contacts/_link.html.erb
 - base/app/views/contacts/_pendings.html.erb
 - base/app/views/contacts/_suggestions.html.erb
 - base/app/views/contacts/_suggestions_and_pendings.html.erb
@@ -510,6 +512,7 @@ files:
 - base/app/views/devise/registrations/new.html.erb
 - base/app/views/devise/sessions/new.html.erb
 - base/app/views/devise/shared/_links.erb
+- base/app/views/frontpage/_caracteristics.html.erb
 - base/app/views/frontpage/_header.html.erb
 - base/app/views/frontpage/_sponsor.html.erb
 - base/app/views/frontpage/host_meta.xml.builder
@@ -601,9 +604,8 @@ files:
 - base/app/views/relation/customs/create.js.erb
 - base/app/views/relation/customs/index.html.erb
 - base/app/views/relation/customs/update.js.erb
-- base/app/views/search/_focus_search.html.erb
+- base/app/views/search/_extended_search.html.erb
 - base/app/views/search/_form.html.erb
-- base/app/views/search/_global_search.html.erb
 - base/app/views/search/_header_search.html.erb
 - base/app/views/search/_index.html.erb
 - base/app/views/search/_index_frontpage.html.erb
@@ -624,6 +626,7 @@ files:
 - base/app/views/toolbar/_logo.html.erb
 - base/app/views/toolbar/_messages.html.erb
 - base/app/views/toolbar/_profile.html.erb
+- base/app/views/toolbar/_subject.html.erb
 - base/app/views/users/_groups.html.erb
 - base/app/views/users/_index.html.erb
 - base/app/views/users/_sidebar_index.html.erb
@@ -636,6 +639,7 @@ files:
 - base/app/views/users/show.js.erb
 - base/app/views/users/show.xml.builder
 - base/config/locales/en.yml
+- base/config/locales/es.yml
 - base/config/routes.rb
 - base/db/migrate/20110610112023_create_social_stream.rb
 - base/db/migrate/20110705103202_empty_ties_count.rb
@@ -675,6 +679,7 @@ files:
 - base/spec/controllers/frontpage_controller_spec.rb
 - base/spec/controllers/groups_controller_spec.rb
 - base/spec/controllers/home_controller_spec.rb
+- base/spec/controllers/invitations_controller_spec.rb
 - base/spec/controllers/likes_controller_spec.rb
 - base/spec/controllers/notifications_controller_spec.rb
 - base/spec/controllers/permissions_controller_spec.rb
@@ -746,6 +751,7 @@ files:
 - base/spec/support/db.rb
 - base/spec/support/devise.rb
 - base/spec/support/mock.rb
+- base/spec/support/thinking-sphinx.rb
 - base/vendor/assets/javascripts/ajax.paginate.js
 - base/vendor/assets/javascripts/chosen.jquery.js
 - base/vendor/assets/javascripts/d3.geom.js
@@ -850,6 +856,7 @@ files:
 - documents/app/views/audios/_audio.html.erb
 - documents/app/views/audios/_audio_processed.html.erb
 - documents/app/views/audios/_audio_processing.html.erb
+- documents/app/views/audios/_audio_with_details.html.erb
 - documents/app/views/audios/_mediapreviews.html.erb
 - documents/app/views/audios/_new.html.erb
 - documents/app/views/audios/destroy.js.erb
@@ -858,6 +865,7 @@ files:
 - documents/app/views/audios/show.html.erb
 - documents/app/views/common-documents/_index.html.erb
 - documents/app/views/documents/_document.html.erb
+- documents/app/views/documents/_document_with_details.html.erb
 - documents/app/views/documents/_header.html.erb
 - documents/app/views/documents/_new_activity.html.erb
 - documents/app/views/documents/_new_activity_fields.html.erb
@@ -868,6 +876,7 @@ files:
 - documents/app/views/pictures/_mediapreviews.html.erb
 - documents/app/views/pictures/_new.html.erb
 - documents/app/views/pictures/_picture.html.erb
+- documents/app/views/pictures/_picture_with_details.html.erb
 - documents/app/views/pictures/destroy.js.erb
 - documents/app/views/pictures/index.html.erb
 - documents/app/views/pictures/index.js.erb
@@ -877,15 +886,18 @@ files:
 - documents/app/views/videos/_video.html.erb
 - documents/app/views/videos/_video_processed.html.erb
 - documents/app/views/videos/_video_processing.html.erb
+- documents/app/views/videos/_video_with_details.html.erb
 - documents/app/views/videos/destroy.js.erb
 - documents/app/views/videos/index.html.erb
 - documents/app/views/videos/show.html.erb
 - documents/app/worker/audioencoder.rb
 - documents/app/worker/videoencoder.rb
 - documents/config/locales/en.yml
+- documents/config/locales/es.yml
 - documents/config/routes.rb
 - documents/db/migrate/20110615143707_create_social_stream_documents.rb
 - documents/db/migrate/20110922173707_add_file_processing_to_document.rb
+- documents/db/migrate/20111005112707_add_title_and_description_to_document.rb
 - documents/lib/generators/social_stream/documents/install_generator.rb
 - documents/lib/social_stream-documents.rb
 - documents/lib/social_stream/documents/engine.rb
@@ -1004,7 +1016,6 @@ files:
 - events/app/views/events/_event.html.erb
 - events/app/views/events/_event_with_details.html.erb
 - events/app/views/events/_form.html.erb
-- events/app/views/events/_jquery.html.erb
 - events/app/views/events/_manage.html.erb
 - events/app/views/events/_new_activity.html.erb
 - events/app/views/events/_new_activity_fields.html.erb