sunspot 2.0.0.pre.120720 → 2.0.0.pre.120924

Sign up to get free protection for your applications and to get access to all the features.
Files changed (299) hide show
  1. data/.gitignore +9 -11
  2. data/.travis.yml +35 -0
  3. data/README.md +863 -0
  4. data/Rakefile +32 -8
  5. data/ci/travis.sh +67 -0
  6. data/sunspot/.gitignore +13 -0
  7. data/{Gemfile → sunspot/Gemfile} +0 -0
  8. data/{History.txt → sunspot/History.txt} +0 -0
  9. data/{LICENSE → sunspot/LICENSE} +0 -0
  10. data/sunspot/Rakefile +13 -0
  11. data/{TODO → sunspot/TODO} +0 -0
  12. data/{lib → sunspot/lib}/light_config.rb +0 -0
  13. data/{lib → sunspot/lib}/sunspot/adapters.rb +85 -5
  14. data/{lib → sunspot/lib}/sunspot/batcher.rb +0 -0
  15. data/{lib → sunspot/lib}/sunspot/class_set.rb +0 -0
  16. data/{lib → sunspot/lib}/sunspot/composite_setup.rb +0 -0
  17. data/{lib → sunspot/lib}/sunspot/configuration.rb +0 -0
  18. data/{lib → sunspot/lib}/sunspot/data_extractor.rb +0 -0
  19. data/{lib → sunspot/lib}/sunspot/dsl/adjustable.rb +0 -0
  20. data/{lib → sunspot/lib}/sunspot/dsl/field_group.rb +2 -2
  21. data/{lib → sunspot/lib}/sunspot/dsl/field_query.rb +1 -1
  22. data/{lib → sunspot/lib}/sunspot/dsl/fields.rb +0 -0
  23. data/{lib → sunspot/lib}/sunspot/dsl/fulltext.rb +0 -0
  24. data/{lib → sunspot/lib}/sunspot/dsl/function.rb +0 -0
  25. data/{lib → sunspot/lib}/sunspot/dsl/functional.rb +0 -0
  26. data/{lib → sunspot/lib}/sunspot/dsl/more_like_this_query.rb +0 -0
  27. data/{lib → sunspot/lib}/sunspot/dsl/paginatable.rb +0 -0
  28. data/{lib → sunspot/lib}/sunspot/dsl/query_facet.rb +0 -0
  29. data/{lib → sunspot/lib}/sunspot/dsl/restriction.rb +0 -0
  30. data/{lib → sunspot/lib}/sunspot/dsl/restriction_with_near.rb +0 -0
  31. data/{lib → sunspot/lib}/sunspot/dsl/scope.rb +8 -11
  32. data/{lib → sunspot/lib}/sunspot/dsl/search.rb +0 -0
  33. data/{lib → sunspot/lib}/sunspot/dsl/standard_query.rb +3 -4
  34. data/{lib → sunspot/lib}/sunspot/dsl.rb +0 -0
  35. data/{lib → sunspot/lib}/sunspot/field.rb +0 -0
  36. data/{lib → sunspot/lib}/sunspot/field_factory.rb +0 -0
  37. data/{lib → sunspot/lib}/sunspot/indexer.rb +0 -0
  38. data/{lib → sunspot/lib}/sunspot/query/abstract_field_facet.rb +1 -1
  39. data/{lib → sunspot/lib}/sunspot/query/bbox.rb +0 -0
  40. data/{lib → sunspot/lib}/sunspot/query/boost_query.rb +0 -0
  41. data/{lib → sunspot/lib}/sunspot/query/common_query.rb +0 -0
  42. data/{lib → sunspot/lib}/sunspot/query/composite_fulltext.rb +0 -0
  43. data/{lib → sunspot/lib}/sunspot/query/connective.rb +0 -0
  44. data/{lib → sunspot/lib}/sunspot/query/date_field_facet.rb +0 -0
  45. data/{lib → sunspot/lib}/sunspot/query/dismax.rb +0 -0
  46. data/{lib → sunspot/lib}/sunspot/query/field_facet.rb +0 -0
  47. data/{lib → sunspot/lib}/sunspot/query/field_group.rb +0 -0
  48. data/{lib → sunspot/lib}/sunspot/query/filter.rb +0 -0
  49. data/{lib → sunspot/lib}/sunspot/query/function_query.rb +0 -0
  50. data/{lib → sunspot/lib}/sunspot/query/geo.rb +0 -0
  51. data/{lib → sunspot/lib}/sunspot/query/geofilt.rb +0 -0
  52. data/{lib → sunspot/lib}/sunspot/query/highlighting.rb +0 -0
  53. data/{lib → sunspot/lib}/sunspot/query/more_like_this.rb +0 -0
  54. data/{lib → sunspot/lib}/sunspot/query/more_like_this_query.rb +0 -0
  55. data/{lib → sunspot/lib}/sunspot/query/pagination.rb +0 -0
  56. data/{lib → sunspot/lib}/sunspot/query/query_facet.rb +0 -0
  57. data/{lib → sunspot/lib}/sunspot/query/range_facet.rb +1 -0
  58. data/{lib → sunspot/lib}/sunspot/query/restriction.rb +12 -0
  59. data/{lib → sunspot/lib}/sunspot/query/scope.rb +0 -0
  60. data/{lib → sunspot/lib}/sunspot/query/sort.rb +0 -0
  61. data/{lib → sunspot/lib}/sunspot/query/sort_composite.rb +0 -0
  62. data/{lib → sunspot/lib}/sunspot/query/standard_query.rb +0 -0
  63. data/{lib → sunspot/lib}/sunspot/query/text_field_boost.rb +0 -0
  64. data/{lib → sunspot/lib}/sunspot/query.rb +0 -0
  65. data/{lib → sunspot/lib}/sunspot/schema.rb +0 -0
  66. data/{lib → sunspot/lib}/sunspot/search/abstract_search.rb +2 -2
  67. data/{lib → sunspot/lib}/sunspot/search/date_facet.rb +0 -0
  68. data/{lib → sunspot/lib}/sunspot/search/facet_row.rb +0 -0
  69. data/{lib → sunspot/lib}/sunspot/search/field_facet.rb +0 -0
  70. data/sunspot/lib/sunspot/search/field_group.rb +70 -0
  71. data/{lib → sunspot/lib}/sunspot/search/group.rb +0 -0
  72. data/{lib → sunspot/lib}/sunspot/search/highlight.rb +0 -0
  73. data/{lib → sunspot/lib}/sunspot/search/hit.rb +0 -0
  74. data/{lib → sunspot/lib}/sunspot/search/hit_enumerable.rb +5 -9
  75. data/{lib → sunspot/lib}/sunspot/search/more_like_this_search.rb +0 -0
  76. data/{lib → sunspot/lib}/sunspot/search/paginated_collection.rb +0 -0
  77. data/{lib → sunspot/lib}/sunspot/search/query_facet.rb +0 -0
  78. data/{lib → sunspot/lib}/sunspot/search/range_facet.rb +0 -0
  79. data/{lib → sunspot/lib}/sunspot/search/standard_search.rb +0 -0
  80. data/{lib → sunspot/lib}/sunspot/search.rb +0 -0
  81. data/{lib → sunspot/lib}/sunspot/session.rb +0 -0
  82. data/{lib → sunspot/lib}/sunspot/session_proxy/abstract_session_proxy.rb +0 -0
  83. data/{lib → sunspot/lib}/sunspot/session_proxy/class_sharding_session_proxy.rb +0 -0
  84. data/{lib → sunspot/lib}/sunspot/session_proxy/id_sharding_session_proxy.rb +0 -0
  85. data/{lib → sunspot/lib}/sunspot/session_proxy/master_slave_session_proxy.rb +0 -0
  86. data/{lib → sunspot/lib}/sunspot/session_proxy/retry_5xx_session_proxy.rb +0 -0
  87. data/{lib → sunspot/lib}/sunspot/session_proxy/sharding_session_proxy.rb +0 -0
  88. data/{lib → sunspot/lib}/sunspot/session_proxy/silent_fail_session_proxy.rb +0 -0
  89. data/{lib → sunspot/lib}/sunspot/session_proxy/thread_local_session_proxy.rb +0 -0
  90. data/{lib → sunspot/lib}/sunspot/session_proxy.rb +0 -0
  91. data/{lib → sunspot/lib}/sunspot/setup.rb +0 -0
  92. data/{lib → sunspot/lib}/sunspot/text_field_setup.rb +0 -0
  93. data/{lib → sunspot/lib}/sunspot/type.rb +0 -0
  94. data/{lib → sunspot/lib}/sunspot/util.rb +0 -0
  95. data/sunspot/lib/sunspot/version.rb +3 -0
  96. data/{lib → sunspot/lib}/sunspot.rb +0 -0
  97. data/{log → sunspot/log}/.gitignore +0 -0
  98. data/{pkg → sunspot/pkg}/.gitignore +0 -0
  99. data/{script → sunspot/script}/console +0 -0
  100. data/sunspot/spec/api/adapters_spec.rb +68 -0
  101. data/{spec → sunspot/spec}/api/batcher_spec.rb +0 -0
  102. data/{spec → sunspot/spec}/api/binding_spec.rb +0 -0
  103. data/{spec → sunspot/spec}/api/class_set_spec.rb +0 -0
  104. data/{spec → sunspot/spec}/api/hit_enumerable_spec.rb +0 -0
  105. data/{spec → sunspot/spec}/api/indexer/attributes_spec.rb +0 -0
  106. data/{spec → sunspot/spec}/api/indexer/batch_spec.rb +0 -0
  107. data/{spec → sunspot/spec}/api/indexer/dynamic_fields_spec.rb +0 -0
  108. data/{spec → sunspot/spec}/api/indexer/fixed_fields_spec.rb +0 -0
  109. data/{spec → sunspot/spec}/api/indexer/fulltext_spec.rb +0 -0
  110. data/{spec → sunspot/spec}/api/indexer/removal_spec.rb +0 -0
  111. data/{spec → sunspot/spec}/api/indexer/spec_helper.rb +0 -0
  112. data/{spec → sunspot/spec}/api/indexer_spec.rb +0 -0
  113. data/{spec → sunspot/spec}/api/query/advanced_manipulation_examples.rb +0 -0
  114. data/{spec → sunspot/spec}/api/query/connectives_examples.rb +12 -0
  115. data/{spec → sunspot/spec}/api/query/dsl_spec.rb +0 -0
  116. data/{spec → sunspot/spec}/api/query/dynamic_fields_examples.rb +0 -0
  117. data/{spec → sunspot/spec}/api/query/faceting_examples.rb +8 -8
  118. data/{spec → sunspot/spec}/api/query/fulltext_examples.rb +0 -0
  119. data/{spec → sunspot/spec}/api/query/function_spec.rb +0 -0
  120. data/{spec → sunspot/spec}/api/query/geo_examples.rb +0 -0
  121. data/{spec → sunspot/spec}/api/query/group_spec.rb +0 -0
  122. data/{spec → sunspot/spec}/api/query/highlighting_examples.rb +0 -0
  123. data/{spec → sunspot/spec}/api/query/more_like_this_spec.rb +0 -0
  124. data/{spec → sunspot/spec}/api/query/ordering_pagination_examples.rb +0 -0
  125. data/{spec → sunspot/spec}/api/query/scope_examples.rb +0 -0
  126. data/{spec → sunspot/spec}/api/query/spatial_examples.rb +0 -0
  127. data/{spec → sunspot/spec}/api/query/spec_helper.rb +0 -0
  128. data/{spec → sunspot/spec}/api/query/standard_spec.rb +0 -0
  129. data/{spec → sunspot/spec}/api/query/text_field_scoping_examples.rb +0 -0
  130. data/{spec → sunspot/spec}/api/query/types_spec.rb +0 -0
  131. data/{spec → sunspot/spec}/api/search/dynamic_fields_spec.rb +0 -0
  132. data/{spec → sunspot/spec}/api/search/faceting_spec.rb +0 -0
  133. data/{spec → sunspot/spec}/api/search/highlighting_spec.rb +0 -0
  134. data/{spec → sunspot/spec}/api/search/hits_spec.rb +16 -0
  135. data/{spec → sunspot/spec}/api/search/paginated_collection_spec.rb +0 -0
  136. data/{spec → sunspot/spec}/api/search/results_spec.rb +0 -0
  137. data/{spec → sunspot/spec}/api/search/search_spec.rb +0 -0
  138. data/{spec → sunspot/spec}/api/search/spec_helper.rb +0 -0
  139. data/{spec → sunspot/spec}/api/session_proxy/class_sharding_session_proxy_spec.rb +0 -0
  140. data/{spec → sunspot/spec}/api/session_proxy/id_sharding_session_proxy_spec.rb +0 -0
  141. data/{spec → sunspot/spec}/api/session_proxy/master_slave_session_proxy_spec.rb +0 -0
  142. data/{spec → sunspot/spec}/api/session_proxy/retry_5xx_session_proxy_spec.rb +5 -0
  143. data/{spec → sunspot/spec}/api/session_proxy/sharding_session_proxy_spec.rb +0 -0
  144. data/{spec → sunspot/spec}/api/session_proxy/silent_fail_session_proxy_spec.rb +0 -0
  145. data/{spec → sunspot/spec}/api/session_proxy/spec_helper.rb +0 -0
  146. data/{spec → sunspot/spec}/api/session_proxy/thread_local_session_proxy_spec.rb +0 -0
  147. data/{spec → sunspot/spec}/api/session_spec.rb +0 -0
  148. data/{spec → sunspot/spec}/api/spec_helper.rb +0 -0
  149. data/{spec → sunspot/spec}/api/sunspot_spec.rb +2 -2
  150. data/{spec → sunspot/spec}/ext.rb +0 -0
  151. data/{spec → sunspot/spec}/helpers/indexer_helper.rb +0 -0
  152. data/{spec → sunspot/spec}/helpers/integration_helper.rb +0 -0
  153. data/{spec → sunspot/spec}/helpers/mock_session_helper.rb +0 -0
  154. data/{spec → sunspot/spec}/helpers/query_helper.rb +0 -0
  155. data/{spec → sunspot/spec}/helpers/search_helper.rb +0 -0
  156. data/{spec → sunspot/spec}/integration/dynamic_fields_spec.rb +0 -0
  157. data/{spec → sunspot/spec}/integration/faceting_spec.rb +26 -0
  158. data/{spec → sunspot/spec}/integration/field_grouping_spec.rb +0 -0
  159. data/{spec → sunspot/spec}/integration/geospatial_spec.rb +11 -0
  160. data/{spec → sunspot/spec}/integration/highlighting_spec.rb +0 -0
  161. data/{spec → sunspot/spec}/integration/indexing_spec.rb +0 -0
  162. data/{spec → sunspot/spec}/integration/keyword_search_spec.rb +0 -0
  163. data/{spec → sunspot/spec}/integration/local_search_spec.rb +0 -0
  164. data/{spec → sunspot/spec}/integration/more_like_this_spec.rb +0 -0
  165. data/{spec → sunspot/spec}/integration/scoped_search_spec.rb +0 -0
  166. data/{spec → sunspot/spec}/integration/stored_fields_spec.rb +0 -0
  167. data/{spec → sunspot/spec}/integration/test_pagination.rb +0 -0
  168. data/{spec → sunspot/spec}/integration/unicode_spec.rb +0 -0
  169. data/{spec → sunspot/spec}/mocks/adapters.rb +1 -0
  170. data/{spec → sunspot/spec}/mocks/blog.rb +0 -0
  171. data/{spec → sunspot/spec}/mocks/comment.rb +0 -0
  172. data/{spec → sunspot/spec}/mocks/connection.rb +0 -0
  173. data/{spec → sunspot/spec}/mocks/mock_adapter.rb +0 -0
  174. data/{spec → sunspot/spec}/mocks/mock_class_sharding_session_proxy.rb +0 -0
  175. data/{spec → sunspot/spec}/mocks/mock_record.rb +0 -0
  176. data/{spec → sunspot/spec}/mocks/mock_sharding_session_proxy.rb +0 -0
  177. data/{spec → sunspot/spec}/mocks/photo.rb +0 -0
  178. data/{spec → sunspot/spec}/mocks/post.rb +0 -0
  179. data/{spec → sunspot/spec}/mocks/super_class.rb +0 -0
  180. data/{spec → sunspot/spec}/mocks/user.rb +0 -0
  181. data/{spec → sunspot/spec}/spec_helper.rb +0 -0
  182. data/{sunspot.gemspec → sunspot/sunspot.gemspec} +0 -0
  183. data/{tasks → sunspot/tasks}/rdoc.rake +0 -0
  184. data/{tasks → sunspot/tasks}/schema.rake +0 -0
  185. data/{tasks → sunspot/tasks}/todo.rake +0 -0
  186. data/sunspot_rails/.gitignore +7 -0
  187. data/sunspot_rails/.rspec +1 -0
  188. data/sunspot_rails/History.txt +74 -0
  189. data/sunspot_rails/LICENSE +18 -0
  190. data/sunspot_rails/MIT-LICENSE +20 -0
  191. data/sunspot_rails/README.rdoc +265 -0
  192. data/sunspot_rails/Rakefile +17 -0
  193. data/sunspot_rails/TODO +8 -0
  194. data/sunspot_rails/dev_tasks/rdoc.rake +24 -0
  195. data/sunspot_rails/dev_tasks/release.rake +4 -0
  196. data/sunspot_rails/dev_tasks/spec.rake +107 -0
  197. data/sunspot_rails/dev_tasks/todo.rake +4 -0
  198. data/sunspot_rails/gemfiles/rails-2.3.14 +12 -0
  199. data/sunspot_rails/gemfiles/rails-3.0.15 +12 -0
  200. data/sunspot_rails/gemfiles/rails-3.1.6 +12 -0
  201. data/sunspot_rails/gemfiles/rails-3.2.6 +12 -0
  202. data/sunspot_rails/generators/sunspot/sunspot_generator.rb +9 -0
  203. data/sunspot_rails/generators/sunspot/templates/sunspot.yml +20 -0
  204. data/sunspot_rails/install.rb +1 -0
  205. data/sunspot_rails/lib/generators/sunspot_rails/install/install_generator.rb +13 -0
  206. data/sunspot_rails/lib/generators/sunspot_rails/install/templates/config/sunspot.yml +19 -0
  207. data/sunspot_rails/lib/generators/sunspot_rails.rb +9 -0
  208. data/sunspot_rails/lib/sunspot/rails/adapters.rb +88 -0
  209. data/sunspot_rails/lib/sunspot/rails/configuration.rb +352 -0
  210. data/sunspot_rails/lib/sunspot/rails/init.rb +5 -0
  211. data/sunspot_rails/lib/sunspot/rails/log_subscriber.rb +45 -0
  212. data/sunspot_rails/lib/sunspot/rails/railtie.rb +41 -0
  213. data/sunspot_rails/lib/sunspot/rails/railties/controller_runtime.rb +36 -0
  214. data/sunspot_rails/lib/sunspot/rails/request_lifecycle.rb +36 -0
  215. data/sunspot_rails/lib/sunspot/rails/searchable.rb +495 -0
  216. data/sunspot_rails/lib/sunspot/rails/server.rb +106 -0
  217. data/sunspot_rails/lib/sunspot/rails/solr_instrumentation.rb +19 -0
  218. data/sunspot_rails/lib/sunspot/rails/solr_logging.rb +62 -0
  219. data/sunspot_rails/lib/sunspot/rails/spec_helper.rb +26 -0
  220. data/sunspot_rails/lib/sunspot/rails/stub_session_proxy.rb +146 -0
  221. data/sunspot_rails/lib/sunspot/rails/tasks.rb +94 -0
  222. data/sunspot_rails/lib/sunspot/rails.rb +69 -0
  223. data/sunspot_rails/lib/sunspot_rails.rb +12 -0
  224. data/sunspot_rails/spec/configuration_spec.rb +209 -0
  225. data/sunspot_rails/spec/model_lifecycle_spec.rb +63 -0
  226. data/sunspot_rails/spec/model_spec.rb +601 -0
  227. data/sunspot_rails/spec/rails_template/app/controllers/application_controller.rb +10 -0
  228. data/sunspot_rails/spec/rails_template/app/controllers/posts_controller.rb +6 -0
  229. data/sunspot_rails/spec/rails_template/app/models/author.rb +10 -0
  230. data/sunspot_rails/spec/rails_template/app/models/blog.rb +14 -0
  231. data/sunspot_rails/spec/rails_template/app/models/location.rb +3 -0
  232. data/sunspot_rails/spec/rails_template/app/models/photo_post.rb +2 -0
  233. data/sunspot_rails/spec/rails_template/app/models/post.rb +13 -0
  234. data/sunspot_rails/spec/rails_template/app/models/post_with_auto.rb +12 -0
  235. data/sunspot_rails/spec/rails_template/app/models/post_with_default_scope.rb +13 -0
  236. data/sunspot_rails/spec/rails_template/config/boot.rb +127 -0
  237. data/sunspot_rails/spec/rails_template/config/preinitializer.rb +22 -0
  238. data/sunspot_rails/spec/rails_template/config/routes.rb +9 -0
  239. data/sunspot_rails/spec/rails_template/config/sunspot.yml +24 -0
  240. data/sunspot_rails/spec/rails_template/db/schema.rb +27 -0
  241. data/sunspot_rails/spec/request_lifecycle_spec.rb +61 -0
  242. data/sunspot_rails/spec/schema.rb +27 -0
  243. data/sunspot_rails/spec/searchable_spec.rb +12 -0
  244. data/sunspot_rails/spec/server_spec.rb +33 -0
  245. data/sunspot_rails/spec/session_spec.rb +57 -0
  246. data/sunspot_rails/spec/shared_examples/indexed_after_save.rb +8 -0
  247. data/sunspot_rails/spec/shared_examples/not_indexed_after_save.rb +8 -0
  248. data/sunspot_rails/spec/spec_helper.rb +48 -0
  249. data/sunspot_rails/spec/stub_session_proxy_spec.rb +122 -0
  250. data/sunspot_rails/sunspot_rails.gemspec +43 -0
  251. data/sunspot_rails/tmp/.gitkeep +0 -0
  252. data/sunspot_solr/Gemfile +3 -0
  253. data/sunspot_solr/README.rdoc +24 -0
  254. data/sunspot_solr/bin/sunspot-installer +20 -0
  255. data/sunspot_solr/bin/sunspot-solr +80 -0
  256. data/sunspot_solr/lib/sunspot/solr/installer/config_installer.rb +46 -0
  257. data/sunspot_solr/lib/sunspot/solr/installer/task_helper.rb +13 -0
  258. data/sunspot_solr/lib/sunspot/solr/installer.rb +25 -0
  259. data/sunspot_solr/lib/sunspot/solr/java.rb +10 -0
  260. data/sunspot_solr/lib/sunspot/solr/railtie.rb +15 -0
  261. data/sunspot_solr/lib/sunspot/solr/server.rb +223 -0
  262. data/sunspot_solr/lib/sunspot/solr/tasks.rb +49 -0
  263. data/sunspot_solr/lib/sunspot_solr.rb +5 -0
  264. data/sunspot_solr/solr/README.txt +42 -0
  265. data/sunspot_solr/solr/etc/jetty.xml +219 -0
  266. data/sunspot_solr/solr/etc/webdefault.xml +379 -0
  267. data/sunspot_solr/solr/lib/jetty-6.1.26-patched-JETTY-1340.jar +0 -0
  268. data/sunspot_solr/solr/lib/jetty-util-6.1.26-patched-JETTY-1340.jar +0 -0
  269. data/sunspot_solr/solr/lib/jsp-2.1/ant-1.6.5.jar +0 -0
  270. data/sunspot_solr/solr/lib/jsp-2.1/core-3.1.1.jar +0 -0
  271. data/sunspot_solr/solr/lib/jsp-2.1/jsp-2.1.jar +0 -0
  272. data/sunspot_solr/solr/lib/jsp-2.1/jsp-api-2.1.jar +0 -0
  273. data/sunspot_solr/solr/lib/servlet-api-2.5-20081211.jar +0 -0
  274. data/sunspot_solr/solr/solr/.gitignore +1 -0
  275. data/sunspot_solr/solr/solr/README.txt +54 -0
  276. data/sunspot_solr/solr/solr/conf/admin-extra.html +31 -0
  277. data/sunspot_solr/solr/solr/conf/elevate.xml +36 -0
  278. data/sunspot_solr/solr/solr/conf/mapping-ISOLatin1Accent.txt +246 -0
  279. data/sunspot_solr/solr/solr/conf/protwords.txt +21 -0
  280. data/sunspot_solr/solr/solr/conf/schema.xml +250 -0
  281. data/sunspot_solr/solr/solr/conf/scripts.conf +24 -0
  282. data/sunspot_solr/solr/solr/conf/solrconfig.xml +934 -0
  283. data/sunspot_solr/solr/solr/conf/spellings.txt +2 -0
  284. data/sunspot_solr/solr/solr/conf/stopwords.txt +58 -0
  285. data/sunspot_solr/solr/solr/conf/synonyms.txt +31 -0
  286. data/sunspot_solr/solr/solr/conf/xslt/example.xsl +132 -0
  287. data/sunspot_solr/solr/solr/conf/xslt/example_atom.xsl +67 -0
  288. data/sunspot_solr/solr/solr/conf/xslt/example_rss.xsl +66 -0
  289. data/sunspot_solr/solr/solr/conf/xslt/luke.xsl +337 -0
  290. data/sunspot_solr/solr/start.jar +0 -0
  291. data/sunspot_solr/solr/webapps/solr.war +0 -0
  292. data/sunspot_solr/spec/server_spec.rb +98 -0
  293. data/sunspot_solr/spec/spec_helper.rb +18 -0
  294. data/sunspot_solr/sunspot_solr.gemspec +37 -0
  295. data/tools/gem_tasks.rb +69 -0
  296. metadata +353 -343
  297. data/lib/sunspot/search/field_group.rb +0 -46
  298. data/lib/sunspot/version.rb +0 -3
  299. data/spec/api/adapters_spec.rb +0 -33
@@ -0,0 +1,265 @@
1
+ = Sunspot::Rails
2
+
3
+ Sunspot::Rails is a Rails plugin that provides drop-in integration of the
4
+ Sunspot[http://outoftime.github.com/sunspot] Solr search library with Rails. It
5
+ provides the following features:
6
+
7
+ * Configure Sunspot using config/sunspot.yml
8
+ * Extend ActiveRecord for easy index configuration, search, and indexing
9
+ * Automatically index ActiveRecord objects when they are saved, and remove them
10
+ from the index when they are destroyed (can be disabled)
11
+ * Automatically commit Solr changes at the end of each request (can be disabled)
12
+ * Provide utility methods to find and fix orphaned documents and rebuild the
13
+ Solr index for a given class
14
+ * Provide rake tasks for starting and stopping the development Solr instance,
15
+ using the configuration in sunspot.yml
16
+
17
+ Sunspot::Rails has been tested with Rails versions 2.3 and 3.0
18
+
19
+ == Installation in Rails 3
20
+
21
+ In your <code>Gemfile</code>:
22
+
23
+ gem 'sunspot_rails'
24
+ # This is an optional packaged Solr:
25
+ group :test, :development do
26
+ gem 'sunspot_solr'
27
+ end
28
+
29
+ == Installation in Rails 2
30
+
31
+ In your project's <code>config/environment.rb</code>, add the following gem dependencies:
32
+
33
+ config.gem 'sunspot'
34
+ config.gem 'sunspot_rails'
35
+
36
+ And in your project's <code>config/development.rb</code> and <code>config/test.rb</code>,
37
+ add the following gem dependency to install the optional packaged Solr:
38
+
39
+ config.gem 'sunspot_solr'
40
+
41
+ Install the gems with:
42
+
43
+ rake gems:install
44
+
45
+ Generate the file <code>config/sunspot.yml</code>:
46
+
47
+ script/generate sunspot
48
+
49
+ Rails doesn't automatically load rake tasks from plugins installed as gems
50
+ (https://rails.lighthouseapp.com/projects/8994/tickets/59). If you installed
51
+ Sunspot::Rails as a gem, add the following line to your project's Rakefile:
52
+
53
+ require 'sunspot/rails/tasks'
54
+
55
+ == Using Sunspot::Rails
56
+
57
+ If you wish to make modifications to the Solr schema, you can create a custom
58
+ Solr home in your project directory. In order to do so, create the directory
59
+ <code>RAILS_ROOT/solr/conf</code>, and copy in the contents of the Solr gem's
60
+ <code>solr/solr/conf</code> directory. If the files are in the right place,
61
+ Sunspot::Rails will detect them and tell Solr to use your local configurations.
62
+ Use caution when modifying <code>schema.xml</code> - Sunspot relies on the
63
+ field naming scheme in the packaged schema file.
64
+
65
+ To start up a Solr instance, issue the following (requires sunspot_solr to be
66
+ installed):
67
+
68
+ rake sunspot:solr:start
69
+
70
+ Note that using the built-in Solr instance packaged with Sunspot is great for
71
+ development, but is not recommended for production. See the Sunspot
72
+ documentation for more information.
73
+
74
+ == Usage
75
+
76
+ === Setup
77
+
78
+ In order for an ActiveRecord model to be indexable and searchable, it must be
79
+ configured for search. For example:
80
+
81
+ class Post < ActiveRecord::Base
82
+ searchable do
83
+ text :title, :body
84
+ integer :blog_id
85
+ time :updated_at
86
+ string :sort_title do
87
+ title.downcase.sub(/^(an?|the) /, '')
88
+ end
89
+ end
90
+ end
91
+
92
+ See the documentation for Sunspot.setup for full details on what can go in the
93
+ configuration block.
94
+
95
+ === Indexing
96
+
97
+ By default, models are indexed whenever they are saved, and removed from the
98
+ index whenever they are destroyed. This behavior can be disabled:
99
+
100
+ class Post < ActiveRecord::Base
101
+ searchable :auto_index => false, :auto_remove => false do
102
+ # setup...
103
+ end
104
+ end
105
+
106
+ Note that <b>using the <code>:auto_remove</code> option is not recommended
107
+ </b>, as destroying an object without removing it from the index will
108
+ create an orphaned document in the index, which is a Bad Thing. Turning off
109
+ <code>:auto_index</code> is perfectly safe if you prefer to manage indexing manually
110
+ (perhaps using a background job).
111
+
112
+ If you have disabled lifecycle indexing hooks, you can invoke indexing
113
+ operations directly on your model:
114
+
115
+ post = Post.create
116
+ post.index
117
+ post.remove_from_index
118
+
119
+ === Committing
120
+
121
+ When data is changed in Solr, it is initially stored in memory and not made
122
+ available to the currently running searcher instance. Issuing a +commit+ to Solr
123
+ will cause it to write the changes to disk, and instantiate a new searcher
124
+ instance. This operation is fairly expensive, so rather than issuing a commit
125
+ every time a document is added or removed, Sunspot::Rails issues a commit at
126
+ the end of any request where data has been added to or removed from Solr. If
127
+ you need to immediately issue a commit, bang!-versions of the methods are
128
+ available:
129
+
130
+ post = Post.create
131
+ post.index!
132
+ # this is the same as...
133
+ post.index
134
+ Sunspot.commit
135
+
136
+ When writing tests outside of the context of a controller request, you will want
137
+ to use one of these two approaches.
138
+
139
+ === Searching
140
+
141
+ Do it like this:
142
+
143
+ Post.search do
144
+ with :blog_id, 1
145
+ with(:updated_at).greater_than(Time.now - 2.weeks)
146
+ order_by :sort_title, :asc
147
+ paginate :page => 1, :per_page => 15
148
+ end
149
+
150
+ See the documentation for <code>Sunspot.search</code> for all the options
151
+ available in the search block, and the information available in the result
152
+ block.
153
+
154
+ === Searching for IDs
155
+
156
+ In some situations, you may want to get the IDs for models returned by a search
157
+ without actually loading the models out of the database. For that, you can
158
+ call +search_ids+, using the same block format as #search. This will return an
159
+ array of IDs.
160
+
161
+ === Searching for multiple types
162
+
163
+ Sunspot is entirely agnostic about whether searches are for one or more types;
164
+ the only restriction is that columns used for restriction, ordering, etc. are
165
+ defined in the same way for all types being searched. Sunspot::Rails does not
166
+ provide any additional support for this, since there is not anything useful to
167
+ be added, so just use the interface provided by Sunspot:
168
+
169
+ Sunspot.search(Post, Comment) do
170
+ with :blog_id, 1
171
+ order_by :created_at, :asc
172
+ end
173
+
174
+ Be sure to check out the Sunspot documentation for all the details.
175
+
176
+ === Adding search functionality in mixins
177
+
178
+ Sunspot does not require that search setup for a given class happen all in one
179
+ place; it is perfectly acceptable to call the <code>Sunspot.setup</code> method
180
+ more than once. This capability is particularly useful for adding search
181
+ functionality in mixins. For instance, if you have a +Ratable+ module, you may
182
+ wish to add additional search fields for searchable classes that mix in that
183
+ module. For example:
184
+
185
+ module Ratable
186
+ def self.included(base)
187
+ if base.searchable?
188
+ base.searchable do
189
+ float :average_rating do
190
+ ratings.average(:value)
191
+ end
192
+ end
193
+ end
194
+ end
195
+ end
196
+
197
+ Note the use of <code>base.searchable?</code> - this ensures that only classes
198
+ that already have search enabled will have the additional configuration added.
199
+ The above pattern requires that the class be declared searchable before the
200
+ module is mixed in; other patterns (such as passing a :searchable option to an
201
+ acts_as_-style declaration) may be more flexible.
202
+
203
+ === Utility methods
204
+
205
+ If you need to completely reindex all of the instances of a given model class,
206
+ you can issue:
207
+
208
+ Post.reindex
209
+
210
+ If for some reason models get deleted from the database, but not from the index,
211
+ they will become index orphans - not a good situation. To get IDs that exist in
212
+ the index but not the database, you can use the +index_orphans+ method; to
213
+ remove those documents from the index, use +clean_index_orphans+. Note that
214
+ neither of these operations should be needed if Sunspot and Sunspot::Rails are
215
+ used as intended.
216
+
217
+ == Testing Solr integration using RSpec
218
+
219
+ To disable the sunspot-solr integration for your active record models, require
220
+ the file `sunspot/rails/spec_helper`
221
+
222
+ Then, in your spec, use the #disconnect_sunspot method:
223
+
224
+ require 'sunspot/rails/spec_helper'
225
+
226
+ describe Post do
227
+ disconnect_sunspot
228
+
229
+ it 'should have some behavior'
230
+ # ...
231
+ end
232
+ end
233
+
234
+ In all of the examples in this group, all Sunspot calls will be stubbed out. The
235
+ Sunspot#search method will return a stub search object that mimics a search with
236
+ no results.
237
+
238
+ == Further Reading
239
+
240
+ Reading the {Sunspot documentation}[http://outoftime.github.com/sunspot/docs] is
241
+ highly recommended. Sunspot::Rails exists to wrap Sunspot with a Rails-friendly
242
+ API, but almost all of the functionality you use in Sunspot::Rails is
243
+ implemented in Sunspot.
244
+
245
+ Posts about Sunspot on my blog are available at http://outofti.me/tagged/sunspot
246
+
247
+ == Bugs
248
+
249
+ Please submit bug reports to https://github.com/sunspot/sunspot/issues
250
+
251
+ == Contributors
252
+
253
+ - Mat Brown (mat@patch.com)
254
+ - Peer Allan (peer.allan@gmail.com)
255
+ - Michael Moen (michael@underpantsgnome.com)
256
+ - Benjamin Krause (bk@benjaminkrause.com)
257
+ - Adam Salter (adam@codebright.net)
258
+ - Brandon Keepers (brandon@opensoul.org)
259
+ - Paul Canavese (paul@canavese.org)
260
+ - John Eberly (jeberly@elctech.com)
261
+ - Gert Thiel (gertthiel@gmail.com)
262
+
263
+ == License
264
+
265
+ Sunspot::Rails is distributed under the MIT License, copyright (c) 2009 Mat Brown
@@ -0,0 +1,17 @@
1
+ require 'rake'
2
+
3
+ begin
4
+ require 'rdoc/task'
5
+ rescue LoadError
6
+ require 'rake/rdoctask'
7
+ end
8
+
9
+ if File.exist?(sunspot_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'sunspot', 'lib')))
10
+ STDERR.puts("Using sunspot lib at #{sunspot_lib}")
11
+ $: << sunspot_lib
12
+ end
13
+
14
+ task :environment do
15
+ end
16
+
17
+ FileList['dev_tasks/*.rake', 'lib/sunspot/rails/tasks.rb'].each { |file| load(file) }
@@ -0,0 +1,8 @@
1
+ * Delegate new_search method
2
+ =======
3
+ * Fix final status output for reindex
4
+ * Add batch-per-request option
5
+ * Optionally yield from reindex
6
+ * Access to all searchable classes
7
+ * Add a method to disable sunspot updates for certain values, e.g.
8
+ if you just touch a record, sunspot shouldn't index the
@@ -0,0 +1,24 @@
1
+ begin
2
+ require 'hanna/rdoctask'
3
+ rescue LoadError
4
+ if require 'rubygems'
5
+ retry
6
+ end
7
+ # It's OK if hanna isn't installed.
8
+ end
9
+
10
+ Rake::RDocTask.new(:doc) do |rdoc|
11
+ rdoc.main = 'README.md'
12
+ rdoc.rdoc_files.include('README.md', 'lib/sunspot/rails/**/*.rb', 'lib/sunspot/rails.rb')
13
+ rdoc.rdoc_dir = 'doc'
14
+ end
15
+
16
+ namespace :doc do
17
+ desc 'Generate rdoc and move into pages directory'
18
+ task :publish => :redoc do
19
+ doc_dir = File.join(File.dirname(__FILE__), '..', 'doc')
20
+ publish_dir = File.join(File.dirname(__FILE__), '..', '..', 'pages', 'rails', 'docs')
21
+ FileUtils.rm_rf(publish_dir) if File.exist?(publish_dir)
22
+ FileUtils.cp_r(doc_dir, publish_dir)
23
+ end
24
+ end
@@ -0,0 +1,4 @@
1
+ namespace :release do
2
+ desc 'Release gem on RubyForge and GitHub'
3
+ task :all => [:release, :"rubyforge:release:gem"]
4
+ end
@@ -0,0 +1,107 @@
1
+ require 'fileutils'
2
+
3
+ namespace :spec do
4
+ def rails_app_path(version)
5
+ File.join(File.dirname(__FILE__), "..", "tmp", "rails_#{version.gsub(".", "_")}_app")
6
+ end
7
+
8
+ def gemfile_path(version)
9
+ File.join(File.dirname(__FILE__), "..", "gemfiles", "rails-#{version}")
10
+ end
11
+
12
+ def vendor_path(version)
13
+ File.expand_path("vendor/bundle", rails_app_path(version))
14
+ end
15
+
16
+ def rails_template_path
17
+ File.join(File.dirname(__FILE__), "..", "spec", "rails_template")
18
+ end
19
+
20
+ task :run_with_rails => [:set_gemfile, :generate_rails_app, :setup_rails_app, :run]
21
+
22
+ task :set_gemfile do
23
+ version = ENV['VERSION']
24
+
25
+ ENV['BUNDLE_PATH'] = vendor_path(version)
26
+ ENV['BUNDLE_GEMFILE'] = gemfile_path(version)
27
+
28
+ unless File.exist?(ENV['BUNDLE_PATH'])
29
+ puts "Installing gems for Rails #{version} (this will only be done once)..."
30
+ system("bundle install #{ENV['BUNDLE_ARGS']}") || exit(1)
31
+ end
32
+ end
33
+
34
+ task :generate_rails_app do
35
+ version = ENV['VERSION']
36
+ app_path = rails_app_path(version)
37
+
38
+ unless File.exist?(File.expand_path("config/environment.rb", app_path))
39
+ rails_cmd = "bundle exec rails _#{version}_"
40
+
41
+ puts "Generating Rails #{version} application..."
42
+ if version.start_with?("2")
43
+ system("#{rails_cmd} \"#{app_path}\" --force") || exit(1)
44
+ elsif version.start_with?("3")
45
+ system("#{rails_cmd} new \"#{app_path}\" --force --skip-git --skip-javascript --skip-gemfile --skip-sprockets") || exit(1)
46
+ end
47
+ end
48
+ end
49
+
50
+ task :setup_rails_app do
51
+ version = ENV['VERSION']
52
+ app_path = rails_app_path(version)
53
+
54
+ FileUtils.cp_r File.join(rails_template_path, "."), app_path
55
+ end
56
+
57
+ task :run do
58
+ version = ENV['VERSION']
59
+
60
+ ENV['BUNDLE_GEMFILE'] = gemfile_path(version)
61
+ ENV['RAILS_ROOT'] = rails_app_path(version)
62
+
63
+ spec_command = if version.start_with?("2")
64
+ "spec"
65
+ elsif version.start_with?("3")
66
+ "rspec"
67
+ end
68
+
69
+ system "bundle exec #{spec_command} #{ENV['SPEC'] || 'spec/*_spec.rb'} --color"
70
+ end
71
+ end
72
+
73
+ def rails_all_versions
74
+ versions = []
75
+ Dir.glob(File.join(File.dirname(__FILE__), "..", "gemfiles", "rails-*")).each do |gemfile|
76
+ if !gemfile.end_with?(".lock") && gemfile =~ /rails-([0-9.]+)/
77
+ versions << $1
78
+ end
79
+ end
80
+
81
+ versions
82
+ end
83
+
84
+ def reenable_spec_tasks
85
+ Rake::Task.tasks.each do |task|
86
+ if task.name =~ /spec:/
87
+ task.reenable
88
+ end
89
+ end
90
+ end
91
+
92
+ desc 'Run spec suite in all Rails versions'
93
+ task :spec do
94
+ versions = if ENV['RAILS']
95
+ ENV['RAILS'].split(",")
96
+ else
97
+ rails_all_versions
98
+ end
99
+
100
+ versions.each do |version|
101
+ puts "Running specs against Rails #{version}..."
102
+
103
+ ENV['VERSION'] = version
104
+ reenable_spec_tasks
105
+ Rake::Task['spec:run_with_rails'].invoke
106
+ end
107
+ end
@@ -0,0 +1,4 @@
1
+ desc 'Show all TODO and related tags'
2
+ task :todo do
3
+ FileList['lib/**/*.rb'].egrep(/#.*(TODO|FIXME|XXX)/)
4
+ end
@@ -0,0 +1,12 @@
1
+ source :rubygems
2
+
3
+ gem 'rails', '2.3.14'
4
+ gem 'sqlite3-ruby', '~> 1.3.1'
5
+
6
+ gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
7
+ gem 'sunspot_solr', :path => File.expand_path('../../../sunspot_solr', __FILE__)
8
+ gem 'sunspot_rails', :path => File.expand_path('../..', __FILE__)
9
+
10
+ group :test do
11
+ gem 'rspec-rails', '~> 1.3.4'
12
+ end
@@ -0,0 +1,12 @@
1
+ source :rubygems
2
+
3
+ gem 'rails', '3.0.15'
4
+ gem 'sqlite3-ruby', '~> 1.3.1'
5
+
6
+ gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
7
+ gem 'sunspot_solr', :path => File.expand_path('../../../sunspot_solr', __FILE__)
8
+ gem 'sunspot_rails', :path => File.expand_path('../..', __FILE__)
9
+
10
+ group :test do
11
+ gem 'rspec-rails', '~> 2.8.1'
12
+ end
@@ -0,0 +1,12 @@
1
+ source :rubygems
2
+
3
+ gem 'rails', '3.1.6'
4
+ gem 'sqlite3-ruby', '~> 1.3.1'
5
+
6
+ gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
7
+ gem 'sunspot_solr', :path => File.expand_path('../../../sunspot_solr', __FILE__)
8
+ gem 'sunspot_rails', :path => File.expand_path('../..', __FILE__)
9
+
10
+ group :test do
11
+ gem 'rspec-rails', '~> 2.8.1'
12
+ end
@@ -0,0 +1,12 @@
1
+ source :rubygems
2
+
3
+ gem 'rails', '3.2.6'
4
+ gem 'sqlite3-ruby', '~> 1.3.1'
5
+
6
+ gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
7
+ gem 'sunspot_solr', :path => File.expand_path('../../../sunspot_solr', __FILE__)
8
+ gem 'sunspot_rails', :path => File.expand_path('../..', __FILE__)
9
+
10
+ group :test do
11
+ gem 'rspec-rails', '~> 2.8.1'
12
+ end
@@ -0,0 +1,9 @@
1
+ class SunspotGenerator < Rails::Generator::Base
2
+
3
+ def manifest
4
+ record do |m|
5
+ m.template 'sunspot.yml', 'config/sunspot.yml'
6
+ end
7
+ end
8
+
9
+ end
@@ -0,0 +1,20 @@
1
+ production:
2
+ solr:
3
+ hostname: localhost
4
+ port: 8983
5
+ log_level: WARNING
6
+ # read_timeout: 2
7
+ # open_timeout: 0.5
8
+
9
+ development:
10
+ solr:
11
+ hostname: localhost
12
+ port: 8982
13
+ log_level: INFO
14
+
15
+ test:
16
+ solr:
17
+ hostname: localhost
18
+ port: 8981
19
+ log_level: WARNING
20
+
@@ -0,0 +1 @@
1
+ # Install hook code here
@@ -0,0 +1,13 @@
1
+ module SunspotRails
2
+ module Generators
3
+ class InstallGenerator < Rails::Generators::Base
4
+ def self.source_root
5
+ @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
6
+ end
7
+ def copy_config_file
8
+ template 'config/sunspot.yml'
9
+ end
10
+ end
11
+ end
12
+ end
13
+
@@ -0,0 +1,19 @@
1
+ production:
2
+ solr:
3
+ hostname: localhost
4
+ port: 8983
5
+ log_level: WARNING
6
+ # read_timeout: 2
7
+ # open_timeout: 0.5
8
+
9
+ development:
10
+ solr:
11
+ hostname: localhost
12
+ port: 8982
13
+ log_level: INFO
14
+
15
+ test:
16
+ solr:
17
+ hostname: localhost
18
+ port: 8981
19
+ log_level: WARNING
@@ -0,0 +1,9 @@
1
+ module SunspotRails
2
+ module Generators
3
+ class Base < Rails::Generators::NamedBase
4
+ def self.source_root
5
+ @_sunspot_rails_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'sunspot_rails', generator_name, 'templates'))
6
+ end
7
+ end
8
+ end
9
+ end
@@ -0,0 +1,88 @@
1
+ module Sunspot #:nodoc:
2
+ module Rails #:nodoc:
3
+ #
4
+ # This module provides Sunspot Adapter implementations for ActiveRecord
5
+ # models.
6
+ #
7
+ module Adapters
8
+ class ActiveRecordInstanceAdapter < Sunspot::Adapters::InstanceAdapter
9
+ #
10
+ # Return the primary key for the adapted instance
11
+ #
12
+ # ==== Returns
13
+ #
14
+ # Integer:: Database ID of model
15
+ #
16
+ def id
17
+ @instance.id
18
+ end
19
+ end
20
+
21
+ class ActiveRecordDataAccessor < Sunspot::Adapters::DataAccessor
22
+ # options for the find
23
+ attr_accessor :include, :select
24
+
25
+ def initialize(clazz)
26
+ super(clazz)
27
+ @inherited_attributes = [:include, :select]
28
+ end
29
+
30
+ #
31
+ # Set the fields to select from the database. This will be passed
32
+ # to ActiveRecord.
33
+ #
34
+ # ==== Parameters
35
+ #
36
+ # value<Mixed>:: String of comma-separated columns or array of columns
37
+ #
38
+ def select=(value)
39
+ value = value.join(', ') if value.respond_to?(:join)
40
+ @select = value
41
+ end
42
+
43
+ #
44
+ # Get one ActiveRecord instance out of the database by ID
45
+ #
46
+ # ==== Parameters
47
+ #
48
+ # id<String>:: Database ID of model to retreive
49
+ #
50
+ # ==== Returns
51
+ #
52
+ # ActiveRecord::Base:: ActiveRecord model
53
+ #
54
+ def load(id)
55
+ @clazz.first(options_for_find.merge(
56
+ :conditions => { @clazz.primary_key => id}
57
+ ))
58
+ end
59
+
60
+ #
61
+ # Get a collection of ActiveRecord instances out of the database by ID
62
+ #
63
+ # ==== Parameters
64
+ #
65
+ # ids<Array>:: Database IDs of models to retrieve
66
+ #
67
+ # ==== Returns
68
+ #
69
+ # Array:: Collection of ActiveRecord models
70
+ #
71
+ def load_all(ids)
72
+ @clazz.all(options_for_find.merge(
73
+ :conditions => { @clazz.primary_key => ids.map { |id| id }}
74
+ ))
75
+ end
76
+
77
+ private
78
+
79
+ def options_for_find
80
+ options = {}
81
+ options[:include] = @include unless @include.blank?
82
+ options[:select] = @select unless @select.blank?
83
+ options
84
+ end
85
+ end
86
+ end
87
+ end
88
+ end