social_stream 0.29.0 → 0.30.0

data/documents/lib/social_stream-documents.rb

@@ -8,6 +8,35 @@ module SocialStream
   end
 
   module Documents
+    # Picture thumbnails
+    mattr_accessor :picture_styles
+    @@picture_styles = {
+      :thumb48sq  => ["48x48"],
+      :thumbwall => ["130x97#"],
+      # midwall preserves A4 proportion: 210x297
+      :midwall => ["80x113#"],
+      :preview => ["500>"]
+    }
+
+    mattr_accessor :audio_styles
+    @@audio_styles = { :webma => {:format => 'webm'} }
+
+    mattr_accessor :video_styles
+    @@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 }
+    }
+
+    class << self
+      def setup
+        yield self
+      end
+    end
+
     # Add :document to SocialStream.objects and SocialStream.activity_forms by default
     # It can be configured by users at application's config/initializers/social_stream.rb
     [ :picture, :video, :audio, :document].each do |o|

data/documents/lib/social_stream/documents/dependencies.rb

@@ -1,6 +1,5 @@
 require 'social_stream-base'
 require 'paperclip'
-require 'paperclip/social_stream-documents'
 require 'paperclip-ffmpeg'
 require 'delayed_paperclip'
 require 'delayed_paperclip/social_stream-documents'

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.17.0".freeze
+    VERSION = "0.18.0".freeze
   end
 end

data/documents/social_stream-documents.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.23.0')
-  s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
-  s.add_runtime_dependency('paperclip','= 2.4.5')
-  s.add_runtime_dependency('delayed_paperclip','2.4.5.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.24.0')
+  s.add_runtime_dependency('paperclip','~> 3.3.0')
+  s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.9.0')
+  s.add_runtime_dependency('delayed_paperclip','>= 2.4.5.2')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')
   if RUBY_VERSION < '1.9'

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

@@ -72,10 +72,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
-
   # ==> Configuration for :validatable
   # Range for password length. Default is 6..20.
   # config.password_length = 6..20
@@ -163,6 +159,10 @@ Devise.setup do |config|
   config.omniauth :linkedin, "ekxfXU8nueVSMQ9fc5KJAryBkyztUlCBYMW3DoQPzbE79WhivvzhQloRNHCHgPeB", "WYiHFT-KKFgjd45W3-pEAficmXRHmN6_6DGwj1C_ZILJlSO1gBvv6VNYXU9tybGY"
                       
   config.omniauth :facebook, "129571360447856","eef39dce5e20e76f77495c59623bdb38"
+
+  #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

data/events/db/migrate/20120330131859_create_social_stream_events.rb

@@ -1,10 +1,33 @@
-# SocialStream migrations live at least 10 minor versions.
-# Then they are merged.
-# This is a placeholder migration to merge SocialStreamEvents' migrations
 class CreateSocialStreamEvents < ActiveRecord::Migration
-  def up
-  end
+  def change
+    create_table "events", :force => true do |t|
+      t.integer  "activity_object_id"
+      t.datetime "start_at"
+      t.datetime "end_at"
+      t.boolean  "all_day"
+      t.datetime "created_at",                        :null => false
+      t.datetime "updated_at",                        :null => false
+      t.integer  "room_id"
+      t.date     "start_date"
+      t.date     "end_date"
+      t.integer  "frequency",          :default => 0
+      t.integer  "interval"
+      t.integer  "days",               :default => 0
+      t.integer  "interval_flag",      :default => 0
+    end
+
+    add_index "events", ["room_id"], :name => "index_events_on_room_id"
+
+    create_table "rooms", :force => true do |t|
+      t.integer  "actor_id"
+      t.string   "name"
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+    end
+
+    add_index "rooms", ["actor_id"], :name => "index_rooms_on_actor_id"
 
-  def down
+    add_foreign_key "events", "activity_objects", :name => "events_on_activity_object_id"
+    add_foreign_key "events", "rooms", :name => "index_events_on_room_id"
   end
 end

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.15.0".freeze
+    VERSION = "0.16.0".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.23.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.24.0')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.8')
 
   # Development Gem dependencies

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.29.0".freeze
+  VERSION = "0.30.0".freeze
 end

data/linkser/app/controllers/links_controller.rb

@@ -1,3 +1,11 @@
 class LinksController < ApplicationController
   include SocialStream::Controllers::Objects
+
+  def create
+    super do |format|
+      format.json { render :json => resource }
+      format.js { render }
+      format.all {redirect_to link_path(resource) || home_path}
+    end
+  end
 end

data/linkser/db/migrate/{20111219122952_create_social_stream_linkser.rb → 20120208143739_create_social_stream_linkser.rb}

@@ -6,13 +6,13 @@ class CreateSocialStreamLinkser < ActiveRecord::Migration
       t.datetime "updated_at"
       t.string   "url"
       t.string   "callback_url"
-      t.string   "title"
       t.string   "image"
-      t.text     "description"
       t.integer  "width",              :default => 470
       t.integer  "height",             :default => 353
     end
 
     add_index "links", ["activity_object_id"], :name => "index_links_on_activity_object_id"
+    
+    add_foreign_key "links", "activity_objects", :name => "links_on_activity_object_id"
   end
 end

data/linkser/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.14.0".freeze
+    VERSION = "0.15.0".freeze
   end
 end

data/linkser/social_stream-linkser.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.23.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.24.0')
   s.add_runtime_dependency('linkser', '~> 0.0.12')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

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

@@ -72,10 +72,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
-
   # ==> Configuration for :validatable
   # Range for password length. Default is 6..20.
   # config.password_length = 6..20
@@ -122,11 +118,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
@@ -163,6 +155,10 @@ Devise.setup do |config|
   config.omniauth :linkedin, "ekxfXU8nueVSMQ9fc5KJAryBkyztUlCBYMW3DoQPzbE79WhivvzhQloRNHCHgPeB", "WYiHFT-KKFgjd45W3-pEAficmXRHmN6_6DGwj1C_ZILJlSO1gBvv6VNYXU9tybGY"
                       
   config.omniauth :facebook, "129571360447856","eef39dce5e20e76f77495c59623bdb38"
+  
+  #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

data/ostatus/app/decorators/social_stream/base/contact_decorator.rb

@@ -0,0 +1,3 @@
+Contact.class_eval do
+  include SocialStream::Ostatus::Models::Contact
+end

data/ostatus/lib/social_stream-ostatus.rb

@@ -34,6 +34,7 @@ module SocialStream
       autoload :Activity, 'social_stream/ostatus/models/activity'
       autoload :Actor, 'social_stream/ostatus/models/actor'
       autoload :Audience, 'social_stream/ostatus/models/audience'
+      autoload :Contact, 'social_stream/ostatus/models/contact'
       autoload :Tie, 'social_stream/ostatus/models/tie'
 
       module Object

data/ostatus/lib/social_stream/ostatus/activity_streams.rb

@@ -21,8 +21,10 @@ module SocialStream
         # FIXME: should not use to_sym
         # https://github.com/shf/proudhon/issues/7
         case entry.verb.to_sym
-        when :follow
-          Tie.from_entry! entry, receiver
+        when :follow, :subscribe, :join
+          Tie.create_from_entry! entry, receiver
+        when :unsubscribe, :leave, 'http://ostatus.org/schema/1.0/unfollow'
+          Tie.destroy_from_entry! entry, receiver
         else
           # :post is the default verb
           r = record_from_entry! entry, receiver

data/ostatus/lib/social_stream/ostatus/models/contact.rb

@@ -0,0 +1,64 @@
+module SocialStream
+  module Ostatus
+    module Models
+      module Contact
+        extend ActiveSupport::Concern
+
+        included do
+          # FIXME: hack, this overwrites base definition, see there
+          # for the reasons related to after_destroy callbacks
+          alias_method_chain :unset_follow_action, :salmon
+        end
+
+        module ClassMethods
+          # Find contact from OStatus entry
+          def from_entry! entry, receiver
+            # Sender must be remote
+            sender = RemoteSubject.find_or_create_by_webfinger_uri! entry.author.uri
+
+            contact = sender.contact_to!(receiver)
+
+            # FIXME: hack
+            contact.user_author = sender
+
+            contact
+          end
+        end
+
+        # Send Salmon notification
+        #
+        # FIXME DRY with activity.rb
+        def unset_follow_action_with_salmon(relation)
+          unset_follow_action_without_salmon(relation)
+
+          return if sender.subject_type == "RemoteSubject" ||
+                      receiver.subject_type != "RemoteSubject"
+
+          title = I18n.t "activity.stream.title.unfollow",
+                         author: sender_subject.name,
+                         activity_object: receiver_subject.name
+
+          entry =
+            Proudhon::Entry.new id: "tag:#{ SocialStream::Ostatus.activity_feed_host },2005:contact-destroy-#{ id }",
+                                title: title,
+                                content: title,
+                                verb: 'http://ostatus.org/schema/1.0/unfollow',
+                                author: Proudhon::Author.new(name: sender.name,
+                                                             uri: sender.webfinger_uri)
+          salmon = entry.to_salmon
+
+          if SocialStream::Ostatus.debug_requests
+            logger.info entry.to_xml
+          end
+
+          # FIXME: Rails 4 queues
+          Thread.new do
+            salmon.deliver receiver_subject.salmon_url, sender.rsa_key
+
+            ActiveRecord::Base.connection.close
+          end
+        end
+      end
+    end
+  end
+end

data/ostatus/lib/social_stream/ostatus/models/tie.rb

@@ -6,16 +6,17 @@ module SocialStream
 
         module ClassMethods
           # Create a new {Tie} from OStatus entry
-          def from_entry! entry, receiver
-            # Sender must be remote
-            sender = RemoteSubject.find_or_create_by_webfinger_uri! entry.author.uri
+          def create_from_entry! entry, receiver
+            contact = ::Contact.from_entry! entry, receiver
+           
+            contact.relation_ids = [::Relation::Public.instance.id]
+          end
 
-            contact = sender.contact_to!(receiver)
+          # Remove all {Tie} from OStatus entry
+          def destroy_from_entry! entry, receiver
+            contact = ::Contact.from_entry! entry, receiver
 
-            # FIXME: hack
-            contact.user_author = sender
-            
-            contact.relation_ids = [::Relation::Public.instance.id]
+            contact.relation_ids = []
           end
         end
       end

data/ostatus/lib/social_stream/ostatus/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Ostatus
-    VERSION = "0.1.0".freeze
+    VERSION = "0.2.0".freeze
   end
 end

data/ostatus/social_stream-ostatus.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.23.0')
-  s.add_runtime_dependency('proudhon','>= 0.3.5')
+  s.add_runtime_dependency('social_stream-base', '~> 0.24.0')
+  s.add_runtime_dependency('proudhon','>= 0.3.6')
   s.add_runtime_dependency('nokogiri','> 1.4.4')
   
   # Development Gem dependencies

data/presence/db/migrate/20120330132148_create_social_stream_presence.rb

@@ -1,10 +1,9 @@
-# SocialStream migrations live at least 10 minor versions.
-# Then they are merged.
-# This is a placeholder migration to merge SocialStreamPresence' migrations
 class CreateSocialStreamPresence < ActiveRecord::Migration
-  def up
-  end
-
-  def down
+  def change
+    change_table :users do |t|
+      t.boolean :connected,    :default => false
+      t.string  :status,       :default => "available"
+      t.boolean :chat_enabled, :default => true
+    end
   end
 end

data/presence/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "0.16.0"
+    VERSION = "0.17.0"
   end
 end

data/presence/social_stream-presence.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.23.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.24.0')
   
   s.add_runtime_dependency "xmpp4r"
 

data/social_stream.gemspec

@@ -11,12 +11,12 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.23.0')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.17.0')
-  s.add_runtime_dependency('social_stream-events', '~> 0.15.0')
-  s.add_runtime_dependency('social_stream-linkser', '~> 0.14.0')
-  s.add_runtime_dependency('social_stream-presence', '~> 0.16.0')
-  s.add_runtime_dependency('social_stream-ostatus', '~> 0.1.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.24.0')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.18.0')
+  s.add_runtime_dependency('social_stream-events', '~> 0.16.0')
+  s.add_runtime_dependency('social_stream-linkser', '~> 0.15.0')
+  s.add_runtime_dependency('social_stream-presence', '~> 0.17.0')
+  s.add_runtime_dependency('social_stream-ostatus', '~> 0.2.0')
  
   # Development Gem dependencies
   #

data/spec/dummy/config/database.yml

@@ -21,6 +21,7 @@ test:
 test_mysql:
   adapter: mysql2
   database: social_stream_test
+  pool: 8
   username: 
   encoding: utf8
 
@@ -28,6 +29,7 @@ test_postgres:
   adapter: postgresql
   database: social_stream_test
   username: postgres
+  pool: 8
 
 production:
   adapter: sqlite3