enju_circulation 0.0.71 → 0.1.0.pre

data/app/controllers/checked_items_controller.rb

@@ -6,9 +6,9 @@ class CheckedItemsController < ApplicationController
   # GET /checked_items.json
   def index
     if @basket
-      @checked_items = @basket.checked_items.paginate(:page => params[:page])
+      @checked_items = @basket.checked_items.page(params[:page])
     else
-      @checked_items = CheckedItem.paginate(:page => params[:page])
+      @checked_items = CheckedItem.page(params[:page])
     end
 
     respond_to do |format|

data/app/controllers/checkins_controller.rb

@@ -8,9 +8,9 @@ class CheckinsController < ApplicationController
   # GET /checkins.json
   def index
     if @basket
-      @checkins = @basket.checkins.paginate(:page => params[:page])
+      @checkins = @basket.checkins.page(params[:page])
     else
-      @checkins = Checkin.paginate(:page => params[:page])
+      @checkins = Checkin.page(params[:page])
     end
 
     respond_to do |format|
@@ -42,7 +42,7 @@ class CheckinsController < ApplicationController
       @basket.save!
     end
     @checkin = Checkin.new
-    @checkins = [].paginate(:page => 1)
+    @checkins = Kaminari::paginate_array([]).page(1)
     flash[:checkin_basket_id] = @basket.id
 
     respond_to do |format|
@@ -81,7 +81,7 @@ class CheckinsController < ApplicationController
         format.json { render :json => @checkin, :status => :created, :location => @checkin }
         format.js { redirect_to basket_checkins_url(@basket, :format => :js) }
       else
-        @checkins = @basket.checkins.paginate(:page => 1)
+        @checkins = @basket.checkins.page(1)
         format.html { render :action => "new" }
         format.json { render :json => @checkin.errors, :status => :unprocessable_entity }
         format.js { render :action => "index" }

data/app/controllers/checkouts_controller.rb

@@ -27,7 +27,7 @@ class CheckoutsController < ApplicationController
     if params[:format] == 'csv'
       per_page = 65534
     else
-      per_page = Checkout.per_page
+      per_page = Checkout.default_per_page
     end
 
     unless icalendar_user
@@ -101,7 +101,7 @@ class CheckoutsController < ApplicationController
         facet :reserved
       end
       page = params[:page] || 1
-      search.query.paginate(page.to_i, Checkout.per_page)
+      search.query.paginate(page.to_i, Checkout.default_per_page)
       @checkouts = search.execute!.results
       @checkouts_facet = search.facet(:reserved).rows
     end

data/app/controllers/manifestation_checkout_stats_controller.rb

@@ -19,9 +19,9 @@ class ManifestationCheckoutStatsController < ApplicationController
     if params[:format] == 'csv'
       per_page = 65534
     else
-      per_page = CheckoutStatHasManifestation.per_page
+      per_page = CheckoutStatHasManifestation.default_per_page
     end
-    @stats = @manifestation_checkout_stat.checkout_stat_has_manifestations.order('checkouts_count DESC, manifestation_id').page(params[:page]).per_page(per_page)
+    @stats = @manifestation_checkout_stat.checkout_stat_has_manifestations.order('checkouts_count DESC, manifestation_id').page(params[:page]).per(per_page)
 
     respond_to do |format|
       format.html # show.html.erb

data/app/controllers/manifestation_reserve_stats_controller.rb

@@ -19,9 +19,9 @@ class ManifestationReserveStatsController < ApplicationController
     if params[:format] == 'csv'
       per_page = 65534
     else
-      per_page = ReserveStatHasManifestation.per_page
+      per_page = ReserveStatHasManifestation.default_per_page
     end
-    @stats = @manifestation_reserve_stat.reserve_stat_has_manifestations.order('reserves_count DESC, manifestation_id').page(params[:page]).per_page(per_page)
+    @stats = @manifestation_reserve_stat.reserve_stat_has_manifestations.order('reserves_count DESC, manifestation_id').page(params[:page]).per(per_page)
 
     respond_to do |format|
       format.html # show.html.erb

data/app/controllers/user_checkout_stats_controller.rb

@@ -19,9 +19,9 @@ class UserCheckoutStatsController < ApplicationController
     if params[:format] == 'csv'
       per_page = 65534
     else
-      per_page = CheckoutStatHasUser.per_page
+      per_page = CheckoutStatHasUser.default_per_page
     end
-    @stats = @user_checkout_stat.checkout_stat_has_users.order('checkouts_count DESC, user_id').page(params[:page]).per_page(per_page)
+    @stats = @user_checkout_stat.checkout_stat_has_users.order('checkouts_count DESC, user_id').page(params[:page]).per(per_page)
 
     respond_to do |format|
       format.html # show.html.erb

data/app/controllers/user_reserve_stats_controller.rb

@@ -19,9 +19,9 @@ class UserReserveStatsController < ApplicationController
     if params[:format] == 'csv'
       per_page = 65534
     else
-      per_page = ReserveStatHasUser.per_page
+      per_page = ReserveStatHasUser.default_per_page
     end
-    @stats = @user_reserve_stat.reserve_stat_has_users.order('reserves_count DESC, user_id').page(params[:page]).per_page(per_page)
+    @stats = @user_reserve_stat.reserve_stat_has_users.order('reserves_count DESC, user_id').page(params[:page]).per(per_page)
 
     respond_to do |format|
       format.html # show.html.erb

data/app/models/checkin.rb

@@ -13,9 +13,7 @@ class Checkin < ActiveRecord::Base
 
   attr_accessor :item_identifier
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def available_for_checkin?
     if item.blank?

data/app/models/checkout.rb

@@ -43,9 +43,7 @@ class Checkout < ActiveRecord::Base
     end
   end
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def is_not_checked?
     checkout = Checkout.not_returned.where(:item_id => item_id)

data/app/models/checkout_stat_has_manifestation.rb

@@ -8,9 +8,7 @@ class CheckoutStatHasManifestation < ActiveRecord::Base
   validates_uniqueness_of :manifestation_id, :scope => :manifestation_checkout_stat_id
   validates_presence_of :manifestation_checkout_stat_id, :manifestation_id
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 end
 
 # == Schema Information

data/app/models/checkout_stat_has_user.rb

@@ -8,9 +8,7 @@ class CheckoutStatHasUser < ActiveRecord::Base
   validates_uniqueness_of :user_id, :scope => :user_checkout_stat_id
   validates_presence_of :user_checkout_stat_id, :user_id
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 end
 
 # == Schema Information

data/app/models/checkout_type.rb

@@ -13,9 +13,7 @@ class CheckoutType < ActiveRecord::Base
   #has_many :items, :through => :item_has_checkout_types
   has_many :items
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 end
 
 # == Schema Information

data/app/models/item_has_use_restriction.rb

@@ -8,9 +8,7 @@ class ItemHasUseRestriction < ActiveRecord::Base
   validates_presence_of :use_restriction
   validates_presence_of :item, :on => :update
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 end
 
 # == Schema Information

data/app/models/lending_policy.rb

@@ -9,9 +9,7 @@ class LendingPolicy < ActiveRecord::Base
   validates_uniqueness_of :user_group_id, :scope => :item_id
   validates_date :fixed_due_date, :allow_blank => true
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   acts_as_list :scope => :item_id
 end

data/app/models/manifestation_checkout_stat.rb

@@ -13,9 +13,7 @@ class ManifestationCheckoutStat < ActiveRecord::Base
     end
   end
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def calculate_count
     self.started_at = Time.zone.now

data/app/models/manifestation_reserve_stat.rb

@@ -13,9 +13,7 @@ class ManifestationReserveStat < ActiveRecord::Base
     end
   end
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def calculate_count
     self.started_at = Time.zone.now

data/app/models/reserve.rb

@@ -71,9 +71,7 @@ class Reserve < ActiveRecord::Base
     end
   end
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def set_item_and_manifestation
     item = Item.where(:item_identifier => item_identifier).first
@@ -174,7 +172,8 @@ class Reserve < ActiveRecord::Base
       request.assign_attributes({:sender => sender, :receiver => sender, :message_template => message_template_to_library}, :as => :admin)
       request.save_message_body(:manifestations => options[:manifestations])
       self.not_sent_expiration_notice_to_library.each do |reserve|
-        reserve.update_attribute(:expiration_notice_to_library, true)
+        reserve.expiration_notice_to_library = true
+        reserve.save(:validate => false)
       end
     #when 'canceled'
     #  message_template_to_library = MessageTemplate.localized_template('reservation_canceled_for_library', sender.locale)

data/app/models/reserve_stat_has_manifestation.rb

@@ -8,9 +8,7 @@ class ReserveStatHasManifestation < ActiveRecord::Base
   validates_uniqueness_of :manifestation_id, :scope => :manifestation_reserve_stat_id
   validates_presence_of :manifestation_reserve_stat_id, :manifestation_id
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 end
 
 # == Schema Information

data/app/models/reserve_stat_has_user.rb

@@ -8,9 +8,7 @@ class ReserveStatHasUser < ActiveRecord::Base
   validates_uniqueness_of :user_id, :scope => :user_reserve_stat_id
   validates_presence_of :user_reserve_stat_id, :user_id
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 end
 
 # == Schema Information

data/app/models/user_checkout_stat.rb

@@ -13,9 +13,7 @@ class UserCheckoutStat < ActiveRecord::Base
     end
   end
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def calculate_count
     self.started_at = Time.zone.now

data/app/models/user_reserve_stat.rb

@@ -13,9 +13,7 @@ class UserReserveStat < ActiveRecord::Base
     end
   end
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def calculate_count
     self.started_at = Time.zone.now

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

@@ -19,7 +19,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@baskets) -%>
+<%= paginate(@baskets) -%>
 
 </div>
 </div>

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

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.checked_item')) -%></h1>
 <div id="content_list">
   <%= render 'checked_item' %>
-  <%= will_paginate @checked_items %>
+  <%= paginate @checked_items %>
 </div>
 </div>
 

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

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.checkin')) -%></h1>
 <div id="content_list">
   <%= render 'checkin' %>
-  <%= will_paginate @checkins %>
+  <%= paginate @checkins %>
 </div>
 </div>
 

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

@@ -21,7 +21,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@checkout_stat_has_manifestations) -%>
+<%= paginate(@checkout_stat_has_manifestations) -%>
 
 </div>
 </div>

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

@@ -21,7 +21,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@checkout_stat_has_users) -%>
+<%= paginate(@checkout_stat_has_users) -%>
 
 </div>
 </div>

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

@@ -35,7 +35,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@checkout_types) -%>
+<%= paginate(@checkout_types) -%>
 </div>
 </div>
 

data/app/views/checkouts/_list.html.erb

@@ -42,4 +42,4 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@checkouts) %>
+<%= paginate(@checkouts) %>

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

@@ -21,7 +21,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@item_has_use_restrictions) -%>
+<%= paginate(@item_has_use_restrictions) -%>
 <br />
 
 <%- if @item -%>

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

@@ -33,7 +33,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@lending_policies) -%>
+<%= paginate(@lending_policies) -%>
 
 </div>
 </div>

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

@@ -24,7 +24,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@manifestation_checkout_stats) -%>
+<%= paginate(@manifestation_checkout_stats) -%>
 </div>
 </div>
 

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

@@ -38,7 +38,7 @@
   <%- end -%>
 </table>
 
-<%= will_paginate(@stats) -%>
+<%= paginate(@stats) -%>
 
 </div>
 </div>

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

@@ -24,7 +24,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@manifestation_reserve_stats) -%>
+<%= paginate(@manifestation_reserve_stats) -%>
 </div>
 </div>
 

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

@@ -38,7 +38,7 @@
   <%- end -%>
 </table>
 
-<%= will_paginate(@stats) -%>
+<%= paginate(@stats) -%>
 
 </div>
 </div>

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

@@ -21,7 +21,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@reserve_stat_has_manifestations) -%>
+<%= paginate(@reserve_stat_has_manifestations) -%>
 
 </div>
 </div>

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

@@ -21,7 +21,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@reserve_stat_has_users) -%>
+<%= paginate(@reserve_stat_has_users) -%>
 
 </div>
 </div>

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

@@ -39,7 +39,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@reserves) -%>
+<%= paginate(@reserves) -%>
 
 </div>
 </div>

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

@@ -24,7 +24,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@user_checkout_stats) -%>
+<%= paginate(@user_checkout_stats) -%>
 </div>
 </div>
 

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

@@ -38,7 +38,7 @@
   <%- end -%>
 </table>
 
-<%= will_paginate(@stats) -%>
+<%= paginate(@stats) -%>
 
 </div>
 </div>

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

@@ -24,7 +24,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@user_reserve_stats) -%>
+<%= paginate(@user_reserve_stats) -%>
 </div>
 </div>
 

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

@@ -38,7 +38,7 @@
   <%- end -%>
 </table>
 
-<%= will_paginate(@stats) -%>
+<%= paginate(@stats) -%>
 </div>
 </div>
 

data/lib/enju_circulation/controller.rb

@@ -13,10 +13,6 @@ module EnjuCirculation
     module InstanceMethods
       private
 
-      def get_basket
-        @basket = Basket.find(params[:basket_id]) if params[:basket_id]
-      end
-
       def get_checkout_type
         @checkout_type = CheckoutType.find(params[:checkout_type_id]) if params[:checkout_type_id]
       end

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.71"
+  VERSION = "0.1.0.pre"
 end

data/lib/generators/enju_circulation/views_generator.rb

@@ -0,0 +1,38 @@
+module EnjuCirculation
+  module Generators
+    class ViewsGenerator < Rails::Generators::Base
+      source_root File.expand_path('../../../../app/views', __FILE__)
+
+      def copy_files
+        directories = %w(
+          baskets
+          carrier_type_has_checkout_types
+          checked_items
+          checkins
+          checkout_stat_has_manifestations
+          checkout_stat_has_users
+          checkout_types
+          checkouts
+          circulation_statuses
+          item_has_use_restrictions
+          lending_policies
+          manifestation_checkout_stats
+          manifestation_reserve_stats
+          my_accounts
+          reserve_stat_has_manifestations
+          reserve_stat_has_users
+          reserves
+          use_restrictions
+          user_checkout_stats
+          user_group_has_checkout_types
+          user_reserve_stats
+          users
+        )
+
+        directories.each do |dir|
+          directory dir, "app/views/#{dir}"
+        end
+      end
+    end
+  end
+end

data/spec/dummy/app/mailers/notifier.rb

@@ -4,12 +4,13 @@ class Notifier < ActionMailer::Base
     default_url_options[:host] = uri.host
     default_url_options[:port] = uri.port if configatron.enju.web_port_number != 80
   else
-    default_url_options[:host] = configatron.enju.web_hostname
-    default_url_options[:port] = configatron.enju.web_port_number if configatron.enju.web_port_number != 80
+    default_url_options[:host] = 'library.example.jp'
+    default_url_options[:port] = 80
   end
 
-  def message_notification(message)
-    I18n.locale = message.receiver.locale.to_sym
+  def message_notification(message_id)
+    message = Message.find(message_id)
+    I18n.locale = message.receiver.locale.try(:to_sym) || I18n.default_locale
     from = "#{LibraryGroup.system_name(message.receiver.locale)} <#{LibraryGroup.site_config.email}>"
     if message.subject
       subject = message.subject

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

@@ -5,7 +5,6 @@ class Ability
     case user.try(:role).try(:name)
     when 'Administrator'
       can :manage, [
-        Accept,
         Basket,
         CarrierTypeHasCheckoutType,
         CheckedItem,
@@ -43,7 +42,6 @@ class Ability
       end
     when 'Librarian'
       can :manage, [
-        Accept,
         Basket,
         CheckedItem,
         Checkin,

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

@@ -0,0 +1,13 @@
+class LocalPatron
+  def initialize(user)
+    @user = user
+  end
+
+  def id 
+  end
+
+  def full_name
+    # TODO: 外部サービスから取得
+    @user.email
+  end
+end

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

@@ -46,4 +46,12 @@ class User < ActiveRecord::Base
       end
     end
   end
+
+  def patron
+    LocalPatron.new(self)
+  end
+
+  def full_name
+    username
+  end
 end

data/spec/dummy/config/application.rb

@@ -54,4 +54,7 @@ module Dummy
   end
 end
 
-require 'enju_leaf'
+require 'nkf'
+require 'enju_biblio'
+require 'enju_library'
+require 'enju_manifestation_viewer'

data/spec/dummy/db/schema.rb

@@ -13,17 +13,6 @@
 
 ActiveRecord::Schema.define(:version => 20120424103932) do
 
-  create_table "accepts", :force => true do |t|
-    t.integer  "basket_id"
-    t.integer  "item_id"
-    t.integer  "librarian_id"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  add_index "accepts", ["basket_id"], :name => "index_accepts_on_basket_id"
-  add_index "accepts", ["item_id"], :name => "index_accepts_on_item_id"
-
   create_table "baskets", :force => true do |t|
     t.integer  "user_id"
     t.text     "note"