social_stream 2.1.1 → 2.2.0

data/base/config/routes.rb

@@ -7,31 +7,31 @@ Rails.application.routes.draw do
   match 'search' => 'search#index', :as => :search
 
   # Social Stream subjects configured in config/initializers/social_stream.rb
-  SocialStream.subjects.each do |actor|
-    resources actor.to_s.pluralize do
-      resources :contacts
-      resource :like
-      resource :profile
-      resources :activities
-
-      # Nested Social Stream objects configured in config/initializers/social_stream.rb
-      #
-      # /users/demo/posts
-      (SocialStream.objects - [ :actor ]).each do |object|
-        resources object.to_s.pluralize do
-          get 'search', :on => :collection
-        end
+  route_subjects do
+    resources :contacts
+    resource :like
+    resource :profile
+    resources :activities
+
+    # Nested Social Stream objects configured in config/initializers/social_stream.rb
+    #
+    # /users/demo/posts
+    (SocialStream.objects - [ :actor ]).each do |object|
+      resources object.to_s.pluralize do
+        get 'search', :on => :collection
       end
+    end
 
-      # Repository models are configured in config/initializers/social_stream.rb
-      if SocialStream.repository_models.present?
-        resource :repository do
-          get 'search', on: :collection
-        end
+    # Repository models are configured in config/initializers/social_stream.rb
+    if SocialStream.repository_models.present?
+      resource :repository do
+        get 'search', on: :collection
       end
     end
   end
 
+  resources :actors, only: [ :index ]
+
   # Get information about current_subject
   match 'user'    => 'users#current', format: :json
 
@@ -62,19 +62,11 @@ Rails.application.routes.draw do
     end
   end
 
-  constraints SocialStream::Routing::Constraints::Custom.new do
-    namespace "relation" do
-      resources :customs
-    end
-
-    resources :permissions
+  namespace "relation" do
+    resources :customs
   end
 
-  constraints SocialStream::Routing::Constraints::Follow.new do
-    match 'followings' => 'followers#index', :as => :followings, :defaults => { :direction => 'sent' }
-    match 'followers' => 'followers#index', :as => :followers, :defaults => { :direction => 'received' }
-    resources :followers
-  end
+  resources :permissions
 
   resources :activity_actions
 

data/base/db/migrate/20130708152633_set_group_owners.rb

@@ -0,0 +1,19 @@
+class SetGroupOwners < ActiveRecord::Migration
+  def up
+    o_id = ::Relation::Owner.instance.id
+
+    Group.all.each do |g|
+      highest_rel = g.relation_customs.sort.last
+
+      highest_rel.contacts.each do |c|
+        unless c.relation_ids.include? o_id
+          c.ties.create! relation_id: o_id
+        end
+      end
+    end
+  end
+
+  def down
+    ::Relation::Owner.instance.ties.destroy_all
+  end
+end

data/base/db/migrate/20130723133530_actor_notification_settings.rb

@@ -0,0 +1,10 @@
+class ActorNotificationSettings < ActiveRecord::Migration
+  def change
+    change_table :actors do |t|
+      t.string "notification_settings"
+    end
+
+    # rake db:populate does not work without this
+    Actor.reset_column_information
+  end
+end

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

@@ -5,6 +5,10 @@ SocialStream.setup do |config|
   # Remember you must add an "actor_id" foreign key column to your migration!
   #
   # config.subjects = [:user, :group ]
+  
+  # List of subjects that can be accessed by the client browser or the API
+  #
+  # config.routed_subjects = [:user, :group ]
 
   # Include devise modules in User. See devise documentation for details.
   # Others available are:
@@ -13,13 +17,6 @@ SocialStream.setup do |config|
   #                         :recoverable, :rememberable, :trackable,
   #                         :omniauthable, :token_authenticatable
   
-  # Config the relation model of your network
-  #
-  # :custom - users define their own relation types, and post with privacy, like Google+
-  # :follow - user just follow other users, like Twitter
-  #
-  # config.relation_model = :custom
-
   # Config the default relations that will be created and customized by actors
   # config.custom_relations = {
   #  user: {
@@ -80,4 +77,13 @@ SocialStream.setup do |config|
 
   # Cleditor controls. It is used in new message editor, for example
   # config.cleditor_controls = "bold italic underline strikethrough subscript superscript | size style | bullets | image link unlink"
+
+  # Default notification email settings for new users
+  # config.default_notification_settings = {
+  #   someone_adds_me_as_a_contact: true,
+  #   someone_confirms_my_contact_request: true,
+  #   someone_likes_my_post: true,
+  #   someone_comments_on_my_post: true
+  # }
+
 end

data/base/lib/rails/social_stream.rb

@@ -21,3 +21,5 @@ class ActionDispatch::Http::UploadedFile
 
   alias_method_chain :initialize, :magic
 end
+
+require 'social_stream/routing/mapper'

data/base/lib/social_stream/base.rb

@@ -9,6 +9,8 @@ module SocialStream
   mattr_accessor :subjects
   @@subjects = [ :user, :group, :site ]
 
+  mattr_writer :routed_subjects
+
   mattr_accessor :devise_modules
   @@devise_modules = [ :database_authenticatable, :registerable, :recoverable,
                        :rememberable, :trackable, :omniauthable, :token_authenticatable]
@@ -19,9 +21,6 @@ module SocialStream
   mattr_accessor :activity_forms
   @@activity_forms = []
 
-  mattr_accessor :relation_model
-  @@relation_model = :custom
-
   mattr_accessor :single_relations
   @@single_relations = [ :public, :follow, :reject ]
 
@@ -71,10 +70,10 @@ module SocialStream
     'site/current' => {}
   }
 
-  mattr_accessor :list_relations
-  @@list_relations = {
+  mattr_accessor :system_relations
+  @@system_relations = {
     user: [],
-    group: []
+    group: [ :owner ]
   }
 
   mattr_accessor :available_permissions
@@ -115,12 +114,33 @@ module SocialStream
 
   mattr_accessor :cleditor_controls
   @@cleditor_controls = "bold italic underline strikethrough subscript superscript | size style | bullets | image link unlink"
- 
+
+  mattr_accessor :default_notification_settings
+  @@default_notification_settings = {
+      someone_adds_me_as_a_contact: true,
+      someone_confirms_my_contact_request: true,
+      someone_likes_my_post: true,
+      someone_comments_on_my_post: true
+  }
+
   class << self
     def setup
       yield self
     end
 
+    # All the subjects that appear in routes and can be accessed
+    # through the browser / API
+    def routed_subjects
+      @@routed_subjects ||= subjects.dup
+    end
+
+    # An array of the keys that must be tried when searching for a
+    # profile subject
+    def profile_subject_keys
+      @profile_subject_keys ||=
+        routed_subjects.map{ |s| s.to_s.split('/').last }
+    end
+
     def objects
       @@objects.push(:actor) unless @@objects.include?(:actor)
       @@objects

data/base/lib/social_stream/base/ability.rb

@@ -81,11 +81,7 @@ module SocialStream
             g.author_id == Actor.normalize_id(subject)
         end
 
-        can :update, Group do |g|
-          g.represented_by?(subject)
-        end
-
-        can :destroy, Group do |g|
+        can [ :update, :destroy, :represent ], Group do |g|
           g.represented_by?(subject)
         end
 
@@ -97,6 +93,8 @@ module SocialStream
         end
 
         # Privacy
+        can :read, Relation::Owner
+
         can :manage, ::Relation::Custom do |r|
           subject.present? && (
             r.actor_id == subject.actor_id ||

data/base/lib/social_stream/base/autoload.rb

@@ -14,6 +14,7 @@ module SocialStream
   autoload :TestHelpers, 'social_stream/test_helpers'
 
   module Controllers
+    autoload :Authorship,              'social_stream/controllers/authorship'
     autoload :MarkNotificationsRead,   'social_stream/controllers/mark_notifications_read'
     autoload :I18nIntegration,         'social_stream/controllers/i18n_integration'
     autoload :CancanDeviseIntegration, 'social_stream/controllers/cancan_devise_integration'

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "2.1.0".freeze
+    VERSION = "2.2.0".freeze
   end
 end

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

@@ -0,0 +1,18 @@
+module SocialStream
+  module Controllers
+    module Authorship
+      extend ActiveSupport::Concern
+
+      included do
+        before_filter :set_author_ids, only: [ :new, :create ]
+      end
+
+      private
+
+      def set_author_ids
+        resource_params.first[:author_id] = current_subject.try(:actor_id)
+        resource_params.first[:user_author_id] = current_user.try(:actor_id)
+      end
+    end
+  end
+end

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

@@ -17,7 +17,7 @@ module SocialStream
         #   Post #=> in PostsController
         #
         def model_class
-          controller_name.classify.constantize
+          self.name.sub(/Controller/, '').singularize.constantize
         end
       end
 
@@ -122,13 +122,27 @@ module SocialStream
       end
 
       def find_profile_subject
-        SocialStream.subjects.each do |type|
+        SocialStream.profile_subject_keys.each do |type|
           id = params["#{ type }_id"]
 
           next if id.blank?
 
-          subject_class = type.to_s.classify.constantize
-
+          subject_class = 
+            begin
+              type.to_s.classify.constantize
+            rescue NameError => e
+              # Try with namespace
+              ns = params[:controller].split('/')
+              ns.pop
+
+              if ns.blank?
+                raise e
+              end
+
+              ns.push(type)
+              ns.join('/').classify.constantize
+            end
+              
           return subject_class.find_by_slug! id
         end
 

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

@@ -17,9 +17,9 @@ module SocialStream
       extend ActiveSupport::Concern
 
       included do
-        inherit_resources
+        include SocialStream::Controllers::Authorship
 
-        before_filter :set_author_ids, :only => [ :new, :create, :update ]
+        inherit_resources
 
         before_filter :authenticate_user!, :only => [:new, :edit, :create, :update, :destroy]
 
@@ -75,12 +75,6 @@ module SocialStream
         resource.activity_object.increment!(:visit_count) if request.format == 'html'
       end
 
-      def set_author_ids
-        resource_params.first[:author_id] = current_subject.try(:actor_id)
-        resource_params.first[:user_author_id] = current_user.try(:actor_id)
-        resource_params.first[:owner_id] ||= current_subject.try(:actor_id)
-      end
-
       def collection_variable_get
         instance_variable_get "@#{ controller_name }"
       end

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

@@ -4,15 +4,22 @@ module SocialStream
       extend ActiveSupport::Concern
 
       included do
-        include SocialStream::Controllers::Helpers
-
         inherit_resources
+
+        protected
+
+        # Overwrite resource method to support slug
+        # See InheritedResources::BaseHelpers#resource
+        def method_for_find
+          :find_by_slug!
+        end
       end
 
       # Overwrite {SocialStream::Controllers::Helpers::InstanceMethods#profile_subject}
       def profile_subject
         self.class.model_class.find_by_slug(params[:id])
       end
+
     end
   end
 end

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

@@ -35,6 +35,8 @@ module SocialStream #:nodoc:
           case a
           when Integer
             a
+          when String
+            a.to_i
           when Array
             a.map{ |e| normalize_id(e) }
           else

data/base/lib/social_stream/population/activity_object.rb

@@ -13,16 +13,14 @@ module SocialStream
           populate klass, author, owner, relation_ids, &block
         end
 
-        if SocialStream.relation_model == :custom
-          ties = Tie.allowing('create', 'activity').all
-          PowerLaw.new ties.sample(ties.count / 3) do |t|
+        ties = Tie.allowing('create', 'activity').all
+        PowerLaw.new ties.sample(ties.count / 3) do |t|
 
-            author = t.receiver
-            owner  = t.sender
-            relation_ids = Array(t.relation_id)
+          author = t.receiver
+          owner  = t.sender
+          relation_ids = Array(t.relation_id)
 
-            populate klass, author, owner, relation_ids, &block
-          end
+          populate klass, author, owner, relation_ids, &block
         end
 
         end_time = Time.now

data/base/lib/social_stream/routing/mapper.rb

@@ -0,0 +1,52 @@
+module SocialStream
+  module Routing
+    module Mapper
+
+      # Route subjects configured as SocialStream.routed_subjects in
+      # config/initializers/social_stream.rb
+      #
+      # It supports namespaces, so setting
+      #
+      #   SocialStream.routed_subjects = [ ':site/clients' ]
+      #
+      # and using
+      #
+      #   route_subjects do
+      #     resources :posts
+      #   end
+      #
+      # is equivalent to
+      #
+      #   namespace :site
+      #     resources :clients
+      #       resources :posts
+      #     end
+      #   end
+      #  
+      def route_subjects
+        SocialStream.routed_subjects.each do |name|
+          ns = name.to_s.split('/')
+          actor = ns.pop
+
+          rts = -> {
+            resources actor.pluralize do
+              yield
+            end
+          }
+
+          if ns.present?
+            ns.reverse.inject(rts) { |lmda, n|
+              proc do
+                namespace n, &lmda
+              end
+            }.call
+          else
+            rts.call
+          end
+        end
+      end
+    end
+  end
+end
+
+ActionDispatch::Routing::Mapper.send :include, SocialStream::Routing::Mapper