enju_circulation 0.1.0.pre47 → 0.1.0.pre48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42c4ad13fae4f036cd78c045f9eded59ff44a229
-  data.tar.gz: 6fd3afa71eb59716ed7dd801c6b1e07b754f8774
+  metadata.gz: 3fa4ac8a717069b0e0e49dafb6822873fed12cb4
+  data.tar.gz: f36b593f237141416cf2a7050efc271dacf948d0
 SHA512:
-  metadata.gz: ac2e3cc83d35d247fdc12611241a0be61f05a0b98f58dc24bfff70182dd2f17c46cd80f390543d1971d3faf17d1912d1abf4fd7660ef1524c8fae9b7e47bbbd4
-  data.tar.gz: 0a0348e65018e54f84efa184cbdc417e17ff3884bedc622b683dcfc87fdc9b0ec1650ab72dec210ec575a0e79c3047254b39dd47410b96f6b1d4c882ae09cdfa
+  metadata.gz: 5ac896d0434121bcac47efe750df4a8f0e77737c4915ac02489f179035c8710de7234e8409ac2754db8191b8df8536449869ee8b282e3493824a94a08c7530ec
+  data.tar.gz: 1d9fb95d1d93a3247c66da62a6fd549a19e63aa6a39e78189f3395f02fc094e0aac4d0c69a1d9bcc9cc7bfb4190894881b694520756fd4f43a1203dac698a4da

data/app/controllers/reserves_controller.rb

@@ -140,7 +140,7 @@ class ReservesController < ApplicationController
     if @manifestation
       @reserve.manifestation = @manifestation
       if @reserve.user
-        @reserve.expired_at = @manifestation.reservation_expired_period(@reserve.user).days.from_now.end_of_day
+        #@reserve.expired_at = @manifestation.reservation_expired_period(@reserve.user).days.from_now.end_of_day
         if @manifestation.is_reserved_by?(@reserve.user)
           flash[:notice] = t('reserve.this_manifestation_is_already_reserved')
           redirect_to @manifestation
@@ -253,7 +253,7 @@ class ReservesController < ApplicationController
   def reserve_params
     if current_user.try(:has_role?, 'Librarian')
       params.fetch(:reserve, {}).permit(
-        :manifestation_id, :user_number, :expired_at,
+        :manifestation_id, :user_number,
         :pickup_location_id, :expired_at,
         :manifestation_id, :item_identifier, :user_number,
         :request_status_type, :canceled_at, :checked_out_at,
@@ -270,7 +270,7 @@ class ReservesController < ApplicationController
   def reserve_update_params
     if current_user.try(:has_role?, 'Librarian')
       params.fetch(:reserve, {}).permit(
-        :manifestation_id, :user_number, :expired_at,
+        :manifestation_id, :user_number,
         :pickup_location_id, :expired_at,
         :manifestation_id, :item_identifier, :user_number,
         :request_status_type, :canceled_at, :checked_out_at,

data/app/models/enju_circulation/ability.rb

@@ -96,18 +96,14 @@ module EnjuCirculation
         can :read, [
           CirculationStatus,
           ManifestationCheckoutStat,
-          ManifestationReserveStat,
-          UserCheckoutStat,
-          UserReserveStat,
+          ManifestationReserveStat
         ]
       else
         can :index, Checkout
         can :read, [
           CirculationStatus,
           ManifestationCheckoutStat,
-          ManifestationReserveStat,
-          UserCheckoutStat,
-          UserReserveStat
+          ManifestationReserveStat
         ]
       end
     end

data/app/models/reserve.rb

@@ -56,7 +56,8 @@ class Reserve < ActiveRecord::Base
   validate :valid_item?
   validate :retained_by_other_user?
   before_validation :set_manifestation, on: :create
-  before_validation :set_item, :set_expired_at
+  before_validation :set_item
+  validate :check_expired_at
   before_validation :set_user, on: :update
   before_validation :set_request_status, on: :create
 
@@ -141,16 +142,11 @@ class Reserve < ActiveRecord::Base
     self.request_status_type = RequestStatusType.where(name: 'In Process').first
   end
 
-  def set_expired_at
-    if user and manifestation
-      if canceled_at.blank?
-        if expired_at.blank?
-          expired_period = manifestation.reservation_expired_period(user)
-          self.expired_at = (expired_period + 1).days.from_now.beginning_of_day
-        elsif !completed?
-          if expired_at.beginning_of_day < Time.zone.now
-            errors[:base] << I18n.t('reserve.invalid_date')
-          end
+  def check_expired_at
+    if canceled_at.blank? and expired_at?
+      if !completed?
+        if expired_at.beginning_of_day < Time.zone.now
+          errors[:base] << I18n.t('reserve.invalid_date')
         end
       end
     end

data/app/views/profiles/_feed_token.html.erb

@@ -1,14 +1,14 @@
-<%- if @user.profile.try(:checkout_icalendar_token?) -%>
-  <%= checkouts_url(icalendar_token: @user.profile.checkout_icalendar_token, format: :ics) -%>
-  <%= hidden_field_tag 'user.profile.checkout_icalendar_token]', @user.profile.checkout_icalendar_token -%>
+<%- if profile.respond_to?(:checkout_icalendar_token?) -%>
+  <%= checkouts_url(icalendar_token: profile.checkout_icalendar_token, format: :ics) if profile.checkout_icalendar_token -%>
+  <%= hidden_field_tag 'profile[checkout_icalendar_token]', profile.checkout_icalendar_token -%>
 <%- end -%>
 <br />
-<%- if @user.profile.try(:checkout_icalendar_token?) -%>
-  <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_user_path(@user, disable: true, mode: 'feed_token') %>'});" type="button" value="<%= t('page.delete') %>" />
+<%- if profile.try(:checkout_icalendar_token?) -%>
+  <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_profile_path(profile, disable: true, mode: 'feed_token') %>'});" type="button" value="<%= t('page.delete') %>" />
   <br />
   <%= t('user.you_have_to_save_profile_to_activate_feed_url') -%>
 <%- else -%>
-  <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_user_path(@user, mode: 'feed_token') %>'});" type="button" value="<%= t('page.reset') %>" />
+  <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_profile_path(profile, mode: 'feed_token') %>'});" type="button" value="<%= t('page.reset') %>" />
   <br />
   <%= t('user.you_have_to_save_profile_to_deactivate_feed_url') -%>
 <%- end -%>

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

@@ -49,7 +49,7 @@
       <%= t('activerecord.models.user') -%>: <%= link_to reserve.user.username, reserve.user.profile -%>
       <%= t('activerecord.attributes.reserve.created_at') %>: <%= l(reserve.created_at, format: :short) -%>
       <br />
-      <%= t('activerecord.attributes.reserve.expired_at') %>: <%= l(reserve.expired_at, format: :short) -%>
+      <%= t('activerecord.attributes.reserve.expired_at') %>: <%= l(reserve.expired_at, format: :short) if reserve.expired_at? -%>
       <br />
       <%= t('activerecord.attributes.reserve.pickup_location_id') %>: <%= link_to reserve.pickup_location.display_name.localize, reserve.pickup_location if reserve.pickup_location %>
     </td>

data/app/views/user_group_has_checkout_types/edit.html.erb

@@ -33,11 +33,6 @@
     <%= f.text_field :reservation_limit, class: 'resource_integer' -%>
   </div>
 
-  <div class="field">
-    <%= f.label :reservation_expired_period -%><br />
-    <%= f.text_field :reservation_expired_period, class: 'resource_integer' -%>
-  </div>
-
   <div class="field">
     <%= f.label :set_due_date_before_closing_day -%>
     <%= f.check_box :set_due_date_before_closing_day -%>

data/app/views/user_group_has_checkout_types/new.html.erb

@@ -33,11 +33,6 @@
     <%= f.text_field :reservation_limit, class: 'resource_integer' -%>
   </div>
 
-  <div class="field">
-    <%= f.label :reservation_expired_period -%><br />
-    <%= f.text_field :reservation_expired_period, class: 'resource_integer' -%>
-  </div>
-
   <div class="field">
     <%= f.label :set_due_date_before_closing_day -%>
     <%= f.check_box :set_due_date_before_closing_day -%>

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

@@ -38,11 +38,6 @@
   <%= @user_group_has_checkout_type.reservation_limit -%>
 </p>
 
-<p>
-  <strong><%= t('activerecord.attributes.user_group_has_checkout_type.reservation_expired_period') -%>:</strong>
-  <%= @user_group_has_checkout_type.reservation_expired_period -%>
-</p>
-
 <p>
   <strong><%= t('activerecord.attributes.user_group_has_checkout_type.set_due_date_before_closing_day') -%>:</strong>
   <%= localized_boolean(@user_group_has_checkout_type.set_due_date_before_closing_day) -%>

data/app/views/user_groups/_checkout_form.html.erb

@@ -14,8 +14,6 @@
     <br />
     <%= checkout_form.label :reservation_limit -%>
     <%= checkout_form.text_field :reservation_limit, class: 'resource_integer' %>
-    <%= checkout_form.label :reservation_expired_period -%>
-    <%= checkout_form.text_field :reservation_expired_period, class: 'resource_integer' %>
     <%= checkout_form.label :set_due_date_before_closing_day -%>
     <%= checkout_form.check_box :set_due_date_before_closing_day %>
   <% end %>

data/config/locales/translation_ja.yml

@@ -75,12 +75,12 @@ ja:
         note: 注記
         position: 位置
         user_group_id: 利用者グループ
-        checkout_type_id: 貸出種別
+        checkout_type_id: 貸出区分
         current_checkout_count: 現在の貸出数
       carrier_type_has_checkout_type:
         note: 注記
         position: 位置
-        checkout_type_id: 貸出種別
+        checkout_type_id: 貸出区分
       manifestation_checkout_stat:
         start_date: 開始日
         end_date: 終了日
@@ -117,7 +117,7 @@ ja:
         note: 注記
         position: 位置
       item:
-        checkout_type: 貸出種別
+        checkout_type: 貸出区分
         circulation_status: 貸出状態
       profile:
         checkout_icalendar_token: 貸出iCalendarのトークン

data/lib/enju_circulation/engine.rb

@@ -1,6 +1,4 @@
-require "enju_biblio"
-require "enju_library"
-require "enju_message"
+require "enju_leaf"
 require "enju_event"
 
 module EnjuCirculation

data/lib/enju_circulation/item.rb

@@ -27,10 +27,12 @@ module EnjuCirculation
         include InstanceMethods
         has_many :reserves, :foreign_key => :manifestation_id
 
-        scope :for_checkout, -> { includes(:circulation_status, :use_restriction).where(
+        scope :for_checkout, ->(identifier_conditions = 'item_identifier IS NOT NULL') {
+          includes(:circulation_status, :use_restriction).where(
             'circulation_statuses.name' => FOR_CHECKOUT_CIRCULATION_STATUS,
             'use_restrictions.name' => FOR_CHECKOUT_USE_RESTRICTION
-          ).where('item_identifier IS NOT NULL') }
+          ).where(identifier_conditions)
+	}
         scope :removed, -> { includes(:circulation_status).where('circulation_statuses.name' => 'Removed') }
         has_many :checkouts
         has_many :reserves

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre47"
+  VERSION = "0.1.0.pre48"
 end

data/lib/enju_circulation/withdraw.rb

@@ -0,0 +1,21 @@
+module EnjuCirculation
+  module EnjuWithdraw
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def enju_circulation_withdraw_model
+        include InstanceMethods
+        before_save :withdraw!, on: :create
+      end
+    end
+
+    module InstanceMethods
+      def withdraw!
+        circulation_status = CirculationStatus.where(name: 'Removed').first
+        item.update_column(:circulation_status_id, circulation_status.id) if circulation_status
+      end
+    end
+  end
+end

data/lib/enju_circulation.rb

@@ -7,6 +7,7 @@ require "enju_circulation/profile"
 require "enju_circulation/accept"
 require "enju_circulation/basket"
 require "enju_circulation/carrier_type"
+require "enju_circulation/withdraw"
 require "enju_circulation/controller"
 require "enju_circulation/helper"
 
@@ -22,4 +23,5 @@ ActiveRecord::Base.send :include, EnjuCirculation::EnjuProfile
 ActiveRecord::Base.send :include, EnjuCirculation::EnjuAccept
 ActiveRecord::Base.send :include, EnjuCirculation::EnjuBasket
 ActiveRecord::Base.send :include, EnjuCirculation::EnjuCarrierType
+ActiveRecord::Base.send :include, EnjuCirculation::EnjuWithdraw
 ActionView::Base.send :include, EnjuCirculation::ManifestationsHelper

data/spec/controllers/reserves_controller_spec.rb

@@ -353,7 +353,7 @@ describe ReservesController do
         it "redirects to the created reserve" do
           post :create, :reserve => @attrs
           response.should redirect_to(assigns(:reserve))
-          assigns(:reserve).expired_at.should be_truthy
+          assigns(:reserve).expired_at.should be_nil
         end
       end
 
@@ -379,7 +379,7 @@ describe ReservesController do
 
       it "should create other user's reserve" do
         post :create, :reserve => {:user_number => users(:user1).profile.user_number, :manifestation_id => 5}
-        assigns(:reserve).expired_at.should be_truthy
+        assigns(:reserve).expired_at.should be_nil
         response.should redirect_to reserve_url(assigns(:reserve))
       end
 
@@ -407,7 +407,7 @@ describe ReservesController do
         it "redirects to the created reserve" do
           post :create, :reserve => @attrs
           response.should redirect_to(assigns(:reserve))
-          assigns(:reserve).expired_at.should be_truthy
+          assigns(:reserve).expired_at.should be_nil
         end
 
         it "should send accepted messages" do
@@ -434,7 +434,7 @@ describe ReservesController do
       it "should create other user's reserve" do
         post :create, :reserve => {:user_number => users(:user1).profile.user_number, :manifestation_id => 5}
         assigns(:reserve).should be_valid
-        assigns(:reserve).expired_at.should be_truthy
+        assigns(:reserve).expired_at.should be_nil
         response.should redirect_to reserve_url(assigns(:reserve))
       end
 
@@ -456,7 +456,7 @@ describe ReservesController do
         it "redirects to the created reserve" do
           post :create, :reserve => @attrs
           response.should redirect_to(assigns(:reserve))
-          assigns(:reserve).expired_at.should be > Time.zone.now
+          assigns(:reserve).expired_at.should be_nil
         end
       end
 

data/spec/controllers/user_checkout_stats_controller_spec.rb

@@ -31,14 +31,16 @@ describe UserCheckoutStatsController do
 
       it "assigns all user_checkout_stats as @user_checkout_stats" do
         get :index
-        assigns(:user_checkout_stats).should eq(UserCheckoutStat.order('id DESC').page(1))
+        assigns(:user_checkout_stats).should be_empty
+        response.should be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not assign user_checkout_stats as @user_checkout_stats" do
         get :index
-        assigns(:user_checkout_stats).should eq(UserCheckoutStat.order('id DESC').page(1))
+        assigns(:user_checkout_stats).should be_empty
+        response.should redirect_to(new_user_session_url)
       end
     end
   end
@@ -71,6 +73,7 @@ describe UserCheckoutStatsController do
         user_checkout_stat = FactoryGirl.create(:user_checkout_stat)
         get :show, :id => user_checkout_stat.id
         assigns(:user_checkout_stat).should eq(user_checkout_stat)
+        response.should be_forbidden
       end
     end
 
@@ -79,6 +82,7 @@ describe UserCheckoutStatsController do
         user_checkout_stat = FactoryGirl.create(:user_checkout_stat)
         get :show, :id => user_checkout_stat.id
         assigns(:user_checkout_stat).should eq(user_checkout_stat)
+        response.should redirect_to(new_user_session_url)
       end
     end
   end

data/spec/controllers/user_reserve_stats_controller_spec.rb

@@ -31,14 +31,16 @@ describe UserReserveStatsController do
 
       it "assigns all user_reserve_stats as @user_reserve_stats" do
         get :index
-        assigns(:user_reserve_stats).should eq(UserReserveStat.order('id DESC').page(1))
+        assigns(:user_reserve_stats).should be_empty
+        response.should be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not assign user_reserve_stats as @user_reserve_stats" do
         get :index
-        assigns(:user_reserve_stats).should eq(UserReserveStat.order('id DESC').page(1))
+        assigns(:user_reserve_stats).should be_empty
+        response.should redirect_to(new_user_session_url)
       end
     end
   end
@@ -71,6 +73,7 @@ describe UserReserveStatsController do
         user_reserve_stat = FactoryGirl.create(:user_reserve_stat)
         get :show, :id => user_reserve_stat.id
         assigns(:user_reserve_stat).should eq(user_reserve_stat)
+        response.should be_forbidden
       end
     end
 
@@ -79,6 +82,7 @@ describe UserReserveStatsController do
         user_reserve_stat = FactoryGirl.create(:user_reserve_stat)
         get :show, :id => user_reserve_stat.id
         assigns(:user_reserve_stat).should eq(user_reserve_stat)
+        response.should redirect_to(new_user_session_url)
       end
     end
   end

data/spec/views/reserves/index.html.erb_spec.rb

@@ -17,4 +17,11 @@ describe "reserves/index" do
     assert_select "tr>td:nth-child(2)", :text => /#{reserves(:reserve_00001).user.username}/
     assert_select "tr>td:nth-child(2)", :text => /#{reserves(:reserve_00002).manifestation.original_title}/
   end
+
+  it "renders a list of reserves when a reserve does not have expired_at" do
+    reserve = FactoryGirl.create(:reserve, :expired_at => nil)
+    assign(:reserves, Reserve.page(2))
+    render
+    rendered.should match /<td/
+  end
 end

metadata

@@ -1,57 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre47
+  version: 0.1.0.pre48
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: enju_biblio
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0.pre67
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0.pre67
-- !ruby/object:Gem::Dependency
-  name: enju_library
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0.pre42
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0.pre42
-- !ruby/object:Gem::Dependency
-  name: enju_message
+  name: enju_leaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre25
+        version: 1.1.0.rc20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre25
+        version: 1.1.0.rc20
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.17.pre26
-- !ruby/object:Gem::Dependency
-  name: enju_leaf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0.rc19
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0.rc19
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +56,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -384,7 +342,6 @@ files:
 - app/views/manifestation_reserve_stats/new.html.erb
 - app/views/manifestation_reserve_stats/show.html.erb
 - app/views/manifestation_reserve_stats/show.txt.erb
-- app/views/my_accounts/_feed_token.html.erb
 - app/views/profiles/_feed_token.html.erb
 - app/views/reserves/_form.html.erb
 - app/views/reserves/_new.html.erb
@@ -485,6 +442,7 @@ files:
 - lib/enju_circulation/user.rb
 - lib/enju_circulation/user_group.rb
 - lib/enju_circulation/version.rb
+- lib/enju_circulation/withdraw.rb
 - lib/generators/enju_circulation/setup/USAGE
 - lib/generators/enju_circulation/setup/setup_generator.rb
 - lib/generators/enju_circulation/setup/templates/config/schedule.rb

data/app/views/my_accounts/_feed_token.html.erb

@@ -1,14 +0,0 @@
-<%- if @user.profile.try(:checkout_icalendar_token?) -%>
-  <%= checkouts_url(icalendar_token: @user.profile.checkout_icalendar_token, format: :ics) -%>
-  <%= hidden_field_tag 'user.profile.checkout_icalendar_token]', @user.profile.checkout_icalendar_token -%>
-<%- end -%>
-<br />
-<%- if @user.profile.try(:checkout_icalendar_token?) -%>
-  <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_my_account_path(@user, disable: true, mode: 'feed_token') %>'});" type="button" value="<%= t('page.delete') %>" />
-  <br />
-  <%= t('user.you_have_to_save_profile_to_activate_feed_url') -%>
-<%- else -%>
-  <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_my_account_path(@user, mode: 'feed_token') %>'});" type="button" value="<%= t('page.reset') %>" />
-  <br />
-  <%= t('user.you_have_to_save_profile_to_deactivate_feed_url') -%>
-<%- end -%>