social_stream-base 0.24.1 → 0.24.2

data/app/models/ability.rb

@@ -1,2 +1,3 @@
-class Ability < SocialStream::Ability
+class Ability
+  include SocialStream::Ability
 end

data/app/views/notification_mailer/new_notification_email.text.erb

@@ -2,13 +2,8 @@
 <% locale_as @receiver.subject %>
 <%= t('notification.hello', :receiver => @receiver.name)%>
 
-<% if @notification.notified_object.verb == 'join' %>
-      <%= render :partial => "notifications/activities/join_#{ @notification.notified_object.direct_object.class.to_s.underscore }", 
-                           :locals =>{:activity => @notification.notified_object} %>
-<% else %>
-  <%= render :partial => "notifications/activities/#{ @notification.notified_object.verb }", 
-                     :locals =>{:activity => @notification.notified_object}%>
-<% end %>
+<%= render partial: "notifications/activities/#{ @notification.notified_object.verb }",
+           locals: { activity: @notification.notified_object } %>
 
 -----------------------------------------------
 <%= raw t('notification.visit', :url=> notifications_url)%>

data/app/views/notifications/_notification.html.erb

@@ -20,14 +20,8 @@
 
 <div class="content_right">
   <div class="briefing">
-    <% if notification.notified_object.verb == 'join' %>
-      <%= render :partial => "notifications/activities/join_#{ notification.notified_object.direct_object.class.to_s.underscore }", 
-                           :locals =>{:activity => notification.notified_object} %>
-    <% else %>
-    
-      <%= render :partial => "notifications/activities/#{ notification.notified_object.verb }", 
-                           :locals =>{:activity => notification.notified_object} %>
-    <% end %>
+    <%= render partial: "notifications/activities/#{ notification.notified_object.verb }", 
+               locals:  { activity: notification.notified_object } %>
   </div>
   <div class="clearfloat">
   </div>
@@ -47,4 +41,4 @@
 </div>
 <div class="clearfloat">
 </div>
-<% end %>
+<% end %>

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

@@ -59,4 +59,40 @@ class SocialStream::Base::InstallGenerator < Rails::Generators::Base #:nodoc:
     Rake::Task['railties:install:migrations'].reenable
     Rake::Task['social_stream_base_engine:install:migrations'].invoke
   end
+
+  def create_ability_file
+    ability_code = [
+      "# Generator social_stream:install has modified this file. Please,",   #0
+      "# check everything is working ok, specially if the former `Ability`", #1
+      "# class inherited from another class or included another module",     #2
+      "class Ability",                                                       #3
+      "  include SocialStream::Ability",                                     #4
+      "",                                                                    #5
+      "  def initialize(subject)",                                           #6
+      "    super",                                                           #7
+      "",                                                                    #8
+      "    # Add your authorization rules here",                             #9
+      "    # For instance:",                                                 #10
+      "    #    can :create, Comment",                                       #11
+      "    #    can [:create, :destroy], Post do |p|",                       #12
+      "    #      p.actor_id == Actor.normalize_id(subject)",                #13
+      "    #    end",                                                        #14
+      "  end",                                                               #15
+      "end"]                                                                 #16
+    ability_file = 'app/models/ability.rb'
+
+    if FileTest.exists? ability_file
+      prepend_to_file ability_file, ability_code[0..2].join("\n")+"\n"
+      if not File.read(ability_file).include?("include SocialStream::Ability\n")
+        inject_into_file ability_file, ability_code[4..5].join("\n")+"\n", :after => /class Ability(.*)\n/
+      end
+      if File.read(ability_file).include?("def initialize\n")
+        inject_into_file ability_file, ability_code[7..14].join("\n")+"\n", :after => /def initialize(.*)\n/
+      else
+        inject_into_file ability_file, ability_code[5..15].join("\n")+"\n", :after => /include SocialStream::Ability\n/
+      end
+    else
+      create_file ability_file, ability_code[3..16].join("\n")
+    end
+  end
 end

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

@@ -10,13 +10,14 @@ SocialStream.setup do |config|
   # config.devise_modules = :database_authenticatable, :registerable,
   #                         :recoverable, :rememberable, :trackable,
   #                         :omniauthable, :token_authenticatable
-  
+
   # Type of activities managed by actors
   # Remember you must add an "activity_object_id" foreign key column to your migration!
+  # Be sure to add the other modules of Social Stream you might be using (e.g. :document, :event, :link ).
   #
   # config.objects = [ :post, :comment ]
-  
-  # Form for activity objects to be loaded 
+
+  # Form for activity objects to be loaded
   # You can write your own activity objects
   #
   # config.activity_forms = [ :post, :document, :foo, :bar ]
@@ -31,10 +32,10 @@ SocialStream.setup do |config|
   # Expose resque interface to manage background tasks at /resque
   #
   # config.resque_access = true
- 
+
   # Quick search (header) and Extended search models and its order. Remember to create
   # the indexes with thinking-sphinx if you are using customized models.
-  # 
+  #
   # config.quick_search_models = [:user, :group]
   # config.extended_search_models = [:user, :group]
 

data/lib/social_stream/ability.rb

@@ -1,7 +1,7 @@
-require 'social_stream/ability/base'
+require 'social_stream/base/ability'
 
 module SocialStream
-  class Ability
-    include SocialStream::Ability::Base
+  module Ability
+    include SocialStream::Base::Ability
   end
 end

data/lib/social_stream/{ability/base.rb → base/ability.rb}

@@ -1,6 +1,6 @@
 module SocialStream
-  class Ability
-    module Base
+  module Base
+    module Ability
       include CanCan::Ability
 
       # Create a new ability for this user, who is currently representing subject

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.24.1".freeze
+    VERSION = "0.24.2".freeze
   end
 end

data/lib/social_stream/controllers/helpers.rb

@@ -90,7 +90,7 @@ module SocialStream
       # Override Cancan#current_ability method to use {#current_subject}
       def current_ability
         @current_ability ||=
-          Ability.new(current_subject)
+          ::Ability.new(current_subject)
       end
 
       private

data/lib/social_stream-base.rb

@@ -3,12 +3,15 @@ require 'social_stream/base/dependencies'
 
 # Provides your Rails application with social network and activity stream support
 module SocialStream
-  autoload :Ability,   'social_stream/ability'
+  autoload :Ability, 'social_stream/ability'
   autoload :ActivityStreams, 'social_stream/activity_streams'
   module ActivityStreams
     autoload :Supertype, 'social_stream/activity_streams/supertype'
     autoload :Subtype,   'social_stream/activity_streams/subtype'
   end
+  module Base
+    autoload :Ability,   'social_stream/base/ability'
+  end
   autoload :D3,        'social_stream/d3'
   autoload :Populate,  'social_stream/populate'
   autoload :Relations, 'social_stream/relations'

data/lib/tasks/workers.rake

@@ -52,6 +52,10 @@ namespace :workers do
       ENV['COUNT']
     end
 
+    def queue_pathname
+      queue.gsub(/[:\*<>\|\"\/\\\?]/, "_")
+    end
+
     def Process.exists?(pid)
       kill(0, pid.to_i) rescue false
     end
@@ -61,11 +65,11 @@ namespace :workers do
     end
 
     def pid_directory_for_group
-      @pid_directory_for_group ||= Rails.root.join('tmp', 'pids', "resque", queue)
+      @pid_directory_for_group ||= Rails.root.join('tmp', 'pids', "resque", queue_pathname)
     end
 
     def group_master_pid
-      File.read pid_directory.join("#{queue}.pid").to_s rescue nil
+      File.read pid_directory.join("#{queue_pathname}.pid").to_s rescue nil
     end
 
     def group?
@@ -77,10 +81,20 @@ namespace :workers do
     end
 
     def kill_worker(pid)
-      Process.kill("QUIT", pid)
-      puts "Killed worker with PID #{pid}"
-      rescue Errno::ESRCH => e
-        puts " STALE worker with PID #{pid}"
+      %w{QUIT TERM KILL}.each do |signal|
+        if Signal.list.has_key?(signal)
+          begin
+            Process.kill(signal, pid)
+          rescue Errno::EINVAL
+            next
+          end
+
+          puts "Killed worker with PID #{pid}"
+          break
+        end
+      end
+    rescue Errno::ESRCH => e
+      puts " STALE worker with PID #{pid}"
     end
 
     def kill_workers
@@ -97,7 +111,7 @@ namespace :workers do
         end
       end
       if group_master_pid
-        FileUtils.rm    pid_directory.join("#{queue}.pid").to_s
+        FileUtils.rm    pid_directory.join("#{queue_pathname}.pid").to_s
         FileUtils.rm_rf pid_directory_for_group.to_s
       end
     end
@@ -120,7 +134,13 @@ namespace :workers do
 
     # Handle exit
     trap('INT')  { shutdown }
-    trap('QUIT') { shutdown }
+
+    begin
+      trap('QUIT') { shutdown }
+    rescue ArgumentError
+      warn "SIGQUIT not supported"
+    end
+
     trap('TERM') { shutdown }
     trap('KILL') { shutdown }
     trap('SIGKILL') { shutdown }
@@ -130,7 +150,11 @@ namespace :workers do
     # Launch workers in separate processes, saving their PIDs
     @pids = []
     ENV['COUNT'].to_i.times do
-      @pids << Process.fork { Rake::Task['resque:work'].invoke }
+      if Process.respond_to?(:fork)
+        @pids << Process.fork { Rake::Task['resque:work'].invoke }
+      else
+        @pids << Process.spawn("rake environment resque:work", chdir: Rails.root)
+      end
     end
 
     if group?
@@ -138,7 +162,7 @@ namespace :workers do
       FileUtils.mkdir_p pid_directory.to_s
       FileUtils.mkdir_p pid_directory_for_group.to_s
       # Create PID files for workers
-      File.open( pid_directory.join("#{queue}.pid").to_s, 'w' ) do |f| f.write Process.pid end
+      File.open( pid_directory.join("#{queue_pathname}.pid").to_s, 'w' ) do |f| f.write Process.pid end
       @pids.each do |pid|
         File.open( pid_directory_for_group.join("worker_#{pid}.pid").to_s, 'w' ) { |f| f.write pid }
       end
@@ -156,7 +180,7 @@ namespace :workers do
     Resque::Worker.all.each do |worker|
       puts "Shutting down worker #{worker}"
       host, pid, queues = worker.id.split(':')
-      Process.kill("QUIT", pid.to_i)
+      kill_worker(pid.to_i)
     end
   end
 

data/spec/dummy/config/initializers/social_stream.rb

@@ -10,13 +10,14 @@ SocialStream.setup do |config|
   # config.devise_modules = :database_authenticatable, :registerable,
   #                         :recoverable, :rememberable, :trackable,
   #                         :omniauthable, :token_authenticatable
-  
+
   # Type of activities managed by actors
   # Remember you must add an "activity_object_id" foreign key column to your migration!
+  # Be sure to add the other modules of Social Stream you might be using (e.g. :document, :event, :link ).
   #
   # config.objects = [ :post, :comment ]
-  
-  # Form for activity objects to be loaded 
+
+  # Form for activity objects to be loaded
   # You can write your own activity objects
   #
   # config.activity_forms = [ :post, :document, :foo, :bar ]
@@ -31,10 +32,10 @@ SocialStream.setup do |config|
   # Expose resque interface to manage background tasks at /resque
   #
   # config.resque_access = true
- 
+
   # Quick search (header) and Extended search models and its order. Remember to create
   # the indexes with thinking-sphinx if you are using customized models.
-  # 
+  #
   # config.quick_search_models = [:user, :group]
   # config.extended_search_models = [:user, :group]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.24.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -1113,10 +1113,10 @@ files:
 - lib/rails/social_stream.rb
 - lib/social_stream-base.rb
 - lib/social_stream/ability.rb
-- lib/social_stream/ability/base.rb
 - lib/social_stream/activity_streams.rb
 - lib/social_stream/activity_streams/subtype.rb
 - lib/social_stream/activity_streams/supertype.rb
+- lib/social_stream/base/ability.rb
 - lib/social_stream/base/dependencies.rb
 - lib/social_stream/base/engine.rb
 - lib/social_stream/base/thinking-sphinx.rb