enju_search_log 0.0.6 → 0.0.7

data/app/controllers/search_histories_controller.rb

@@ -6,17 +6,17 @@ class SearchHistoriesController < ApplicationController
   # GET /search_histories.json
   def index
     if params[:mode] == 'not_found'
-      if current_user.has_role?('Administrator')
-        @search_histories = SearchHistory.not_found.order('created_at DESC').page(params[:page])
-      else
+      #if current_user.has_role?('Administrator')
+      #  @search_histories = SearchHistory.not_found.order('created_at DESC').page(params[:page])
+      #else
         @search_histories = current_user.search_histories.not_found.order('created_at DESC').page(params[:page])
-      end
+      #end
     else
-      if current_user.has_role?('Administrator')
-        @search_histories = SearchHistory.order('created_at DESC').page(params[:page])
-      else
+      #if current_user.has_role?('Administrator')
+      #  @search_histories = SearchHistory.order('created_at DESC').page(params[:page])
+      #else
         @search_histories = current_user.search_histories.order('created_at DESC').page(params[:page])
-      end
+      #end
     end
 
     respond_to do |format|
@@ -44,4 +44,13 @@ class SearchHistoriesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  def remove_all
+    SearchHistory.remove_all_history(current_user)
+
+    respond_to do |format|
+      format.html { redirect_to search_histories_url, :notice => t('controller.successfully_deleted', :model => t('activerecord.models.search_history')) }
+      format.json { head :no_content }
+    end
+  end
 end

data/app/models/search_history.rb

@@ -16,6 +16,10 @@ class SearchHistory < ActiveRecord::Base
   def self.not_found_query(number, duration = 1.year.ago)
     self.not_found.where('created_at > ?', duration).all.collect(&:query).inject(Hash.new(0)){|r,e|r[e]+=1;r}.to_a.collect{|q| q if q[1] >= number.to_i}.compact
   end
+
+  def self.remove_all_history(user)
+    user.search_histories.update_all(:user_id => nil)
+  end
 end
 
 # == Schema Information

data/app/views/search_histories/index.html.erb

@@ -41,7 +41,7 @@
     </td>
     <td>
       <%- if can? :destroy, search_history -%>
-        <%= link_to t('page.destroy'), search_history, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), search_history, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -53,4 +53,7 @@
 </div>
 
 <div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= link_to t('search_history.remove_all_history'), remove_all_search_histories_path, :method => :put, :data => {:confirm => t('page.are_you_sure')} %></li>
+  </ul>
 </div>

data/config/locales/translation_en.yml

@@ -29,3 +29,4 @@ en:
     all_history: "All search history"
     failed_search: "Failed searches"
     searched_at: "Searched at"
+    remove_all_history: "Remove all search history"

data/config/locales/translation_ja.yml

@@ -29,3 +29,4 @@ ja:
     all_history: "全ての検索履歴"
     failed_search: "失敗した検索"
     searched_at: "検索時刻"
+    remove_all_history: "すべての検索履歴を削除"

data/config/routes.rb

@@ -1,3 +1,5 @@
 Rails.application.routes.draw do
-  resources :search_histories, :only => [:index, :show, :destroy]
+  resources :search_histories, :only => [:index, :show, :destroy] do
+    put :remove_all, :on => :collection
+  end
 end

data/lib/enju_search_log.rb

@@ -7,12 +7,17 @@ module EnjuSearchLog
     if configatron.write_search_log_to_file
       write_search_log(query, total, user)
     else
-      history = SearchHistory.create(:query => query, :user => user, :start_record => offset + 1, :maximum_records => nil, :number_of_records => total)
+      history = SearchHistory.new(:query => query, :start_record => offset + 1, :maximum_records => nil, :number_of_records => total)
+      history.user = user
+      history.save
     end
   end
 
   def write_search_log(query, total, user)
-    SEARCH_LOGGER.info "#{Time.zone.now}\t#{query}\t#{total}\t#{user.try(:username)}\t#{params[:format]}"
+    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]}"
   end
 end
 

data/lib/enju_search_log/version.rb

@@ -1,3 +1,3 @@
 module EnjuSearchLog
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/models/search_history_spec.rb

@@ -2,8 +2,16 @@
 require 'spec_helper'
 
 describe SearchHistory do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  fixtures :all
 
+  it "should destroy all history" do
+    user = users(:admin)
+    old_count = SearchHistory.count
+    old_user_count = user.search_histories.count
+    SearchHistory.remove_all_history(user)
+    user.search_histories.count.should eq 0
+    SearchHistory.count.should eq old_count
+  end
 end
 
 # == Schema Information

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_search_log
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -182,7 +182,6 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20111201121844_create_roles.rb
 - spec/dummy/db/migrate/20111201155456_create_users.rb
 - spec/dummy/db/migrate/20111201155513_add_devise_to_users.rb
@@ -259,7 +258,6 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20111201121844_create_roles.rb
 - spec/dummy/db/migrate/20111201155456_create_users.rb
 - spec/dummy/db/migrate/20111201155513_add_devise_to_users.rb