enju_circulation 0.1.0.pre16 → 0.1.0.pre17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f86efed31c18ea347f1658523aab6bd370f1841
-  data.tar.gz: 61f456e339046fd324677c83eb51d1c87184919a
+  metadata.gz: fec219b16955e4c0948c4eac32f42d0eb65853db
+  data.tar.gz: a06d2a6379e17f5b5ac6834d5078781204ffa9a0
 SHA512:
-  metadata.gz: 49d8ab628ce347d257b9f20eac121778fbf0a71b27087aa3aa38093519881406206a8f8744d1e387c0ad122d1087dd4c2fd0eeb70d1943da1662df84b8435991
-  data.tar.gz: 65f319e166213426075e0c833144bae589d1301980143ca532407ded3e60fccaa6586196b8723d82e7f66bd29a32f8029aa58429d4f371b9a8c54f8e681f2f9f
+  metadata.gz: da8dc3e8fb1e4e029dcef94f6417d23c26f8383a5e530a0e3899a7f6f5e63d9f9472b70d6669bca0afd5493e6d2e41898006f611c7a4c68dd8dd8ba959fc3f73
+  data.tar.gz: 843ba68dff6dd627473e2adf95bf310ae6a59a742fecc8c2cc35f2d7a801af76e122ff8c77b7444f43e4f72d1495f25053703797d626b77e39cee87412fa4d1c

data/app/controllers/reserves_controller.rb

@@ -157,14 +157,15 @@ 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
@@ -194,7 +195,7 @@ class ReservesController < ApplicationController
       if @reserve.user != current_user
         access_denied; return
       end
-      @reserve.assign_attributes(params[:reserve], :as => :user_update)
+      @reserve.assign_attributes(params[:reserve], :as => :user)
     end
 
     if @reserve.valid?

data/app/models/reserve.rb

@@ -1,7 +1,6 @@
 # -*- encoding: utf-8 -*-
 class Reserve < ActiveRecord::Base
-  attr_accessible :manifestation_id, :user_number, :expired_at
-  attr_accessible :expired_at, :as => :user_update
+  attr_accessible :manifestation_id, :user_number, :expired_at, :as => :user
   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/config/locales/translation_en.yml

@@ -47,6 +47,7 @@ en:
         postponed_at: Postponed at
         state: State
         force_retaining: Force retaining
+        item_identifier: Item identifier
       checkout_type:
         name: Name
         display_name: Display name

data/config/locales/translation_ja.yml

@@ -45,6 +45,7 @@ ja:
         postponed_at: 取置取消時刻
         state: 状態
         force_retaining: 強制的に取り置きを行う
+        item_identifier: 個別資料ID
       checkout_type:
         name: 名前
         display_name: 表示名

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre16"
+  VERSION = "0.1.0.pre17"
 end

data/lib/generators/enju_circulation/setup/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Explain the generator
+
+Example:
+    rails generate setup Thing
+
+    This will create:
+        what/will/it/create

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

@@ -0,0 +1,8 @@
+class EnjuCirculation::SetupGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+
+  def copy_setup_files
+    directory("db/fixtures", "db/fixtures/enju_circulation")
+    rake("enju_circulation_engine:install:migrations")
+  end
+end

data/lib/generators/enju_circulation/setup/templates/db/fixtures/carrier_type_has_checkout_types.yml

@@ -0,0 +1,8 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+carrier_type_has_checkout_type_00001:
+  id: 1
+  carrier_type_id: 1
+  checkout_type_id: 1
+  note: 
+  position: 1

data/lib/generators/enju_circulation/setup/templates/db/fixtures/carrier_types.yml

@@ -0,0 +1,29 @@
+--- 
+carrier_type_00004: 
+  name: file  
+  display_name: "en: file\r\n\
+    ja: コンピュータファイル"
+  id: 4
+  note:
+  position: 4
+carrier_type_00001: 
+  name: print  
+  display_name: "en: print\r\n\
+    ja: 印刷物"
+  id: 1
+  note: !binary |
+  position: 1
+carrier_type_00002: 
+  name: CD  
+  display_name: "en: CD\r\n\
+    ja: CD"
+  id: 2
+  note: 
+  position: 2
+carrier_type_00003: 
+  name: DVD  
+  display_name: "en: DVD\r\n\
+    ja: DVD"
+  id: 3
+  note: 
+  position: 3

data/lib/generators/enju_circulation/setup/templates/db/fixtures/checkout_types.yml

@@ -0,0 +1,22 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+checkout_type_00001:
+  id: 1
+  name: book
+  display_name: "en: Book\r\n\
+    ja: 図書"
+  note: 
+  position: 1
+checkout_type_00002:
+  id: 2
+  name: serial
+  display_name: "en: Serial\r\n\
+    ja: 定期刊行物"
+  note: 
+  position: 2
+checkout_type_00003:
+  id: 3
+  name: cd
+  display_name: CD
+  note: 
+  position: 3

data/lib/generators/enju_circulation/setup/templates/db/fixtures/circulation_statuses.yml

@@ -0,0 +1,106 @@
+--- 
+circulation_status_00001: 
+  name: Available For Pickup  
+  display_name: "en: Available For Pickup\r\n\
+    ja: 持ち出し可能"
+  id: 1
+  note: ""
+  position: 1
+circulation_status_00002: 
+  name: Available On Shelf  
+  display_name: "en: Available on Shelf\r\n\
+    ja: 在架（利用可能）"
+  id: 2
+  note: ""
+  position: 2
+circulation_status_00003: 
+  name: Circulation Status Undefined  
+  display_name: Circulation Status Undefined
+  id: 3
+  note: ""
+  position: 3
+circulation_status_00004: 
+  name: Claimed Returned Or Never Borrowed  
+  display_name: Claimed Returned Or Never Borrowed
+  id: 4
+  note: ""
+  position: 4
+circulation_status_00005: 
+  name: In Process  
+  display_name: "en: In Process\r\n\
+    ja: 作業中"
+  id: 5
+  note: ""
+  position: 5
+circulation_status_00006: 
+  name: In Transit Between Library Locations  
+  display_name: In Transit Between Library Locations
+  id: 6
+  note: ""
+  position: 6
+circulation_status_00007: 
+  name: Lost  
+  display_name: "en: Lost\r\n\
+    ja: 紛失"
+  id: 7
+  note: ""
+  position: 7
+circulation_status_00008: 
+  name: Missing  
+  display_name: "en: Missing\r\n\
+    ja: 行方不明"
+  id: 8
+  note: ""
+  position: 8
+circulation_status_00009: 
+  name: Not Available  
+  display_name: "en: Not Available\r\n\
+    ja: 利用不可"
+  id: 9
+  note: ""
+  position: 9
+circulation_status_00010: 
+  name: On Loan  
+  display_name: "en: On Loan\r\n\
+    ja: 貸出中"
+  id: 10
+  note: ""
+  position: 10
+circulation_status_00011: 
+  name: On Order  
+  display_name: On Order
+  id: 11
+  note: ""
+  position: 11
+circulation_status_00012: 
+  name: Pending Transfer  
+  display_name: Pending Transfer
+  id: 12
+  note: ""
+  position: 12
+circulation_status_00013: 
+  name: Recalled  
+  display_name: Recalled
+  id: 13
+  note: ""
+  position: 13
+circulation_status_00014: 
+  name: Waiting To Be Reshelved  
+  display_name: Waiting To Be Reshelved
+  id: 14
+  note: ""
+  position: 14
+circulation_status_00015: 
+  name: Not arrived
+  display_name: "en: Not arrived\r\n\
+    ja: 未着"
+  id: 15
+  note: ""
+  position: 15
+circulation_status_00016: 
+  name: Removed
+  display_name: "en: Removed\r\n\
+    ja: 除籍済み"
+  id: 16
+  note: ""
+  position: 16

data/lib/generators/enju_circulation/setup/templates/db/fixtures/use_restrictions.yml

@@ -0,0 +1,79 @@
+--- 
+use_restriction_00001: 
+  name: Available For Supply Without Return  
+  display_name: Available For Supply Without Return
+  id: 1
+  position: 1
+  note: ""
+use_restriction_00002: 
+  name: In Library Use Only  
+  display_name: "en: In Library Use Only\r\nja: 館内利用のみ可"
+  id: 2
+  position: 2
+  note: ""
+use_restriction_00003: 
+  name: Limited Circulation, Long Loan Period  
+  display_name: "en: Limited Circulation, Long Loan Period\r\nja: 長期期間貸出"
+  id: 3
+  position: 3
+  note: ""
+use_restriction_00004: 
+  name: Limited Circulation, Normal Loan Period  
+  display_name: "en: Limited Circulation, Normal Loan Period\r\nja: 通常期間貸出"
+  id: 4
+  position: 4
+  note: ""
+use_restriction_00005: 
+  name: Limited Circulation, Short Loan Period  
+  display_name: "en: Limited Circulation, Short Loan Period\r\nja: 短期期間貸出"
+  id: 5
+  position: 5
+  note: ""
+use_restriction_00006: 
+  name: No Reproduction  
+  display_name: No Reproduction
+  id: 6
+  position: 6
+  note: ""
+use_restriction_00007: 
+  name: Not For Loan  
+  display_name: "en: Not For Loan\r\nja: 貸出不可"
+  id: 7
+  position: 7
+  note: ""
+use_restriction_00008: 
+  name: Overnight Only  
+  display_name: "en: Overnight Only\r\nja: 一夜貸出のみ"
+  id: 8
+  position: 8
+  note: ""
+use_restriction_00009: 
+  name: Renewals Not Permitted  
+  display_name: Renewals Not Permitted
+  id: 9
+  position: 9
+  note: ""
+use_restriction_00010: 
+  name: Supervision Required  
+  display_name: Supervision Required
+  id: 10
+  position: 10
+  note: ""
+use_restriction_00011: 
+  name: Term Loan  
+  display_name: Term Loan
+  id: 11
+  position: 11
+  note: ""
+use_restriction_00012: 
+  name: Use Only In Controlled Access  
+  display_name: Use Only In Controlled Access
+  id: 12
+  position: 12
+  note: ""
+use_restriction_00013: 
+  name: User Signature Required  
+  display_name: User Signature Required
+  id: 13
+  position: 13
+  note: ""

data/lib/tasks/enju_circulation_tasks.rake

@@ -1,8 +1,9 @@
 require 'active_record/fixtures'
-desc "copy fixtures for enju_circulation"
-task :enju_circulation => :environment do
-  path = File.expand_path(File.dirname(__FILE__)) + '/../../db/fixtures/'
-  Dir.glob(path + '*.yml').each do |file|
-    ActiveRecord::Fixtures.create_fixtures(path, File.basename(file, '.*'))
+desc "create initial records for enju_circulation"
+namespace :enju_circulation do
+  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, '.*'))
+    end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre16
+  version: 0.1.0.pre17
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: enju_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13.rc2
+        version: 0.1.0.pre4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13.rc2
+        version: 0.1.0.pre4
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre4
+        version: 0.1.14.pre6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre4
+        version: 0.1.14.pre6
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre6
+        version: 0.1.17.pre8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre6
+        version: 0.1.17.pre8
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -170,42 +170,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre23
+        version: 0.1.0.pre28
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre23
+        version: 0.1.0.pre28
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre11
+        version: 0.1.0.pre15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre11
+        version: 0.1.0.pre15
 - !ruby/object:Gem::Dependency
   name: enju_export
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1.pre2
+        version: 0.1.1.pre3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1.pre2
+        version: 0.1.1.pre3
 - !ruby/object:Gem::Dependency
   name: mobylette
   requirement: !ruby/object:Gem::Requirement
@@ -459,6 +459,13 @@ files:
 - lib/enju_circulation/user_group.rb
 - lib/enju_circulation/version.rb
 - lib/enju_circulation.rb
+- lib/generators/enju_circulation/setup/setup_generator.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
@@ -613,16 +620,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/_12z.fdt
-- spec/dummy/solr/data/test/index/_12z.fdx
-- spec/dummy/solr/data/test/index/_12z.fnm
-- spec/dummy/solr/data/test/index/_12z.frq
-- spec/dummy/solr/data/test/index/_12z.nrm
-- spec/dummy/solr/data/test/index/_12z.prx
-- spec/dummy/solr/data/test/index/_12z.tii
-- spec/dummy/solr/data/test/index/_12z.tis
+- spec/dummy/solr/data/test/index/_1bn.fdt
+- spec/dummy/solr/data/test/index/_1bn.fdx
+- spec/dummy/solr/data/test/index/_1bn.fnm
+- spec/dummy/solr/data/test/index/_1bn.frq
+- spec/dummy/solr/data/test/index/_1bn.nrm
+- spec/dummy/solr/data/test/index/_1bn.prx
+- spec/dummy/solr/data/test/index/_1bn.tii
+- spec/dummy/solr/data/test/index/_1bn.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_261
+- spec/dummy/solr/data/test/index/segments_2nd
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb
@@ -886,16 +893,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/_12z.fdt
-- spec/dummy/solr/data/test/index/_12z.fdx
-- spec/dummy/solr/data/test/index/_12z.fnm
-- spec/dummy/solr/data/test/index/_12z.frq
-- spec/dummy/solr/data/test/index/_12z.nrm
-- spec/dummy/solr/data/test/index/_12z.prx
-- spec/dummy/solr/data/test/index/_12z.tii
-- spec/dummy/solr/data/test/index/_12z.tis
+- spec/dummy/solr/data/test/index/_1bn.fdt
+- spec/dummy/solr/data/test/index/_1bn.fdx
+- spec/dummy/solr/data/test/index/_1bn.fnm
+- spec/dummy/solr/data/test/index/_1bn.frq
+- spec/dummy/solr/data/test/index/_1bn.nrm
+- spec/dummy/solr/data/test/index/_1bn.prx
+- spec/dummy/solr/data/test/index/_1bn.tii
+- spec/dummy/solr/data/test/index/_1bn.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_261
+- spec/dummy/solr/data/test/index/segments_2nd
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb