enju_search_log 0.1.0.pre6 → 0.1.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0c3299c71cb309bb0e515975b8231709543b2d9
-  data.tar.gz: a36668e89747f76f7207ff652bc64d02fc46a9be
+  metadata.gz: 5afb3f79b394e43484940f90619f3375ca7b9740
+  data.tar.gz: e8253e5af30e36beb02aaadcb6c1d5c33549ae8a
 SHA512:
-  metadata.gz: d3754d69657a49c48d405827e90b6a279e0ea797da583e528d87bfb3a573e3b3ab90d1e4077c2b289f7280371edc58bec389649b2b4dd68495b7f81495472240
-  data.tar.gz: 626c20990b9fbce6a5b8594f7f5b92c33d647871186f2d1a4667252f17c48e4bcbd71b64b96b3f0aef3890bd75e903ebe3f4a1953adbb39fce844a1e12f8095f
+  metadata.gz: dd5cab045493e977152383a5f833265c61b18c96a7e0d4247281611b5c663bd87031490a5626e3514efc2dde722ff0f23788778459d4913a32fb67b329d713d1
+  data.tar.gz: a37411273b5cf581dc8d47e7530afc3c7c6aaf80ce65f682af23b8faa3a241e3e08a494396a227c0f489428bdd1084e390ae7a6370c71a43fbf79029fc67b984

data/app/models/search_history.rb

@@ -24,10 +24,10 @@ end
 #
 # Table name: search_histories
 #
-#  id                             :integer         not null, primary key
+#  id                             :integer          not null, primary key
 #  user_id                        :integer
-#  operation                      :string(255)     default("searchRetrieve")
-#  sru_version                    :float           default(1.2)
+#  operation                      :string(255)      default("searchRetrieve")
+#  sru_version                    :float            default(1.2)
 #  query                          :string(255)
 #  start_record                   :integer
 #  maximum_records                :integer
@@ -36,7 +36,7 @@ end
 #  result_set_ttl                 :integer
 #  stylesheet                     :string(255)
 #  extra_request_data             :string(255)
-#  number_of_records              :integer         default(0)
+#  number_of_records              :integer          default(0)
 #  result_set_id                  :string(255)
 #  result_set_idle_time           :integer
 #  records                        :text
@@ -44,7 +44,7 @@ end
 #  diagnostics                    :text
 #  extra_response_data            :text
 #  echoed_search_retrieve_request :text
-#  created_at                     :datetime
-#  updated_at                     :datetime
+#  created_at                     :datetime         not null
+#  updated_at                     :datetime         not null
 #
 

data/lib/enju_search_log/engine.rb

@@ -1,4 +1,4 @@
-require 'enju_core'
+require 'enju_seed'
 
 module EnjuSearchLog
   class Engine < ::Rails::Engine

data/lib/enju_search_log/version.rb

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

data/spec/controllers/search_histories_controller_spec.rb

@@ -95,8 +95,10 @@ describe SearchHistoriesController do
       end
 
       it "should not show missing search_history" do
-        get :show, :id => 100
-        response.should be_missing
+        lambda{
+          get :show, :id => 100
+        }.should raise_error(ActiveRecord::RecordNotFound)
+        #response.should be_missing
       end
     end
 
@@ -208,8 +210,10 @@ describe SearchHistoriesController do
       end
 
       it "should not destroy missing search_history" do
-        delete :destroy, :id => 100
-        response.should be_missing
+        lambda{
+          delete :destroy, :id => 100
+        }.should raise_error(ActiveRecord::RecordNotFound)
+        #response.should be_missing
       end
     end
 

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,62 +1,6 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
-  rescue_from CanCan::AccessDenied, :with => :render_403
-  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
-
-  before_filter :set_locale
-  
-  private
-  def render_403
-    return if performed?
-    if user_signed_in?
-      respond_to do |format|
-        format.html {render :template => 'page/403', :status => 403}
-        format.xml {render :template => 'page/403', :status => 403}
-        format.json
-      end
-    else
-      respond_to do |format|
-        format.html {redirect_to new_user_session_url}
-        format.xml {render :template => 'page/403', :status => 403}
-        format.json
-      end
-    end
-  end
-
-  def render_404
-    return if performed?
-    respond_to do |format|
-      format.html {render :template => 'page/404', :status => 404}
-      format.xml {render :template => 'page/404', :status => 404}
-      format.json
-    end
-  end
-
-  def set_locale
-    if params[:locale]
-      unless I18n.available_locales.include?(params[:locale].to_s.intern)
-        raise InvalidLocaleError
-      end
-    end
-    if user_signed_in?
-      locale = params[:locale] || session[:locale] || current_user.locale.try(:to_sym)
-    else
-      locale = params[:locale] || session[:locale]
-    end
-    if locale
-      I18n.locale = @locale = session[:locale] = locale.to_sym
-    else
-      I18n.locale = @locale = session[:locale] = I18n.default_locale
-    end
-  rescue InvalidLocaleError
-    @locale = I18n.default_locale
-  end
-
-  def access_denied
-    raise CanCan::AccessDenied
-  end
-end
-
-class InvalidLocaleError < StandardError
+  enju_leaf
+  enju_library
 end

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

@@ -1,28 +1,9 @@
+# -*- encoding: utf-8 -*-
 class User < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
-
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
-
-  has_one :user_has_role
-  has_one :role, :through => :user_has_role
-  belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
+  devise :database_authenticatable, #:registerable,
+    :recoverable, :rememberable, :trackable, #, :validatable
+    :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
+  enju_leaf_user_model
   enju_search_log_user_model
-
-  def has_role?(role_in_question)
-    return false unless role
-    return true if role.name == role_in_question
-    case role.name
-    when 'Administrator'
-      return true
-    when 'Librarian'
-      return true if role_in_question == 'User'
-    else
-      false
-    end
-  end
 end

data/spec/dummy/config/application.rb

@@ -43,3 +43,4 @@ module Dummy
   end
 end
 
+require 'enju_leaf'

data/spec/dummy/config/initializers/devise.rb

@@ -1,6 +1,8 @@
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
+  config.secret_key = 'c1d460d81ff2efaca14a9e4abef14047c903384f645f02e6ab8dafc1856c2d9750a7866cf7954682d45ded1df5156e2b6b3e5ceca5799cf9b6da5d763102d6b5'
+
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.

data/spec/dummy/db/migrate/080_create_library_groups.rb

@@ -0,0 +1,18 @@
+class CreateLibraryGroups < ActiveRecord::Migration
+  def change
+    create_table :library_groups do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.string :short_name, :null => false
+      t.string :email
+      t.text :my_networks
+      t.text :login_banner
+      t.text :note
+      t.integer :country_id
+      t.integer :position
+
+      t.timestamps
+    end
+    add_index :library_groups, :short_name
+  end
+end

data/spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb

@@ -0,0 +1,9 @@
+class AddAdminNetworksToLibraryGroup < ActiveRecord::Migration
+  def self.up
+    add_column :library_groups, :admin_networks, :text
+  end
+
+  def self.down
+    remove_column :library_groups, :admin_networks
+  end
+end

data/spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb

@@ -0,0 +1,9 @@
+class AddUrlToLibraryGroup < ActiveRecord::Migration
+  def self.up
+    add_column :library_groups, :url, :string, :default => 'http://localhost:3000/'
+  end
+
+  def self.down
+    remove_column :library_groups, :url
+  end
+end

data/spec/dummy/db/schema.rb

@@ -13,6 +13,24 @@
 
 ActiveRecord::Schema.define(:version => 20120418121539) do
 
+  create_table "library_groups", :force => true do |t|
+    t.string   "name",                                                 :null => false
+    t.text     "display_name"
+    t.string   "short_name",                                           :null => false
+    t.string   "email"
+    t.text     "my_networks"
+    t.text     "login_banner"
+    t.text     "note"
+    t.integer  "country_id"
+    t.integer  "position"
+    t.datetime "created_at",                                           :null => false
+    t.datetime "updated_at",                                           :null => false
+    t.text     "admin_networks"
+    t.string   "url",            :default => "http://localhost:3000/"
+  end
+
+  add_index "library_groups", ["short_name"], :name => "index_library_groups_on_short_name"
+
   create_table "roles", :force => true do |t|
     t.string   "name"
     t.text     "display_name"

data/spec/fixtures/library_groups.yml

@@ -0,0 +1,34 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+one:
+  id: 1
+  name: enju_library
+  display_name: "<%= I18n.locale %>: Enju Library"
+  short_name: enju
+  email: next-l@library.example.jp
+  note: 
+  my_networks: 0.0.0.0/0
+  url: "http://localhost:3000/"
+  position: 1
+  login_banner: "*Next-L Enju*"
+  admin_networks: 0.0.0.0/0
+
+# == Schema Information
+#
+# Table name: library_groups
+#
+#  id             :integer          not null, primary key
+#  name           :string(255)      not null
+#  display_name   :text
+#  short_name     :string(255)      not null
+#  email          :string(255)
+#  my_networks    :text
+#  login_banner   :text
+#  note           :text
+#  country_id     :integer
+#  position       :integer
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#  admin_networks :text
+#  url            :string(255)      default("http://localhost:3000/")
+#
+

data/spec/fixtures/search_histories.yml

@@ -58,16 +58,16 @@ four:
   extra_request_data: MyString
   created_at: 2007-10-13 11:28:02
   updated_at: 2007-10-13 11:28:02
-  user_id: 
+  user_id:
 
 # == Schema Information
 #
 # Table name: search_histories
 #
-#  id                             :integer         not null, primary key
+#  id                             :integer          not null, primary key
 #  user_id                        :integer
-#  operation                      :string(255)     default("searchRetrieve")
-#  sru_version                    :float           default(1.2)
+#  operation                      :string(255)      default("searchRetrieve")
+#  sru_version                    :float            default(1.2)
 #  query                          :string(255)
 #  start_record                   :integer
 #  maximum_records                :integer
@@ -76,7 +76,7 @@ four:
 #  result_set_ttl                 :integer
 #  stylesheet                     :string(255)
 #  extra_request_data             :string(255)
-#  number_of_records              :integer         default(0)
+#  number_of_records              :integer          default(0)
 #  result_set_id                  :string(255)
 #  result_set_idle_time           :integer
 #  records                        :text
@@ -84,7 +84,7 @@ four:
 #  diagnostics                    :text
 #  extra_response_data            :text
 #  echoed_search_retrieve_request :text
-#  created_at                     :datetime
-#  updated_at                     :datetime
+#  created_at                     :datetime         not null
+#  updated_at                     :datetime         not null
 #
 

data/spec/models/search_history_spec.rb

@@ -29,10 +29,10 @@ end
 #
 # Table name: search_histories
 #
-#  id                             :integer         not null, primary key
+#  id                             :integer          not null, primary key
 #  user_id                        :integer
-#  operation                      :string(255)     default("searchRetrieve")
-#  sru_version                    :float           default(1.2)
+#  operation                      :string(255)      default("searchRetrieve")
+#  sru_version                    :float            default(1.2)
 #  query                          :string(255)
 #  start_record                   :integer
 #  maximum_records                :integer
@@ -41,7 +41,7 @@ end
 #  result_set_ttl                 :integer
 #  stylesheet                     :string(255)
 #  extra_request_data             :string(255)
-#  number_of_records              :integer         default(0)
+#  number_of_records              :integer          default(0)
 #  result_set_id                  :string(255)
 #  result_set_idle_time           :integer
 #  records                        :text
@@ -49,7 +49,7 @@ end
 #  diagnostics                    :text
 #  extra_response_data            :text
 #  echoed_search_retrieve_request :text
-#  created_at                     :datetime
-#  updated_at                     :datetime
+#  created_at                     :datetime         not null
+#  updated_at                     :datetime         not null
 #
 

metadata

@@ -1,78 +1,109 @@
 --- !ruby/object:Gem::Specification
 name: enju_search_log
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre6
+  version: 0.1.0.pre7
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: enju_seed
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1.pre9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1.pre9
 - !ruby/object:Gem::Dependency
   name: enju_biblio
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre31
+        version: 0.1.0.pre52
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre31
+        version: 0.1.0.pre52
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: enju_leaf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0.rc9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0.rc9
 description: Search log management for Next-L Enju
 email:
-- tanabe@mwr.mediacom.keio.ac.jp
+- nabeta@fastmail.fm
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
 - app/controllers/search_histories_controller.rb
 - app/helpers/search_histories_helper.rb
 - app/models/enju_search_log/ability.rb
@@ -87,31 +118,24 @@ files:
 - db/migrate/090_create_search_histories.rb
 - db/migrate/20100623173800_rename_search_history_version_to_sru_version.rb
 - db/migrate/20120418121539_add_save_search_history_to_user.rb
+- lib/enju_search_log.rb
 - lib/enju_search_log/engine.rb
 - lib/enju_search_log/user.rb
 - lib/enju_search_log/version.rb
-- lib/enju_search_log.rb
-- lib/generators/enju_search_log/setup/setup_generator.rb
 - lib/generators/enju_search_log/setup/USAGE
+- lib/generators/enju_search_log/setup/setup_generator.rb
 - lib/tasks/enju_search_log_tasks.rake
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
 - spec/controllers/search_histories_controller_spec.rb
+- spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/ability.rb
-- spec/dummy/app/models/role.rb
 - spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
-- spec/dummy/app/models/user_has_role.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/page/403.html.erb
-- spec/dummy/app/views/page/403.xml.erb
-- spec/dummy/app/views/page/404.html.erb
-- spec/dummy/app/views/page/404.xml.erb
+- spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
@@ -129,20 +153,20 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
+- spec/dummy/db/migrate/080_create_library_groups.rb
+- spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb
+- spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb
 - 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
 - spec/dummy/db/migrate/20111201163718_create_user_has_roles.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
 - spec/dummy/script/rails
+- spec/fixtures/library_groups.yml
 - spec/fixtures/roles.yml
 - spec/fixtures/search_histories.yml
 - spec/fixtures/user_has_roles.yml
@@ -160,17 +184,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: enju_search_log plugin
@@ -181,15 +205,9 @@ test_files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/ability.rb
-- spec/dummy/app/models/role.rb
 - spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
-- spec/dummy/app/models/user_has_role.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/page/403.html.erb
-- spec/dummy/app/views/page/403.xml.erb
-- spec/dummy/app/views/page/404.html.erb
-- spec/dummy/app/views/page/404.xml.erb
 - spec/dummy/config/application.rb
 - spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
@@ -208,19 +226,21 @@ 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/080_create_library_groups.rb
+- spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb
+- spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb
 - 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
 - spec/dummy/db/migrate/20111201163718_create_user_has_roles.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
+- spec/fixtures/library_groups.yml
 - spec/fixtures/roles.yml
 - spec/fixtures/search_histories.yml
 - spec/fixtures/user_has_roles.yml

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

@@ -1,5 +0,0 @@
-class Role < ActiveRecord::Base
-  def self.default_role
-    Role.where(:name => 'Guest').first
-  end
-end

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

@@ -1,4 +0,0 @@
-class UserHasRole < ActiveRecord::Base
-  belongs_to :user
-  belongs_to :role
-end

data/spec/dummy/app/views/page/403.html.erb

@@ -1,9 +0,0 @@
-<div id="content_detail" class="ui-corner-all">
-  <h1 class="title"><%= t('page.access_denied') -%></h1>
-  <div id="content_list">
-    <%= render 'page/search_form' %>
-  </div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-</div>

data/spec/dummy/app/views/page/403.xml.erb

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<error>
-  <status>403</status>
-</error>

data/spec/dummy/app/views/page/404.html.erb

@@ -1,9 +0,0 @@
-<div id="content_detail" class="ui-corner-all">
-  <h1 class="title"><%= t('page.not_found') -%></h1>
-  <div id="content_list">
-    <%= render 'page/search_form' %>
-  </div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-</div>

data/spec/dummy/app/views/page/404.xml.erb

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<error>
-  <status>404</status>
-</error>