enju_leaf 1.1.0.rc18 → 1.1.0.rc19

Sign up to get free protection for your applications and to get access to all the features.
Files changed (61) hide show
  1. checksums.yaml +4 -4
  2. data/MIT-LICENSE +1 -1
  3. data/app/controllers/my_accounts_controller.rb +1 -1
  4. data/app/controllers/page_controller.rb +5 -5
  5. data/app/controllers/profiles_controller.rb +0 -1
  6. data/app/controllers/user_import_files_controller.rb +2 -1
  7. data/app/models/identity.rb +9 -0
  8. data/app/models/profile.rb +2 -0
  9. data/app/models/user_import_file.rb +0 -1
  10. data/app/views/devise/registrations/edit.html.erb +8 -14
  11. data/app/views/my_accounts/_edit_credential.html.erb +6 -21
  12. data/app/views/my_accounts/_edit_credential.html.slim +63 -0
  13. data/app/views/my_accounts/edit.html.erb +1 -0
  14. data/app/views/my_accounts/show.html.erb +2 -1
  15. data/app/views/my_accounts/show.html.slim +59 -0
  16. data/app/views/page/500_nosolr.html.erb +66 -0
  17. data/app/views/page/{_msie_acceralator.html.erb → _msie_accelerator.html.erb} +0 -0
  18. data/app/views/page/add_on.html.slim +7 -0
  19. data/app/views/page/{msie_acceralator.builder → msie_accelerator.builder} +0 -0
  20. data/app/views/profiles/_edit_credential.html.slim +67 -0
  21. data/app/views/profiles/_edit_profile.html.slim +40 -0
  22. data/app/views/profiles/new.html.erb +0 -5
  23. data/app/views/roles/index.html.erb +6 -2
  24. data/app/views/roles/show.html.erb +3 -1
  25. data/app/views/user_groups/index.html.erb +3 -1
  26. data/app/views/user_groups/show.html.erb +6 -2
  27. data/app/views/user_import_files/index.html.slim +52 -0
  28. data/app/views/user_import_files/new.html.slim +64 -0
  29. data/config/locales/devise.ja.yml +1 -1
  30. data/config/locales/translation_en.yml +11 -9
  31. data/config/locales/translation_ja.yml +2 -0
  32. data/config/routes.rb +6 -1
  33. data/db/migrate/20140110122216_create_user_import_files.rb +1 -1
  34. data/db/migrate/20150421023923_create_identities.rb +15 -0
  35. data/lib/enju_leaf/controller.rb +1 -1
  36. data/lib/enju_leaf/user.rb +8 -8
  37. data/lib/enju_leaf/version.rb +1 -1
  38. data/lib/enju_leaf.rb +13 -2
  39. data/lib/generators/enju_leaf/quick_install/quick_install_generator.rb +12 -8
  40. data/lib/generators/enju_leaf/setup/setup_generator.rb +14 -14
  41. data/lib/generators/enju_leaf/setup/templates/config/initializers/resque.rb +3 -0
  42. data/lib/generators/enju_leaf/setup/templates/db/seeds.rb +2 -7
  43. data/lib/generators/enju_leaf/setup/templates/solr/conf/schema.xml +32 -12
  44. data/lib/generators/enju_leaf/setup/templates/solr/conf/solrconfig.xml +599 -853
  45. data/spec/controllers/my_accounts_controller_spec.rb +6 -6
  46. data/spec/controllers/page_controller_spec.rb +2 -2
  47. data/spec/dummy/db/schema.rb +14 -1
  48. data/spec/factories/user.rb +0 -3
  49. data/spec/fixtures/library_groups.yml +1 -0
  50. data/spec/models/user_import_file_spec.rb +1 -1
  51. data/spec/models/user_spec.rb +0 -17
  52. metadata +27 -25
  53. data/lib/generators/enju_leaf/setup/templates/config/resque.yml +0 -3
  54. data/lib/generators/enju_leaf/setup/templates/solr/conf/admin-extra.html +0 -31
  55. data/lib/generators/enju_leaf/setup/templates/solr/conf/elevate.xml +0 -36
  56. data/lib/generators/enju_leaf/setup/templates/solr/conf/mapping-ISOLatin1Accent.txt +0 -246
  57. data/lib/generators/enju_leaf/setup/templates/solr/conf/protwords.txt +0 -21
  58. data/lib/generators/enju_leaf/setup/templates/solr/conf/scripts.conf +0 -24
  59. data/lib/generators/enju_leaf/setup/templates/solr/conf/spellings.txt +0 -2
  60. data/lib/generators/enju_leaf/setup/templates/solr/conf/stopwords.txt +0 -58
  61. data/lib/generators/enju_leaf/setup/templates/solr/conf/synonyms.txt +0 -31
data/lib/generators/enju_leaf/setup/templates/solr/conf/scripts.conf DELETED
@@ -1,24 +0,0 @@
1
- # Licensed to the Apache Software Foundation (ASF) under one or more
2
- # contributor license agreements. See the NOTICE file distributed with
3
- # this work for additional information regarding copyright ownership.
4
- # The ASF licenses this file to You under the Apache License, Version 2.0
5
- # (the "License"); you may not use this file except in compliance with
6
- # the License. You may obtain a copy of the License at
7
- #
8
- # http://www.apache.org/licenses/LICENSE-2.0
9
- #
10
- # Unless required by applicable law or agreed to in writing, software
11
- # distributed under the License is distributed on an "AS IS" BASIS,
12
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
- # See the License for the specific language governing permissions and
14
- # limitations under the License.
15
-
16
- user=
17
- solr_hostname=localhost
18
- solr_port=8983
19
- rsyncd_port=18983
20
- data_dir=
21
- webapp_name=solr
22
- master_host=
23
- master_data_dir=
24
- master_status_dir=
data/lib/generators/enju_leaf/setup/templates/solr/conf/stopwords.txt DELETED
@@ -1,58 +0,0 @@
1
- # Licensed to the Apache Software Foundation (ASF) under one or more
2
- # contributor license agreements. See the NOTICE file distributed with
3
- # this work for additional information regarding copyright ownership.
4
- # The ASF licenses this file to You under the Apache License, Version 2.0
5
- # (the "License"); you may not use this file except in compliance with
6
- # the License. You may obtain a copy of the License at
7
- #
8
- # http://www.apache.org/licenses/LICENSE-2.0
9
- #
10
- # Unless required by applicable law or agreed to in writing, software
11
- # distributed under the License is distributed on an "AS IS" BASIS,
12
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
- # See the License for the specific language governing permissions and
14
- # limitations under the License.
15
-
16
- #-----------------------------------------------------------------------
17
- # a couple of test stopwords to test that the words are really being
18
- # configured from this file:
19
- stopworda
20
- stopwordb
21
-
22
- #Standard english stop words taken from Lucene's StopAnalyzer
23
- a
24
- an
25
- and
26
- are
27
- as
28
- at
29
- be
30
- but
31
- by
32
- for
33
- if
34
- in
35
- into
36
- is
37
- it
38
- no
39
- not
40
- of
41
- on
42
- or
43
- s
44
- such
45
- t
46
- that
47
- the
48
- their
49
- then
50
- there
51
- these
52
- they
53
- this
54
- to
55
- was
56
- will
57
- with
58
-
data/lib/generators/enju_leaf/setup/templates/solr/conf/synonyms.txt DELETED
@@ -1,31 +0,0 @@
1
- # The ASF licenses this file to You under the Apache License, Version 2.0
2
- # (the "License"); you may not use this file except in compliance with
3
- # the License. You may obtain a copy of the License at
4
- #
5
- # http://www.apache.org/licenses/LICENSE-2.0
6
- #
7
- # Unless required by applicable law or agreed to in writing, software
8
- # distributed under the License is distributed on an "AS IS" BASIS,
9
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10
- # See the License for the specific language governing permissions and
11
- # limitations under the License.
12
-
13
- #-----------------------------------------------------------------------
14
- #some test synonym mappings unlikely to appear in real input text
15
- aaa => aaaa
16
- bbb => bbbb1 bbbb2
17
- ccc => cccc1,cccc2
18
- a\=>a => b\=>b
19
- a\,a => b\,b
20
- fooaaa,baraaa,bazaaa
21
-
22
- # Some synonym groups specific to this example
23
- GB,gib,gigabyte,gigabytes
24
- MB,mib,megabyte,megabytes
25
- Television, Televisions, TV, TVs
26
- #notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming
27
- #after us won't split it into two words.
28
-
29
- # Synonym mappings can be used for spelling correction too
30
- pixima => pixma
31
-