enju_message 0.0.13 → 0.0.14

data/app/views/user_reserve_stats/show.html.erb

@@ -0,0 +1,54 @@
+<div id="content_detail" class="ui-corner-all">
+<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.user_reserve_stat')) -%></h1>
+<div id="content_list">
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong><%= t('activerecord.attributes.user_reserve_stat.start_date') -%>:</strong>
+  <%= l(@user_reserve_stat.start_date) -%>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.user_reserve_stat.end_date') -%>:</strong>
+  <%= l(@user_reserve_stat.end_date) -%>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.user_reserve_stat.state') -%>:</strong>
+  <%= @user_reserve_stat.state -%>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.user_reserve_stat.note') -%>:</strong>
+  <%= @user_reserve_stat.note -%>
+</p>
+
+<table class="index">
+  <tr>
+    <th><%= t('activerecord.models.user') -%></th>
+    <th><%= t('activerecord.attributes.reserve_stat_has_user.reserves_count') -%></th>
+  </tr>
+  <%- @stats.each do |stat| -%>
+    <tr class="line<%= cycle("0", "1") -%>">
+      <td>
+        <%= link_to stat.user.username, stat.user -%>
+      </td>
+      <td><%= stat.reserves_count -%></td>
+    </tr>
+  <%- end -%>
+</table>
+
+<%= will_paginate(@stats) -%>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= link_to t('page.edit'), edit_user_reserve_stat_path(@user_reserve_stat) -%></li>
+    <li><%= back_to_index(flash[:page_info]) -%></li>
+  </ul>
+  <h4><%= t('page.export') -%></h4>
+  <ul>
+    <li><%= link_to 'CSV', user_reserve_stat_path(@user_reserve_stat, :format => :csv, :locale => @locale.to_s) -%></li>
+  </ul>
+</div>

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/spec/dummy/db/migrate/20120213092115_add_queue_to_delayed_jobs.rb

@@ -0,0 +1,9 @@
+class AddQueueToDelayedJobs < ActiveRecord::Migration
+  def self.up
+    add_column :delayed_jobs, :queue, :string
+  end
+
+  def self.down
+    remove_column :delayed_jobs, :queue
+  end
+end

data/spec/dummy/script/delayed_job

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
+require 'delayed/command'
+Delayed::Command.new(ARGV).daemonize

data/spec/support/controller_macros.rb

@@ -2,14 +2,14 @@ module ControllerMacros
   def login_admin
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:admin]
-      sign_in Factory.create(:admin)
+      sign_in FactoryGirl.create(:admin)
     end
   end
 
   def login_librarian
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      user = Factory.create(:librarian)
+      user = FactoryGirl.create(:librarian)
       sign_in user
     end
   end
@@ -17,7 +17,7 @@ module ControllerMacros
   def login_user
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      user = Factory.create(:user)
+      user = FactoryGirl.create(:user)
       sign_in user
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_message
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-17 00:00:00.000000000 Z
+date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70179611324280 !ruby/object:Gem::Requirement
+  requirement: &70202192848700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70179611324280
+  version_requirements: *70202192848700
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &70179611323100 !ruby/object:Gem::Requirement
+  requirement: &70202192847780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179611323100
+  version_requirements: *70202192847780
 - !ruby/object:Gem::Dependency
   name: configatron
-  requirement: &70179611321920 !ruby/object:Gem::Requirement
+  requirement: &70202192862820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179611321920
+  version_requirements: *70202192862820
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
-  requirement: &70179611320460 !ruby/object:Gem::Requirement
+  requirement: &70202192861300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179611320460
+  version_requirements: *70202192861300
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70179611318860 !ruby/object:Gem::Requirement
+  requirement: &70202192860300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70179611318860
+  version_requirements: *70202192860300
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &70179611318060 !ruby/object:Gem::Requirement
+  requirement: &70202192859760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179611318060
+  version_requirements: *70202192859760
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70179611317340 !ruby/object:Gem::Requirement
+  requirement: &70202192859260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179611317340
+  version_requirements: *70202192859260
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70179611316700 !ruby/object:Gem::Requirement
+  requirement: &70202192858640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179611316700
+  version_requirements: *70202192858640
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70179611316160 !ruby/object:Gem::Requirement
+  requirement: &70202192857800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179611316160
+  version_requirements: *70202192857800
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70179611315720 !ruby/object:Gem::Requirement
+  requirement: &70202192857020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179611315720
+  version_requirements: *70202192857020
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &70179611315240 !ruby/object:Gem::Requirement
+  requirement: &70202192856260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179611315240
+  version_requirements: *70202192856260
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70179611314760 !ruby/object:Gem::Requirement
+  requirement: &70202192855740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179611314760
+  version_requirements: *70202192855740
 - !ruby/object:Gem::Dependency
   name: attribute_normalizer
-  requirement: &70179611314260 !ruby/object:Gem::Requirement
+  requirement: &70202192855220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70179611314260
+  version_requirements: *70202192855220
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &70179611313820 !ruby/object:Gem::Requirement
+  requirement: &70202192871160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179611313820
+  version_requirements: *70202192871160
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &70179611313340 !ruby/object:Gem::Requirement
+  requirement: &70202192870700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179611313340
+  version_requirements: *70202192870700
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70179611312840 !ruby/object:Gem::Requirement
+  requirement: &70202192870120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70179611312840
+  version_requirements: *70202192870120
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70179611312400 !ruby/object:Gem::Requirement
+  requirement: &70202192869560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70179611312400
+  version_requirements: *70202192869560
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70179611361080 !ruby/object:Gem::Requirement
+  requirement: &70202192868780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,21 +208,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70179611361080
+  version_requirements: *70202192868780
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70179611360380 !ruby/object:Gem::Requirement
+  requirement: &70202192866800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70179611360380
+  version_requirements: *70202192866800
 - !ruby/object:Gem::Dependency
   name: sunspot-rails-tester
-  requirement: &70179611359840 !ruby/object:Gem::Requirement
+  requirement: &70202192865840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,7 +230,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70179611359840
+  version_requirements: *70202192865840
 description: Message management for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -245,7 +245,84 @@ files:
 - app/models/message.rb
 - app/models/message_request.rb
 - app/models/message_template.rb
+- app/views/baskets/edit.html.erb
+- app/views/baskets/index.html.erb
+- app/views/baskets/new.html.erb
+- app/views/baskets/show.html.erb
+- app/views/carrier_type_has_checkout_types/_form.html.erb
+- app/views/carrier_type_has_checkout_types/edit.html.erb
+- app/views/carrier_type_has_checkout_types/index.html.erb
+- app/views/carrier_type_has_checkout_types/new.html.erb
+- app/views/carrier_type_has_checkout_types/show.html.erb
+- app/views/checked_items/_checkouts.html.erb
+- app/views/checked_items/_list.html.erb
+- app/views/checked_items/edit.html.erb
+- app/views/checked_items/index.html.erb
+- app/views/checked_items/index.js.erb
+- app/views/checked_items/new.html.erb
+- app/views/checked_items/show.html.erb
+- app/views/checkins/_form.html.erb
+- app/views/checkins/_list.html.erb
+- app/views/checkins/edit.html.erb
+- app/views/checkins/index.html.erb
+- app/views/checkins/index.js.erb
+- app/views/checkins/new.html.erb
+- app/views/checkins/show.html.erb
+- app/views/checkout_stat_has_manifestations/_form.html.erb
+- app/views/checkout_stat_has_manifestations/edit.html.erb
+- app/views/checkout_stat_has_manifestations/index.html.erb
+- app/views/checkout_stat_has_manifestations/new.html.erb
+- app/views/checkout_stat_has_manifestations/show.html.erb
+- app/views/checkout_stat_has_users/_form.html.erb
+- app/views/checkout_stat_has_users/edit.html.erb
+- app/views/checkout_stat_has_users/index.html.erb
+- app/views/checkout_stat_has_users/new.html.erb
+- app/views/checkout_stat_has_users/show.html.erb
+- app/views/checkout_types/_form.html.erb
+- app/views/checkout_types/edit.html.erb
+- app/views/checkout_types/index.html.erb
+- app/views/checkout_types/new.html.erb
+- app/views/checkout_types/show.html.erb
+- app/views/checkouts/_form.html.erb
+- app/views/checkouts/_index.html.erb
+- app/views/checkouts/_index_overdue.html.erb
+- app/views/checkouts/_index_user.html.erb
+- app/views/checkouts/_list.html.erb
+- app/views/checkouts/edit.html.erb
+- app/views/checkouts/index.atom.builder
+- app/views/checkouts/index.csv.erb
+- app/views/checkouts/index.html.erb
+- app/views/checkouts/index.ics.erb
+- app/views/checkouts/index.rss.builder
+- app/views/checkouts/new.html.erb
+- app/views/checkouts/show.html.erb
+- app/views/circulation_statuses/_form.html.erb
+- app/views/circulation_statuses/edit.html.erb
+- app/views/circulation_statuses/index.html.erb
+- app/views/circulation_statuses/new.html.erb
+- app/views/circulation_statuses/show.html.erb
+- app/views/item_has_use_restrictions/edit.html.erb
+- app/views/item_has_use_restrictions/index.html.erb
+- app/views/item_has_use_restrictions/new.html.erb
+- app/views/item_has_use_restrictions/show.html.erb
 - app/views/layouts/messages.html.erb
+- app/views/lending_policies/_form.html.erb
+- app/views/lending_policies/edit.html.erb
+- app/views/lending_policies/index.html.erb
+- app/views/lending_policies/new.html.erb
+- app/views/lending_policies/show.html.erb
+- app/views/manifestation_checkout_stats/_form.html.erb
+- app/views/manifestation_checkout_stats/edit.html.erb
+- app/views/manifestation_checkout_stats/index.html.erb
+- app/views/manifestation_checkout_stats/new.html.erb
+- app/views/manifestation_checkout_stats/show.csv.erb
+- app/views/manifestation_checkout_stats/show.html.erb
+- app/views/manifestation_reserve_stats/_form.html.erb
+- app/views/manifestation_reserve_stats/edit.html.erb
+- app/views/manifestation_reserve_stats/index.html.erb
+- app/views/manifestation_reserve_stats/new.html.erb
+- app/views/manifestation_reserve_stats/show.csv.erb
+- app/views/manifestation_reserve_stats/show.html.erb
 - app/views/message_requests/edit.html.erb
 - app/views/message_requests/index.html.erb
 - app/views/message_requests/new.html.erb
@@ -264,6 +341,48 @@ files:
 - app/views/messages/show.html.erb
 - app/views/notifier/message_notification.en.text.erb
 - app/views/notifier/message_notification.ja.text.erb
+- app/views/reserve_stat_has_manifestations/_form.html.erb
+- app/views/reserve_stat_has_manifestations/edit.html.erb
+- app/views/reserve_stat_has_manifestations/index.html.erb
+- app/views/reserve_stat_has_manifestations/new.html.erb
+- app/views/reserve_stat_has_manifestations/show.html.erb
+- app/views/reserve_stat_has_users/_form.html.erb
+- app/views/reserve_stat_has_users/edit.html.erb
+- app/views/reserve_stat_has_users/index.html.erb
+- app/views/reserve_stat_has_users/new.html.erb
+- app/views/reserve_stat_has_users/show.html.erb
+- app/views/reserves/_form.html.erb
+- app/views/reserves/_new.html.erb
+- app/views/reserves/_new_user.html.erb
+- app/views/reserves/_title.html.erb
+- app/views/reserves/edit.html.erb
+- app/views/reserves/index.atom.builder
+- app/views/reserves/index.csv.erb
+- app/views/reserves/index.html.erb
+- app/views/reserves/index.rss.builder
+- app/views/reserves/new.html.erb
+- app/views/reserves/show.html.erb
+- app/views/use_restrictions/_form.html.erb
+- app/views/use_restrictions/edit.html.erb
+- app/views/use_restrictions/index.html.erb
+- app/views/use_restrictions/new.html.erb
+- app/views/use_restrictions/show.html.erb
+- app/views/user_checkout_stats/_form.html.erb
+- app/views/user_checkout_stats/edit.html.erb
+- app/views/user_checkout_stats/index.html.erb
+- app/views/user_checkout_stats/new.html.erb
+- app/views/user_checkout_stats/show.csv.erb
+- app/views/user_checkout_stats/show.html.erb
+- app/views/user_group_has_checkout_types/edit.html.erb
+- app/views/user_group_has_checkout_types/index.html.erb
+- app/views/user_group_has_checkout_types/new.html.erb
+- app/views/user_group_has_checkout_types/show.html.erb
+- app/views/user_reserve_stats/_form.html.erb
+- app/views/user_reserve_stats/edit.html.erb
+- app/views/user_reserve_stats/index.html.erb
+- app/views/user_reserve_stats/new.html.erb
+- app/views/user_reserve_stats/show.csv.erb
+- app/views/user_reserve_stats/show.html.erb
 - config/locales/translation_en.yml
 - config/locales/translation_ja.yml
 - config/routes.rb
@@ -320,6 +439,7 @@ 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/001_create_patrons.rb
 - spec/dummy/db/migrate/080_create_library_groups.rb
 - spec/dummy/db/migrate/20080905191442_create_patron_types.rb
@@ -335,6 +455,8 @@ files:
 - spec/dummy/db/migrate/20111201155513_add_devise_to_users.rb
 - spec/dummy/db/migrate/20111201163342_create_user_groups.rb
 - spec/dummy/db/migrate/20111201163718_create_user_has_roles.rb
+- spec/dummy/db/migrate/20120213092115_add_queue_to_delayed_jobs.rb
+- spec/dummy/db/production.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/enju_leaf/localized_name.rb
@@ -346,6 +468,7 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
+- spec/dummy/script/delayed_job
 - spec/dummy/script/rails
 - spec/dummy/solr/conf/admin-extra.html
 - spec/dummy/solr/conf/elevate.xml
@@ -445,6 +568,7 @@ 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/001_create_patrons.rb
 - spec/dummy/db/migrate/080_create_library_groups.rb
 - spec/dummy/db/migrate/20080905191442_create_patron_types.rb
@@ -460,6 +584,8 @@ test_files:
 - spec/dummy/db/migrate/20111201155513_add_devise_to_users.rb
 - spec/dummy/db/migrate/20111201163342_create_user_groups.rb
 - spec/dummy/db/migrate/20111201163718_create_user_has_roles.rb
+- spec/dummy/db/migrate/20120213092115_add_queue_to_delayed_jobs.rb
+- spec/dummy/db/production.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/enju_leaf/localized_name.rb
@@ -471,6 +597,7 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
+- spec/dummy/script/delayed_job
 - spec/dummy/script/rails
 - spec/dummy/solr/conf/admin-extra.html
 - spec/dummy/solr/conf/elevate.xml
@@ -505,4 +632,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/controller_macros.rb
 - spec/support/devise.rb
-has_rdoc: