enju_library 0.1.0.pre23 → 0.1.0.pre24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/search_engines_controller.rb +1 -1
- data/app/models/library.rb +3 -0
- data/lib/enju_library/version.rb +1 -1
- data/spec/controllers/accepts_controller_spec.rb +0 -10
- data/spec/controllers/libraries_controller_spec.rb +0 -6
- data/spec/dummy/app/controllers/application_controller.rb +1 -54
- data/spec/dummy/config/application.rb +3 -5
- data/spec/dummy/db/test.sqlite3 +0 -0
- data/spec/dummy/solr/data/test/index/{_ga.fdt → _h4.fdt} +0 -0
- data/spec/dummy/solr/data/test/index/{_ga.fdx → _h4.fdx} +0 -0
- data/spec/dummy/solr/data/test/index/{_ga.fnm → _h4.fnm} +0 -0
- data/spec/dummy/solr/data/test/index/{_ga.frq → _h4.frq} +0 -0
- data/spec/dummy/solr/data/test/index/{_ga.nrm → _h4.nrm} +0 -0
- data/spec/dummy/solr/data/test/index/{_ga.prx → _h4.prx} +0 -0
- data/spec/dummy/solr/data/test/index/{_ga.tii → _h4.tii} +0 -0
- data/spec/dummy/solr/data/test/index/_h4.tis +0 -0
- data/spec/dummy/solr/data/test/index/segments.gen +0 -0
- data/spec/dummy/solr/data/test/index/{segments_123 → segments_140} +0 -0
- data/spec/fixtures/libraries.yml +3 -0
- data/spec/models/library_spec.rb +3 -0
- metadata +43 -35
- data/spec/dummy/app/models/role.rb +0 -46
- data/spec/dummy/app/models/user_group.rb +0 -40
- data/spec/dummy/app/models/user_has_role.rb +0 -5
- data/spec/dummy/solr/data/test/index/_ga.tis +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e6723c43444e6660f0a87e011dfc92df5726c58c
|
4
|
+
data.tar.gz: 2c982f76bdd247dfe019ea8b51d5937c63c0ffe5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 79e5337ba90731e5caf63a29232c41972f6297606b70edf15fbc2dee7e7d99b6aac8617d34f49ea577cfb222a3fbe5bfc7424bce9b761093634b5ef0792c3ae5
|
7
|
+
data.tar.gz: 526ee0ff546daf9bcfc9c9814136d83753d5e9b113ea48b390ebfaecebcb7274748ad7642ffaa04f99fe3136016cee9e57a0c1aba1c90e6b85fc018c15da0a70
|
data/app/models/library.rb
CHANGED
data/lib/enju_library/version.rb
CHANGED
@@ -66,11 +66,6 @@ describe AcceptsController do
|
|
66
66
|
get :show, :id => accept.id
|
67
67
|
assigns(:accept).should eq(accept)
|
68
68
|
end
|
69
|
-
|
70
|
-
it "should not show missing accept" do
|
71
|
-
get :show, :id => 'missing'
|
72
|
-
response.should be_missing
|
73
|
-
end
|
74
69
|
end
|
75
70
|
|
76
71
|
describe "When logged in as Librarian" do
|
@@ -257,11 +252,6 @@ describe AcceptsController do
|
|
257
252
|
delete :destroy, :id => @accept.id
|
258
253
|
response.should redirect_to(accepts_url)
|
259
254
|
end
|
260
|
-
|
261
|
-
it "should not destroy missing accept" do
|
262
|
-
delete :destroy, :id => 'missing'
|
263
|
-
response.should be_missing
|
264
|
-
end
|
265
255
|
end
|
266
256
|
|
267
257
|
describe "When logged in as Librarian" do
|
@@ -57,12 +57,6 @@ describe LibrariesController do
|
|
57
57
|
get :show, :id => 1
|
58
58
|
assigns(:library).should eq(libraries(:library_00001))
|
59
59
|
end
|
60
|
-
|
61
|
-
it "assigns nil as @library if id is missing" do
|
62
|
-
get :show, :id => 'missing'
|
63
|
-
assigns(:library).should be_nil
|
64
|
-
response.should be_missing
|
65
|
-
end
|
66
60
|
end
|
67
61
|
|
68
62
|
describe "When logged in as Librarian" do
|
@@ -1,59 +1,6 @@
|
|
1
1
|
class ApplicationController < ActionController::Base
|
2
2
|
protect_from_forgery
|
3
|
-
|
4
|
-
rescue_from CanCan::AccessDenied, :with => :render_403
|
5
|
-
rescue_from ActiveRecord::RecordNotFound, :with => :render_404
|
6
|
-
|
3
|
+
enju_leaf
|
7
4
|
enju_biblio
|
8
5
|
enju_library
|
9
|
-
|
10
|
-
private
|
11
|
-
def render_403
|
12
|
-
return if performed?
|
13
|
-
if user_signed_in?
|
14
|
-
respond_to do |format|
|
15
|
-
format.html {render :template => 'page/403', :status => 403}
|
16
|
-
format.xml {render :template => 'page/403', :status => 403}
|
17
|
-
format.json
|
18
|
-
end
|
19
|
-
else
|
20
|
-
respond_to do |format|
|
21
|
-
format.html {redirect_to new_user_session_url}
|
22
|
-
format.xml {render :template => 'page/403', :status => 403}
|
23
|
-
format.json
|
24
|
-
end
|
25
|
-
end
|
26
|
-
end
|
27
|
-
|
28
|
-
def render_404
|
29
|
-
return if performed?
|
30
|
-
respond_to do |format|
|
31
|
-
format.html {render :template => 'page/404', :status => 404}
|
32
|
-
format.mobile {render :template => 'page/404', :status => 404}
|
33
|
-
format.xml {render :template => 'page/404', :status => 404}
|
34
|
-
format.json
|
35
|
-
end
|
36
|
-
end
|
37
|
-
|
38
|
-
def access_denied
|
39
|
-
raise CanCan::AccessDenied
|
40
|
-
end
|
41
|
-
|
42
|
-
#def current_ability
|
43
|
-
# @current_ability ||= Ability.new(current_user, request.remote_ip.split('%')[0])
|
44
|
-
#end
|
45
|
-
|
46
|
-
def solr_commit
|
47
|
-
Sunspot.commit
|
48
|
-
end
|
49
|
-
|
50
|
-
def move_position(resource, direction, redirect = true)
|
51
|
-
if ['higher', 'lower'].include?(direction)
|
52
|
-
resource.send("move_#{direction}")
|
53
|
-
if redirect
|
54
|
-
redirect_to url_for(:controller => resource.class.to_s.pluralize.underscore)
|
55
|
-
return
|
56
|
-
end
|
57
|
-
end
|
58
|
-
end
|
59
6
|
end
|
@@ -4,8 +4,6 @@ require 'rails/all'
|
|
4
4
|
|
5
5
|
Bundler.require
|
6
6
|
require "enju_library"
|
7
|
-
require "enju_event"
|
8
|
-
require "enju_inter_library_loan"
|
9
7
|
|
10
8
|
module Dummy
|
11
9
|
class Application < Rails::Application
|
@@ -56,8 +54,8 @@ module Dummy
|
|
56
54
|
end
|
57
55
|
end
|
58
56
|
|
57
|
+
require 'enju_leaf'
|
59
58
|
require 'enju_biblio'
|
60
59
|
require 'enju_circulation'
|
61
|
-
require
|
62
|
-
require
|
63
|
-
require 'redcarpet'
|
60
|
+
require "enju_event"
|
61
|
+
require "enju_inter_library_loan"
|
data/spec/dummy/db/test.sqlite3
CHANGED
Binary file
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
Binary file
|
Binary file
|
Binary file
|
data/spec/fixtures/libraries.yml
CHANGED
data/spec/models/library_spec.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: enju_library
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.0.
|
4
|
+
version: 0.1.0.pre24
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kosuke Tanabe
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-
|
11
|
+
date: 2013-06-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: enju_core
|
@@ -136,48 +136,62 @@ dependencies:
|
|
136
136
|
- - '>='
|
137
137
|
- !ruby/object:Gem::Version
|
138
138
|
version: '0'
|
139
|
+
- !ruby/object:Gem::Dependency
|
140
|
+
name: enju_leaf
|
141
|
+
requirement: !ruby/object:Gem::Requirement
|
142
|
+
requirements:
|
143
|
+
- - ~>
|
144
|
+
- !ruby/object:Gem::Version
|
145
|
+
version: 1.1.0.rc2
|
146
|
+
type: :development
|
147
|
+
prerelease: false
|
148
|
+
version_requirements: !ruby/object:Gem::Requirement
|
149
|
+
requirements:
|
150
|
+
- - ~>
|
151
|
+
- !ruby/object:Gem::Version
|
152
|
+
version: 1.1.0.rc2
|
139
153
|
- !ruby/object:Gem::Dependency
|
140
154
|
name: enju_ndl
|
141
155
|
requirement: !ruby/object:Gem::Requirement
|
142
156
|
requirements:
|
143
157
|
- - ~>
|
144
158
|
- !ruby/object:Gem::Version
|
145
|
-
version: 0.1.0.
|
159
|
+
version: 0.1.0.pre24
|
146
160
|
type: :development
|
147
161
|
prerelease: false
|
148
162
|
version_requirements: !ruby/object:Gem::Requirement
|
149
163
|
requirements:
|
150
164
|
- - ~>
|
151
165
|
- !ruby/object:Gem::Version
|
152
|
-
version: 0.1.0.
|
166
|
+
version: 0.1.0.pre24
|
153
167
|
- !ruby/object:Gem::Dependency
|
154
168
|
name: enju_manifestation_viewer
|
155
169
|
requirement: !ruby/object:Gem::Requirement
|
156
170
|
requirements:
|
157
171
|
- - ~>
|
158
172
|
- !ruby/object:Gem::Version
|
159
|
-
version: 0.1.0.
|
173
|
+
version: 0.1.0.pre11
|
160
174
|
type: :development
|
161
175
|
prerelease: false
|
162
176
|
version_requirements: !ruby/object:Gem::Requirement
|
163
177
|
requirements:
|
164
178
|
- - ~>
|
165
179
|
- !ruby/object:Gem::Version
|
166
|
-
version: 0.1.0.
|
180
|
+
version: 0.1.0.pre11
|
167
181
|
- !ruby/object:Gem::Dependency
|
168
182
|
name: enju_biblio
|
169
183
|
requirement: !ruby/object:Gem::Requirement
|
170
184
|
requirements:
|
171
185
|
- - ~>
|
172
186
|
- !ruby/object:Gem::Version
|
173
|
-
version: 0.1.0.
|
187
|
+
version: 0.1.0.pre41
|
174
188
|
type: :development
|
175
189
|
prerelease: false
|
176
190
|
version_requirements: !ruby/object:Gem::Requirement
|
177
191
|
requirements:
|
178
192
|
- - ~>
|
179
193
|
- !ruby/object:Gem::Version
|
180
|
-
version: 0.1.0.
|
194
|
+
version: 0.1.0.pre41
|
181
195
|
- !ruby/object:Gem::Dependency
|
182
196
|
name: enju_event
|
183
197
|
requirement: !ruby/object:Gem::Requirement
|
@@ -198,14 +212,14 @@ dependencies:
|
|
198
212
|
requirements:
|
199
213
|
- - ~>
|
200
214
|
- !ruby/object:Gem::Version
|
201
|
-
version: 0.1.0.
|
215
|
+
version: 0.1.0.pre27
|
202
216
|
type: :development
|
203
217
|
prerelease: false
|
204
218
|
version_requirements: !ruby/object:Gem::Requirement
|
205
219
|
requirements:
|
206
220
|
- - ~>
|
207
221
|
- !ruby/object:Gem::Version
|
208
|
-
version: 0.1.0.
|
222
|
+
version: 0.1.0.pre27
|
209
223
|
- !ruby/object:Gem::Dependency
|
210
224
|
name: enju_inter_library_loan
|
211
225
|
requirement: !ruby/object:Gem::Requirement
|
@@ -437,11 +451,8 @@ files:
|
|
437
451
|
- spec/dummy/app/controllers/application_controller.rb
|
438
452
|
- spec/dummy/app/helpers/application_helper.rb
|
439
453
|
- spec/dummy/app/models/ability.rb
|
440
|
-
- spec/dummy/app/models/role.rb
|
441
454
|
- spec/dummy/app/models/setting.rb
|
442
455
|
- spec/dummy/app/models/user.rb
|
443
|
-
- spec/dummy/app/models/user_group.rb
|
444
|
-
- spec/dummy/app/models/user_has_role.rb
|
445
456
|
- spec/dummy/app/views/layouts/application.html.erb
|
446
457
|
- spec/dummy/app/views/page/403.html.erb
|
447
458
|
- spec/dummy/app/views/page/403.mobile.erb
|
@@ -549,16 +560,16 @@ files:
|
|
549
560
|
- spec/dummy/solr/conf/spellings.txt
|
550
561
|
- spec/dummy/solr/conf/stopwords.txt
|
551
562
|
- spec/dummy/solr/conf/synonyms.txt
|
552
|
-
- spec/dummy/solr/data/test/index/
|
553
|
-
- spec/dummy/solr/data/test/index/
|
554
|
-
- spec/dummy/solr/data/test/index/
|
555
|
-
- spec/dummy/solr/data/test/index/
|
556
|
-
- spec/dummy/solr/data/test/index/
|
557
|
-
- spec/dummy/solr/data/test/index/
|
558
|
-
- spec/dummy/solr/data/test/index/
|
559
|
-
- spec/dummy/solr/data/test/index/
|
563
|
+
- spec/dummy/solr/data/test/index/_h4.fdt
|
564
|
+
- spec/dummy/solr/data/test/index/_h4.fdx
|
565
|
+
- spec/dummy/solr/data/test/index/_h4.fnm
|
566
|
+
- spec/dummy/solr/data/test/index/_h4.frq
|
567
|
+
- spec/dummy/solr/data/test/index/_h4.nrm
|
568
|
+
- spec/dummy/solr/data/test/index/_h4.prx
|
569
|
+
- spec/dummy/solr/data/test/index/_h4.tii
|
570
|
+
- spec/dummy/solr/data/test/index/_h4.tis
|
560
571
|
- spec/dummy/solr/data/test/index/segments.gen
|
561
|
-
- spec/dummy/solr/data/test/index/
|
572
|
+
- spec/dummy/solr/data/test/index/segments_140
|
562
573
|
- spec/dummy/solr/data/test/spellchecker/segments.gen
|
563
574
|
- spec/dummy/solr/data/test/spellchecker/segments_1
|
564
575
|
- spec/dummy/tmp/cache/4AD/470/country_all
|
@@ -648,7 +659,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
648
659
|
version: 1.3.1
|
649
660
|
requirements: []
|
650
661
|
rubyforge_project:
|
651
|
-
rubygems_version: 2.0.
|
662
|
+
rubygems_version: 2.0.2
|
652
663
|
signing_key:
|
653
664
|
specification_version: 4
|
654
665
|
summary: enju_library plugin
|
@@ -669,11 +680,8 @@ test_files:
|
|
669
680
|
- spec/dummy/app/controllers/application_controller.rb
|
670
681
|
- spec/dummy/app/helpers/application_helper.rb
|
671
682
|
- spec/dummy/app/models/ability.rb
|
672
|
-
- spec/dummy/app/models/role.rb
|
673
683
|
- spec/dummy/app/models/setting.rb
|
674
684
|
- spec/dummy/app/models/user.rb
|
675
|
-
- spec/dummy/app/models/user_group.rb
|
676
|
-
- spec/dummy/app/models/user_has_role.rb
|
677
685
|
- spec/dummy/app/views/layouts/application.html.erb
|
678
686
|
- spec/dummy/app/views/page/403.html.erb
|
679
687
|
- spec/dummy/app/views/page/403.mobile.erb
|
@@ -781,16 +789,16 @@ test_files:
|
|
781
789
|
- spec/dummy/solr/conf/spellings.txt
|
782
790
|
- spec/dummy/solr/conf/stopwords.txt
|
783
791
|
- spec/dummy/solr/conf/synonyms.txt
|
784
|
-
- spec/dummy/solr/data/test/index/
|
785
|
-
- spec/dummy/solr/data/test/index/
|
786
|
-
- spec/dummy/solr/data/test/index/
|
787
|
-
- spec/dummy/solr/data/test/index/
|
788
|
-
- spec/dummy/solr/data/test/index/
|
789
|
-
- spec/dummy/solr/data/test/index/
|
790
|
-
- spec/dummy/solr/data/test/index/
|
791
|
-
- spec/dummy/solr/data/test/index/
|
792
|
+
- spec/dummy/solr/data/test/index/_h4.fdt
|
793
|
+
- spec/dummy/solr/data/test/index/_h4.fdx
|
794
|
+
- spec/dummy/solr/data/test/index/_h4.fnm
|
795
|
+
- spec/dummy/solr/data/test/index/_h4.frq
|
796
|
+
- spec/dummy/solr/data/test/index/_h4.nrm
|
797
|
+
- spec/dummy/solr/data/test/index/_h4.prx
|
798
|
+
- spec/dummy/solr/data/test/index/_h4.tii
|
799
|
+
- spec/dummy/solr/data/test/index/_h4.tis
|
792
800
|
- spec/dummy/solr/data/test/index/segments.gen
|
793
|
-
- spec/dummy/solr/data/test/index/
|
801
|
+
- spec/dummy/solr/data/test/index/segments_140
|
794
802
|
- spec/dummy/solr/data/test/spellchecker/segments.gen
|
795
803
|
- spec/dummy/solr/data/test/spellchecker/segments_1
|
796
804
|
- spec/dummy/tmp/cache/4AD/470/country_all
|
@@ -1,46 +0,0 @@
|
|
1
|
-
class Role < ActiveRecord::Base
|
2
|
-
include MasterModel
|
3
|
-
default_scope :order => "roles.position"
|
4
|
-
has_many :user_has_roles
|
5
|
-
has_many :users, :through => :user_has_roles
|
6
|
-
after_save :clear_all_cache
|
7
|
-
after_destroy :clear_all_cache
|
8
|
-
|
9
|
-
extend FriendlyId
|
10
|
-
friendly_id :name
|
11
|
-
|
12
|
-
def localized_name
|
13
|
-
display_name.localize
|
14
|
-
end
|
15
|
-
|
16
|
-
def self.all_cache
|
17
|
-
if Rails.env == 'production'
|
18
|
-
Rails.cache.fetch('role_all'){Role.select(:name).all}
|
19
|
-
else
|
20
|
-
Role.select(:name)
|
21
|
-
end
|
22
|
-
end
|
23
|
-
|
24
|
-
def clear_all_cache
|
25
|
-
Rails.cache.delete('role_all')
|
26
|
-
end
|
27
|
-
|
28
|
-
def self.default_role
|
29
|
-
Rails.cache.fetch('default_role'){Role.find('Guest')}
|
30
|
-
end
|
31
|
-
end
|
32
|
-
|
33
|
-
# == Schema Information
|
34
|
-
#
|
35
|
-
# Table name: roles
|
36
|
-
#
|
37
|
-
# id :integer not null, primary key
|
38
|
-
# name :string(255) not null
|
39
|
-
# display_name :string(255)
|
40
|
-
# note :text
|
41
|
-
# created_at :datetime
|
42
|
-
# updated_at :datetime
|
43
|
-
# score :integer default(0), not null
|
44
|
-
# position :integer
|
45
|
-
#
|
46
|
-
|
@@ -1,40 +0,0 @@
|
|
1
|
-
# -*- encoding: utf-8 -*-
|
2
|
-
class UserGroup < ActiveRecord::Base
|
3
|
-
attr_accessible :name, :display_name, :note, :valid_period_for_new_user,
|
4
|
-
:expired_at, :number_of_day_to_notify_overdue,
|
5
|
-
:number_of_day_to_notify_overdue,
|
6
|
-
:number_of_day_to_notify_due_date,
|
7
|
-
:number_of_time_to_notify_overdue
|
8
|
-
|
9
|
-
include MasterModel
|
10
|
-
default_scope :order => "user_groups.position"
|
11
|
-
has_many :users
|
12
|
-
|
13
|
-
validates_numericality_of :valid_period_for_new_user,
|
14
|
-
:greater_than_or_equal_to => 0,
|
15
|
-
:allow_blank => true
|
16
|
-
|
17
|
-
def self.per_page
|
18
|
-
10
|
19
|
-
end
|
20
|
-
end
|
21
|
-
|
22
|
-
# == Schema Information
|
23
|
-
#
|
24
|
-
# Table name: user_groups
|
25
|
-
#
|
26
|
-
# id :integer not null, primary key
|
27
|
-
# name :string(255)
|
28
|
-
# display_name :text
|
29
|
-
# note :text
|
30
|
-
# position :integer
|
31
|
-
# created_at :datetime
|
32
|
-
# updated_at :datetime
|
33
|
-
# deleted_at :datetime
|
34
|
-
# valid_period_for_new_user :integer default(0), not null
|
35
|
-
# expired_at :datetime
|
36
|
-
# number_of_day_to_notify_overdue :integer default(1), not null
|
37
|
-
# number_of_day_to_notify_due_date :integer default(7), not null
|
38
|
-
# number_of_time_to_notify_overdue :integer default(3), not null
|
39
|
-
#
|
40
|
-
|
Binary file
|