social_stream 0.29.0 → 0.30.0

data/base/app/models/like.rb

@@ -5,7 +5,8 @@ class Like
   class << self
     # Find the children activity of activity_id liked by subject
     def find(subject, object)
-      like = new(object.liked_by(subject).first)
+      like = new(object.liked_by(subject).readonly(false).first)
+      return nil if like.object.nil?
       # Cache object to make it available before it is destroyed
       like.object
       like
@@ -18,7 +19,9 @@ class Like
     end
 
     def build(subject, user, object)
-       new object.new_like(subject, user)
+       l = self.find(subject,object)
+       l = new object.new_like(subject, user) if l.nil?
+       l
     end
   end
 
@@ -34,7 +37,9 @@ class Like
   # The object that is liked. It can be an activity
   def object
     @object ||=
-      if @like.is_root?
+      if @like.nil?
+        nil
+      elsif @like.is_root?
         obj = @like.direct_object
         obj = obj.subject if obj.is_a?(Actor)
         obj

data/base/config/locales/en.yml

@@ -66,6 +66,7 @@ en:
       atom_title: "Activity Stream from %{subject}"
       title:
         follow: "%{author} added %{activity_object} as contact"
+        unfollow: "%{author} removed %{activity_object} as contact"
         like: "%{author} likes %{activity_object}"
         make-friend: "%{author} also added %{activity_object} as contact"
         post: "%{author} posted %{activity_object}"

data/base/config/locales/es.yml

@@ -65,6 +65,7 @@ es:
       atom_title: "Actividades de %{subject}"
       title:
         follow: "%{author} añadió a %{activity_object} como contacto"
+        unfollow: "%{author} eliminó a %{activity_object} como contacto"
         like: "A %{author} le gusta %{activity_object}"
         make-friend: "%{author} también añadió a %{activity_object} como contacto"
         post: "%{author} publicó %{activity_object}"

data/base/db/migrate/{20120111141717_create_social_stream.rb → 20120326083509_create_social_stream.rb}

@@ -11,6 +11,19 @@ class CreateSocialStream < ActiveRecord::Migration
     add_index "activities", ["activity_verb_id"], :name => "index_activities_on_activity_verb_id"
     add_index "activities", ["channel_id"], :name => "index_activities_on_channel_id"
 
+    create_table :activity_actions do |t|
+      t.references :actor
+      t.references :activity_object
+      t.boolean    :follow, :default => false
+      t.boolean    :author, :default => false
+      t.boolean    :user_author, :default => false
+      t.boolean    :owner,  :default => false
+
+      t.timestamps
+    end
+    add_index :activity_actions, :actor_id
+    add_index :activity_actions, :activity_object_id
+
     create_table "activity_object_activities", :force => true do |t|
       t.integer  "activity_id"
       t.integer  "activity_object_id"
@@ -23,14 +36,25 @@ class CreateSocialStream < ActiveRecord::Migration
     add_index "activity_object_activities", ["activity_object_id"], :name => "index_activity_object_activities_on_activity_object_id"
 
     create_table "activity_objects", :force => true do |t|
+      t.string   "title", :default => ""
+      t.text     "description"
       t.datetime "created_at"
       t.datetime "updated_at"
-      t.string   "object_type", :limit => 45
-      t.integer  "like_count",                :default => 0
-      t.integer  "channel_id"
+      t.string   "object_type",    :limit => 45
+      t.integer  "like_count",     :default => 0
+      t.integer  "follower_count", :default => 0
     end
 
-    add_index "activity_objects", ["channel_id"], :name => "index_activity_objects_on_channel_id"
+    create_table :activity_object_properties do |t|
+      t.integer :activity_object_id
+      t.integer :property_id
+      t.string  :type
+
+      t.timestamp
+    end
+
+    add_index "activity_object_properties", "activity_object_id"
+    add_index "activity_object_properties", "property_id"
 
     create_table "activity_verbs", :force => true do |t|
       t.string   "name",       :limit => 45
@@ -47,7 +71,6 @@ class CreateSocialStream < ActiveRecord::Migration
       t.datetime "created_at"
       t.datetime "updated_at"
       t.integer  "activity_object_id"
-      t.integer  "follower_count",     :default => 0
     end
 
     add_index "actors", ["activity_object_id"], :name => "index_actors_on_activity_object_id"
@@ -97,7 +120,6 @@ class CreateSocialStream < ActiveRecord::Migration
 
     create_table "comments", :force => true do |t|
       t.integer  "activity_object_id"
-      t.text     "text"
       t.datetime "created_at"
       t.datetime "updated_at"
     end
@@ -136,7 +158,6 @@ class CreateSocialStream < ActiveRecord::Migration
       t.integer  "activity_object_id"
       t.datetime "created_at"
       t.datetime "updated_at"
-      t.text     "text"
     end
 
     add_index "posts", ["activity_object_id"], :name => "index_posts_on_activity_object_id"
@@ -223,10 +244,14 @@ class CreateSocialStream < ActiveRecord::Migration
     add_foreign_key "activities", "activity_verbs", :name => "index_activities_on_activity_verb_id"
     add_foreign_key "activities", "channels", :name => "index_activities_on_channel_id"
 
+    add_foreign_key "activity_actions", "actors", :name => "index_activity_actions_on_actor_id"
+    add_foreign_key "activity_actions", "activity_objects", :name => "index_activity_actions_on_activity_object_id"
+
     add_foreign_key "activity_object_activities", "activities", :name => "index_activity_object_activities_on_activity_id"
     add_foreign_key "activity_object_activities", "activity_objects", :name => "activity_object_activities_on_activity_object_id"
 
-    add_foreign_key "activity_objects", "channels", :name => "index_activity_objects_on_channel_id"
+    add_foreign_key "activity_object_properties", "activity_objects", :name => "index_activity_object_properties_on_activity_object_id", :column => :activity_object_id
+    add_foreign_key "activity_object_properties", "activity_objects", :name => "index_activity_object_properties_on_property_id", :column => :property_id
 
     add_foreign_key "actors", "activity_objects", :name => "actors_on_activity_object_id"
 

data/base/lib/generators/social_stream/base/install_generator.rb

@@ -13,7 +13,7 @@ class SocialStream::Base::InstallGenerator < Rails::Generators::Base #:nodoc:
                       \n  config.omniauth :facebook, \"129571360447856\",\"eef39dce5e20e76f77495c59623bdb38\"
                       \n  #config.omniauth :twitter, \"wgTxO0fTpjTeSnjKC9ZHA\",\"JepulVWwLcuAnGfWjwCu47yEP0TcJJfKtvISPBsilI\"
                       \n  config.token_authentication_key = :auth_token
-                      \n  config.stateless_token = true",
+                      \n  config.skip_session_storage << :token_auth",
                       :after => "  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'"
   end
 

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.23.0".freeze
+    VERSION = "0.24.0".freeze
   end
 end

data/base/lib/social_stream/controllers/objects.rb

@@ -8,9 +8,11 @@ module SocialStream
 
         before_filter :set_author_ids, :only => [ :new, :create, :update ]
 
-	after_filter :increment_visit_count, :only => :show
+        before_filter :authenticate_user!, :only => [:new, :edit, :create, :update, :destroy]
 
-        load_and_authorize_resource :except => [ :index, :search ]
+        after_filter :increment_visit_count, :only => :show
+
+        load_and_authorize_resource :except => [ :new, :index, :search ]
 
         respond_to :html, :js
 

data/base/lib/tasks/attachments.rake

@@ -0,0 +1,22 @@
+namespace :social_stream do
+  namespace :avatars do
+    desc "Fix avatar's attachment path from paperclip < 3.0"
+    task :fix => :environment do
+      dir = "#{ Rails.root }/public/system/logos/"
+
+      Avatar.all.each do |a|
+        old_logo_dir = "#{ dir }#{ a.id }/"
+
+        old_logo_contents = Dir["#{ old_logo_dir }*"]
+
+        new_logo_dir = "#{ Rails.root }/public#{ a.logo.to_s.split('original').first }"
+
+        puts "Moving #{ old_logo_dir } to #{ new_logo_dir }"
+
+        FileUtils.mkdir_p new_logo_dir
+        FileUtils.mv old_logo_contents, new_logo_dir
+      end
+    end
+  end
+end
+

data/base/social_stream-base.gemspec

@@ -26,17 +26,17 @@ Gem::Specification.new do |s|
   # SQL foreign keys
   s.add_runtime_dependency('foreigner', '~> 1.1.1')
   # Authentication
-  s.add_runtime_dependency('devise', '~> 1.5.3')
+  s.add_runtime_dependency('devise', '~> 2.1.2')
   # CRUD controllers
   s.add_runtime_dependency('inherited_resources', '~> 1.3.0')
   # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.3.0')
   # Avatar attachments
-  s.add_runtime_dependency('avatars_for_rails', '~> 0.2.5')
+  s.add_runtime_dependency('avatars_for_rails', '~> 0.2.8')
   # jQuery
   s.add_runtime_dependency('jquery-rails', '>= 1.0.9')
   # Authorization
-  s.add_runtime_dependency('cancan', '1.6.7')
+  s.add_runtime_dependency('cancan', '~> 1.6.7')
   # Pagination
   s.add_runtime_dependency('kaminari', '~> 0.13.0')
   # OAuth client
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
   # HTML Forms
   s.add_runtime_dependency('formtastic','>= 1.2.3')
   # Background jobs
-  s.add_runtime_dependency('resque','~> 1.20.0')
+  s.add_runtime_dependency('resque','~> 1.23.0')
   # Modernizr.js javascript library
   s.add_runtime_dependency('modernizr-rails', '~> 2.0.6')
   # Sphinx search engine

data/base/spec/controllers/relation_customs_controller_spec.rb

@@ -74,7 +74,8 @@ describe Relation::CustomsController do
 	begin
           post :create, :custom => { :name => 'Test', :actor_id => actor.id }
 
-          assert false
+          assigns(:custom).should_not be_new_record
+          assigns(:custom).actor_id.should eq(@user.actor_id)
         rescue CanCan::AccessDenied
           assigns(:custom).should be_new_record
 

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

@@ -93,10 +93,6 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.
   # config.cookie_options = {}
@@ -159,11 +155,7 @@ Devise.setup do |config|
   # ==> Configuration for :token_authenticatable
   # Defines name of the authentication token params key
   # config.token_authentication_key = :auth_token
-
-  # If true, authentication through token does not store user in session and needs
-  # to be supplied on each request. Useful if you are using the token as API token.
-  # config.stateless_token = false
-
+  
   # ==> Scopes configuration
   # Turn scoped views on. Before rendering "sessions/new", it will first check for
   # "users/sessions/new". It's turned off by default because it's slower if you
@@ -205,9 +197,11 @@ Devise.setup do |config|
   #config.omniauth :twitter, "wgTxO0fTpjTeSnjKC9ZHA","JepulVWwLcuAnGfWjwCu47yEP0TcJJfKtvISPBsilI"
                       
   config.token_authentication_key = :auth_token
-                      
-  config.stateless_token = true
 
+  #re state_less token removal 
+  #https://github.com/plataformatec/devise/issues/1499
+  config.skip_session_storage << :token_auth
+                      
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or
   # change the failure app, you can configure them inside the config.warden block.

data/documents/app/controllers/documents_controller.rb

@@ -20,6 +20,7 @@ class DocumentsController < ApplicationController
   def create
     super do |format|
       format.json { render :json => resource }
+      format.js
       format.all {redirect_to request.referer || home_path}
     end
   end

data/documents/app/models/audio.rb

@@ -1,9 +1,9 @@
 class Audio < Document  
   has_attached_file :file, 
-                    :url => '/:class/:id.:extension',
+                    :url => '/:class/:id.:content_type_extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style',
-                    :styles => {:webma => {:format => 'webm'}                                
-                    },:processors => [:ffmpeg]
+                    :styles => SocialStream::Documents.audio_styles,
+                    :processors => [ :ffmpeg ]
   
   process_in_background :file    
   

data/documents/app/models/document.rb

@@ -4,7 +4,7 @@ class Document < ActiveRecord::Base
   IMAGE_FORMATS = ["doc","ppt","xls","rar","zip","mpeg","plain","pdf"]
 
   has_attached_file :file, 
-                    :url => '/:class/:id.:extension',
+                    :url => '/:class/:id.:content_type_extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style/:filename.:extension'
 
   paginates_per 20
@@ -82,5 +82,3 @@ class Document < ActiveRecord::Base
     self.title = file_file_name if self.title.blank?
   end
 end
-
-ActiveSupport.run_load_hooks(:document, Document) 

data/documents/app/models/picture.rb

@@ -1,13 +1,8 @@
 class Picture < Document
   has_attached_file :file, 
-                    :url => '/:class/:id.:extension',
+                    :url => '/:class/:id.:content_type_extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style',
-                    :styles => {:thumb48sq  => ["48x48"],
-                                :thumbwall => ["130x97#"],
-                                # midwall preserves A4 proportion: 210x297
-                                :midwall => ["80x113#"],
-                                :preview => ["500>"]
-                               }                              
+                    :styles => SocialStream::Documents.picture_styles
                                
   define_index do
     activity_object_index
@@ -28,6 +23,8 @@ class Picture < Document
         helper.picture_path self, :format => format, :style => 'thumbwall'
       when 500
         helper.picture_path self, :format => format, :style => 'preview'
+      when 1000
+        helper.picture_path self, :format => format, :style => 'original'
     end
   end
       

data/documents/app/models/video.rb

@@ -1,16 +1,9 @@
 class Video < Document  
   has_attached_file :file, 
-                    :url => '/:class/:id.:extension',
+                    :url => '/:class/:id.:content_type_extension',
                     :default_url => 'missing_:style.png',
                     :path => ':rails_root/documents/:class/:id_partition/:style',
-                    :styles => {
-                      :webm => {:format => 'webm'},
-                      :flv  => {:format => 'flv'},
-                      :mp4  => {:format => 'mp4'},
-                      :poster  => {:format => 'png', :time => 5},
-                      :thumb48sq  => {:geometry => "48x48" , :format => 'png', :time => 5},
-                      :thumbwall => {:geometry => "130x97#", :format => 'png', :time => 5}
-                    },
+                    :styles => SocialStream::Documents.video_styles,
                     :processors => [:ffmpeg]
                     
   process_in_background :file

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

@@ -53,7 +53,7 @@
       ready: function () {
         $(this).jPlayer("setMedia", {
           webmv: "<%= video_url(video, :format => 'webm' ) %>", // Defines the webm url
-          flv:   "<%= video_url(video, :format => 'flv') %>"
+          flv:   "<%= video_url(video, :format => 'flv') %>",
           mp4:   "<%= video_url(video, :format => 'mp4') %>"
         });
       },

data/documents/db/migrate/{20120109155431_create_social_stream_documents.rb → 20120208143721_create_social_stream_documents.rb}

@@ -10,8 +10,6 @@ class CreateSocialStreamDocuments < ActiveRecord::Migration
       t.string   "file_content_type"
       t.string   "file_file_size"
       t.boolean  "file_processing"
-      t.string   "title"
-      t.text     "description"
     end
 
     add_index "documents", ["activity_object_id"], :name => "index_documents_on_activity_object_id"

data/documents/lib/delayed_paperclip/social_stream-documents.rb

@@ -1,18 +1,13 @@
-# Monkey-patch https://github.com/jstorimer/delayed_paperclip/commit/3e0e3451147e96f378cda4695546d9633944cc5c
+# Monkey-patch https://github.com/jstorimer/delayed_paperclip/issues/67
 #
-# Remove with delayed_paperclip > 2.4.5.1
+# Remove with delayed_paperclip > 2.4.5.2 ???
 require 'delayed_paperclip'
 
 module DelayedPaperclip::Attachment::InstanceMethods
-  def post_process_styles_with_processing(*args)
-    post_process_styles_without_processing(*args)
-
-    # update_column is available in rails 3.1 instead we can do this to update the attribute without callbacks
-
-    #instance.update_column("#{name}_processing", false) if instance.respond_to?(:"#{name}_processing?")
-    if instance.respond_to?(:"#{name}_processing?")
-      instance.send("#{name}_processing=", false)
-      instance.class.update_all({ "#{name}_processing" => false }, instance.class.primary_key => instance.id)
-    end
+  def process_delayed!
+    self.job_is_processing = true
+    self.post_processing = true
+    reprocess!
+    self.job_is_processing = false
   end
 end

data/documents/lib/generators/social_stream/documents/install_generator.rb

@@ -3,6 +3,10 @@ class SocialStream::Documents::InstallGenerator < Rails::Generators::Base
   
   source_root File.expand_path('../templates', __FILE__)
 
+  def create_initializer_file
+    template 'initializer.rb', 'config/initializers/social_stream-documents.rb'
+  end
+
   def create_migration_file
     require 'rake'
     Rails.application.load_tasks

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

@@ -0,0 +1,26 @@
+SocialStream::Documents.setup do |config| 
+  # Configure picture thumbnails
+  #
+  # config.picture_styles = {
+  #    :thumb48sq  => ["48x48"],
+  #    :thumbwall => ["130x97#"],
+  #    # midwall preserves A4 proportion: 210x297
+  #    :midwall => ["80x113#"],
+  #    :preview => ["500>"]
+  #  }
+
+  # Configure audio thumbnails
+  #
+  # config.audio_styles = { :webma => {:format => 'webm'} }
+
+  # Configure video thumbnails
+  #
+  #  @@video_styles = {
+  #    :webm => { :format => 'webm' },
+  #    :flv  => { :format => 'flv' },
+  #    :mp4  => { :format => 'mp4' },
+  #    :poster  => { :format => 'png', :time => 5 },
+  #    :thumb48sq  => { :geometry => "48x48" , :format => 'png', :time => 5 },
+  #    :thumbwall => { :geometry => "130x97#", :format => 'png', :time => 5 }
+  #  }
+end