social_stream 0.16.3 → 0.17.0

data/base/app/views/settings/_notifications.html.erb

@@ -31,4 +31,4 @@
         </ul>
         <% end %>
     </div>
-</div>
+</div>

data/base/config/locales/en.yml

@@ -372,6 +372,8 @@ en:
           activity: "Read wall"
         represent:
           nil: "Administrate"
+        notify:
+          nil: "Notify via email"
       detailed:
         create:
           activity: "Post to \"%{relation}\" wall"
@@ -382,6 +384,8 @@ en:
           tie: "See contacts in levels: %{relations} and %{public}"
         represent:
           nil: "Change session to act as %{subject}"
+        notify:
+          nil: "Updates of contacts at %{relation} will be sent to your email"
     of_relation:
       choose: "2. Permissions in <strong>%{name}</strong> sphere"
   privacy:
@@ -433,6 +437,7 @@ en:
       briefing: "Change your email"
     lang_change:
       briefing: "Change your language"
+      name: "Change your language"
     error: "Some errors raised when saving your changes"
     for: "Settings for"
     main: "Settings"

data/base/config/locales/es.yml

@@ -371,6 +371,8 @@ es:
           activity: "Leer muro"
         represent:
           nil: "Administrar"
+        notify:
+          nil: "Notificar por email"
       detailed:
         create:
           activity: "Publicar en el muro de\"%{relation}\""
@@ -381,6 +383,8 @@ es:
           tie: "Ver contactos en los niveles: %{relations} y %{public}"
         represent:
           nil: "Cambiar sesión para actuar en nombre de %{subject}"
+        notify:
+          nil: "Las actividades de los contactos en %{relation} se te enviarán al email"
     of_relation:
       choose: "2. Permisos para <strong>%{name}</strong>"
   privacy:
@@ -430,6 +434,9 @@ es:
       briefing: "Te permite cancelar tu cuenta"
     email_change:
       briefing: "Cambia tu email"
+    lang_change:
+      briefing: "Cambia tu idioma"
+      name: "Cambia tu idioma"
     error: "Hubo errores al guardar los cambios"
     for: "Ajustes para"
     main: "Ajustes"

data/base/db/migrate/20120103103125_add_channels.rb

@@ -0,0 +1,88 @@
+class AddChannels < ActiveRecord::Migration
+  def up
+    create_table :channels do |t|
+      t.integer :author_id
+      t.integer :owner_id
+      t.integer :user_author_id
+
+      t.timestamps
+    end
+
+    add_index "channels", "author_id"
+    add_index "channels", "owner_id"
+    add_index "channels", "user_author_id"
+
+    add_foreign_key "channels", "actors", :name => "index_channels_on_author_id", :column => :author_id
+    add_foreign_key "channels", "actors", :name => "index_channels_on_owner_id", :column => :owner_id
+    add_foreign_key "channels", "actors", :name => "index_channels_on_user_author_id", :column => :user_author_id
+
+    change_table :activity_objects do |t|
+      t.integer :channel_id
+    end
+
+    add_index "activity_objects", "channel_id"
+
+    add_foreign_key "activity_objects", "channels", :name => "index_activity_objects_on_channel_id"
+
+    ActivityObject.record_timestamps = false
+
+    ActivityObject.reset_column_information
+
+    ActivityObject.all.each do |a|
+      %w( author user_author owner ).each do |m|
+        a.channel!.__send__ "#{ m }_id=",  a.read_attribute("#{ m }_id") # a.channel!.author_id = a.read_attribute("author_id")
+      end
+
+      a.save!
+    end
+
+    remove_foreign_key "activity_objects", :name => "index_activity_objects_on_author_id"
+    remove_foreign_key "activity_objects", :name => "index_activity_objects_on_owner_id"
+    remove_foreign_key "activity_objects", :name => "index_activity_objects_on_user_author_id"
+
+    remove_column :activity_objects, :author_id
+    remove_column :activity_objects, :owner_id
+    remove_column :activity_objects, :user_author_id
+
+    ActivityObject.reset_column_information
+  end
+
+  def down
+    change_table :activity_objects do |t|
+      t.integer :author_id
+      t.integer :owner_id
+      t.integer :user_author_id
+    end
+
+    add_index "activity_objects", "author_id"
+    add_index "activity_objects", "owner_id"
+    add_index "activity_objects", "user_author_id"
+
+    add_foreign_key "activity_objects", "actors", :name => "index_activity_objects_on_author_id", :column => :author_id
+    add_foreign_key "activity_objects", "actors", :name => "index_activity_objects_on_owner_id", :column => :owner_id
+    add_foreign_key "activity_objects", "actors", :name => "index_activity_objects_on_user_author_id", :column => :user_author_id
+
+    ActivityObject.reset_column_information
+    ActivityObject.record_timestamps = false
+
+    ActivityObject.all.each do |a|
+      next if a.channel.blank?
+
+      a.author_id      = a.channel.author_id
+      a.owner_id       = a.channel.owner_id
+      a.user_author_id = a.channel.user_author_id
+
+      a.save!
+    end
+
+    remove_foreign_key "activity_objects", :name => "index_activity_objects_on_channel_id"
+
+    remove_column :activity_objects, :channel_id
+
+    remove_foreign_key "channels", :name => "index_channels_on_author_id"
+    remove_foreign_key "channels", :name => "index_channels_on_owner_id"
+    remove_foreign_key "channels", :name => "index_channels_on_user_author_id"
+
+    drop_table :channels
+  end
+end

data/base/db/migrate/20120109081509_update_notify_permissions.rb

@@ -0,0 +1,15 @@
+# Before the 'notify' permission was added, only users with the first relation in each group where notified by email
+# This migration preserves the old behavior by granting the 'notify' permission to the first relation in each group
+class UpdateNotifyPermissions < ActiveRecord::Migration
+  def up
+    perm_notify = Permission.find_or_create_by_action('notify')
+    Group.all.each do |g|
+      r = g.relation_customs.first
+      next if r.blank?
+      r.permissions << perm_notify
+    end
+  end
+
+  def down
+  end
+end

data/base/lib/social_stream-base.rb

@@ -10,15 +10,18 @@ module SocialStream
   autoload :TestHelpers, 'social_stream/test_helpers'
 
   module Controllers
+    autoload :I18nIntegration,         'social_stream/controllers/i18n_integration'
     autoload :CancanDeviseIntegration, 'social_stream/controllers/cancan_devise_integration'
-    autoload :Helpers, 'social_stream/controllers/helpers'
-    autoload :Objects, 'social_stream/controllers/objects'
+    autoload :Helpers,  'social_stream/controllers/helpers'
+    autoload :Objects,  'social_stream/controllers/objects'
+    autoload :Subjects, 'social_stream/controllers/subjects'
   end
 
   module Models
-    autoload :Supertype, 'social_stream/models/supertype'
-    autoload :Subject,   'social_stream/models/subject'
     autoload :Object,    'social_stream/models/object'
+    autoload :Subject,   'social_stream/models/subject'
+    autoload :Subtype,   'social_stream/models/subtype'
+    autoload :Supertype, 'social_stream/models/supertype'
   end
 
   module Views

data/base/lib/social_stream/base/engine.rb

@@ -14,14 +14,22 @@ module SocialStream
         end
       end
 
-     initializer "social_stream-base.mime_types" do
+      initializer "social_stream-base.mime_types" do
         Mime::Type.register 'application/xrd+xml', :xrd
       end
 
-      initializer "social_stream-base.controller_helpers" do
+      initializer "social_stream-base.model.supertype" do
+        ActiveSupport.on_load(:active_record) do
+          include SocialStream::Models::Subtype::ActiveRecord
+          include SocialStream::Models::Supertype::ActiveRecord
+        end
+      end
+
+      initializer "social_stream-base.controller.helpers" do
         ActiveSupport.on_load(:action_controller) do
           include SocialStream::Controllers::Helpers
           include SocialStream::Controllers::CancanDeviseIntegration
+          include SocialStream::Controllers::I18nIntegration
         end
       end
 

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.11.2".freeze
+    VERSION = "0.12.0".freeze
   end
 end

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

@@ -0,0 +1,29 @@
+module SocialStream
+  module Controllers
+    # Common methods added to ApplicationController
+    module I18nIntegration
+      extend ActiveSupport::Concern
+
+      included do
+         before_filter :set_locale
+      end
+
+      module InstanceMethods
+        # Set locale as per params, user preference or default
+        def set_locale
+          I18n.locale = params[:locale] || user_preferred_locale || extract_locale_from_accept_language_header || I18n.default_locale
+        end
+
+        private
+	def extract_locale_from_accept_language_header
+	  return nil if request.env['HTTP_ACCEPT_LANGUAGE'].nil?
+	  (request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).map{|l| l.to_sym} & I18n.available_locales).first
+	end
+
+	def user_preferred_locale
+          current_user.language if user_signed_in?
+	end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module SocialStream
+  module Controllers
+    module Subjects
+      extend ActiveSupport::Concern
+
+      included do
+        inherit_resources
+      end
+
+      module InstanceMethods
+        # Overwrite {SocialStream::Controllers::Helpers::InstanceMethods#profile_subject}
+        def profile_subject
+          !resource.new? && resource || current_subject
+        end
+      end
+    end
+  end
+end
+

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

@@ -10,12 +10,11 @@ module SocialStream
         attr_writer   :_relation_ids
         attr_accessor :_activity_parent_id
 
-        belongs_to :activity_object,
-                   :validate  => true,
-                   :autosave => true,
-                   :dependent => :destroy
+        subtype_of :activity_object,
+                   :build => { :object_type => to_s }
 
-        has_many   :activity_object_activities, :through => :activity_object
+        has_one  :channel, :through => :activity_object
+        has_many :activity_object_activities, :through => :activity_object
 
 #        before_create :create_activity_object_with_type
 
@@ -23,31 +22,18 @@ module SocialStream
           validates_presence_of :author_id, :owner_id, :user_author_id
 
           after_create :create_post_activity
-          after_update :create_update_activity
+          # Disable update activity for now
+          # It usually appears repeated in the wall and provides no useful information
+          #after_update :create_update_activity
         end
+
+        scope :authored_by, lambda { |subject|
+          joins(:activity_object).
+            merge(ActivityObject.authored_by(subject))
+        }
       end
 
       module InstanceMethods
-        def activity_object!
-          activity_object || build_activity_object(:object_type => self.class.to_s)
-        end
-
-        # Delegate missing methods to {ActivityObject}, if they exist there
-        def method_missing(method, *args, &block)
-          super
-        rescue NameError => object_error 
-          # These methods must be raised to avoid loops (the :activity_object association calls here again)
-          exceptions = [ :_activity_object_id ]
-          raise object_error if exceptions.include?(method)
-
-          activity_object!.__send__ method, *args, &block
-        end
-
-        # {ActivityObject} handles some methods
-        def respond_to? *args
-          super || activity_object!.respond_to?(*args)
-        end
-
         # Was the author represented with this {SocialStream::Models::Object object} was created?
         def represented_author?
           author_id == user_author_id

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

@@ -21,10 +21,8 @@ module SocialStream
       extend ActiveSupport::Concern
       
       included do
-        belongs_to :actor,
-                   :validate => true,
-                   :autosave => true,
-                   :dependent => :destroy
+        subtype_of :actor,
+                   :build => { :subject_type => to_s }
         
         has_one :profile, :through => :actor
         
@@ -78,29 +76,9 @@ module SocialStream
       end
       
       module InstanceMethods
-        def actor!
-          actor || build_actor(:subject_type => self.class.to_s)
-        end
-        
         def to_param
           slug
         end
-
-        # Delegate missing methods to {Actor}, if they exist there
-        def method_missing(method, *args, &block)
-          super
-        rescue NameError => subject_error 
-          # These methods must be raised to avoid loops (the :actor association calls here again)
-          exceptions = [ :_actor_id ]
-          raise subject_error if exceptions.include?(method)
-
-          actor!.__send__ method, *args, &block
-        end
-
-        # {Actor} handles some methods
-        def respond_to? *args
-          super || actor!.respond_to?(*args)
-        end
       end
       
       module ClassMethods

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

@@ -0,0 +1,80 @@
+require 'active_support/concern'
+
+module SocialStream #:nodoc:
+  module Models
+    # Common methods for models that have a {SocialStream::Models::Supertype}
+    module Subtype
+      extend ActiveSupport::Concern
+
+      included do
+        class << self
+          attr_reader :supertype_name, :supertype_options
+        end
+
+        belongs_to supertype_name, {
+                    :validate  => true,
+                    :autosave  => true,
+                    :dependent => :destroy
+                  }.merge(supertype_options[:belongs] || {})
+
+        class_eval <<-EOS
+          def #{ supertype_name }!                                      # def actor!
+            #{ supertype_name } ||                                      #   actor ||
+              # FIXME: ruby1.9 remove .inspect
+              build_#{ supertype_name }(#{ supertype_options[:build].inspect }) #     build_actor(:subject_type => "User")
+          end                                                           # end
+
+        EOS
+
+        alias_method :supertype!, "#{ supertype_name }!"
+
+        before_validation :supertype!
+      end
+
+      module ClassMethods
+        def supertype_foreign_key
+          "#{ supertype_name }_id"
+        end 
+      end
+
+      module InstanceMethods
+        # Delegate missing methods to supertype, if they exist there
+        def method_missing(method, *args, &block)
+          super
+        rescue NameError => subtype_error
+          # These methods must be raised to avoid loops
+          # (the @supertype_name association (i.e. :actor) calls here again)
+          exceptions = [ "_#{ self.class.supertype_foreign_key }".to_sym ] # [ :_actor_id ]
+          raise subtype_error if exceptions.include?(method)
+
+          begin
+            supertype!.__send__ method, *args, &block
+          # We rescue supertype's NameErrors so methods not defined are raised from
+          # the subtype. Example: user.foo should raise "foo is not defined in user"
+          # and not "in actor"
+          rescue NameError => supertype_error
+            raise subtype_error
+          end
+        end
+
+        # {SocialStream::Models::Supertype} handles some methods
+        def respond_to? *args
+          super || supertype!.respond_to?(*args)
+        end 
+      end
+
+      module ActiveRecord
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          # This class is a subtype. Its supertype class is name
+          def subtype_of name, options = {}
+            @supertype_name = name
+            @supertype_options = options
+            include SocialStream::Models::Subtype
+          end
+        end
+      end
+    end
+  end
+end