Merge remote-tracking branch 'origin/master'

Weblate
2 parents 27bd922a aca12460
Showing 7 changed files with 46 additions and 19 deletions Show diff stats
app/models/user.rb
db/migrate/20140519113821_add_last_login_at_to_user.rb
lib/authenticated_system.rb
plugins/relevant_content/lib/relevant_content_plugin/relevant_content_block.rb
plugins/relevant_content/test/unit/article.rb
plugins/relevant_content/test/unit/relevant_content_block_test.rb
plugins/tolerance_time/lib/tolerance_time_plugin.rb
@@ -114,6 +114,10 @@ class User &lt; ActiveRecord::Base
     u && u.authenticated?(password) ? u : nil
   end
+  def register_login
+    self.update_attribute :last_login_at, Time.now
+  end
+
   # Activates the user in the database.
   def activate
     return false unless self.person
@@ -0,0 +1,9 @@
+class AddLastLoginAtToUser < ActiveRecord::Migration
+  def self.up
+    add_column :users, :last_login_at, :datetime
+  end
+
+  def self.down
+    remove_column :users, :last_login_at
+  end
+end
@@ -5,22 +5,23 @@ module AuthenticatedSystem
     def logged_in?
       current_user != nil
     end
-    
+
     # Accesses the current user from the session.
     def current_user
       @current_user ||= (session[:user] && User.find_by_id(session[:user])) || nil
     end
-    
+
     # Store the given user in the session.
     def current_user=(new_user)
       if new_user.nil?
         session.delete(:user)
       else
         session[:user] = new_user.id
+        new_user.register_login
       end
       @current_user = new_user
     end
-    
+
     # Check if the user is authorized.
     #
     # Override this method in your controllers if you want to restrict access
@@ -62,7 +63,7 @@ module AuthenticatedSystem
         access_denied
       end
     end
-    
+
     # Redirect as appropriate when an access request fails.
     #
     # The default action is to redirect to the login screen.
@@ -88,15 +89,15 @@ module AuthenticatedSystem
         end
       end
       false
-    end  
-    
+    end
+
     # Store the URI of the current request in the session.
     #
     # We can return to this location by calling #redirect_back_or_default.
     def store_location(location = request.url)
       session[:return_to] = location
     end
-    
+
     # Redirect to the URI stored by the most recent store_location call or
     # to the passed default.
     def redirect_back_or_default(default)
@@ -106,7 +107,7 @@ module AuthenticatedSystem
         redirect_to(default)
       end
     end
-    
+
     # Inclusion hook to make #current_user and #logged_in?
     # available as ActionView helper methods.
     def self.included(base)
@@ -132,6 +133,6 @@ module AuthenticatedSystem
     def get_auth_data
       auth_key  = @@http_auth_headers.detect { |h| request.env.has_key?(h) }
       auth_data = request.env[auth_key].to_s.split unless auth_key.blank?
-      return auth_data && auth_data[0] == 'Basic' ? Base64.decode64(auth_data[1]).split(':')[0..1] : [nil, nil] 
+      return auth_data && auth_data[0] == 'Basic' ? Base64.decode64(auth_data[1]).split(':')[0..1] : [nil, nil]
     end
 end
@@ -4,7 +4,7 @@ class RelevantContentPlugin::RelevantContentBlock &lt; Block
   end
   def default_title
-      _('Relevant content')
+    _('Relevant content')
   end
   def help
@@ -53,7 +53,7 @@ class RelevantContentPlugin::RelevantContentBlock &lt; Block
       env =  owner.environment
     end
-    if env.plugin_enabled?(VotePlugin)
+    if env.plugin_enabled?('VotePlugin')
       if self.show_most_liked
         docs = Article.more_positive_votes(owner, self.limit)
         if !docs.blank?
@@ -20,10 +20,10 @@ class RelevantContentBlockTest &lt; ActiveSupport::TestCase
   def enable_vote_plugin
     enabled = false
-    environment=Environment.default
+    environment = Environment.default
     if Noosfero::Plugin.all.include?('VotePlugin')
-      if not environment.enabled_plugins.include?(:vote)
-        environment.enable_plugin(Vote)
+      if not environment.enabled_plugins.include?('VotePlugin')
+        environment.enable_plugin(VotePlugin)
         environment.save!
       end
       enabled = true
@@ -145,4 +145,4 @@ class RelevantContentBlockTest &lt; ActiveSupport::TestCase
     assert_equal '23 votes for 29 votes against', articles.first.name
     assert_equal '2 votes against', articles.last.name
   end
-end
 \ No newline at end of file
+end
@@ -44,4 +44,19 @@ class RelevantContentBlockTest &lt; ActiveSupport::TestCase
     assert_equal RelevantContentPlugin::RelevantContentBlock.expire_on, {:environment=>[:article], :profile=>[:article]}
   end
+  should 'not crash if vote plugin is not found' do
+    box = fast_create(Box, :owner_id => @profile.id, :owner_type => 'Profile')
+    block = RelevantContentPlugin::RelevantContentBlock.new(:box => box)
+
+    Environment.any_instance.stubs(:enabled_plugins).returns(['RelevantContent'])
+    # When the plugin is disabled from noosfero instance, its constant name is
+    # undefined.  To test this case, I have to manually undefine the constant
+    # if necessary.
+    Object.send(:remove_const, VotePlugin.to_s) if defined? VotePlugin
+
+    assert_nothing_raised do
+      block.content
+    end
+  end
+
 end
@@ -28,8 +28,7 @@ class ToleranceTimePlugin &lt; Noosfero::Plugin
   end
   def cms_controller_filters
-    p = Proc.new { |context| return if !context.environment.plugin_enabled?(ToleranceTimePlugin) }
-    block = lambda do
+    block = proc do
       content = Article.find(params[:id])
       if ToleranceTimePlugin.expired?(content)
         session[:notice] = _("This content can't be edited anymore because it expired the tolerance time")
@@ -43,8 +42,7 @@ class ToleranceTimePlugin &lt; Noosfero::Plugin
   end
   def content_viewer_controller_filters
-    p = Proc.new { |context| return if !context.environment.plugin_enabled?(ToleranceTimePlugin) }
-    block = lambda do
+    block = proc do
       content = Comment.find(params[:id])
       if ToleranceTimePlugin.expired?(content)
         session[:notice] = _("This content can't be edited anymore because it expired the tolerance time")
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class AddLastLoginAtToUser < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column :users, :last_login_at, :datetime
	4	+ end
	5	+
	6	+ def self.down
	7	+ remove_column :users, :last_login_at
	8	+ end
	9	+end
	@@ -4,7 +4,7 @@ class RelevantContentPlugin::RelevantContentBlock < Block		@@ -4,7 +4,7 @@ class RelevantContentPlugin::RelevantContentBlock < Block
4	end	4	end
5		5
6	def default_title	6	def default_title
7	- _('Relevant content')	7	+ _('Relevant content')
8	end	8	end
9		9
10	def help	10	def help
	@@ -53,7 +53,7 @@ class RelevantContentPlugin::RelevantContentBlock < Block		@@ -53,7 +53,7 @@ class RelevantContentPlugin::RelevantContentBlock < Block
53	env = owner.environment	53	env = owner.environment
54	end	54	end
55		55
56	- if env.plugin_enabled?(VotePlugin)	56	+ if env.plugin_enabled?('VotePlugin')
57	if self.show_most_liked	57	if self.show_most_liked
58	docs = Article.more_positive_votes(owner, self.limit)	58	docs = Article.more_positive_votes(owner, self.limit)
59	if !docs.blank?	59	if !docs.blank?
	@@ -44,4 +44,19 @@ class RelevantContentBlockTest < ActiveSupport::TestCase		@@ -44,4 +44,19 @@ class RelevantContentBlockTest < ActiveSupport::TestCase
44	assert_equal RelevantContentPlugin::RelevantContentBlock.expire_on, {:environment=>[:article], :profile=>[:article]}	44	assert_equal RelevantContentPlugin::RelevantContentBlock.expire_on, {:environment=>[:article], :profile=>[:article]}
45	end	45	end
46		46
		47	+ should 'not crash if vote plugin is not found' do
		48	+ box = fast_create(Box, :owner_id => @profile.id, :owner_type => 'Profile')
		49	+ block = RelevantContentPlugin::RelevantContentBlock.new(:box => box)
		50	+
		51	+ Environment.any_instance.stubs(:enabled_plugins).returns(['RelevantContent'])
		52	+ # When the plugin is disabled from noosfero instance, its constant name is
		53	+ # undefined. To test this case, I have to manually undefine the constant
		54	+ # if necessary.
		55	+ Object.send(:remove_const, VotePlugin.to_s) if defined? VotePlugin
		56	+
		57	+ assert_nothing_raised do
		58	+ block.content
		59	+ end
		60	+ end
		61	+
47	end	62	end