enju_leaf 1.1.0.rc20 → 1.1.0.rc21

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 (47) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/unknown_resource.png +0 -0
  3. data/app/controllers/my_accounts_controller.rb +0 -11
  4. data/app/controllers/page_controller.rb +12 -0
  5. data/app/controllers/profiles_controller.rb +23 -5
  6. data/app/controllers/user_import_files_controller.rb +1 -0
  7. data/app/helpers/page_helper.rb +14 -0
  8. data/app/models/profile.rb +7 -1
  9. data/app/models/user_export_file.rb +1 -0
  10. data/app/models/user_import_file.rb +20 -10
  11. data/app/views/page/_menu.html.erb +40 -51
  12. data/app/views/page/advanced_search.html.erb +14 -3
  13. data/app/views/page/configuration.html.erb +3 -0
  14. data/app/views/page/statistics.html.erb +0 -14
  15. data/app/views/page/system_information.html.erb +13 -1
  16. data/app/views/profiles/_edit_profile.html.erb +2 -2
  17. data/app/views/user_import_files/_results.html.erb +22 -0
  18. data/app/views/user_import_files/show.html.erb +8 -12
  19. data/app/views/user_import_results/_list.html.erb +22 -0
  20. data/app/views/user_import_results/_list_lines.html.erb +24 -0
  21. data/app/views/user_import_results/index.html.erb +5 -30
  22. data/app/views/user_import_results/show.html.erb +1 -1
  23. data/config/locales/devise.ja.yml +3 -3
  24. data/config/locales/translation_en.yml +5 -1
  25. data/config/locales/translation_ja.yml +5 -1
  26. data/lib/enju_leaf/calculate_stat.rb +3 -0
  27. data/lib/enju_leaf/engine.rb +0 -1
  28. data/lib/enju_leaf/helper.rb +22 -7
  29. data/lib/enju_leaf/import_file.rb +4 -0
  30. data/lib/enju_leaf/master_model.rb +1 -0
  31. data/lib/enju_leaf/user.rb +52 -20
  32. data/lib/enju_leaf/version.rb +1 -1
  33. data/lib/generators/enju_leaf/setup/setup_generator.rb +1 -1
  34. data/spec/controllers/my_accounts_controller_spec.rb +2 -2
  35. data/spec/controllers/profiles_controller_spec.rb +19 -5
  36. data/spec/controllers/user_import_files_controller_spec.rb +8 -1
  37. data/spec/controllers/user_import_results_controller_spec.rb +21 -1
  38. data/spec/dummy/app/assets/javascripts/application.js +4 -6
  39. data/spec/dummy/config/initializers/kaminari_config.rb +10 -0
  40. data/spec/fixtures/user_import_files.yml +2 -0
  41. data/spec/models/user_import_file_spec.rb +32 -24
  42. data/spec/models/user_spec.rb +29 -1
  43. data/spec/rails_helper.rb +82 -0
  44. data/spec/spec_helper.rb +86 -51
  45. data/spec/views/page/configuration.html.erb_spec.rb +1 -1
  46. data/spec/views/user_import_results/index.html.erb_spec.rb +32 -0
  47. metadata +20 -11
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_leaf
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0.rc20
4
+ version: 1.1.0.rc21
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kosuke Tanabe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-08-20 00:00:00.000000000 Z
11
+ date: 2015-10-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -36,14 +36,14 @@ dependencies:
36
36
  requirements:
37
37
  - - "~>"
38
38
  - !ruby/object:Gem::Version
39
- version: 0.1.0.pre68
39
+ version: 0.1.0.pre69
40
40
  type: :runtime
41
41
  prerelease: false
42
42
  version_requirements: !ruby/object:Gem::Requirement
43
43
  requirements:
44
44
  - - "~>"
45
45
  - !ruby/object:Gem::Version
46
- version: 0.1.0.pre68
46
+ version: 0.1.0.pre69
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: enju_library
49
49
  requirement: !ruby/object:Gem::Requirement
@@ -120,14 +120,14 @@ dependencies:
120
120
  requirements:
121
121
  - - "~>"
122
122
  - !ruby/object:Gem::Version
123
- version: '1.12'
123
+ version: 1.13.1
124
124
  type: :runtime
125
125
  prerelease: false
126
126
  version_requirements: !ruby/object:Gem::Requirement
127
127
  requirements:
128
128
  - - "~>"
129
129
  - !ruby/object:Gem::Version
130
- version: '1.12'
130
+ version: 1.13.1
131
131
  - !ruby/object:Gem::Dependency
132
132
  name: acts_as_list
133
133
  requirement: !ruby/object:Gem::Requirement
@@ -384,16 +384,16 @@ dependencies:
384
384
  name: mysql2
385
385
  requirement: !ruby/object:Gem::Requirement
386
386
  requirements:
387
- - - ">="
387
+ - - "~>"
388
388
  - !ruby/object:Gem::Version
389
- version: '0'
389
+ version: 0.3.20
390
390
  type: :development
391
391
  prerelease: false
392
392
  version_requirements: !ruby/object:Gem::Requirement
393
393
  requirements:
394
- - - ">="
394
+ - - "~>"
395
395
  - !ruby/object:Gem::Version
396
- version: '0'
396
+ version: 0.3.20
397
397
  - !ruby/object:Gem::Dependency
398
398
  name: pg
399
399
  requirement: !ruby/object:Gem::Requirement
@@ -826,6 +826,7 @@ files:
826
826
  - app/views/user_groups/new.html.erb
827
827
  - app/views/user_groups/show.html.erb
828
828
  - app/views/user_import_files/_form.html.erb
829
+ - app/views/user_import_files/_results.html.erb
829
830
  - app/views/user_import_files/edit.html.erb
830
831
  - app/views/user_import_files/index.html.erb
831
832
  - app/views/user_import_files/index.html.slim
@@ -833,6 +834,8 @@ files:
833
834
  - app/views/user_import_files/new.html.slim
834
835
  - app/views/user_import_files/show.html.erb
835
836
  - app/views/user_import_results/_form.html.erb
837
+ - app/views/user_import_results/_list.html.erb
838
+ - app/views/user_import_results/_list_lines.html.erb
836
839
  - app/views/user_import_results/index.html.erb
837
840
  - app/views/user_import_results/index.txt.erb
838
841
  - app/views/user_import_results/show.html.erb
@@ -942,6 +945,7 @@ files:
942
945
  - spec/dummy/config/initializers/devise.rb
943
946
  - spec/dummy/config/initializers/friendly_id.rb
944
947
  - spec/dummy/config/initializers/inflections.rb
948
+ - spec/dummy/config/initializers/kaminari_config.rb
945
949
  - spec/dummy/config/initializers/mime_types.rb
946
950
  - spec/dummy/config/initializers/secret_token.rb
947
951
  - spec/dummy/config/initializers/session_store.rb
@@ -1271,6 +1275,7 @@ files:
1271
1275
  - spec/models/user_import_file_spec.rb
1272
1276
  - spec/models/user_import_result_spec.rb
1273
1277
  - spec/models/user_spec.rb
1278
+ - spec/rails_helper.rb
1274
1279
  - spec/requests/profiles_spec.rb
1275
1280
  - spec/routing/accounts_spec.rb
1276
1281
  - spec/routing/profiles_routing_spec.rb
@@ -1293,6 +1298,7 @@ files:
1293
1298
  - spec/views/profiles/new.html.erb_spec.rb
1294
1299
  - spec/views/profiles/show.html.erb_spec.rb
1295
1300
  - spec/views/user_export_files/new.html.erb_spec.rb
1301
+ - spec/views/user_import_results/index.html.erb_spec.rb
1296
1302
  - vendor/assets/javascripts/event_calendar.js
1297
1303
  - vendor/assets/javascripts/jquery.colorbox.js
1298
1304
  - vendor/assets/javascripts/jquery.cookie.js
@@ -1330,7 +1336,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
1330
1336
  requirements:
1331
1337
  - - ">="
1332
1338
  - !ruby/object:Gem::Version
1333
- version: '0'
1339
+ version: 1.9.3
1334
1340
  required_rubygems_version: !ruby/object:Gem::Requirement
1335
1341
  requirements:
1336
1342
  - - ">"
@@ -1376,6 +1382,7 @@ test_files:
1376
1382
  - spec/dummy/config/initializers/devise.rb
1377
1383
  - spec/dummy/config/initializers/friendly_id.rb
1378
1384
  - spec/dummy/config/initializers/inflections.rb
1385
+ - spec/dummy/config/initializers/kaminari_config.rb
1379
1386
  - spec/dummy/config/initializers/mime_types.rb
1380
1387
  - spec/dummy/config/initializers/secret_token.rb
1381
1388
  - spec/dummy/config/initializers/session_store.rb
@@ -1708,6 +1715,7 @@ test_files:
1708
1715
  - spec/models/user_import_file_spec.rb
1709
1716
  - spec/models/user_import_result_spec.rb
1710
1717
  - spec/models/user_spec.rb
1718
+ - spec/rails_helper.rb
1711
1719
  - spec/requests/profiles_spec.rb
1712
1720
  - spec/routing/accounts_spec.rb
1713
1721
  - spec/routing/profiles_routing_spec.rb
@@ -1730,3 +1738,4 @@ test_files:
1730
1738
  - spec/views/profiles/new.html.erb_spec.rb
1731
1739
  - spec/views/profiles/show.html.erb_spec.rb
1732
1740
  - spec/views/user_export_files/new.html.erb_spec.rb
1741
+ - spec/views/user_import_results/index.html.erb_spec.rb