enju_circulation 0.1.0.pre48 → 0.1.0.pre49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fa4ac8a717069b0e0e49dafb6822873fed12cb4
-  data.tar.gz: f36b593f237141416cf2a7050efc271dacf948d0
+  metadata.gz: e14228dba69a1610c4f660d9ea14b9e395045d75
+  data.tar.gz: d85526d2a648828dbb330d83d2f442d4bc23a6ae
 SHA512:
-  metadata.gz: 5ac896d0434121bcac47efe750df4a8f0e77737c4915ac02489f179035c8710de7234e8409ac2754db8191b8df8536449869ee8b282e3493824a94a08c7530ec
-  data.tar.gz: 1d9fb95d1d93a3247c66da62a6fd549a19e63aa6a39e78189f3395f02fc094e0aac4d0c69a1d9bcc9cc7bfb4190894881b694520756fd4f43a1203dac698a4da
+  metadata.gz: 3a067ef4994dd36d5ece33d029c7b17d95d025eb12d15100461092bc1404e6d56770fa6da5dc66ef9031642c2376fc5aa17a264ce07396c70f9917fed23402bc
+  data.tar.gz: a3acf54008cd8ff39120315c36ba3e18d32b906ffee562b45bcabdc28be91d07f819ccefd3879293b2a6278fb872775230e7dd5f724ca1d3fd6d64069f9ecbbf

data/app/models/enju_circulation/ability.rb

@@ -18,11 +18,10 @@ module EnjuCirculation
           Checkin,
           CheckoutStatHasManifestation,
           CheckoutStatHasUser,
-	  Demand,
+          Demand,
           ItemHasUseRestriction,
           ManifestationCheckoutStat,
           ManifestationReserveStat,
-          Reserve,
           ReserveStatHasManifestation,
           ReserveStatHasUser,
           UserCheckoutStat,
@@ -37,6 +36,10 @@ module EnjuCirculation
         can [:destroy, :delete], Checkout do |checkout|
           checkout.checkin
         end
+        can [:read, :create, :update], Reserve
+        can [:destroy, :delete], Reserve do |reserve|
+          true unless reserve.retained?
+        end
         can [:read, :update], [
           CirculationStatus,
           LendingPolicy,
@@ -54,7 +57,7 @@ module EnjuCirculation
           Basket,
           CheckedItem,
           Checkin,
-	  Demand,
+          Demand,
           ManifestationCheckoutStat,
           ManifestationReserveStat,
           Reserve

data/app/models/reserve.rb

@@ -3,7 +3,7 @@ class Reserve < ActiveRecord::Base
   include Statesman::Adapters::ActiveRecordQueries
   scope :hold, -> { where('item_id IS NOT NULL') }
   scope :not_hold, -> { where(item_id: nil) }
-  scope :waiting, -> {not_in_state(:completed, :expired).where('canceled_at IS NULL AND expired_at > ?', Time.zone.now).order('reserves.id DESC')}
+  scope :waiting, -> {not_in_state(:completed, :expired).where('canceled_at IS NULL AND (expired_at > ? OR expired_at IS NULL)', Time.zone.now).order('reserves.id DESC')}
   scope :retained, -> {in_state(:retained).where('retained_at IS NOT NULL')}
   scope :completed, -> {in_state(:completed).where('checked_out_at IS NOT NULL')}
   scope :canceled, -> {in_state(:canceled).where('canceled_at IS NOT NULL')}

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

@@ -17,6 +17,7 @@
     <li><%= link_to t('page.overdue'), checkouts_path(view: 'overdue') -%></li>
   </ul>
   <%= render 'reserved_facet' %>
+  <h4><%= t('page.other_format') %></h4>
   <ul>
     <li>
       <%= link_to 'RSS', checkouts_path(format: :rss) -%>

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

@@ -25,10 +25,15 @@
     <li><%= link_to t('page.back_to', model: t('activerecord.models.checkout')), checkouts_path -%></li>
   </ul>
   <%= render 'reserved_facet' %>
-  <p>
-    <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(format: :rss, view: 'overdue') -%>
-    (<%= link_to 'RSS', checkouts_path(format: :rss, view: 'overdue') -%>)
-    <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(format: :txt, view: 'overdue', locale: @locale.to_s) -%>
-    (<%= link_to 'TSV', checkouts_path(format: :txt, view: 'overdue', locale: @locale.to_s) -%>)
-  </p>
+  <h4><%= t('page.other_format') %></h4>
+  <ul>
+    <li>
+      <%= link_to 'RSS', checkouts_path(format: :rss, view: 'overdue') -%>
+      <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(format: :rss, view: 'overdue') -%>
+    </li>
+    <li>
+      <%= link_to 'TSV', checkouts_path(format: :txt, view: 'overdue', locale: @locale.to_s) -%>
+      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(format: :txt, view: 'overdue', locale: @locale.to_s) -%>
+    </li>
+  </ul>
 </div>

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

@@ -19,13 +19,14 @@
         <%= user.checked_item_count[:"#{available_checkout_type.checkout_type.name}"] -%> / <%= available_checkout_type.checkout_limit -%>
       </li>
     <%- end -%>
+    <li><%= link_to t('activerecord.models.reserve'), reserves_path(user_id: user.username) -%></li>
+    <% if current_user.has_role?('Librarian') %>
+      <li><%= link_to t('checkout.all_checkout'), checkouts_path -%></li>
+    <% end %>
   </ul>
   <%= render 'reserved_facet' %>
+  <h4><%= t('page.other_format') %></h4>
   <ul>
-    <li><%= link_to t('activerecord.models.reserve'), reserves_path(user_id: user.username) -%></li>
-    <%- if current_user.has_role?('Librarian') -%>
-      <li><%= link_to t('checkout.all_checkout'), checkouts_path -%></li>
-    <%- end -%>
     <% if current_user.profile.checkout_icalendar_token? %>
       <li>
         <%= link_to 'iCalendar', checkouts_path(icalendar_token: user.profile.checkout_icalendar_token, format: :ics) -%>

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

@@ -0,0 +1,10 @@
+<h2>
+  <%= t('activerecord.models.checkout') %>
+  <%= link_to image_tag('icons/date.png', size: '16x16', alt: 'iCalendar', class: 'icon'), checkouts_path(icalendar_token: current_user.profile.checkout_icalendar_token, format: :ics) if current_user.profile.checkout_icalendar_token? %>
+  <%= link_to image_tag('icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(user_id: current_user.username, format: :rss) %>
+  <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(user_id: current_user.username, format: :txt) %>
+</h2>
+<% if @profile.user %>
+  <%= render 'checkouts/list', checkouts: @profile.user.checkouts.order('created_at DESC').page(params[:page]) %>
+<% end %>
+

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

@@ -0,0 +1,9 @@
+<ul>
+  <%- @profile.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>
+    <li>
+      <%= available_checkout_type.checkout_type.display_name.localize -%>:
+      <%= @profile.user.checked_item_count[:"#{available_checkout_type.checkout_type.name}"] -%> / <%= available_checkout_type.checkout_limit -%>
+    </li>
+  <%- end -%>
+</ul>
+

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

@@ -24,7 +24,11 @@
   <% unless @reserve.completed? %>
     <div class="field">
       <%= f.label :item_identifier %><br />
-      <%= f.text_field :item_identifier %>
+      <% if current_user.has_role?('Librarian') %>
+        <%= f.text_field :item_identifier %>
+      <% else %>
+        <%= @reserve.item.try(:item_identifier) %>
+      <% end %>
     </div>
   <% end %>
 

data/lib/enju_circulation/version.rb

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

data/lib/enju_circulation/withdraw.rb

@@ -15,6 +15,8 @@ module EnjuCirculation
       def withdraw!
         circulation_status = CirculationStatus.where(name: 'Removed').first
         item.update_column(:circulation_status_id, circulation_status.id) if circulation_status
+        item.use_restriction = UseRestriction.where(name: 'Not For Loan').first
+        item.index!
       end
     end
   end

data/spec/dummy/app/assets/javascripts/application.js

@@ -1,9 +1,13 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
+//
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
+// compiled file.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
 //
-//= require jquery
-//= require jquery_ujs
 //= require_tree .

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,226 +1,5 @@
 # Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
-  include PictureFilesHelper if defined?(EnjuLibrary)
-  include EnjuManifestationViewer::ManifestationViewerHelper if defined?(EnjuManifestationViewer)
-
-  def form_icon(carrier_type)
-    case carrier_type.name
-    when 'print'
-      image_tag('icons/book.png', :size => '16x16', :alt => carrier_type.display_name.localize)
-    when 'CD'
-      image_tag('icons/cd.png', :size => '16x16', :alt => carrier_type.display_name.localize)
-    when 'DVD'
-      image_tag('icons/dvd.png', :size => '16x16', :alt => carrier_type.display_name.localize)
-    when 'file'
-      image_tag('icons/monitor.png', :size => '16x16', :alt => carrier_type.display_name.localize)
-    else
-      image_tag('icons/help.png', :size => '16x16', :alt => t('page.unknown'))
-    end
-  rescue NoMethodError
-    image_tag('icons/help.png', :size => '16x16', :alt => t('page.unknown'))
-  end
-
-  def content_type_icon(content_type)
-    case content_type.name
-    when 'text'
-      image_tag('icons/page_white_text.png', :size => '16x16', :alt => content_type.display_name.localize)
-    when 'picture'
-      image_tag('icons/picture.png', :size => '16x16', :alt => content_type.display_name.localize)
-    when 'sound'
-      image_tag('icons/sound.png', :size => '16x16', :alt => content_type.display_name.localize)
-    when 'video'
-      image_tag('icons/film.png', :size => '16x16', :alt => content_type.display_name.localize)
-    else
-      image_tag('icons/help.png', :size => '16x16', :alt => t('page.unknown'))
-    end
-  rescue NoMethodError
-    image_tag('icons/help.png', :size => '16x16', :alt => t('page.unknown'))
-  end
-
-  def patron_type_icon(patron_type)
-    case patron_type
-    when 'Person'
-      image_tag('icons/user.png', :size => '16x16', :alt => 'Person')
-    when 'CorporateBody'
-      image_tag('icons/group.png', :size => '16x16', :alt => 'CorporateBody')
-    else
-      image_tag('icons/help.png', :size => '16x16', :alt => t('page.unknown'))
-    end
-  end
-
-  def link_to_tag(tag)
-    link_to tag, manifestations_path(:tag => tag.name)
-  end
-
-  def render_tag_cloud(tags, options = {})
-    return nil if tags.nil?
-    # TODO: add options to specify different limits and sorts
-    #tags = Tag.all(:limit => 100, :order => 'taggings_count DESC').sort_by(&:name)
-
-    # TODO: add option to specify which classes you want and overide this if you want?
-    classes = %w(popular v-popular vv-popular vvv-popular vvvv-popular)
-
-    max, min = 0, 0
-    tags.each do |tag|
-      #if options[:max] or options[:min]
-      #  max = options[:max].to_i
-      #  min = options[:min].to_i
-      #end
-      max = tag.taggings.size if tag.taggings.size > max
-      min = tag.taggings.size if tag.taggings.size < min
-    end
-    divisor = ((max - min).div(classes.size)) + 1
-
-    content_tag :div, :class => "hTagcloud" do
-      content_tag :ul, :class => "popularity" do
-        tags.each do |tag|
-          content_tag :li do
-            link_to(tag.name, manifestations_path(:tag => tag.name), :class => classes[(tag.taggings.size - min).div(divisor)])
-          end
-        end
-      end
-    end
-  end
-
-  def patrons_list(patrons = [], options = {})
-    return nil if patrons.blank?
-    patrons_list = []
-    if options[:nolink]
-      patrons_list = patrons.map{|patron| patron.full_name}
-    else
-      patrons_list = patrons.map{|patron| link_to(patron.full_name, patron, options)}
-    end
-    patrons_list.join(" ").html_safe
-  end
-
-  def book_jacket(manifestation)
-    if manifestation.picture_files.exists?
-      link = ''
-      manifestation.picture_files.each_with_index do |picture_file, i|
-        if i == 0
-          link += link_to(show_image(picture_file, :size => :thumb), picture_file_path(picture_file, :format => :download), :rel => "manifestation_#{manifestation.id}")
-        else
-          link += content_tag :span, :style => "display: none" do
-            link_to(show_image(picture_file, :size => :thumb), picture_file_path(picture_file, :format => :download), :rel => "manifestation_#{manifestation.id}")
-          end
-        end
-      end
-      return link.html_safe
-    else
-      link = book_jacket_tag(manifestation)
-      unless link
-        link = screenshot_tag(manifestation)
-      end
-    end
-
-    unless link
-      link = link_to image_tag('unknown_resource.png', :width => '100', :height => '100', :alt => '*', :itemprop => 'image'), manifestation
-    end
-    link
-  end
-
-  def database_adapter
-    case ActiveRecord::Base.configurations["#{Rails.env}"]['adapter']
-    when 'postgresql'
-      link_to 'PostgreSQL', 'http://www.postgresql.org/'
-    when 'jdbcpostgresql'
-      link_to 'PostgreSQL', 'http://www.postgresql.org/'
-    when 'mysql'
-      link_to 'MySQL', 'http://www.mysql.org/'
-    when 'jdbcmysql'
-      link_to 'MySQL', 'http://www.mysql.org/'
-    when 'sqlite3'
-      link_to 'SQLite', 'http://www.sqlite.org/'
-    when 'jdbcsqlite3'
-      link_to 'SQLite', 'http://www.sqlite.org/'
-    end
-  end
-
-  def title_action_name
-    case controller.action_name
-    when 'index'
-      t('title.index')
-    when 'show'
-      t('title.show')
-    when 'new'
-      t('title.new')
-    when 'edit'
-      t('title.edit')
-    end
-  end
-
-  def link_to_wikipedia(string)
-    link_to "Wikipedia", "http://#{I18n.locale}.wikipedia.org/wiki/#{URI.escape(string)}"
-  end
-
-  def locale_display_name(locale)
-    Language.where(:iso_639_1 => locale).first.display_name
-  end
-
-  def locale_native_name(locale)
-    Language.where(:iso_639_1 => locale).first.native_name
-  end
-
-  def move_position(object)
-    render :partial => 'page/position', :locals => {:object => object}
-  end
-
-  def localized_state(state)
-    case state
-    when 'pending'
-      t('state.pending')
-    when 'canceled'
-      t('state.canceled')
-    when 'started'
-      t('state.started')
-    when 'failed'
-      t('state.failed')
-    when 'completed'
-      t('state.completed')
-    else
-      state
-    end
-  end
-
-  def localized_boolean(bool)
-    case bool.to_s
-    when nil
-    when "true"
-      t('page.boolean.true')
-    when "false"
-      t('page.boolean.false')
-    end
-  end
-
-  def current_user_role_name
-    current_user.try(:role).try(:name) || 'Guest'
-  end
-
-  def title(controller_name)
-    string = ''
-    unless ['page', 'routing_error', 'my_accounts'].include?(controller_name)
-      string << t("activerecord.models.#{controller_name.singularize}") + ' - '
-    end
-    if controller_name == 'routing_error'
-      string << t("page.routing_error") + ' - '
-    end
-    string << LibraryGroup.system_name + ' - Next-L Enju Leaf'
-    string.html_safe
-  end
-
-  def back_to_index(options = {})
-    if options == nil
-      options = {}
-    else
-      options.reject!{|key, value| value.blank?}
-      options.delete(:page) if options[:page].to_i == 1
-    end
-    unless controller_name == 'test'
-      link_to t('page.listing', :model => t("activerecord.models.#{controller_name.singularize}")), url_for(params.merge(:controller => controller_name, :action => :index, :id => nil, :only_path => true).merge(options))
-    end
-  end
-
-  def set_focus_on_search_form
-    javascript_tag("$('#search_form').focus()") if @query.blank?
-  end
+  include EnjuLeaf::EnjuLeafHelper
+  include EnjuBiblio::BiblioHelper if defined?(EnjuBiblio)
 end

data/spec/factories/checkout.rb

@@ -0,0 +1,9 @@
+FactoryGirl.define do
+  factory :checkout, :class => Checkout do |f|
+    f.due_date Time.zone.now.next_week
+    f.association :item, factory: :item
+    f.association :user, factory: :user
+    f.association :librarian, factory: :librarian
+    f.association :basket, factory: :basket
+  end
+end

data/spec/models/reserve_spec.rb

@@ -99,6 +99,13 @@ describe Reserve do
     reservation.reload
     assert reservation.should be_valid
   end
+
+  it "should be treated as Waiting" do
+    reserve = FactoryGirl.create(:reserve)
+    expect(Reserve.waiting).to include reserve
+    reserve = FactoryGirl.create(:reserve, expired_at: nil)
+    expect(Reserve.waiting).to include reserve
+  end
 end
 
 # == Schema Information

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

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe "checkouts/index" do
-  fixtures :users, :roles, :user_has_roles
+  fixtures :all
 
   before(:each) do
     view.extend EnjuLeaf::EnjuLeafHelper
@@ -16,6 +16,6 @@ describe "checkouts/index" do
   it "renders a list of checkouts" do
     render
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    rendered.should match(/これからの生命科学研究者のためのバイオ特許入門講座/)
+    assert_select "tr:nth-child(2)>td:nth-child(2)", /00001/
   end
 end

data/spec/views/profiles/show.html.erb_spec.rb

@@ -0,0 +1,19 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe "profiles/show" do
+  fixtures :all
+
+  before(:each) do
+    view.stub(:current_user).and_return(User.where(username: 'enjuadmin').first)
+    assign(:profile, User.where(username: 'enjuadmin').first.profile)
+  end
+
+  it "renders attributes in <p>" do
+    render
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    rendered.should match(/返却期限/)
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "tr:nth-child(2)>td:nth-child(2)", /00014/
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre48
+  version: 0.1.0.pre49
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-27 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_leaf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc20
+        version: 1.1.0.rc22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc20
+        version: 1.1.0.rc22
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: mobylette
-  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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -342,7 +328,9 @@ 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/profiles/_checkout_list.html.erb
 - app/views/profiles/_feed_token.html.erb
+- app/views/profiles/_submenu_checkout.html.erb
 - app/views/reserves/_form.html.erb
 - app/views/reserves/_new.html.erb
 - app/views/reserves/_new_user.html.erb
@@ -666,6 +654,7 @@ files:
 - spec/factories/basket.rb
 - spec/factories/carrier_type.rb
 - spec/factories/carrier_type_has_checkout_type.rb
+- spec/factories/checkout.rb
 - spec/factories/checkout_stat.rb
 - spec/factories/checkout_stat_has_manifestation.rb
 - spec/factories/checkout_stat_has_user.rb
@@ -762,6 +751,7 @@ files:
 - spec/views/checkouts/edit.html.erb_spec.rb
 - spec/views/checkouts/index.html.erb_spec.rb
 - spec/views/checkouts/show.html.erb_spec.rb
+- spec/views/profiles/show.html.erb_spec.rb
 - spec/views/reserves/index.html.erb_spec.rb
 - spec/views/use_restrictions/edit.html.erb_spec.rb
 - spec/views/use_restrictions/index.html.erb_spec.rb
@@ -1002,6 +992,7 @@ test_files:
 - spec/factories/basket.rb
 - spec/factories/carrier_type.rb
 - spec/factories/carrier_type_has_checkout_type.rb
+- spec/factories/checkout.rb
 - spec/factories/checkout_stat.rb
 - spec/factories/checkout_stat_has_manifestation.rb
 - spec/factories/checkout_stat_has_user.rb
@@ -1098,6 +1089,7 @@ test_files:
 - spec/views/checkouts/edit.html.erb_spec.rb
 - spec/views/checkouts/index.html.erb_spec.rb
 - spec/views/checkouts/show.html.erb_spec.rb
+- spec/views/profiles/show.html.erb_spec.rb
 - spec/views/reserves/index.html.erb_spec.rb
 - spec/views/use_restrictions/edit.html.erb_spec.rb
 - spec/views/use_restrictions/index.html.erb_spec.rb