enju_subject 0.1.0.pre19 → 0.1.0.pre20
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/subject.rb +16 -15
- data/lib/enju_subject/version.rb +1 -1
- data/spec/dummy/app/controllers/application_controller.rb +2 -41
- data/spec/dummy/config/application.rb +1 -2
- data/spec/dummy/db/development.sqlite3 +0 -0
- data/spec/dummy/db/migrate/20111201155456_create_users.rb +0 -4
- data/spec/dummy/db/migrate/20111201155513_add_devise_to_users.rb +6 -9
- data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb +26 -0
- data/spec/dummy/db/schema.rb +17 -9
- data/spec/dummy/db/test.sqlite3 +0 -0
- data/spec/dummy/solr/data/test/index/segments.gen +0 -0
- data/spec/dummy/solr/data/test/index/segments_22n +0 -0
- data/spec/fixtures/subjects.yml +16 -15
- data/spec/models/subject_spec.rb +16 -15
- metadata +10 -22
- data/spec/dummy/solr/data/test/index/segments_1zn +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f3a150b753e79d512ae60ec836caffa4e06cd332
|
4
|
+
data.tar.gz: 27c137118e8c78bfcc4b301d1311efb072294dd6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d16a2629e846183decf3c67e938a77b44d06d77d63532dc10f9825475ab06cd973832ba3e0adc01cb1568a000533abbc9f4ca955c57708e5f39691cddbc8c412
|
7
|
+
data.tar.gz: 7783d1a8313c2a236475af93020cd871632d95bd54d5e4c8c3967fc813dd8928e432a96a2bf3befe0bf25c6be75d686872f6f230f0622ffdbe264702f61dbbff
|
data/app/models/subject.rb
CHANGED
@@ -25,20 +25,21 @@ end
|
|
25
25
|
#
|
26
26
|
# Table name: subjects
|
27
27
|
#
|
28
|
-
# id
|
29
|
-
# parent_id
|
30
|
-
# use_term_id
|
31
|
-
# term
|
32
|
-
# term_transcription
|
33
|
-
# subject_type_id
|
34
|
-
# scope_note
|
35
|
-
# note
|
36
|
-
# required_role_id
|
37
|
-
# lock_version
|
38
|
-
# created_at
|
39
|
-
# updated_at
|
40
|
-
# deleted_at
|
41
|
-
# url
|
42
|
-
# manifestation_id
|
28
|
+
# id :integer not null, primary key
|
29
|
+
# parent_id :integer
|
30
|
+
# use_term_id :integer
|
31
|
+
# term :string(255)
|
32
|
+
# term_transcription :text
|
33
|
+
# subject_type_id :integer not null
|
34
|
+
# scope_note :text
|
35
|
+
# note :text
|
36
|
+
# required_role_id :integer default(1), not null
|
37
|
+
# lock_version :integer default(0), not null
|
38
|
+
# created_at :datetime
|
39
|
+
# updated_at :datetime
|
40
|
+
# deleted_at :datetime
|
41
|
+
# url :string(255)
|
42
|
+
# manifestation_id :integer
|
43
|
+
# subject_heading_type_id :integer
|
43
44
|
#
|
44
45
|
|
data/lib/enju_subject/version.rb
CHANGED
@@ -1,47 +1,8 @@
|
|
1
1
|
class ApplicationController < ActionController::Base
|
2
2
|
protect_from_forgery
|
3
|
-
rescue_from CanCan::AccessDenied, :with => :render_403
|
4
|
-
rescue_from ActiveRecord::RecordNotFound, :with => :render_404
|
5
3
|
|
4
|
+
enju_leaf
|
6
5
|
enju_biblio
|
6
|
+
enju_library
|
7
7
|
enju_subject
|
8
|
-
|
9
|
-
private
|
10
|
-
def render_403
|
11
|
-
return if performed?
|
12
|
-
if user_signed_in?
|
13
|
-
respond_to do |format|
|
14
|
-
format.html {render :file => "#{Rails.root}/public/404", :status => 403}
|
15
|
-
format.xml
|
16
|
-
format.json
|
17
|
-
end
|
18
|
-
else
|
19
|
-
respond_to do |format|
|
20
|
-
format.html {redirect_to new_user_session_url}
|
21
|
-
format.xml {render :status => 403}
|
22
|
-
format.json
|
23
|
-
end
|
24
|
-
end
|
25
|
-
end
|
26
|
-
|
27
|
-
def render_404
|
28
|
-
return if performed?
|
29
|
-
respond_to do |format|
|
30
|
-
format.html {render :file => "#{Rails.root}/public/404", :status => 404}
|
31
|
-
format.xml
|
32
|
-
format.json
|
33
|
-
end
|
34
|
-
end
|
35
|
-
|
36
|
-
def solr_commit
|
37
|
-
Sunspot.commit
|
38
|
-
end
|
39
|
-
|
40
|
-
def move_position(resource, direction)
|
41
|
-
if ['higher', 'lower'].include?(direction)
|
42
|
-
resource.send("move_#{direction}")
|
43
|
-
redirect_to url_for(:controller => resource.class.to_s.pluralize.underscore)
|
44
|
-
return
|
45
|
-
end
|
46
|
-
end
|
47
8
|
end
|
Binary file
|
@@ -19,22 +19,19 @@ class AddDeviseToUsers < ActiveRecord::Migration
|
|
19
19
|
t.string :current_sign_in_ip
|
20
20
|
t.string :last_sign_in_ip
|
21
21
|
|
22
|
-
## Encryptable
|
23
|
-
t.string :password_salt
|
24
|
-
|
25
22
|
## Confirmable
|
26
|
-
t.string :confirmation_token
|
27
|
-
t.datetime :confirmed_at
|
23
|
+
# t.string :confirmation_token
|
24
|
+
# t.datetime :confirmed_at
|
28
25
|
t.datetime :confirmation_sent_at
|
29
26
|
t.string :unconfirmed_email # Only if using reconfirmable
|
30
27
|
|
31
28
|
## Lockable
|
32
|
-
t.integer :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
|
33
|
-
t.string :unlock_token # Only if unlock strategy is :email or :both
|
34
|
-
t.datetime :locked_at
|
29
|
+
# t.integer :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
|
30
|
+
# t.string :unlock_token # Only if unlock strategy is :email or :both
|
31
|
+
# t.datetime :locked_at
|
35
32
|
|
36
33
|
# Token authenticatable
|
37
|
-
t.string :authentication_token
|
34
|
+
# t.string :authentication_token
|
38
35
|
end
|
39
36
|
|
40
37
|
add_index :users, :email #, :unique => true
|
@@ -0,0 +1,26 @@
|
|
1
|
+
class AddAdditionalAttributesToUser < ActiveRecord::Migration
|
2
|
+
def change
|
3
|
+
add_column :users, :username, :string
|
4
|
+
add_column :users, :user_number, :string
|
5
|
+
add_column :users, :state, :string
|
6
|
+
add_column :users, :locale, :string
|
7
|
+
add_column :users, :deleted_at, :datetime
|
8
|
+
add_column :users, :expired_at, :datetime
|
9
|
+
add_column :users, :library_id, :integer, :default => 1, :null => false
|
10
|
+
add_column :users, :required_role_id, :integer, :default => 1, :null => false
|
11
|
+
add_column :users, :user_group_id, :integer, :default => 1, :null => false
|
12
|
+
add_column :users, :note, :text
|
13
|
+
add_column :users, :keyword_list, :text
|
14
|
+
|
15
|
+
add_column :users, :failed_attempts, :integer
|
16
|
+
add_column :users, :unlock_token, :string
|
17
|
+
add_column :users, :locked_at, :datetime
|
18
|
+
|
19
|
+
add_column :users, :confirmed_at, :datetime
|
20
|
+
|
21
|
+
add_index :users, :username, :unique => true
|
22
|
+
add_index :users, :user_group_id
|
23
|
+
add_index :users, :user_number, :unique => true
|
24
|
+
add_index :users, :unlock_token, :unique => true
|
25
|
+
end
|
26
|
+
end
|
data/spec/dummy/db/schema.rb
CHANGED
@@ -847,10 +847,6 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
|
|
847
847
|
end
|
848
848
|
|
849
849
|
create_table "users", :force => true do |t|
|
850
|
-
t.integer "user_group_id"
|
851
|
-
t.integer "required_role_id"
|
852
|
-
t.string "username"
|
853
|
-
t.text "note"
|
854
850
|
t.datetime "created_at", :null => false
|
855
851
|
t.datetime "updated_at", :null => false
|
856
852
|
t.string "email", :default => "", :null => false
|
@@ -863,19 +859,31 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
|
|
863
859
|
t.datetime "last_sign_in_at"
|
864
860
|
t.string "current_sign_in_ip"
|
865
861
|
t.string "last_sign_in_ip"
|
866
|
-
t.string "password_salt"
|
867
|
-
t.string "confirmation_token"
|
868
|
-
t.datetime "confirmed_at"
|
869
862
|
t.datetime "confirmation_sent_at"
|
870
863
|
t.string "unconfirmed_email"
|
871
|
-
t.
|
864
|
+
t.string "username"
|
865
|
+
t.string "user_number"
|
866
|
+
t.string "state"
|
867
|
+
t.string "locale"
|
868
|
+
t.datetime "deleted_at"
|
869
|
+
t.datetime "expired_at"
|
870
|
+
t.integer "library_id", :default => 1, :null => false
|
871
|
+
t.integer "required_role_id", :default => 1, :null => false
|
872
|
+
t.integer "user_group_id", :default => 1, :null => false
|
873
|
+
t.text "note"
|
874
|
+
t.text "keyword_list"
|
875
|
+
t.integer "failed_attempts"
|
872
876
|
t.string "unlock_token"
|
873
877
|
t.datetime "locked_at"
|
874
|
-
t.
|
878
|
+
t.datetime "confirmed_at"
|
875
879
|
end
|
876
880
|
|
877
881
|
add_index "users", ["email"], :name => "index_users_on_email"
|
878
882
|
add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
|
883
|
+
add_index "users", ["unlock_token"], :name => "index_users_on_unlock_token", :unique => true
|
884
|
+
add_index "users", ["user_group_id"], :name => "index_users_on_user_group_id"
|
885
|
+
add_index "users", ["user_number"], :name => "index_users_on_user_number", :unique => true
|
886
|
+
add_index "users", ["username"], :name => "index_users_on_username", :unique => true
|
879
887
|
|
880
888
|
create_table "versions", :force => true do |t|
|
881
889
|
t.string "item_type", :null => false
|
data/spec/dummy/db/test.sqlite3
CHANGED
Binary file
|
Binary file
|
Binary file
|
data/spec/fixtures/subjects.yml
CHANGED
@@ -60,20 +60,21 @@ subject_00005:
|
|
60
60
|
#
|
61
61
|
# Table name: subjects
|
62
62
|
#
|
63
|
-
# id
|
64
|
-
# parent_id
|
65
|
-
# use_term_id
|
66
|
-
# term
|
67
|
-
# term_transcription
|
68
|
-
# subject_type_id
|
69
|
-
# scope_note
|
70
|
-
# note
|
71
|
-
# required_role_id
|
72
|
-
# lock_version
|
73
|
-
# created_at
|
74
|
-
# updated_at
|
75
|
-
# deleted_at
|
76
|
-
# url
|
77
|
-
# manifestation_id
|
63
|
+
# id :integer not null, primary key
|
64
|
+
# parent_id :integer
|
65
|
+
# use_term_id :integer
|
66
|
+
# term :string(255)
|
67
|
+
# term_transcription :text
|
68
|
+
# subject_type_id :integer not null
|
69
|
+
# scope_note :text
|
70
|
+
# note :text
|
71
|
+
# required_role_id :integer default(1), not null
|
72
|
+
# lock_version :integer default(0), not null
|
73
|
+
# created_at :datetime
|
74
|
+
# updated_at :datetime
|
75
|
+
# deleted_at :datetime
|
76
|
+
# url :string(255)
|
77
|
+
# manifestation_id :integer
|
78
|
+
# subject_heading_type_id :integer
|
78
79
|
#
|
79
80
|
|
data/spec/models/subject_spec.rb
CHANGED
@@ -13,20 +13,21 @@ end
|
|
13
13
|
#
|
14
14
|
# Table name: subjects
|
15
15
|
#
|
16
|
-
# id
|
17
|
-
# parent_id
|
18
|
-
# use_term_id
|
19
|
-
# term
|
20
|
-
# term_transcription
|
21
|
-
# subject_type_id
|
22
|
-
# scope_note
|
23
|
-
# note
|
24
|
-
# required_role_id
|
25
|
-
# lock_version
|
26
|
-
# created_at
|
27
|
-
# updated_at
|
28
|
-
# deleted_at
|
29
|
-
# url
|
30
|
-
# manifestation_id
|
16
|
+
# id :integer not null, primary key
|
17
|
+
# parent_id :integer
|
18
|
+
# use_term_id :integer
|
19
|
+
# term :string(255)
|
20
|
+
# term_transcription :text
|
21
|
+
# subject_type_id :integer not null
|
22
|
+
# scope_note :text
|
23
|
+
# note :text
|
24
|
+
# required_role_id :integer default(1), not null
|
25
|
+
# lock_version :integer default(0), not null
|
26
|
+
# created_at :datetime
|
27
|
+
# updated_at :datetime
|
28
|
+
# deleted_at :datetime
|
29
|
+
# url :string(255)
|
30
|
+
# manifestation_id :integer
|
31
|
+
# subject_heading_type_id :integer
|
31
32
|
#
|
32
33
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: enju_subject
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.0.
|
4
|
+
version: 0.1.0.pre20
|
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
|
@@ -109,33 +109,19 @@ dependencies:
|
|
109
109
|
- !ruby/object:Gem::Version
|
110
110
|
version: '2.4'
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
|
-
name:
|
112
|
+
name: enju_leaf
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
114
114
|
requirements:
|
115
115
|
- - ~>
|
116
116
|
- !ruby/object:Gem::Version
|
117
|
-
version:
|
117
|
+
version: 1.1.0.rc2
|
118
118
|
type: :development
|
119
119
|
prerelease: false
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
121
121
|
requirements:
|
122
122
|
- - ~>
|
123
123
|
- !ruby/object:Gem::Version
|
124
|
-
version:
|
125
|
-
- !ruby/object:Gem::Dependency
|
126
|
-
name: enju_library
|
127
|
-
requirement: !ruby/object:Gem::Requirement
|
128
|
-
requirements:
|
129
|
-
- - ~>
|
130
|
-
- !ruby/object:Gem::Version
|
131
|
-
version: 0.1.0.pre22
|
132
|
-
type: :development
|
133
|
-
prerelease: false
|
134
|
-
version_requirements: !ruby/object:Gem::Requirement
|
135
|
-
requirements:
|
136
|
-
- - ~>
|
137
|
-
- !ruby/object:Gem::Version
|
138
|
-
version: 0.1.0.pre22
|
124
|
+
version: 1.1.0.rc2
|
139
125
|
- !ruby/object:Gem::Dependency
|
140
126
|
name: sunspot_solr
|
141
127
|
requirement: !ruby/object:Gem::Requirement
|
@@ -377,6 +363,7 @@ files:
|
|
377
363
|
- spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb
|
378
364
|
- spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
|
379
365
|
- spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb
|
366
|
+
- spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb
|
380
367
|
- spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb
|
381
368
|
- spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb
|
382
369
|
- spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb
|
@@ -403,7 +390,7 @@ files:
|
|
403
390
|
- spec/dummy/solr/conf/stopwords.txt
|
404
391
|
- spec/dummy/solr/conf/synonyms.txt
|
405
392
|
- spec/dummy/solr/data/test/index/segments.gen
|
406
|
-
- spec/dummy/solr/data/test/index/
|
393
|
+
- spec/dummy/solr/data/test/index/segments_22n
|
407
394
|
- spec/dummy/solr/data/test/spellchecker/segments.gen
|
408
395
|
- spec/dummy/solr/data/test/spellchecker/segments_1
|
409
396
|
- spec/dummy/spec/fixtures/subjects.yml
|
@@ -468,7 +455,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
468
455
|
version: 1.3.1
|
469
456
|
requirements: []
|
470
457
|
rubyforge_project:
|
471
|
-
rubygems_version: 2.0.
|
458
|
+
rubygems_version: 2.0.2
|
472
459
|
signing_key:
|
473
460
|
specification_version: 4
|
474
461
|
summary: enju_subject plugin
|
@@ -605,6 +592,7 @@ test_files:
|
|
605
592
|
- spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb
|
606
593
|
- spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
|
607
594
|
- spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb
|
595
|
+
- spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb
|
608
596
|
- spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb
|
609
597
|
- spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb
|
610
598
|
- spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb
|
@@ -631,7 +619,7 @@ test_files:
|
|
631
619
|
- spec/dummy/solr/conf/stopwords.txt
|
632
620
|
- spec/dummy/solr/conf/synonyms.txt
|
633
621
|
- spec/dummy/solr/data/test/index/segments.gen
|
634
|
-
- spec/dummy/solr/data/test/index/
|
622
|
+
- spec/dummy/solr/data/test/index/segments_22n
|
635
623
|
- spec/dummy/solr/data/test/spellchecker/segments.gen
|
636
624
|
- spec/dummy/solr/data/test/spellchecker/segments_1
|
637
625
|
- spec/dummy/spec/fixtures/subjects.yml
|
Binary file
|