enju_circulation 0.1.0.pre20 → 0.1.0.pre21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aee29af855e1d49a7969170b8f00a5119f7348b
-  data.tar.gz: 2c8ee71e38e9ce51ed8487e1e8894bb08dc80667
+  metadata.gz: 42fe7716b2a15ef1abfbde1049347750372529a8
+  data.tar.gz: 83ebb3332694c8c2353f279c238592c730f3a16f
 SHA512:
-  metadata.gz: 91e698af183d91d3caf3873f05f88553447205225aa20c130bba7e1a154dbcccff1e7a40f1e70008f1017319bfcdea831886dd98b82972f70d7df4644ea9428d
-  data.tar.gz: a29d453833b5bb7379ed79ea292d60d37fb7b1c5864a152feb9a2ccb766eda580dbb04ed2ac8d13dc3b18fc8abae7a54bd6cbf64b79375ed1601af02d1b2290d
+  metadata.gz: 013dc7a2bc51b2aa8a0b262432328f5f997d2c9da07f84c2ba260bb50f43be14dd82a62f5a4c111bfedfd398f5b8ea81cbbcbae622b04ed8d00e64129fa11598
+  data.tar.gz: 6ab8cb1e0a9e4c4d551915d469dbfadc219d38970c0644623611a2b5e9a37fe334627b52dea7fb052d71e5c479d3218e151897a1c77880c9ea31b200dde60e30

data/app/controllers/reserves_controller.rb

@@ -157,15 +157,14 @@ class ReservesController < ApplicationController
   # POST /reserves
   # POST /reserves.json
   def create
+    @reserve = Reserve.new(params[:reserve])
+    @reserve.set_user
+
     if current_user.has_role?('Librarian')
-      @reserve = Reserve.new(params[:reserve], :as => :admin)
-      @reserve.set_user
       unless @reserve.user
         @reserve.user = @user
       end
     else
-      @reserve = Reserve.new(params[:reserve], :as => :user)
-      @reserve.set_user
       if @reserve.user != current_user
         if @user != current_user
           access_denied; return
@@ -195,7 +194,7 @@ class ReservesController < ApplicationController
       if @reserve.user != current_user
         access_denied; return
       end
-      @reserve.assign_attributes(params[:reserve], :as => :user)
+      @reserve.assign_attributes(params[:reserve], :as => :user_update)
     end
 
     if @reserve.valid?

data/app/models/reserve.rb

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 class Reserve < ActiveRecord::Base
-  attr_accessible :manifestation_id, :user_number, :expired_at, :as => :user
+  attr_accessible :manifestation_id, :user_number, :expired_at
+  attr_accessible :expired_at, :as => :user_update
   attr_accessible :manifestation_id, :item_identifier, :user_number,
     :expired_at, :request_status_type, :canceled_at, :checked_out_at,
     :expiration_notice_to_patron, :expiration_notice_to_library, :item_id,

data/db/migrate/20130416054135_add_circulation_status_id_to_item.rb

@@ -0,0 +1,8 @@
+class AddCirculationStatusIdToItem < ActiveRecord::Migration
+  def change
+    add_column :items, :circulation_status_id, :integer, :default => 5, :null => false
+    add_column :items, :checkout_type_id, :integer, :default => 1, :null => false
+    add_index :items, :circulation_status_id
+    add_index :items, :checkout_type_id
+  end
+end

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre20"
+  VERSION = "0.1.0.pre21"
 end

data/lib/generators/enju_circulation/setup/setup_generator.rb

@@ -10,5 +10,6 @@ class EnjuCirculation::SetupGenerator < Rails::Generators::Base
       "  enju_circulation\n", :after => "enju_library\n"
     inject_into_file 'app/models/user.rb',
       "  enju_circulation_user_model\n", :after => "enju_leaf_user_model\n"
+    append_to_file("config/schedule.rb", File.open(File.expand_path('../templates', __FILE__) + '/config/schedule.rb').read)
   end
 end

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

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

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

@@ -1,7 +1,6 @@
 # Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
   include PictureFilesHelper if defined?(EnjuLibrary)
-  include EnjuBookJacket::BookJacketHelper if defined?(EnjuBookJacket)
   include EnjuManifestationViewer::ManifestationViewerHelper if defined?(EnjuManifestationViewer)
 
   def form_icon(carrier_type)

data/spec/dummy/db/migrate/006_create_items.rb

@@ -4,8 +4,6 @@ class CreateItems < ActiveRecord::Migration
       #t.integer :manifestation_id
       t.string :call_number
       t.string :item_identifier
-      t.integer :circulation_status_id, :default => 5, :null => false
-      t.integer :checkout_type_id, :default => 1, :null => false
       t.timestamps
       t.datetime :deleted_at
       t.integer :shelf_id, :default => 1, :null => false
@@ -22,8 +20,6 @@ class CreateItems < ActiveRecord::Migration
       t.integer :required_score, :default => 0, :null => false
     end
     #add_index :items, :manifestation_id
-    add_index :items, :circulation_status_id
-    add_index :items, :checkout_type_id
     add_index :items, :shelf_id
     add_index :items, :item_identifier
     add_index :items, :required_role_id

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130304015019) do
+ActiveRecord::Schema.define(:version => 20130416054135) do
 
   create_table "baskets", :force => true do |t|
     t.integer  "user_id"
@@ -242,8 +242,6 @@ ActiveRecord::Schema.define(:version => 20130304015019) do
   create_table "items", :force => true do |t|
     t.string   "call_number"
     t.string   "item_identifier"
-    t.integer  "circulation_status_id",       :default => 5,     :null => false
-    t.integer  "checkout_type_id",            :default => 1,     :null => false
     t.datetime "created_at",                                     :null => false
     t.datetime "updated_at",                                     :null => false
     t.datetime "deleted_at"
@@ -260,6 +258,8 @@ ActiveRecord::Schema.define(:version => 20130304015019) do
     t.string   "state"
     t.integer  "required_score",              :default => 0,     :null => false
     t.datetime "acquired_at"
+    t.integer  "circulation_status_id",       :default => 5,     :null => false
+    t.integer  "checkout_type_id",            :default => 1,     :null => false
   end
 
   add_index "items", ["checkout_type_id"], :name => "index_items_on_checkout_type_id"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre20
+  version: 0.1.0.pre21
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_core
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre7
+        version: 0.1.14.pre8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre7
+        version: 0.1.14.pre8
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre11
+        version: 0.1.17.pre12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre11
+        version: 0.1.17.pre12
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre30
+        version: 0.1.0.pre31
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre30
+        version: 0.1.0.pre31
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1.pre3
+        version: 0.1.1.pre4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1.pre3
+        version: 0.1.1.pre4
 - !ruby/object:Gem::Dependency
   name: mobylette
   requirement: !ruby/object:Gem::Requirement
@@ -450,6 +450,7 @@ files:
 - db/migrate/20130303104849_add_state_index_to_reserve.rb
 - db/migrate/20130303124821_add_retained_at_to_reserve.rb
 - db/migrate/20130304015019_add_postponed_at_to_reserve.rb
+- db/migrate/20130416054135_add_circulation_status_id_to_item.rb
 - lib/enju_circulation/controller.rb
 - lib/enju_circulation/engine.rb
 - lib/enju_circulation/helper.rb
@@ -460,13 +461,13 @@ files:
 - lib/enju_circulation/version.rb
 - lib/enju_circulation.rb
 - lib/generators/enju_circulation/setup/setup_generator.rb
+- lib/generators/enju_circulation/setup/templates/config/schedule.rb
 - lib/generators/enju_circulation/setup/templates/db/fixtures/carrier_type_has_checkout_types.yml
 - lib/generators/enju_circulation/setup/templates/db/fixtures/carrier_types.yml
 - lib/generators/enju_circulation/setup/templates/db/fixtures/checkout_types.yml
 - lib/generators/enju_circulation/setup/templates/db/fixtures/circulation_statuses.yml
 - lib/generators/enju_circulation/setup/templates/db/fixtures/use_restrictions.yml
 - lib/generators/enju_circulation/setup/USAGE
-- lib/generators/enju_circulation/views_generator.rb
 - lib/tasks/enju_circulation_tasks.rake
 - MIT-LICENSE
 - Rakefile
@@ -622,16 +623,16 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_1cq.fdt
-- spec/dummy/solr/data/test/index/_1cq.fdx
-- spec/dummy/solr/data/test/index/_1cq.fnm
-- spec/dummy/solr/data/test/index/_1cq.frq
-- spec/dummy/solr/data/test/index/_1cq.nrm
-- spec/dummy/solr/data/test/index/_1cq.prx
-- spec/dummy/solr/data/test/index/_1cq.tii
-- spec/dummy/solr/data/test/index/_1cq.tis
+- spec/dummy/solr/data/test/index/_1fz.fdt
+- spec/dummy/solr/data/test/index/_1fz.fdx
+- spec/dummy/solr/data/test/index/_1fz.fnm
+- spec/dummy/solr/data/test/index/_1fz.frq
+- spec/dummy/solr/data/test/index/_1fz.nrm
+- spec/dummy/solr/data/test/index/_1fz.prx
+- spec/dummy/solr/data/test/index/_1fz.tii
+- spec/dummy/solr/data/test/index/_1fz.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_2pj
+- spec/dummy/solr/data/test/index/segments_2w1
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb
@@ -897,16 +898,16 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_1cq.fdt
-- spec/dummy/solr/data/test/index/_1cq.fdx
-- spec/dummy/solr/data/test/index/_1cq.fnm
-- spec/dummy/solr/data/test/index/_1cq.frq
-- spec/dummy/solr/data/test/index/_1cq.nrm
-- spec/dummy/solr/data/test/index/_1cq.prx
-- spec/dummy/solr/data/test/index/_1cq.tii
-- spec/dummy/solr/data/test/index/_1cq.tis
+- spec/dummy/solr/data/test/index/_1fz.fdt
+- spec/dummy/solr/data/test/index/_1fz.fdx
+- spec/dummy/solr/data/test/index/_1fz.fnm
+- spec/dummy/solr/data/test/index/_1fz.frq
+- spec/dummy/solr/data/test/index/_1fz.nrm
+- spec/dummy/solr/data/test/index/_1fz.prx
+- spec/dummy/solr/data/test/index/_1fz.tii
+- spec/dummy/solr/data/test/index/_1fz.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_2pj
+- spec/dummy/solr/data/test/index/segments_2w1
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb

data/lib/generators/enju_circulation/views_generator.rb

@@ -1,38 +0,0 @@
-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