enju_search_log 0.1.0.pre5 → 0.1.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c5348f3dd52c6fbd18db55c08fb2c8f9d17257b
-  data.tar.gz: 3e07b40b717a7f310cb07906e0bba261f7a25ba9
+  metadata.gz: c0c3299c71cb309bb0e515975b8231709543b2d9
+  data.tar.gz: a36668e89747f76f7207ff652bc64d02fc46a9be
 SHA512:
-  metadata.gz: 37ba6d74737dc2a8856bde578b5e26a8db32355e17cb12a4ea4dde7dc3ed2559dc5c525252a6849dff591f82a404f80df34f502fa7421e9734aa83497b4f64cc
-  data.tar.gz: 3f4f31b85e531a01c9f9fe05e26c0bdf4b3c5b503ca4fdd6297d549da455107575f4966a05b3566fa50897cc41fa56d3a404c205068f790b41de7a9d08ce4428
+  metadata.gz: d3754d69657a49c48d405827e90b6a279e0ea797da583e528d87bfb3a573e3b3ab90d1e4077c2b289f7280371edc58bec389649b2b4dd68495b7f81495472240
+  data.tar.gz: 626c20990b9fbce6a5b8594f7f5b92c33d647871186f2d1a4667252f17c48e4bcbd71b64b96b3f0aef3890bd75e903ebe3f4a1953adbb39fce844a1e12f8095f

data/lib/enju_search_log/user.rb

@@ -14,22 +14,20 @@ module EnjuSearchLog
     end
 
     module InstanceMethods
-      def save_search_history(query, offset = 0, total = 0, user = nil)
-        return unless user.try(:save_search_history)
+      def save_history(query, offset = 0, total = 0, format = nil)
+        return nil unless self.save_search_history
         if Setting.write_search_log_to_file
-          write_search_log(query, total, user)
+          write_search_log(query, total, username, format)
         else
           history = SearchHistory.new(:query => query, :start_record => offset + 1, :maximum_records => nil, :number_of_records => total)
-          history.user = user
-          history.save
+          history.user = self
+          history.save(:validate => false)
         end
       end
 
-      def write_search_log(query, total, user)
-        if user
-          username = user.username if user.save_search_history
-        end
-        SEARCH_LOGGER.info "#{Time.zone.now}\t#{query}\t#{total}\t#{username}\t#{params[:format]}"
+      def write_search_log(query, total, username, format)
+        logger = ActiveSupport::BufferedLogger.new(File.join(Rails.root, 'log', 'search.log'))
+        logger.info "#{Time.zone.now}\t#{query}\t#{total}\t#{username}\t#{format}"
       end
     end
   end

data/lib/enju_search_log/version.rb

@@ -1,3 +1,3 @@
 module EnjuSearchLog
-  VERSION = "0.1.0.pre5"
+  VERSION = "0.1.0.pre6"
 end

data/spec/models/search_history_spec.rb

@@ -4,6 +4,17 @@ require 'spec_helper'
 describe SearchHistory do
   fixtures :all
 
+  it "should create search history" do
+    user = users(:admin)
+    user.save_search_history = true
+    user.save_history('test', 1, 10).should be_true
+  end
+
+  it "should not create search history if the user disabled logging" do
+    user = users(:admin)
+    user.save_history('test', 1, 10).should be_nil
+  end
+
   it "should destroy all history" do
     user = users(:admin)
     old_count = SearchHistory.count

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_search_log
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre5
+  version: 0.1.0.pre6
 platform: ruby
 authors:
 - Kosuke Tanabe