enju_subject 0.1.0.pre4 → 0.1.0.pre5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +7 -0
  2. data/lib/enju_subject/manifestation.rb +30 -16
  3. data/lib/enju_subject/version.rb +1 -1
  4. data/lib/enju_subject.rb +3 -1
  5. data/spec/dummy/app/controllers/application_controller.rb +3 -17
  6. data/spec/dummy/config/application.rb +0 -1
  7. data/spec/dummy/db/test.sqlite3 +0 -0
  8. data/spec/dummy/solr/data/test/index/segments.gen +0 -0
  9. data/spec/dummy/solr/data/test/index/segments_b4 +0 -0
  10. data/spec/dummy/tmp/cache/4F7/F90/default_role +0 -0
  11. metadata +32 -89
  12. data/spec/dummy/solr/data/test/index/segments_46 +0 -0
  13. data/spec/support/vcr.rb +0 -12
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 76629c4deb6d57ecfde9a1441e79b700f32da047
4
+ data.tar.gz: 0e7b420d50ee414a4b5af1380607cea674e1d91e
5
+ SHA512:
6
+ metadata.gz: 71fa0de02fc561949b8e09e2827bf95f7bbfaefb93c1139d97053a7f7e39af8582c1326b032df3349b4e3ec51bd04a383b624e187a8a41b254837000191fff95
7
+ data.tar.gz: 37627d39ed0bdc8ab4ca22a0c9fb0a248b6af69950129ff6e3d98f9cbc5d8b933ec668a5b2d03abf469087035d0aaed3de6cfaa3447c5477379a467ef9f1b51e
data/lib/enju_subject/manifestation.rb CHANGED
@@ -1,21 +1,35 @@
1
- class Manifestation < ActiveRecord::Base
2
- has_many :work_has_subjects, :foreign_key => 'work_id', :dependent => :destroy
3
- has_many :subjects, :through => :work_has_subjects
4
-
5
- searchable do
6
- text :subject do
7
- subjects.collect(&:term) + subjects.collect(&:term_transcription)
8
- end
9
- string :subject, :multiple => true do
10
- subjects.collect(&:term) + subjects.collect(&:term_transcription)
1
+ module EnjuSubject
2
+ module EnjuManifestation
3
+ def self.included(base)
4
+ base.extend ClassMethods
11
5
  end
12
- string :classification, :multiple => true do
13
- classifications.collect(&:category)
6
+
7
+ module ClassMethods
8
+ def enju_subject_model
9
+ include InstanceMethods
10
+ attr_accessible :ndc, :classification_number
11
+ has_many :work_has_subjects, :foreign_key => 'work_id', :dependent => :destroy
12
+ has_many :subjects, :through => :work_has_subjects
13
+
14
+ searchable do
15
+ text :subject do
16
+ subjects.map{|s| [:term, :term_transcription]}.compact
17
+ end
18
+ string :subject, :multiple => true do
19
+ subjects.map{|s| [:term, :term_transcription]}.compact
20
+ end
21
+ string :classification, :multiple => true do
22
+ classifications.collect(&:category)
23
+ end
24
+ integer :subject_ids, :multiple => true
25
+ end
26
+ end
14
27
  end
15
- integer :subject_ids, :multiple => true
16
- end
17
28
 
18
- def classifications
19
- subjects.collect(&:classifications).flatten
29
+ module InstanceMethods
30
+ def classifications
31
+ subjects.collect(&:classifications).flatten
32
+ end
33
+ end
20
34
  end
21
35
  end
data/lib/enju_subject/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnjuSubject
2
- VERSION = "0.1.0.pre4"
2
+ VERSION = "0.1.0.pre5"
3
3
  end
data/lib/enju_subject.rb CHANGED
@@ -1,4 +1,5 @@
1
1
  require "enju_subject/engine"
2
+ require "enju_subject/manifestation"
2
3
 
3
4
  module EnjuSubject
4
5
  def self.included(base)
@@ -28,4 +29,5 @@ module EnjuSubject
28
29
  end
29
30
  end
30
31
 
31
- ActionController::Base.send(:include, EnjuSubject)
32
+ ActionController::Base.send :include, EnjuSubject
33
+ ActiveRecord::Base.send :include, EnjuSubject::EnjuManifestation
data/spec/dummy/app/controllers/application_controller.rb CHANGED
@@ -3,6 +3,9 @@ class ApplicationController < ActionController::Base
3
3
  rescue_from CanCan::AccessDenied, :with => :render_403
4
4
  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
5
5
 
6
+ enju_biblio
7
+ enju_subject
8
+
6
9
  private
7
10
  def render_403
8
11
  return if performed?
@@ -30,23 +33,6 @@ class ApplicationController < ActionController::Base
30
33
  end
31
34
  end
32
35
 
33
- def get_work
34
- @work = Manifestation.find(params[:work_id]) if params[:work_id]
35
- authorize! :show, @work if @work
36
- end
37
-
38
- def get_subject_heading_type
39
- @subject_heading_type = SubjectHeadingType.find(params[:subject_heading_type_id]) if params[:subject_heading_type_id]
40
- end
41
-
42
- def get_subject
43
- @subject = Subject.find(params[:subject_id]) if params[:subject_id]
44
- end
45
-
46
- def get_classification
47
- @classification = Classification.find(params[:classification_id]) if params[:classification_id]
48
- end
49
-
50
36
  def solr_commit
51
37
  Sunspot.commit
52
38
  end
data/spec/dummy/config/application.rb CHANGED
@@ -44,4 +44,3 @@ module Dummy
44
44
  end
45
45
 
46
46
  require 'enju_biblio'
47
- require 'enju_manifestation_viewer'
data/spec/dummy/db/test.sqlite3 CHANGED
Binary file
metadata CHANGED
@@ -1,20 +1,18 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_subject
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0.pre4
5
- prerelease: 6
4
+ version: 0.1.0.pre5
6
5
  platform: ruby
7
6
  authors:
8
7
  - Kosuke Tanabe
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2012-12-13 00:00:00.000000000 Z
11
+ date: 2013-03-04 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: rails
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
17
  - - ~>
20
18
  - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
24
  - - ~>
28
25
  - !ruby/object:Gem::Version
@@ -30,179 +27,129 @@ dependencies:
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: enju_core
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
- - - ! '>='
31
+ - - ~>
36
32
  - !ruby/object:Gem::Version
37
- version: '0'
33
+ version: 0.1.1.pre3
38
34
  type: :runtime
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
- - - ! '>='
38
+ - - ~>
44
39
  - !ruby/object:Gem::Version
45
- version: '0'
40
+ version: 0.1.1.pre3
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: inherited_resources
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
- - - ! '>='
45
+ - - '>='
52
46
  - !ruby/object:Gem::Version
53
47
  version: '0'
54
48
  type: :runtime
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
- - - ! '>='
52
+ - - '>='
60
53
  - !ruby/object:Gem::Version
61
54
  version: '0'
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: dynamic_form
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
- - - ! '>='
59
+ - - '>='
68
60
  - !ruby/object:Gem::Version
69
61
  version: '0'
70
62
  type: :runtime
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
- - - ! '>='
66
+ - - '>='
76
67
  - !ruby/object:Gem::Version
77
68
  version: '0'
78
69
  - !ruby/object:Gem::Dependency
79
70
  name: sqlite3
80
71
  requirement: !ruby/object:Gem::Requirement
81
- none: false
82
72
  requirements:
83
- - - ! '>='
73
+ - - '>='
84
74
  - !ruby/object:Gem::Version
85
75
  version: '0'
86
76
  type: :development
87
77
  prerelease: false
88
78
  version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
79
  requirements:
91
- - - ! '>='
80
+ - - '>='
92
81
  - !ruby/object:Gem::Version
93
82
  version: '0'
94
83
  - !ruby/object:Gem::Dependency
95
84
  name: rspec-rails
96
85
  requirement: !ruby/object:Gem::Requirement
97
- none: false
98
86
  requirements:
99
- - - ! '>='
87
+ - - '>='
100
88
  - !ruby/object:Gem::Version
101
89
  version: '0'
102
90
  type: :development
103
91
  prerelease: false
104
92
  version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
93
  requirements:
107
- - - ! '>='
94
+ - - '>='
108
95
  - !ruby/object:Gem::Version
109
96
  version: '0'
110
97
  - !ruby/object:Gem::Dependency
111
98
  name: factory_girl_rails
112
99
  requirement: !ruby/object:Gem::Requirement
113
- none: false
114
100
  requirements:
115
- - - ! '>='
101
+ - - '>='
116
102
  - !ruby/object:Gem::Version
117
103
  version: '0'
118
104
  type: :development
119
105
  prerelease: false
120
106
  version_requirements: !ruby/object:Gem::Requirement
121
- none: false
122
107
  requirements:
123
- - - ! '>='
108
+ - - '>='
124
109
  - !ruby/object:Gem::Version
125
110
  version: '0'
126
111
  - !ruby/object:Gem::Dependency
127
112
  name: vcr
128
113
  requirement: !ruby/object:Gem::Requirement
129
- none: false
130
114
  requirements:
131
115
  - - ~>
132
116
  - !ruby/object:Gem::Version
133
- version: '2.3'
117
+ version: '2.4'
134
118
  type: :development
135
119
  prerelease: false
136
120
  version_requirements: !ruby/object:Gem::Requirement
137
- none: false
138
121
  requirements:
139
122
  - - ~>
140
123
  - !ruby/object:Gem::Version
141
- version: '2.3'
142
- - !ruby/object:Gem::Dependency
143
- name: fakeweb
144
- requirement: !ruby/object:Gem::Requirement
145
- none: false
146
- requirements:
147
- - - ! '>='
148
- - !ruby/object:Gem::Version
149
- version: '0'
150
- type: :development
151
- prerelease: false
152
- version_requirements: !ruby/object:Gem::Requirement
153
- none: false
154
- requirements:
155
- - - ! '>='
156
- - !ruby/object:Gem::Version
157
- version: '0'
124
+ version: '2.4'
158
125
  - !ruby/object:Gem::Dependency
159
126
  name: enju_biblio
160
127
  requirement: !ruby/object:Gem::Requirement
161
- none: false
162
- requirements:
163
- - - ~>
164
- - !ruby/object:Gem::Version
165
- version: 0.1.0.pre13
166
- type: :development
167
- prerelease: false
168
- version_requirements: !ruby/object:Gem::Requirement
169
- none: false
170
- requirements:
171
- - - ~>
172
- - !ruby/object:Gem::Version
173
- version: 0.1.0.pre13
174
- - !ruby/object:Gem::Dependency
175
- name: enju_manifestation_viewer
176
- requirement: !ruby/object:Gem::Requirement
177
- none: false
178
128
  requirements:
179
129
  - - ~>
180
130
  - !ruby/object:Gem::Version
181
- version: 0.1.0.pre2
131
+ version: 0.1.0.pre21
182
132
  type: :development
183
133
  prerelease: false
184
134
  version_requirements: !ruby/object:Gem::Requirement
185
- none: false
186
135
  requirements:
187
136
  - - ~>
188
137
  - !ruby/object:Gem::Version
189
- version: 0.1.0.pre2
138
+ version: 0.1.0.pre21
190
139
  - !ruby/object:Gem::Dependency
191
140
  name: sunspot_solr
192
141
  requirement: !ruby/object:Gem::Requirement
193
- none: false
194
142
  requirements:
195
143
  - - ~>
196
144
  - !ruby/object:Gem::Version
197
- version: 2.0.0.pre.120925
145
+ version: 2.0.0
198
146
  type: :development
199
147
  prerelease: false
200
148
  version_requirements: !ruby/object:Gem::Requirement
201
- none: false
202
149
  requirements:
203
150
  - - ~>
204
151
  - !ruby/object:Gem::Version
205
- version: 2.0.0.pre.120925
152
+ version: 2.0.0
206
153
  description: Subject and classification management for Next-L Enju
207
154
  email:
208
155
  - tanabe@mwr.mediacom.keio.ac.jp
@@ -441,7 +388,7 @@ files:
441
388
  - spec/dummy/solr/conf/stopwords.txt
442
389
  - spec/dummy/solr/conf/synonyms.txt
443
390
  - spec/dummy/solr/data/test/index/segments.gen
444
- - spec/dummy/solr/data/test/index/segments_46
391
+ - spec/dummy/solr/data/test/index/segments_b4
445
392
  - spec/dummy/solr/data/test/spellchecker/segments.gen
446
393
  - spec/dummy/solr/data/test/spellchecker/segments_1
447
394
  - spec/dummy/spec/fixtures/subjects.yml
@@ -451,6 +398,7 @@ files:
451
398
  - spec/dummy/test/unit/user_group_test.rb
452
399
  - spec/dummy/test/unit/user_has_role_test.rb
453
400
  - spec/dummy/test/unit/user_test.rb
401
+ - spec/dummy/tmp/cache/4F7/F90/default_role
454
402
  - spec/factories/classification.rb
455
403
  - spec/factories/classification_type.rb
456
404
  - spec/factories/manifestation.rb
@@ -493,33 +441,28 @@ files:
493
441
  - spec/spec_helper.rb
494
442
  - spec/support/controller_macros.rb
495
443
  - spec/support/devise.rb
496
- - spec/support/vcr.rb
497
- homepage: https://github.com/nabeta/enju_subject
444
+ homepage: https://github.com/next-l/enju_subject
498
445
  licenses: []
446
+ metadata: {}
499
447
  post_install_message:
500
448
  rdoc_options: []
501
449
  require_paths:
502
450
  - lib
503
451
  required_ruby_version: !ruby/object:Gem::Requirement
504
- none: false
505
452
  requirements:
506
- - - ! '>='
453
+ - - '>='
507
454
  - !ruby/object:Gem::Version
508
455
  version: '0'
509
- segments:
510
- - 0
511
- hash: 4551511806052952502
512
456
  required_rubygems_version: !ruby/object:Gem::Requirement
513
- none: false
514
457
  requirements:
515
- - - ! '>'
458
+ - - '>'
516
459
  - !ruby/object:Gem::Version
517
460
  version: 1.3.1
518
461
  requirements: []
519
462
  rubyforge_project:
520
- rubygems_version: 1.8.23
463
+ rubygems_version: 2.0.0
521
464
  signing_key:
522
- specification_version: 3
465
+ specification_version: 4
523
466
  summary: enju_subject plugin
524
467
  test_files:
525
468
  - spec/controllers/classification_types_controller_spec.rb
@@ -661,7 +604,7 @@ test_files:
661
604
  - spec/dummy/solr/conf/stopwords.txt
662
605
  - spec/dummy/solr/conf/synonyms.txt
663
606
  - spec/dummy/solr/data/test/index/segments.gen
664
- - spec/dummy/solr/data/test/index/segments_46
607
+ - spec/dummy/solr/data/test/index/segments_b4
665
608
  - spec/dummy/solr/data/test/spellchecker/segments.gen
666
609
  - spec/dummy/solr/data/test/spellchecker/segments_1
667
610
  - spec/dummy/spec/fixtures/subjects.yml
@@ -671,6 +614,7 @@ test_files:
671
614
  - spec/dummy/test/unit/user_group_test.rb
672
615
  - spec/dummy/test/unit/user_has_role_test.rb
673
616
  - spec/dummy/test/unit/user_test.rb
617
+ - spec/dummy/tmp/cache/4F7/F90/default_role
674
618
  - spec/factories/classification.rb
675
619
  - spec/factories/classification_type.rb
676
620
  - spec/factories/manifestation.rb
@@ -713,4 +657,3 @@ test_files:
713
657
  - spec/spec_helper.rb
714
658
  - spec/support/controller_macros.rb
715
659
  - spec/support/devise.rb
716
- - spec/support/vcr.rb
data/spec/support/vcr.rb DELETED
@@ -1,12 +0,0 @@
1
- require 'vcr'
2
-
3
- RSpec.configure do |config|
4
- config.extend VCR::RSpec::Macros
5
- end
6
-
7
- VCR.configure do |c|
8
- c.cassette_library_dir = 'spec/cassette_library'
9
- c.hook_into :fakeweb
10
- c.ignore_localhost = true
11
- c.default_cassette_options = { :record => :new_episodes }
12
- end