enju_circulation 0.1.0.pre31 → 0.1.0.pre32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dedd68808f1e7f2e922af5529be97237a6aeefe2
-  data.tar.gz: f4d2cb455f03830eb8059167a47762ecde58af11
+  metadata.gz: 87e73feef512a6ef555f86982f59f541dbfd1efa
+  data.tar.gz: 0d66f70320f865bea09fb0f432327975fa8f4836
 SHA512:
-  metadata.gz: 74e721f2f556d8cd3d760bf45defb81504693e1b99cf636c6d5355969513985f0bb8e44bc7bf8402d02fa12fcd261a1b47fbdcce9429ddb1d09f3820ebb2849d
-  data.tar.gz: 8fd577120312b000da5151c4120e18ddce9180060be9191660a3e9e3ee87eee81ee44014ace44c29afac6995eafd64e7055b53553f82cfb566353d2c61092afc
+  metadata.gz: 98223a49ba2217082f9fb50dad9399474bbf6a1a0c6532a173cf7ac1d0703375c862077f58fd433a3bb068617abbe9aca5aaaa18d11e3e719fae8a10c0af0a20
+  data.tar.gz: 33e5f44becadde09fcd0bbffc840fcb9007abffa1bc7c0d4b0d1ae41e98cb8c5c93e1d25893b36b095d0473e78f35d5c407ae1d1986117f055583fa5dd8b699e

data/app/models/enju_circulation/ability.rb

@@ -8,6 +8,9 @@ module EnjuCirculation
         can [:destroy, :delete], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.series_master? and !manifestation.is_reserved?
         end
+        can [:destroy, :delete], Item do |item|
+          true if item.removable?
+        end
         can :manage, [
           Basket,
           CarrierTypeHasCheckoutType,
@@ -38,7 +41,7 @@ module EnjuCirculation
         can [:destroy, :delete], LendingPolicy
       when 'Librarian'
         can [:destroy, :delete], Item do |item|
-          item.checkouts.not_returned.empty?
+          true if item.removable?
         end
         can [:destroy, :delete], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.series_master? and !manifestation.is_reserved?

data/app/models/reserve.rb

@@ -318,7 +318,7 @@ class Reserve < ActiveRecord::Base
 
   def checked_out_now?
     if user and manifestation
-      true if !(user.checkouts.not_returned.pluck(:item_id) & manifestation.items.pluck(:item_id)).empty?
+      true if !(user.checkouts.not_returned.pluck(:item_id) & manifestation.items.pluck('items.id')).empty?
     end
   end
 
@@ -337,7 +337,7 @@ class Reserve < ActiveRecord::Base
 
       expired_period = manifestation.try(:reservation_expired_period, user)
       if expired_period.nil?
-        errors[:base] << I18n.t('reserve.this_agent_cannot_reserve')
+        errors[:base] << I18n.t('reserve.this_patron_cannot_reserve')
       end
     end
   end

data/app/models/use_restriction.rb

@@ -1,10 +1,20 @@
 class UseRestriction < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
-  include MasterModel
-  default_scope :order => 'use_restrictions.position'
-  scope :available, where(:name => ['Not For Loan', 'Limited Circulation, Normal Loan Period'])
+  #include MasterModel
+  acts_as_list
+  validates :name, :presence => true, :format => {:with => /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/}
+  validates :display_name, :presence => true
+  before_validation :set_display_name, :on => :create
+  normalize_attributes :name
+
+  default_scope {order('use_restrictions.position')}
+  scope :available, -> {where(:name => ['Not For Loan', 'Limited Circulation, Normal Loan Period'])}
   has_many :item_has_use_restrictions
   has_many :items, :through => :item_has_use_restrictions
+
+  def set_display_name
+    self.display_name = "#{I18n.locale}: #{name}" if display_name.blank?
+  end
 end
 
 # == Schema Information

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

@@ -9,17 +9,19 @@
 <%- @checkins.each_with_index do |checkin, i| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%= render 'manifestations/show_index', :manifestation => checkin.item.manifestation if checkin.item.manifestation -%>
+      <%= render 'manifestations/show_index', :manifestation => checkin.item.manifestation if checkin.item.try(:manifestation) -%>
     </td>
     <td>
-      <%= link_to checkin.item.item_identifier, checkin.item -%>
-      <br />
-      (<%= link_to checkin.item.shelf.library.display_name.localize, checkin.item.shelf.library %>)
-      <% if defined?(EnjuInterLibraryLoan) %>
+      <% if checkin.item %>
+        <%= link_to checkin.item.item_identifier, checkin.item -%>
         <br />
-        <%- unless checkin.item.shelf.library == current_user.library -%>
-          <span style="color: red"><%= link_to t('activerecord.models.inter_library_loan'), item_inter_library_loans_path(checkin.item) -%></span>
-        <%- end -%>
+        (<%= link_to checkin.item.shelf.library.display_name.localize, checkin.item.shelf.library %>)
+        <% if defined?(EnjuInterLibraryLoan) %>
+          <br />
+          <%- unless checkin.item.shelf.library == current_user.library -%>
+            <span style="color: red"><%= link_to t('activerecord.models.inter_library_loan'), item_inter_library_loans_path(checkin.item) -%></span>
+          <%- end -%>
+        <% end %>
       <% end %>
     </td>
     <td>

data/lib/enju_circulation/item.rb

@@ -34,7 +34,7 @@ module EnjuCirculation
         scope :removed, includes(:circulation_status).where('circulation_statuses.name' => 'Removed')
         has_many :checkouts
         has_many :reserves
-        has_many :checked_items, :dependent => :destroy
+        has_many :checked_items
         has_many :baskets, :through => :checked_items
         belongs_to :circulation_status, :validate => true
         belongs_to :checkout_type

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre31"
+  VERSION = "0.1.0.pre32"
 end

data/lib/generators/enju_circulation/setup/templates/config/schedule.rb

@@ -1,17 +1,17 @@
 
 every 5.minute do
-  rake "enju:message:send"
+  rake "enju_message:send"
 end
 
 every 1.day, :at => '0:00 am' do
-  rake "enju:circulation:expire"
+  rake "enju_circulation:expire"
   runner "User.lock_expired_users"
 end
 
 every 1.day, :at => '1:00 am' do
-  rake "enju:circulation:stat"
+  rake "enju_circulation:stat"
 end
 
 every 1.day, :at => '5:00 am' do
-  rake "enju:circulation:send_notification"
+  rake "enju_circulation:send_notification"
 end

data/lib/tasks/enju_circulation_tasks.rake

@@ -1,6 +1,6 @@
 require 'active_record/fixtures'
-desc "create initial records for enju_circulation"
 namespace :enju_circulation do
+  desc "create initial records for enju_circulation"
   task :setup => :environment do
     Dir.glob(Rails.root.to_s + '/db/fixtures/enju_circulation/*.yml').each do |file|
       ActiveRecord::Fixtures.create_fixtures('db/fixtures/enju_circulation', File.basename(file, '.*'))
@@ -11,4 +11,24 @@ namespace :enju_circulation do
 
     puts 'initial fixture files loaded.'
   end
+
+  desc 'Calculate stats'
+  task :stat => :environment do
+    UserCheckoutStat.calculate_stat
+    UserReserveStat.calculate_stat
+    ManifestationCheckoutStat.calculate_stat
+    ManifestationReserveStat.calculate_stat
+  end
+
+  desc 'Expire circulations and reservations'
+  task :expire => :environment do
+    Reserve.expire
+    Basket.expire
+  end
+
+  desc 'Sending due date notifications'
+  task :send_notification => :environment do
+    Checkout.send_due_date_notification
+    Checkout.send_overdue_notification
+  end
 end

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 = '7e21095c77c61417503b0b32ffe9ae8728eb3c689bce8a45562cbc2c1903d9ab177f6e902f2c97a1cdfe07a6f6459f06bf3fdd975ccebd72fa722489909836fc'
+
   # ==> 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/solr/conf/schema.xml

@@ -64,6 +64,7 @@
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.StandardFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.PorterStemFilterFactory"/>
       </analyzer>
     </fieldType>
     <!-- *** This fieldType is used by Sunspot! *** -->
@@ -84,11 +85,14 @@
     <fieldType name="tfloat" class="solr.TrieFloatField" omitNorms="true"/>
     <!-- *** This fieldType is used by Sunspot! *** -->
     <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true"/>
+
+    <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
+    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
   </types>
   <fields>
     <!-- Valid attributes for fields:
      name: mandatory - the name for the field
-     type: mandatory - the name of a previously defined type from the 
+     type: mandatory - the name of a previously defined type from the
        <types> section
      indexed: true if this field should be indexed (searchable or sortable)
      stored: true if this field should be retrievable
@@ -223,8 +227,21 @@
     <dynamicField name="*_ets" stored="true" termVectors="true" type="tdouble" multiValued="false" indexed="true"/>
     <!-- *** This dynamicField is used by Sunspot! *** -->
     <dynamicField name="*_etms" stored="true" termVectors="true" type="tdouble" multiValued="true" indexed="true"/>
+
+    <!-- Type used to index the lat and lon components for the "location" FieldType -->
+    <dynamicField name="*_coordinate"  type="tdouble" indexed="true"  stored="false" multiValued="false"/>
+    <dynamicField name="*_p" type="location" indexed="true" stored="true" multiValued="false"/>
+
+    <dynamicField name="*_ll" stored="false" type="location" multiValued="false" indexed="true"/>
+    <dynamicField name="*_llm" stored="false" type="location" multiValued="true" indexed="true"/>
+    <dynamicField name="*_lls" stored="true" type="location" multiValued="false" indexed="true"/>
+    <dynamicField name="*_llms" stored="true" type="location" multiValued="true" indexed="true"/>
+    
+    <!-- required by Solr 4 -->
+    <field name="_version_" type="string" indexed="true" stored="true" multiValued="false" />
   </fields>
-  <!-- Field to use to determine and enforce document uniqueness. 
+  
+  <!-- Field to use to determine and enforce document uniqueness.
       Unless this field is marked with required="false", it will be a required field
    -->
   <uniqueKey>id</uniqueKey>