enju_circulation 0.1.0.pre37 → 0.1.0.pre38

Sign up to get free protection for your applications and to get access to all the features.
Files changed (61) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/checked_items_controller.rb +3 -3
  3. data/app/controllers/checkins_controller.rb +2 -2
  4. data/app/controllers/checkout_types_controller.rb +2 -2
  5. data/app/controllers/circulation_statuses_controller.rb +75 -4
  6. data/app/controllers/lending_policies_controller.rb +72 -2
  7. data/app/controllers/use_restrictions_controller.rb +75 -4
  8. data/app/models/checkin.rb +1 -1
  9. data/app/models/checkout.rb +1 -1
  10. data/app/models/circulation_status.rb +1 -5
  11. data/app/models/reserve.rb +6 -6
  12. data/app/models/use_restriction.rb +1 -5
  13. data/app/views/checked_items/_list.html.erb +2 -2
  14. data/app/views/checked_items/edit.html.erb +1 -1
  15. data/app/views/checked_items/show.html.erb +1 -1
  16. data/app/views/checkins/_list.html.erb +1 -1
  17. data/app/views/checkout_types/index.html.erb +16 -13
  18. data/app/views/checkouts/_index_user.html.erb +1 -1
  19. data/app/views/circulation_statuses/index.html.erb +12 -4
  20. data/app/views/use_restrictions/index.html.erb +13 -5
  21. data/config/routes.rb +3 -6
  22. data/lib/enju_circulation/version.rb +1 -1
  23. data/spec/controllers/checked_items_controller_spec.rb +7 -7
  24. data/spec/controllers/checkins_controller_spec.rb +5 -5
  25. data/spec/dummy/db/development.sqlite3 +0 -0
  26. data/spec/dummy/db/schema.rb +0 -2
  27. data/spec/dummy/db/test.sqlite3 +0 -0
  28. data/spec/dummy/solr/default/data/index/_7tr.fdt +0 -0
  29. data/spec/dummy/solr/default/data/index/{_7f0.fdx → _7tr.fdx} +0 -0
  30. data/spec/dummy/solr/default/data/index/{_7f0.fnm → _7tr.fnm} +0 -0
  31. data/spec/dummy/solr/default/data/index/{_7f0.nvd → _7tr.nvd} +0 -0
  32. data/spec/dummy/solr/default/data/index/{_7f0.nvm → _7tr.nvm} +0 -0
  33. data/spec/dummy/solr/default/data/index/{_7f0.si → _7tr.si} +0 -0
  34. data/spec/dummy/solr/default/data/index/{_7f0_Lucene41_0.doc → _7tr_Lucene41_0.doc} +0 -0
  35. data/spec/dummy/solr/default/data/index/{_7f0_Lucene41_0.pos → _7tr_Lucene41_0.pos} +0 -0
  36. data/spec/dummy/solr/default/data/index/{_7f0_Lucene41_0.tim → _7tr_Lucene41_0.tim} +0 -0
  37. data/spec/dummy/solr/default/data/index/{_7f0_Lucene41_0.tip → _7tr_Lucene41_0.tip} +0 -0
  38. data/spec/dummy/solr/default/data/index/segments.gen +0 -0
  39. data/spec/dummy/solr/default/data/index/segments_cjn +0 -0
  40. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000015396 → tlog.0000000000000016249} +0 -0
  41. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000016250 +0 -0
  42. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000015394 → tlog.0000000000000016251} +0 -0
  43. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000016252 +0 -0
  44. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000015402 → tlog.0000000000000016253} +0 -0
  45. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000016254 +0 -0
  46. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000015400 → tlog.0000000000000016255} +0 -0
  47. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000016256 +0 -0
  48. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000015398 → tlog.0000000000000016257} +0 -0
  49. data/spec/dummy/tmp/cache/stdout +629 -0
  50. data/spec/dummy/tmp/pids/redis-test.pid +1 -1
  51. data/spec/routing/checked_items_routing_spec.rb +0 -16
  52. data/spec/views/checkout_types/index.html.erb_spec.rb +2 -2
  53. data/spec/views/use_restrictions/index.html.erb_spec.rb +2 -2
  54. metadata +50 -52
  55. data/spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb +0 -6
  56. data/spec/dummy/solr/default/data/index/_7f0.fdt +0 -0
  57. data/spec/dummy/solr/default/data/index/segments_bvw +0 -0
  58. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015395 +0 -0
  59. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015397 +0 -0
  60. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015399 +0 -0
  61. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015401 +0 -0
data/spec/dummy/tmp/pids/redis-test.pid CHANGED
@@ -1 +1 @@
1
- 42252
1
+ 7034
data/spec/routing/checked_items_routing_spec.rb CHANGED
@@ -7,14 +7,6 @@ describe CheckedItemsController do
7
7
  { :get => "/checked_items" }.should route_to(:controller => "checked_items", :action => "index")
8
8
  end
9
9
 
10
- it "recognizes and generates #index" do
11
- { :get => "/baskets/1/checked_items" }.should route_to(:controller => "checked_items", :action => "index", :basket_id => "1")
12
- end
13
-
14
- it "recognizes and generates #index" do
15
- { :get => "/baskets/1/checked_items" }.should route_to(:controller => "checked_items", :action => "index", :basket_id => "1")
16
- end
17
-
18
10
  it "recognizes and generates #new" do
19
11
  { :get => "/checked_items/new" }.should route_to(:controller => "checked_items", :action => "new")
20
12
  end
@@ -35,14 +27,6 @@ describe CheckedItemsController do
35
27
  { :put => "/checked_items/1" }.should route_to(:controller => "checked_items", :action => "update", :id => "1")
36
28
  end
37
29
 
38
- it "recognizes and generates #update" do
39
- { :put => "/baskets/1/checked_items/1" }.should route_to(:controller => "checked_items", :action => "update", :id => "1", :basket_id => "1")
40
- end
41
-
42
- it "recognizes and generates #update" do
43
- { :put => "/baskets/1/checked_items/1" }.should route_to(:controller => "checked_items", :action => "update", :id => "1", :basket_id => "1")
44
- end
45
-
46
30
  it "recognizes and generates #destroy" do
47
31
  { :delete => "/checked_items/1" }.should route_to(:controller => "checked_items", :action => "destroy", :id => "1")
48
32
  end
data/spec/views/checkout_types/index.html.erb_spec.rb CHANGED
@@ -25,8 +25,8 @@ describe "checkout_types/index" do
25
25
  it "renders a list of checkout_types" do
26
26
  render
27
27
  # Run the generator again with the --webrat flag if you want to use webrat matchers
28
- assert_select "tr>td", :text => "Book".to_s, :count => 1
28
+ assert_select "tr>td:nth-child(3)", /Book/
29
29
  # Run the generator again with the --webrat flag if you want to use webrat matchers
30
- assert_select "tr>td", :text => "MyText".to_s, :count => 0
30
+ assert_select "tr>td:nth-child(3)", /MyText/
31
31
  end
32
32
  end
data/spec/views/use_restrictions/index.html.erb_spec.rb CHANGED
@@ -25,8 +25,8 @@ describe "use_restrictions/index" do
25
25
  it "renders a list of use_restrictions" do
26
26
  render
27
27
  # Run the generator again with the --webrat flag if you want to use webrat matchers
28
- assert_select "tr>td", :text => "Not For Loan".to_s, :count => 2
28
+ assert_select "tr>td:nth-child(3)", /Not For Loan/
29
29
  # Run the generator again with the --webrat flag if you want to use webrat matchers
30
- assert_select "tr>td", :text => "MyText".to_s, :count => 0
30
+ assert_select "tr>td:nth-child(3)", /MyText/
31
31
  end
32
32
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_circulation
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0.pre37
4
+ version: 0.1.0.pre38
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kosuke Tanabe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-08-16 00:00:00.000000000 Z
11
+ date: 2014-08-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: enju_biblio
@@ -30,56 +30,56 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 0.1.0.pre34
33
+ version: 0.1.0.pre35
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 0.1.0.pre34
40
+ version: 0.1.0.pre35
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: enju_message
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 0.1.14.pre16
47
+ version: 0.1.14.pre17
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 0.1.14.pre16
54
+ version: 0.1.14.pre17
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: enju_event
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 0.1.17.pre19
61
+ version: 0.1.17.pre20
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 0.1.17.pre19
68
+ version: 0.1.17.pre20
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: enju_leaf
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 1.1.0.rc13
75
+ version: 1.1.0.rc14
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 1.1.0.rc13
82
+ version: 1.1.0.rc14
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: sqlite3
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -583,7 +583,6 @@ files:
583
583
  - spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb
584
584
  - spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb
585
585
  - spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb
586
- - spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb
587
586
  - spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb
588
587
  - spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb
589
588
  - spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb
@@ -625,27 +624,27 @@ files:
625
624
  - spec/dummy/solr/conf/spellings.txt
626
625
  - spec/dummy/solr/conf/stopwords.txt
627
626
  - spec/dummy/solr/conf/synonyms.txt
628
- - spec/dummy/solr/default/data/index/_7f0.fdt
629
- - spec/dummy/solr/default/data/index/_7f0.fdx
630
- - spec/dummy/solr/default/data/index/_7f0.fnm
631
- - spec/dummy/solr/default/data/index/_7f0.nvd
632
- - spec/dummy/solr/default/data/index/_7f0.nvm
633
- - spec/dummy/solr/default/data/index/_7f0.si
634
- - spec/dummy/solr/default/data/index/_7f0_Lucene41_0.doc
635
- - spec/dummy/solr/default/data/index/_7f0_Lucene41_0.pos
636
- - spec/dummy/solr/default/data/index/_7f0_Lucene41_0.tim
637
- - spec/dummy/solr/default/data/index/_7f0_Lucene41_0.tip
627
+ - spec/dummy/solr/default/data/index/_7tr.fdt
628
+ - spec/dummy/solr/default/data/index/_7tr.fdx
629
+ - spec/dummy/solr/default/data/index/_7tr.fnm
630
+ - spec/dummy/solr/default/data/index/_7tr.nvd
631
+ - spec/dummy/solr/default/data/index/_7tr.nvm
632
+ - spec/dummy/solr/default/data/index/_7tr.si
633
+ - spec/dummy/solr/default/data/index/_7tr_Lucene41_0.doc
634
+ - spec/dummy/solr/default/data/index/_7tr_Lucene41_0.pos
635
+ - spec/dummy/solr/default/data/index/_7tr_Lucene41_0.tim
636
+ - spec/dummy/solr/default/data/index/_7tr_Lucene41_0.tip
638
637
  - spec/dummy/solr/default/data/index/segments.gen
639
- - spec/dummy/solr/default/data/index/segments_bvw
640
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015394
641
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015395
642
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015396
643
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015397
644
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015398
645
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015399
646
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015400
647
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015401
648
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015402
638
+ - spec/dummy/solr/default/data/index/segments_cjn
639
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016249
640
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016250
641
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016251
642
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016252
643
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016253
644
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016254
645
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016255
646
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016256
647
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016257
649
648
  - spec/dummy/solr/development/data/index/segments.gen
650
649
  - spec/dummy/solr/development/data/index/segments_1
651
650
  - spec/dummy/solr/solr.xml
@@ -970,7 +969,6 @@ test_files:
970
969
  - spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb
971
970
  - spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb
972
971
  - spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb
973
- - spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb
974
972
  - spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb
975
973
  - spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb
976
974
  - spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb
@@ -1014,27 +1012,27 @@ test_files:
1014
1012
  - spec/dummy/solr/conf/spellings.txt
1015
1013
  - spec/dummy/solr/conf/stopwords.txt
1016
1014
  - spec/dummy/solr/conf/synonyms.txt
1017
- - spec/dummy/solr/default/data/index/_7f0.fdt
1018
- - spec/dummy/solr/default/data/index/_7f0.fdx
1019
- - spec/dummy/solr/default/data/index/_7f0.fnm
1020
- - spec/dummy/solr/default/data/index/_7f0.nvd
1021
- - spec/dummy/solr/default/data/index/_7f0.nvm
1022
- - spec/dummy/solr/default/data/index/_7f0.si
1023
- - spec/dummy/solr/default/data/index/_7f0_Lucene41_0.doc
1024
- - spec/dummy/solr/default/data/index/_7f0_Lucene41_0.pos
1025
- - spec/dummy/solr/default/data/index/_7f0_Lucene41_0.tim
1026
- - spec/dummy/solr/default/data/index/_7f0_Lucene41_0.tip
1015
+ - spec/dummy/solr/default/data/index/_7tr.fdt
1016
+ - spec/dummy/solr/default/data/index/_7tr.fdx
1017
+ - spec/dummy/solr/default/data/index/_7tr.fnm
1018
+ - spec/dummy/solr/default/data/index/_7tr.nvd
1019
+ - spec/dummy/solr/default/data/index/_7tr.nvm
1020
+ - spec/dummy/solr/default/data/index/_7tr.si
1021
+ - spec/dummy/solr/default/data/index/_7tr_Lucene41_0.doc
1022
+ - spec/dummy/solr/default/data/index/_7tr_Lucene41_0.pos
1023
+ - spec/dummy/solr/default/data/index/_7tr_Lucene41_0.tim
1024
+ - spec/dummy/solr/default/data/index/_7tr_Lucene41_0.tip
1027
1025
  - spec/dummy/solr/default/data/index/segments.gen
1028
- - spec/dummy/solr/default/data/index/segments_bvw
1029
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015394
1030
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015395
1031
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015396
1032
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015397
1033
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015398
1034
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015399
1035
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015400
1036
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015401
1037
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000015402
1026
+ - spec/dummy/solr/default/data/index/segments_cjn
1027
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016249
1028
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016250
1029
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016251
1030
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016252
1031
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016253
1032
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016254
1033
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016255
1034
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016256
1035
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000016257
1038
1036
  - spec/dummy/solr/development/data/index/segments.gen
1039
1037
  - spec/dummy/solr/development/data/index/segments_1
1040
1038
  - spec/dummy/solr/solr.xml
data/spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb DELETED
@@ -1,6 +0,0 @@
1
- class AddDoiToManifestation < ActiveRecord::Migration
2
- def change
3
- add_column :manifestations, :doi, :string
4
- add_index :manifestations, :doi
5
- end
6
- end