enju_search_log 0.1.0.pre4 → 0.1.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0b2ad52ff905b45cbc5af81bc7d604756034c7d
-  data.tar.gz: 26785e9bc6aed126f5e963cc12885750311cdc3c
+  metadata.gz: 8c5348f3dd52c6fbd18db55c08fb2c8f9d17257b
+  data.tar.gz: 3e07b40b717a7f310cb07906e0bba261f7a25ba9
 SHA512:
-  metadata.gz: 525dc5d61403bbc97b77034b0ad363cafff1d952d927ec5c798d83a5fb64ffa1b69c3025d5e7d968c0ec88f26235b10b2e38a598a77e8b8c82361c99788e2840
-  data.tar.gz: 287045301c3386fbb196a62e8b3ae92ccadc7e114ecd5707212ef39f4e03d55ec9ef94ed2b558295f2178df20c3e3473bc722eadcc1b61990caa12c3f4c75a5e
+  metadata.gz: 37ba6d74737dc2a8856bde578b5e26a8db32355e17cb12a4ea4dde7dc3ed2559dc5c525252a6849dff591f82a404f80df34f502fa7421e9734aa83497b4f64cc
+  data.tar.gz: 3f4f31b85e531a01c9f9fe05e26c0bdf4b3c5b503ca4fdd6297d549da455107575f4966a05b3566fa50897cc41fa56d3a404c205068f790b41de7a9d08ce4428

data/app/models/enju_search_log/ability.rb

@@ -8,12 +8,12 @@ module EnjuSearchLog
         can :manage, SearchHistory
       when 'Librarian'
         can :index, SearchHistory
-        can [:show, :destroy], SearchHistory do |search_history|
+        can [:show, :destroy, :delete], SearchHistory do |search_history|
           search_history.user == user
         end
       when 'User'
         can :index, SearchHistory
-        can [:show, :destroy], SearchHistory do |search_history|
+        can [:show, :destroy, :delete], SearchHistory do |search_history|
           search_history.user == user
         end
       end

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

@@ -35,12 +35,12 @@
     <%- end -%>
     <td><%= l(search_history.created_at) -%></td>
     <td>
-      <%- if can? :destroy, search_history -%>
+      <%- if can? :delete, search_history -%>
         <%= link_to t('page.show'), search_history -%>
       <% end %>
     </td>
     <td>
-      <%- if can? :destroy, search_history -%>
+      <%- if can? :delete, search_history -%>
         <%= link_to t('page.destroy'), search_history, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

data/lib/enju_search_log/user.rb

@@ -1,15 +1,36 @@
 module EnjuSearchLog
-  module SearchLogUser
+  module EnjuUser
     def self.included(base)
       base.extend ClassMethods
     end
 
     module ClassMethods
       def enju_search_log_user_model
+        include InstanceMethods
         attr_accessible :save_search_history
         attr_accessible :save_search_history, :as => :admin
         has_many :search_histories, :dependent => :destroy
       end
     end
+
+    module InstanceMethods
+      def save_search_history(query, offset = 0, total = 0, user = nil)
+        return unless user.try(:save_search_history)
+        if Setting.write_search_log_to_file
+          write_search_log(query, total, user)
+        else
+          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)
+        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
   end
 end

data/lib/enju_search_log/version.rb

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

data/lib/enju_search_log.rb

@@ -2,23 +2,6 @@ require "enju_search_log/engine"
 require "enju_search_log/user"
 
 module EnjuSearchLog
-  def save_search_history(query, offset = 0, total = 0, user = nil)
-    return unless user.try(:save_search_history)
-    if Setting.write_search_log_to_file
-      write_search_log(query, total, user)
-    else
-      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)
-    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
 
-ActiveRecord::Base.send :include, EnjuSearchLog::SearchLogUser
+ActiveRecord::Base.send :include, EnjuSearchLog::EnjuUser

data/lib/generators/enju_search_log/setup/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Explain the generator
+
+Example:
+    rails generate setup Thing
+
+    This will create:
+        what/will/it/create

data/lib/generators/enju_search_log/setup/setup_generator.rb

@@ -0,0 +1,9 @@
+class EnjuSearchLog::SetupGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+
+  def setup
+    rake("enju_search_log_engine:install:migrations")
+    inject_into_file 'app/models/user.rb',
+      "  enju_search_log_user_model\n", :after => "enju_leaf_user_model\n"
+  end
+end

data/spec/dummy/app/models/ability.rb

@@ -8,12 +8,12 @@
         can :manage, SearchHistory
       when 'Librarian'
         can :index, SearchHistory
-        can [:show, :destroy], SearchHistory do |search_history|
+        can [:show, :destroy, :delete], SearchHistory do |search_history|
           search_history.user == user
         end
       when 'User'
         can :index, SearchHistory
-        can [:show, :destroy], SearchHistory do |search_history|
+        can [:show, :destroy, :delete], SearchHistory do |search_history|
           search_history.user == user
         end
       end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: enju_search_log
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre4
+  version: 0.1.0.pre5
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: enju_biblio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre23
+        version: 0.1.0.pre31
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre23
+        version: 0.1.0.pre31
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +91,8 @@ files:
 - lib/enju_search_log/user.rb
 - lib/enju_search_log/version.rb
 - lib/enju_search_log.rb
-- lib/generators/enju_search_log/views_generator.rb
+- lib/generators/enju_search_log/setup/setup_generator.rb
+- lib/generators/enju_search_log/setup/USAGE
 - lib/tasks/enju_search_log_tasks.rake
 - MIT-LICENSE
 - Rakefile

data/lib/generators/enju_search_log/views_generator.rb

@@ -1,17 +0,0 @@
-module EnjuSearchLog
-  module Generators
-    class ViewsGenerator < Rails::Generators::Base
-      source_root File.expand_path('../../../../app/views', __FILE__)
-
-      def copy_files
-        directories = %w(
-          search_histories
-        )
-
-        directories.each do |dir|
-          directory dir, "app/views/#{dir}"
-        end
-      end
-    end
-  end
-end