Merge branch 'master' of https://github.com/ermolaev/blazer into ermolaev-master

app/controllers/blazer/base_controller.rb

@@ -44,5 +44,10 @@ module Blazer
       params.except(:controller, :action, :id, :host, :query, :table_names, :authenticity_token, :utf8, :_method, :commit, :statement, :data_source)
     end
     helper_method :variable_params
+
+    def blazer_user
+      send(Blazer.user_method) if Blazer.user_method && respond_to?(Blazer.user_method)
+    end
+    helper_method :blazer_user
   end
 end

app/controllers/blazer/queries_controller.rb

@@ -15,7 +15,7 @@ module Blazer
 
     def create
       @query = Blazer::Query.new(query_params)
-      @query.creator = current_user if respond_to?(:current_user) && Blazer.user_class
+      @query.creator = blazer_user
 
       if @query.save
         redirect_to query_path(@query, variable_params)
@@ -60,7 +60,7 @@ module Blazer
           audit = Blazer::Audit.new(statement: @statement)
           audit.query = @query
           audit.data_source = data_source
-          audit.user = current_user if respond_to?(:current_user) && Blazer.user_class
+          audit.user = blazer_user
           audit.save!
         end
 

app/views/blazer/queries/index.html.erb

@@ -35,7 +35,7 @@
           <td class="creator text-right text-muted">
             <% if query.respond_to?(:creator) && (creator = query.creator) && creator.respond_to?(Blazer.user_name) %>
               <% name = creator.send(Blazer.user_name) %>
-              <% if respond_to?(:current_user) and creator == current_user %>
+              <% if creator == blazer_user %>
                 You
                 <div class="hide">me <%= name %></div>
               <% else %>

lib/blazer.rb

@@ -11,6 +11,7 @@ module Blazer
     attr_reader :time_zone
     attr_accessor :user_name
     attr_accessor :user_class
+    attr_accessor :user_method
     attr_accessor :from_email
   end
   self.audit = true

lib/blazer/engine.rb

@@ -12,6 +12,11 @@ module Blazer
       Blazer.from_email = Blazer.settings["from_email"] if Blazer.settings["from_email"]
 
       Blazer.user_class ||= Blazer.settings["user_class"] || User rescue nil
+      Blazer.user_method = Blazer.settings["user_method"]
+      if Blazer.user_class
+        Blazer.user_method ||= "current_#{Blazer.user_class.to_s.downcase.singularize}"
+      end
+
       Blazer::Query.belongs_to :creator, class_name: Blazer.user_class.to_s if Blazer.user_class
     end
   end