enju_message 0.1.14.pre2 → 0.1.14.pre3

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.
Files changed (27) hide show
  1. data/app/models/message.rb +5 -5
  2. data/app/models/message_request.rb +3 -3
  3. data/app/models/message_template.rb +7 -9
  4. data/app/views/messages/index.html.erb +1 -1
  5. data/lib/enju_message/version.rb +1 -1
  6. data/spec/dummy/db/development.sqlite3 +0 -0
  7. data/spec/dummy/db/production.sqlite3 +0 -0
  8. data/spec/dummy/db/test.sqlite3 +0 -0
  9. data/spec/dummy/solr/conf/schema.xml +2 -14
  10. data/spec/dummy/solr/data/test/index/{_7.fdt → _1b.fdt} +0 -0
  11. data/spec/dummy/solr/data/test/index/{_7.fdx → _1b.fdx} +0 -0
  12. data/spec/dummy/solr/data/test/index/{_7.fnm → _1b.fnm} +0 -0
  13. data/spec/dummy/solr/data/test/index/{_7.frq → _1b.frq} +0 -0
  14. data/spec/dummy/solr/data/test/index/{_7.nrm → _1b.nrm} +0 -0
  15. data/spec/dummy/solr/data/test/index/{_7.prx → _1b.prx} +0 -0
  16. data/spec/dummy/solr/data/test/index/{_7.tii → _1b.tii} +0 -0
  17. data/spec/dummy/solr/data/test/index/{_7.tis → _1b.tis} +0 -0
  18. data/spec/dummy/solr/data/test/index/segments.gen +0 -0
  19. data/spec/dummy/solr/data/test/index/{segments_h → segments_2p} +0 -0
  20. data/spec/dummy/solr/data/test/spellchecker/segments_1 +0 -0
  21. data/spec/fixtures/message_requests.yml +3 -3
  22. data/spec/fixtures/message_templates.yml +15 -0
  23. data/spec/fixtures/messages.yml +5 -5
  24. data/spec/models/message_request_spec.rb +3 -3
  25. data/spec/models/message_spec.rb +5 -5
  26. data/spec/models/message_template_spec.rb +7 -9
  27. metadata +27 -20
data/app/models/message.rb CHANGED
@@ -63,23 +63,23 @@ class Message < ActiveRecord::Base
63
63
  end
64
64
  end
65
65
 
66
-
67
66
  # == Schema Information
68
67
  #
69
68
  # Table name: messages
70
69
  #
71
- # id :integer not null, primary key
70
+ # id :integer not null, primary key
72
71
  # read_at :datetime
73
72
  # receiver_id :integer
74
73
  # sender_id :integer
75
- # subject :string(255) not null
74
+ # subject :string(255) not null
76
75
  # body :text
77
- # created_at :datetime
78
- # updated_at :datetime
79
76
  # message_request_id :integer
80
77
  # state :string(255)
81
78
  # parent_id :integer
79
+ # created_at :datetime not null
80
+ # updated_at :datetime not null
82
81
  # lft :integer
83
82
  # rgt :integer
83
+ # depth :integer
84
84
  #
85
85
 
data/app/models/message_request.rb CHANGED
@@ -83,7 +83,7 @@ end
83
83
  #
84
84
  # Table name: message_requests
85
85
  #
86
- # id :integer not null, primary key
86
+ # id :integer not null, primary key
87
87
  # sender_id :integer
88
88
  # receiver_id :integer
89
89
  # message_template_id :integer
@@ -91,7 +91,7 @@ end
91
91
  # deleted_at :datetime
92
92
  # body :text
93
93
  # state :string(255)
94
- # created_at :datetime
95
- # updated_at :datetime
94
+ # created_at :datetime not null
95
+ # updated_at :datetime not null
96
96
  #
97
97
 
data/app/models/message_template.rb CHANGED
@@ -23,19 +23,17 @@ class MessageTemplate < ActiveRecord::Base
23
23
  end
24
24
  end
25
25
 
26
-
27
-
28
26
  # == Schema Information
29
27
  #
30
28
  # Table name: message_templates
31
29
  #
32
- # id :integer not null, primary key
33
- # status :string(255) not null
34
- # title :text not null
35
- # body :text not null
30
+ # id :integer not null, primary key
31
+ # status :string(255) not null
32
+ # title :text not null
33
+ # body :text not null
36
34
  # position :integer
37
- # created_at :datetime
38
- # updated_at :datetime
39
- # locale :string(255) default("ja")
35
+ # locale :string(255) default("en")
36
+ # created_at :datetime not null
37
+ # updated_at :datetime not null
40
38
  #
41
39
 
data/app/views/messages/index.html.erb CHANGED
@@ -3,7 +3,7 @@
3
3
  <div id="content_list">
4
4
  <%= form_for :messages, :url => messages_path, :html => {:method => 'get'} do -%>
5
5
  <p>
6
- <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
6
+ <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
7
7
  <%= submit_tag t('page.search') -%>
8
8
  </p>
9
9
  <%- end -%>
data/lib/enju_message/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnjuMessage
2
- VERSION = "0.1.14.pre2"
2
+ VERSION = "0.1.14.pre3"
3
3
  end
data/spec/dummy/db/development.sqlite3 ADDED
Binary file
data/spec/dummy/db/production.sqlite3 ADDED
Binary file
data/spec/dummy/db/test.sqlite3 CHANGED
Binary file
data/spec/dummy/solr/conf/schema.xml CHANGED
@@ -84,14 +84,11 @@
84
84
  <fieldType name="tfloat" class="solr.TrieFloatField" omitNorms="true"/>
85
85
  <!-- *** This fieldType is used by Sunspot! *** -->
86
86
  <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true"/>
87
-
88
- <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
89
- <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
90
87
  </types>
91
88
  <fields>
92
89
  <!-- Valid attributes for fields:
93
90
  name: mandatory - the name for the field
94
- type: mandatory - the name of a previously defined type from the
91
+ type: mandatory - the name of a previously defined type from the
95
92
  <types> section
96
93
  indexed: true if this field should be indexed (searchable or sortable)
97
94
  stored: true if this field should be retrievable
@@ -226,17 +223,8 @@
226
223
  <dynamicField name="*_ets" stored="true" termVectors="true" type="tdouble" multiValued="false" indexed="true"/>
227
224
  <!-- *** This dynamicField is used by Sunspot! *** -->
228
225
  <dynamicField name="*_etms" stored="true" termVectors="true" type="tdouble" multiValued="true" indexed="true"/>
229
-
230
- <!-- Type used to index the lat and lon components for the "location" FieldType -->
231
- <dynamicField name="*_coordinate" type="tdouble" indexed="true" stored="false" multiValued="false"/>
232
- <dynamicField name="*_p" type="location" indexed="true" stored="true" multiValued="false"/>
233
-
234
- <dynamicField name="*_ll" stored="false" type="location" multiValued="false" indexed="true"/>
235
- <dynamicField name="*_llm" stored="false" type="location" multiValued="true" indexed="true"/>
236
- <dynamicField name="*_lls" stored="true" type="location" multiValued="false" indexed="true"/>
237
- <dynamicField name="*_llms" stored="true" type="location" multiValued="true" indexed="true"/>
238
226
  </fields>
239
- <!-- Field to use to determine and enforce document uniqueness.
227
+ <!-- Field to use to determine and enforce document uniqueness.
240
228
  Unless this field is marked with required="false", it will be a required field
241
229
  -->
242
230
  <uniqueKey>id</uniqueKey>
data/spec/dummy/solr/data/test/index/{_7.fdt → _1b.fdt} RENAMED
File without changes
data/spec/dummy/solr/data/test/index/{_7.fdx → _1b.fdx} RENAMED
File without changes
data/spec/dummy/solr/data/test/index/{_7.fnm → _1b.fnm} RENAMED
File without changes
data/spec/dummy/solr/data/test/index/{_7.frq → _1b.frq} RENAMED
File without changes
data/spec/dummy/solr/data/test/index/{_7.nrm → _1b.nrm} RENAMED
File without changes
data/spec/dummy/solr/data/test/index/{_7.prx → _1b.prx} RENAMED
File without changes
data/spec/dummy/solr/data/test/index/{_7.tii → _1b.tii} RENAMED
File without changes
data/spec/fixtures/message_requests.yml CHANGED
@@ -16,7 +16,7 @@ two:
16
16
  #
17
17
  # Table name: message_requests
18
18
  #
19
- # id :integer not null, primary key
19
+ # id :integer not null, primary key
20
20
  # sender_id :integer
21
21
  # receiver_id :integer
22
22
  # message_template_id :integer
@@ -24,7 +24,7 @@ two:
24
24
  # deleted_at :datetime
25
25
  # body :text
26
26
  # state :string(255)
27
- # created_at :datetime
28
- # updated_at :datetime
27
+ # created_at :datetime not null
28
+ # updated_at :datetime not null
29
29
  #
30
30
 
data/spec/fixtures/message_templates.yml CHANGED
@@ -68,3 +68,18 @@ message_template_00010:
68
68
  body: Item received
69
69
  position: 10
70
70
  locale: ja
71
+
72
+ # == Schema Information
73
+ #
74
+ # Table name: message_templates
75
+ #
76
+ # id :integer not null, primary key
77
+ # status :string(255) not null
78
+ # title :text not null
79
+ # body :text not null
80
+ # position :integer
81
+ # locale :string(255) default("en")
82
+ # created_at :datetime not null
83
+ # updated_at :datetime not null
84
+ #
85
+
data/spec/fixtures/messages.yml CHANGED
@@ -40,23 +40,23 @@ librarian2_to_user2:
40
40
  lft: 7
41
41
  rgt: 8
42
42
 
43
-
44
43
  # == Schema Information
45
44
  #
46
45
  # Table name: messages
47
46
  #
48
- # id :integer not null, primary key
47
+ # id :integer not null, primary key
49
48
  # read_at :datetime
50
49
  # receiver_id :integer
51
50
  # sender_id :integer
52
- # subject :string(255) not null
51
+ # subject :string(255) not null
53
52
  # body :text
54
- # created_at :datetime
55
- # updated_at :datetime
56
53
  # message_request_id :integer
57
54
  # state :string(255)
58
55
  # parent_id :integer
56
+ # created_at :datetime not null
57
+ # updated_at :datetime not null
59
58
  # lft :integer
60
59
  # rgt :integer
60
+ # depth :integer
61
61
  #
62
62
 
data/spec/models/message_request_spec.rb CHANGED
@@ -10,7 +10,7 @@ end
10
10
  #
11
11
  # Table name: message_requests
12
12
  #
13
- # id :integer not null, primary key
13
+ # id :integer not null, primary key
14
14
  # sender_id :integer
15
15
  # receiver_id :integer
16
16
  # message_template_id :integer
@@ -18,7 +18,7 @@ end
18
18
  # deleted_at :datetime
19
19
  # body :text
20
20
  # state :string(255)
21
- # created_at :datetime
22
- # updated_at :datetime
21
+ # created_at :datetime not null
22
+ # updated_at :datetime not null
23
23
  #
24
24
 
data/spec/models/message_spec.rb CHANGED
@@ -37,23 +37,23 @@ describe Message do
37
37
  end
38
38
  end
39
39
 
40
-
41
40
  # == Schema Information
42
41
  #
43
42
  # Table name: messages
44
43
  #
45
- # id :integer not null, primary key
44
+ # id :integer not null, primary key
46
45
  # read_at :datetime
47
46
  # receiver_id :integer
48
47
  # sender_id :integer
49
- # subject :string(255) not null
48
+ # subject :string(255) not null
50
49
  # body :text
51
- # created_at :datetime
52
- # updated_at :datetime
53
50
  # message_request_id :integer
54
51
  # state :string(255)
55
52
  # parent_id :integer
53
+ # created_at :datetime not null
54
+ # updated_at :datetime not null
56
55
  # lft :integer
57
56
  # rgt :integer
57
+ # depth :integer
58
58
  #
59
59
 
data/spec/models/message_template_spec.rb CHANGED
@@ -6,19 +6,17 @@ describe MessageTemplate do
6
6
 
7
7
  end
8
8
 
9
-
10
-
11
9
  # == Schema Information
12
10
  #
13
11
  # Table name: message_templates
14
12
  #
15
- # id :integer not null, primary key
16
- # status :string(255) not null
17
- # title :text not null
18
- # body :text not null
13
+ # id :integer not null, primary key
14
+ # status :string(255) not null
15
+ # title :text not null
16
+ # body :text not null
19
17
  # position :integer
20
- # created_at :datetime
21
- # updated_at :datetime
22
- # locale :string(255) default("ja")
18
+ # locale :string(255) default("en")
19
+ # created_at :datetime not null
20
+ # updated_at :datetime not null
23
21
  #
24
22
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_message
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.14.pre2
4
+ version: 0.1.14.pre3
5
5
  prerelease: 7
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-10-23 00:00:00.000000000 Z
12
+ date: 2012-12-13 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -281,6 +281,7 @@ files:
281
281
  - spec/dummy/config/locales/en.yml
282
282
  - spec/dummy/config/routes.rb
283
283
  - spec/dummy/config.ru
284
+ - spec/dummy/db/development.sqlite3
284
285
  - spec/dummy/db/migrate/001_create_patrons.rb
285
286
  - spec/dummy/db/migrate/080_create_library_groups.rb
286
287
  - spec/dummy/db/migrate/20080905191442_create_patron_types.rb
@@ -297,6 +298,7 @@ files:
297
298
  - spec/dummy/db/migrate/20111201163342_create_user_groups.rb
298
299
  - spec/dummy/db/migrate/20111201163718_create_user_has_roles.rb
299
300
  - spec/dummy/db/migrate/20120213092115_add_queue_to_delayed_jobs.rb
301
+ - spec/dummy/db/production.sqlite3
300
302
  - spec/dummy/db/schema.rb
301
303
  - spec/dummy/db/test.sqlite3
302
304
  - spec/dummy/public/404.html
@@ -316,16 +318,16 @@ files:
316
318
  - spec/dummy/solr/conf/spellings.txt
317
319
  - spec/dummy/solr/conf/stopwords.txt
318
320
  - spec/dummy/solr/conf/synonyms.txt
319
- - spec/dummy/solr/data/test/index/_7.fdt
320
- - spec/dummy/solr/data/test/index/_7.fdx
321
- - spec/dummy/solr/data/test/index/_7.fnm
322
- - spec/dummy/solr/data/test/index/_7.frq
323
- - spec/dummy/solr/data/test/index/_7.nrm
324
- - spec/dummy/solr/data/test/index/_7.prx
325
- - spec/dummy/solr/data/test/index/_7.tii
326
- - spec/dummy/solr/data/test/index/_7.tis
321
+ - spec/dummy/solr/data/test/index/_1b.fdt
322
+ - spec/dummy/solr/data/test/index/_1b.fdx
323
+ - spec/dummy/solr/data/test/index/_1b.fnm
324
+ - spec/dummy/solr/data/test/index/_1b.frq
325
+ - spec/dummy/solr/data/test/index/_1b.nrm
326
+ - spec/dummy/solr/data/test/index/_1b.prx
327
+ - spec/dummy/solr/data/test/index/_1b.tii
328
+ - spec/dummy/solr/data/test/index/_1b.tis
327
329
  - spec/dummy/solr/data/test/index/segments.gen
328
- - spec/dummy/solr/data/test/index/segments_h
330
+ - spec/dummy/solr/data/test/index/segments_2p
329
331
  - spec/dummy/solr/data/test/spellchecker/segments.gen
330
332
  - spec/dummy/solr/data/test/spellchecker/segments_1
331
333
  - spec/factories/message.rb
@@ -359,6 +361,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
359
361
  - - ! '>='
360
362
  - !ruby/object:Gem::Version
361
363
  version: '0'
364
+ segments:
365
+ - 0
366
+ hash: 3990901655970059189
362
367
  required_rubygems_version: !ruby/object:Gem::Requirement
363
368
  none: false
364
369
  requirements:
@@ -415,6 +420,7 @@ test_files:
415
420
  - spec/dummy/config/locales/en.yml
416
421
  - spec/dummy/config/routes.rb
417
422
  - spec/dummy/config.ru
423
+ - spec/dummy/db/development.sqlite3
418
424
  - spec/dummy/db/migrate/001_create_patrons.rb
419
425
  - spec/dummy/db/migrate/080_create_library_groups.rb
420
426
  - spec/dummy/db/migrate/20080905191442_create_patron_types.rb
@@ -431,6 +437,7 @@ test_files:
431
437
  - spec/dummy/db/migrate/20111201163342_create_user_groups.rb
432
438
  - spec/dummy/db/migrate/20111201163718_create_user_has_roles.rb
433
439
  - spec/dummy/db/migrate/20120213092115_add_queue_to_delayed_jobs.rb
440
+ - spec/dummy/db/production.sqlite3
434
441
  - spec/dummy/db/schema.rb
435
442
  - spec/dummy/db/test.sqlite3
436
443
  - spec/dummy/public/404.html
@@ -450,16 +457,16 @@ test_files:
450
457
  - spec/dummy/solr/conf/spellings.txt
451
458
  - spec/dummy/solr/conf/stopwords.txt
452
459
  - spec/dummy/solr/conf/synonyms.txt
453
- - spec/dummy/solr/data/test/index/_7.fdt
454
- - spec/dummy/solr/data/test/index/_7.fdx
455
- - spec/dummy/solr/data/test/index/_7.fnm
456
- - spec/dummy/solr/data/test/index/_7.frq
457
- - spec/dummy/solr/data/test/index/_7.nrm
458
- - spec/dummy/solr/data/test/index/_7.prx
459
- - spec/dummy/solr/data/test/index/_7.tii
460
- - spec/dummy/solr/data/test/index/_7.tis
460
+ - spec/dummy/solr/data/test/index/_1b.fdt
461
+ - spec/dummy/solr/data/test/index/_1b.fdx
462
+ - spec/dummy/solr/data/test/index/_1b.fnm
463
+ - spec/dummy/solr/data/test/index/_1b.frq
464
+ - spec/dummy/solr/data/test/index/_1b.nrm
465
+ - spec/dummy/solr/data/test/index/_1b.prx
466
+ - spec/dummy/solr/data/test/index/_1b.tii
467
+ - spec/dummy/solr/data/test/index/_1b.tis
461
468
  - spec/dummy/solr/data/test/index/segments.gen
462
- - spec/dummy/solr/data/test/index/segments_h
469
+ - spec/dummy/solr/data/test/index/segments_2p
463
470
  - spec/dummy/solr/data/test/spellchecker/segments.gen
464
471
  - spec/dummy/solr/data/test/spellchecker/segments_1
465
472
  - spec/factories/message.rb