blacklight-spotlight 0.20.3 → 0.21.0

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 (36) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/concerns/spotlight/controller.rb +1 -2
  3. data/app/controllers/spotlight/catalog_controller.rb +1 -1
  4. data/app/controllers/spotlight/concerns/user_invitable.rb +1 -1
  5. data/app/controllers/spotlight/roles_controller.rb +1 -1
  6. data/app/controllers/spotlight/searches_controller.rb +5 -1
  7. data/app/models/concerns/spotlight/ar_light.rb +8 -0
  8. data/app/models/concerns/spotlight/solr_document.rb +0 -1
  9. data/app/models/spotlight/blacklight_configuration.rb +3 -1
  10. data/app/models/spotlight/filter.rb +12 -1
  11. data/app/models/spotlight/resource.rb +13 -2
  12. data/app/models/spotlight/search.rb +4 -0
  13. data/app/uploaders/spotlight/attachment_uploader.rb +2 -2
  14. data/app/uploaders/spotlight/avatar_uploader.rb +4 -0
  15. data/app/uploaders/spotlight/featured_image_uploader.rb +4 -0
  16. data/app/uploaders/spotlight/item_uploader.rb +4 -0
  17. data/app/uploaders/spotlight/masthead_uploader.rb +4 -0
  18. data/app/views/spotlight/pages/_view_type_group.html.erb +1 -1
  19. data/config/locales/spotlight.en.yml +3 -1
  20. data/lib/generators/spotlight/install_generator.rb +3 -3
  21. data/lib/generators/spotlight/templates/solr/config/schema.xml +347 -0
  22. data/lib/generators/spotlight/templates/solr/config/solrconfig.xml +163 -0
  23. data/lib/spotlight/engine.rb +9 -1
  24. data/lib/spotlight/version.rb +1 -1
  25. data/spec/controllers/spotlight/admin_users_controller_spec.rb +1 -1
  26. data/spec/controllers/spotlight/appearances_controller_spec.rb +20 -8
  27. data/spec/controllers/spotlight/roles_controller_spec.rb +2 -2
  28. data/spec/controllers/spotlight/solr_controller_spec.rb +12 -4
  29. data/spec/models/spotlight/resource_spec.rb +18 -0
  30. data/spec/spec_helper.rb +8 -1
  31. data/spec/support/helpers/controller_level_helpers.rb +12 -0
  32. data/spec/support/views/test_view_helpers.rb +4 -0
  33. data/spec/test_app_templates/Gemfile.extra +2 -0
  34. metadata +41 -19
  35. data/lib/generators/spotlight/templates/solr_conf/conf/schema.xml +0 -159
  36. data/lib/generators/spotlight/templates/solr_conf/conf/solrconfig.xml +0 -87
data/lib/generators/spotlight/templates/solr_conf/conf/schema.xml DELETED
@@ -1,159 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <schema name="Hydra" version="1.5">
3
- <!-- NOTE: various comments and unused configuration possibilities have been purged
4
- from this file. Please refer to http://wiki.apache.org/solr/SchemaXml,
5
- as well as the default schema file included with Solr -->
6
-
7
- <uniqueKey>id</uniqueKey>
8
-
9
- <fields>
10
- <field name="id" type="string" stored="true" indexed="true" multiValued="false" required="true"/>
11
- <field name="_version_" type="long" indexed="true" stored="true"/>
12
- <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
13
-
14
- <dynamicField name="*_bbox" type="location_rpt" stored="true" indexed="true"/>
15
- <dynamicField name="*_ng" type="text_en_ng" stored="false" indexed="true" multiValued="true"/>
16
-
17
- <dynamicField name="*_ts" type="text" stored="true" indexed="false" multiValued="false"/>
18
- <dynamicField name="*_tsm" type="text" stored="true" indexed="false" multiValued="true"/>
19
- <dynamicField name="*_tsi" type="text" stored="true" indexed="true" multiValued="false"/>
20
- <dynamicField name="*_tsim" type="text" stored="true" indexed="true" multiValued="true"/>
21
- <dynamicField name="*_tsiv" type="text" stored="true" indexed="true" multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
22
- <dynamicField name="*_tsimv" type="text" stored="true" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
23
-
24
- <dynamicField name="*_tes" type="text_en" stored="true" indexed="false" multiValued="false"/>
25
- <dynamicField name="*_tesm" type="text_en" stored="true" indexed="false" multiValued="true"/>
26
- <dynamicField name="*_tesi" type="text_en" stored="true" indexed="true" multiValued="false"/>
27
- <dynamicField name="*_tesim" type="text_en" stored="true" indexed="true" multiValued="true"/>
28
- <dynamicField name="*_tesiv" type="text_en" stored="true" indexed="true" multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
29
- <dynamicField name="*_tesimv" type="text_en" stored="true" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
30
-
31
- <dynamicField name="*_ss" type="string" stored="true" indexed="false" multiValued="false"/>
32
- <dynamicField name="*_ssm" type="string" stored="true" indexed="false" multiValued="true"/>
33
- <dynamicField name="*_ssi" type="string" stored="true" indexed="true" multiValued="false"/>
34
- <dynamicField name="*_ssim" type="string" stored="true" indexed="true" multiValued="true"/>
35
-
36
- <dynamicField name="*_is" type="int" stored="true" indexed="false" multiValued="false"/>
37
- <dynamicField name="*_ism" type="int" stored="true" indexed="false" multiValued="true"/>
38
- <dynamicField name="*_isi" type="int" stored="true" indexed="true" multiValued="false"/>
39
- <dynamicField name="*_isim" type="int" stored="true" indexed="true" multiValued="true"/>
40
-
41
- <dynamicField name="*_dts" type="date" stored="true" indexed="false" multiValued="false"/>
42
- <dynamicField name="*_dtsm" type="date" stored="true" indexed="false" multiValued="true"/>
43
- <dynamicField name="*_dtsi" type="date" stored="true" indexed="true" multiValued="false"/>
44
- <dynamicField name="*_dtsim" type="date" stored="true" indexed="true" multiValued="true"/>
45
-
46
- <dynamicField name="*_ls" type="long" stored="true" indexed="false" multiValued="false"/>
47
- <dynamicField name="*_lsm" type="long" stored="true" indexed="false" multiValued="true"/>
48
- <dynamicField name="*_lsi" type="long" stored="true" indexed="true" multiValued="false"/>
49
- <dynamicField name="*_lsim" type="long" stored="true" indexed="true" multiValued="true"/>
50
-
51
- <!-- double (_db...) -->
52
- <dynamicField name="*_dbs" type="double" stored="true" indexed="false" multiValued="false"/>
53
- <dynamicField name="*_dbsm" type="double" stored="true" indexed="false" multiValued="true"/>
54
- <dynamicField name="*_dbsi" type="double" stored="true" indexed="true" multiValued="false"/>
55
- <dynamicField name="*_dbsim" type="double" stored="true" indexed="true" multiValued="true"/>
56
-
57
- <dynamicField name="*_fs" type="float" stored="true" indexed="false" multiValued="false"/>
58
- <dynamicField name="*_fsm" type="float" stored="true" indexed="false" multiValued="true"/>
59
- <dynamicField name="*_fsi" type="float" stored="true" indexed="true" multiValued="false"/>
60
- <dynamicField name="*_fsim" type="float" stored="true" indexed="true" multiValued="true"/>
61
-
62
- <dynamicField name="*_bs" type="boolean" stored="true" indexed="false" multiValued="false"/>
63
- <dynamicField name="*_bsi" type="boolean" stored="true" indexed="true" multiValued="false"/>
64
-
65
- <dynamicField name="*_lls" type="location" stored="true" indexed="false" multiValued="false"/>
66
- <dynamicField name="*_llsm" type="location" stored="true" indexed="false" multiValued="true"/>
67
- <dynamicField name="*_llsi" type="location" stored="true" indexed="true" multiValued="false"/>
68
- <dynamicField name="*_llsim" type="location" stored="true" indexed="true" multiValued="true"/>
69
-
70
- <!-- you must define copyField source and dest fields explicity or schemaBrowser doesn't work -->
71
- <field name="all_text_timv" type="text" stored="false" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
72
-
73
-
74
- </fields>
75
-
76
-
77
- <!-- Above, multiple source fields are copied to the [text] field.
78
- Another way to map multiple source fields to the same
79
- destination field is to use the dynamic field syntax.
80
- copyField also supports a maxChars to copy setting. -->
81
-
82
- <copyField source="id" dest="id_ng" maxChars="3000"/>
83
- <copyField source="full_title_tesim" dest="full_title_ng" maxChars="3000"/>
84
- <copyField source="*_tesim" dest="all_text_timv" maxChars="3000"/>
85
- <copyField source="*_ssim" dest="all_text_timv" maxChars="3000"/>
86
-
87
- <types>
88
- <fieldType name="string" class="solr.StrField" sortMissingLast="true" />
89
- <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
90
- <fieldType name="rand" class="solr.RandomSortField" omitNorms="true"/>
91
-
92
- <!-- Default numeric field types. -->
93
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
94
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
95
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
96
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
97
-
98
- <!-- The format for this date field is of the form 1995-12-31T23:59:59Z
99
- Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z
100
- -->
101
- <fieldType name="date" class="solr.TrieDateField" precisionStep="0" positionIncrementGap="0"/>
102
-
103
- <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
104
- <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
105
-
106
- <!-- An alternative geospatial field type new to Solr 4. It supports multiValued and polygon shapes.
107
- For more information about this and other Spatial fields new to Solr 4, see:
108
- http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
109
- -->
110
- <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
111
- geo="true" distErrPct="0.025" maxDistErr="0.000009" units="degrees" />
112
-
113
- <fieldType name="text" class="solr.TextField" omitNorms="false">
114
- <analyzer>
115
- <tokenizer class="solr.ICUTokenizerFactory"/>
116
- <filter class="solr.ICUFoldingFilterFactory"/> <!-- NFKC, case folding, diacritics removed -->
117
- <filter class="solr.TrimFilterFactory"/>
118
- </analyzer>
119
- </fieldType>
120
-
121
- <!-- A text field with defaults appropriate for English -->
122
- <fieldType name="text_en" class="solr.TextField" positionIncrementGap="100">
123
- <analyzer>
124
- <tokenizer class="solr.ICUTokenizerFactory"/>
125
- <filter class="solr.ICUFoldingFilterFactory"/> <!-- NFKC, case folding, diacritics removed -->
126
- <filter class="solr.EnglishPossessiveFilterFactory"/>
127
- <!-- EnglishMinimalStemFilterFactory is less aggressive than PorterStemFilterFactory: -->
128
- <filter class="solr.EnglishMinimalStemFilterFactory"/>
129
- <!--
130
- <filter class="solr.PorterStemFilterFactory"/>
131
- -->
132
- <filter class="solr.TrimFilterFactory"/>
133
- </analyzer>
134
- </fieldType>
135
-
136
- <!-- A text field with defaults appropriate for English an NGrams -->
137
- <fieldType name="text_en_ng" class="solr.TextField" positionIncrementGap="100">
138
- <analyzer type="index">
139
- <tokenizer class="solr.ICUTokenizerFactory"/>
140
- <filter class="solr.ICUFoldingFilterFactory"/> <!-- NFKC, case folding, diacritics removed -->
141
- <filter class="solr.EnglishPossessiveFilterFactory"/>
142
- <!-- EnglishMinimalStemFilterFactory is less aggressive than PorterStemFilterFactory: -->
143
- <filter class="solr.EnglishMinimalStemFilterFactory"/>
144
- <filter class="solr.TrimFilterFactory"/>
145
- <filter class="solr.EdgeNGramFilterFactory" minGramSize="3" maxGramSize="15" />
146
- </analyzer>
147
-
148
- <analyzer type="index">
149
- <tokenizer class="solr.ICUTokenizerFactory"/>
150
- <filter class="solr.ICUFoldingFilterFactory"/> <!-- NFKC, case folding, diacritics removed -->
151
- <filter class="solr.EnglishPossessiveFilterFactory"/>
152
- <!-- EnglishMinimalStemFilterFactory is less aggressive than PorterStemFilterFactory: -->
153
- <filter class="solr.EnglishMinimalStemFilterFactory"/>
154
- <filter class="solr.TrimFilterFactory"/>
155
- </analyzer>
156
- </fieldType>
157
- </types>
158
-
159
- </schema>
data/lib/generators/spotlight/templates/solr_conf/conf/solrconfig.xml DELETED
@@ -1,87 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8" ?>
2
- <config>
3
- <!-- NOTE: various comments and unused configuration possibilities have been purged
4
- from this file. Please refer to http://wiki.apache.org/solr/SolrConfigXml,
5
- as well as the default solrconfig file included with Solr -->
6
-
7
- <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
8
-
9
- <luceneMatchVersion>4.10.3</luceneMatchVersion>
10
-
11
- <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
12
-
13
- <updateHandler class="solr.DirectUpdateHandler2">
14
- <updateLog>
15
- <str name="dir">${solr.core0.data.dir:}</str>
16
- </updateLog>
17
- </updateHandler>
18
-
19
- <!-- solr lib dirs -->
20
- <lib dir="../lib/contrib/analysis-extras/lib" />
21
- <lib dir="../lib/contrib/analysis-extras/lucene-libs" />
22
-
23
- <dataDir>${solr.data.dir:}</dataDir>
24
-
25
- <requestHandler name="search" class="solr.SearchHandler" default="true">
26
- <lst name="defaults">
27
- <str name="defType">edismax</str>
28
- <str name="echoParams">explicit</str>
29
- <str name="q.alt">*:*</str>
30
- <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
31
- <int name="qs">1</int>
32
- <int name="ps">2</int>
33
- <float name="tie">0.01</float>
34
- <str name="qf">
35
- id^1000
36
- full_title_tesim^100
37
- spotlight_upload_description_tesim^50
38
- all_text_timv
39
- </str>
40
- <str name="pf">
41
- full_title_tesim^100
42
- all_text_timv^10
43
- </str>
44
-
45
- <str name="fl">
46
- *, score
47
- </str>
48
-
49
- <str name="facet">true</str>
50
- <str name="facet.mincount">1</str>
51
- <str name="facet.limit">10</str>
52
- </lst>
53
- </requestHandler>
54
-
55
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
56
- <lst name="defaults">
57
- <str name="omitHeader">true</str>
58
- <str name="wt">json</str>
59
- <str name="indent">true</str>
60
- </lst>
61
- </requestHandler>
62
-
63
- <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
64
-
65
- <requestDispatcher handleSelect="true" >
66
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
67
- </requestDispatcher>
68
-
69
- <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
70
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
71
- <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
72
-
73
- <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
74
- <lst name="invariants">
75
- <str name="q">solrpingquery</str>
76
- </lst>
77
- <lst name="defaults">
78
- <str name="echoParams">all</str>
79
- </lst>
80
- </requestHandler>
81
-
82
- <!-- config for the admin interface -->
83
- <admin>
84
- <defaultQuery>search</defaultQuery>
85
- </admin>
86
-
87
- </config>