social_stream-base 0.11.2 → 0.12.0

data/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/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/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/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/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

data/lib/social_stream/models/supertype.rb

@@ -2,9 +2,10 @@ require 'active_support/concern'
 
 module SocialStream #:nodoc:
   module Models
-    # Common methods for models that have subtypes. Currently, there are two supertypes:
-    # * Actor: participates in the social network and has ties with other actors. Its subtypes are subjects, like user or group
-    # * ActivityObject: created and managed by actors in activities. Its subtypes are objects, like post or comment
+    # Common methods for models having many {SocialStream::Models::Subtype subtypes}.
+    # Currently, there are two {SocialStream::Models::Supertype supertypes}:
+    # * {Actor}: participates in the social network and has {Tie Ties} with other actors. Its subtypes are {SocialStream::Models::Subject subjects}, such as {User} or {Group}
+    # * {ActivityObject}: created and managed by {Actor Actors} in {Activity Activities}. Its subtypes are {SocialStream::Models::Object objects}, like {Post} or {Comment}
     module Supertype
       extend ActiveSupport::Concern
 
@@ -32,6 +33,18 @@ module SocialStream #:nodoc:
                        end                                                # end
         end
       end
+
+      module ActiveRecord
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          # This class is a supertype. Subtype classes are known as name
+          def supertype_of name
+            @subtypes_name = name
+            include SocialStream::Models::Supertype
+          end
+        end
+      end
     end
   end
 end

data/lib/social_stream/views/settings/base.rb

@@ -15,6 +15,11 @@ module SocialStream
               }
             end
 
+            items << {
+              :key  => 'language',
+              :html => render(:partial => "language")
+            }
+
             items << {
               :key  => 'notifications',
               :html => render(:partial => "notifications")

data/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/lib/tasks/db/populate.rake

@@ -9,6 +9,7 @@ namespace :db do
 
     desc "Create populate data"
     task :create => :environment do
+      require 'forgery'
 
       LOGOS_PATH = File.join(Rails.root, 'lib', 'logos')
       USERS = (ENV["USERS"] || 9).to_i

data/spec/controllers/settings_controller_spec.rb

@@ -17,7 +17,7 @@ describe SettingsController do
 
   it "should render index after update_all" do
     put :update_all
-    assert_response :success
+    response.should redirect_to(:settings)
   end
 
   describe "Notification settings" do

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] ||= "test"
 
+# Do not check ImageMagick<=>Rmagick versions
+RMAGICK_BYPASS_VERSION_TEST = true
+
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rspec/rails"