Permalink
Browse files

Updated searchgasm

  • Loading branch information...
1 parent dc93423 commit f818abfd71717b94934c1bc1b1f2a03c0e87c8b9 @binarylogic committed Sep 19, 2008
Showing with 5,491 additions and 1,055 deletions.
  1. +3 −1 README.rdoc
  2. +1 −0 app/models/user_group.rb
  3. +4 −0 app/views/jquery/users/index.html.erb
  4. +4 −0 app/views/non_ajax/users/index.html.erb
  5. +5 −4 app/views/rails_ajax/users/index.html.erb
  6. +4 −4 config/boot.rb
  7. +1 −1 config/environment.rb
  8. +963 −0 public/javascripts/controls.js
  9. +972 −0 public/javascripts/dragdrop.js
  10. +1,120 −0 public/javascripts/effects.js
  11. +0 −43 vendor/plugins/searchgasm-1.0.2/benchmarks/benchmark.rb
  12. +0 −52 vendor/plugins/searchgasm-1.0.2/benchmarks/benchmark_helper.rb
  13. +0 −15 vendor/plugins/searchgasm-1.0.2/benchmarks/profile.rb
  14. +0 −73 vendor/plugins/searchgasm-1.0.2/lib/searchgasm/active_record/associations.rb
  15. +0 −30 vendor/plugins/searchgasm-1.0.2/lib/searchgasm/utilities.rb
  16. +23 −2 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/CHANGELOG.rdoc
  17. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/MIT-LICENSE
  18. +4 −4 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/Manifest
  19. +26 −18 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/README.rdoc
  20. +1 −2 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/Rakefile
  21. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/examples/README.rdoc
  22. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/init.rb
  23. +6 −2 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm.rb
  24. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/active_record.rb
  25. +61 −0 vendor/plugins/searchgasm-1.1.0/lib/searchgasm/active_record/associations.rb
  26. +42 −9 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/active_record/base.rb
  27. +1 −1 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/condition/base.rb
  28. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/condition/begins_with.rb
  29. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/condition/child_of.rb
  30. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/condition/contains.rb
  31. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/condition/descendant_of.rb
  32. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/condition/does_not_equal.rb
  33. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/condition/ends_with.rb
  34. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/condition/equals.rb
  35. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/condition/greater_than.rb
  36. 0 ...lugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/condition/greater_than_or_equal_to.rb
  37. +0 −2 ...plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/condition/inclusive_descendant_of.rb
  38. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/condition/keywords.rb
  39. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/condition/less_than.rb
  40. 0 ...r/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/condition/less_than_or_equal_to.rb
  41. +0 −2 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/condition/sibling_of.rb
  42. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/condition/tree.rb
  43. +43 −46 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/conditions/base.rb
  44. +8 −2 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/conditions/protection.rb
  45. +72 −0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/config.rb
  46. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/core_ext/hash.rb
  47. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/helpers.rb
  48. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/helpers/control_types.rb
  49. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/helpers/control_types/link.rb
  50. +50 −16 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/helpers/control_types/links.rb
  51. +1 −0 ...plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/helpers/control_types/remote_link.rb
  52. +3 −0 ...lugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/helpers/control_types/remote_links.rb
  53. +3 −0 ...ugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/helpers/control_types/remote_select.rb
  54. +3 −0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/helpers/control_types/select.rb
  55. +11 −4 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/helpers/form.rb
  56. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/helpers/utilities.rb
  57. +7 −0 vendor/plugins/searchgasm-1.1.0/lib/searchgasm/search.rb
  58. +23 −50 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/search/base.rb
  59. +6 −3 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/search/conditions.rb
  60. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/search/ordering.rb
  61. +2 −1 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/search/pagination.rb
  62. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/search/protection.rb
  63. +43 −0 vendor/plugins/searchgasm-1.1.0/lib/searchgasm/shared/searching.rb
  64. +32 −0 vendor/plugins/searchgasm-1.1.0/lib/searchgasm/shared/utilities.rb
  65. +39 −0 vendor/plugins/searchgasm-1.1.0/lib/searchgasm/shared/virtual_classes.rb
  66. +2 −2 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/lib/searchgasm/version.rb
  67. +13 −10 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/searchgasm.gemspec
  68. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/fixtures/accounts.yml
  69. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/fixtures/orders.yml
  70. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/fixtures/users.yml
  71. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/libs/acts_as_tree.rb
  72. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/libs/rexml_fix.rb
  73. +24 −1 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/test_active_record_associations.rb
  74. +11 −0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/test_active_record_base.rb
  75. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/test_condition_base.rb
  76. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/test_condition_types.rb
  77. +31 −11 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/test_conditions_base.rb
  78. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/test_conditions_protection.rb
  79. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/test_config.rb
  80. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/test_helper.rb
  81. +17 −10 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/test_search_base.rb
  82. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/test_search_conditions.rb
  83. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/test_search_ordering.rb
  84. +11 −0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/test_search_pagination.rb
  85. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/test_search_protection.rb
  86. 0 vendor/plugins/{searchgasm-1.0.2 → searchgasm-1.1.0}/test/text_config.rb
  87. +1 −1 vendor/rails/actionmailer/lib/action_mailer/base.rb
  88. +10 −0 vendor/rails/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb~
  89. +20 −0 vendor/rails/actionpack/CHANGELOG
  90. +8 −6 vendor/rails/actionpack/Rakefile
  91. +2 −0 vendor/rails/actionpack/lib/action_controller.rb
  92. +14 −14 vendor/rails/actionpack/lib/action_controller/assertions/routing_assertions.rb
  93. +6 −2 vendor/rails/actionpack/lib/action_controller/base.rb
  94. +37 −24 vendor/rails/actionpack/lib/action_controller/benchmarking.rb
  95. +2 −1 vendor/rails/actionpack/lib/action_controller/cgi_process.rb
  96. +2 −1 vendor/rails/actionpack/lib/action_controller/rack_process.rb
  97. +22 −0 vendor/rails/actionpack/lib/action_controller/routing/recognition_optimisation.rb
  98. +2 −2 vendor/rails/actionpack/lib/action_controller/routing/route_set.rb
  99. +2 −1 vendor/rails/actionpack/lib/action_controller/session/cookie_store.rb
  100. +4 −0 vendor/rails/actionpack/lib/action_controller/session_management.rb
  101. +13 −0 vendor/rails/actionpack/lib/action_controller/translation.rb
  102. +6 −4 vendor/rails/actionpack/lib/action_view/base.rb
  103. +17 −15 vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb
  104. +3 −3 vendor/rails/actionpack/lib/action_view/helpers/benchmark_helper.rb
  105. +17 −10 vendor/rails/actionpack/lib/action_view/helpers/form_tag_helper.rb
  106. +1 −1 vendor/rails/actionpack/lib/action_view/helpers/scriptaculous_helper.rb
  107. +8 −11 vendor/rails/actionpack/lib/action_view/renderable.rb
  108. +10 −8 vendor/rails/actionpack/lib/action_view/renderable_partial.rb
  109. +30 −0 vendor/rails/actionpack/test/controller/routing_test.rb
  110. +52 −1 vendor/rails/actionpack/test/controller/session/cookie_store_test.rb
  111. +26 −0 vendor/rails/actionpack/test/controller/translation_test.rb
  112. +9 −2 vendor/rails/actionpack/test/template/form_tag_helper_test.rb
  113. +12 −18 vendor/rails/activerecord/CHANGELOG
  114. +108 −36 vendor/rails/activerecord/lib/active_record/aggregations.rb
  115. +8 −5 vendor/rails/activerecord/lib/active_record/association_preload.rb
  116. +39 −34 vendor/rails/activerecord/lib/active_record/associations.rb
  117. +6 −8 vendor/rails/activerecord/lib/active_record/associations/association_collection.rb
  118. +2 −2 vendor/rails/activerecord/lib/active_record/associations/belongs_to_association.rb
  119. +4 −1 vendor/rails/activerecord/lib/active_record/associations/has_many_association.rb
  120. +5 −4 vendor/rails/activerecord/lib/active_record/associations/has_many_through_association.rb
  121. +12 −4 vendor/rails/activerecord/lib/active_record/associations/has_one_association.rb
  122. +1 −1 vendor/rails/activerecord/lib/active_record/attribute_methods.rb
  123. +22 −7 vendor/rails/activerecord/lib/active_record/base.rb
  124. +1 −1 vendor/rails/activerecord/lib/active_record/calculations.rb
  125. +4 −0 vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
  126. +40 −2 vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
  127. +3 −3 vendor/rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
  128. +10 −1 vendor/rails/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
  129. +19 −1 vendor/rails/activerecord/lib/active_record/dirty.rb
  130. +2 −1 vendor/rails/activerecord/lib/active_record/dynamic_finder_match.rb
  131. +25 −4 vendor/rails/activerecord/lib/active_record/locale/en-US.yml
  132. +35 −0 vendor/rails/activerecord/lib/active_record/reflection.rb
  133. +1 −1 vendor/rails/activerecord/lib/active_record/schema_dumper.rb
  134. +55 −42 vendor/rails/activerecord/lib/active_record/validations.rb
  135. +39 −0 vendor/rails/activerecord/test/cases/aggregations_test.rb
  136. +13 −0 vendor/rails/activerecord/test/cases/associations/belongs_to_associations_test.rb
  137. +12 −0 vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
  138. +7 −0 vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb
  139. +12 −108 vendor/rails/activerecord/test/cases/associations_test.rb
  140. +9 −0 vendor/rails/activerecord/test/cases/attribute_methods_test.rb
  141. +33 −4 vendor/rails/activerecord/test/cases/base_test.rb
  142. +31 −0 vendor/rails/activerecord/test/cases/defaults_test.rb
  143. +13 −0 vendor/rails/activerecord/test/cases/dirty_test.rb
  144. +52 −6 vendor/rails/activerecord/test/cases/finder_test.rb
  145. +14 −0 vendor/rails/activerecord/test/cases/helper.rb
  146. +1 −1 vendor/rails/activerecord/test/cases/inheritance_test.rb
  147. +5 −1 vendor/rails/activerecord/test/cases/migration_test.rb
  148. +2 −2 vendor/rails/activerecord/test/cases/reflection_test.rb
  149. +25 −0 vendor/rails/activerecord/test/cases/sanitize_test.rb
  150. +26 −0 vendor/rails/activerecord/test/cases/validations_i18n_test.rb
  151. +36 −29 vendor/rails/activerecord/test/cases/validations_test.rb
  152. +10 −1 vendor/rails/activerecord/test/fixtures/customers.yml
  153. +2 −1 vendor/rails/activerecord/test/models/author.rb
  154. +3 −0 vendor/rails/activerecord/test/models/category.rb
  155. +2 −0 vendor/rails/activerecord/test/models/company.rb
  156. +19 −1 vendor/rails/activerecord/test/models/customer.rb
  157. +1 −0 vendor/rails/activerecord/test/models/parrot.rb
  158. +0 −6 vendor/rails/activerecord/test/models/post.rb
  159. +10 −0 vendor/rails/activesupport/CHANGELOG
  160. +1 −1 vendor/rails/activesupport/lib/active_support/cache.rb
  161. +1 −1 vendor/rails/activesupport/lib/active_support/cache/file_store.rb
  162. +11 −39 vendor/rails/activesupport/lib/active_support/cache/memory_store.rb
  163. +46 −0 vendor/rails/activesupport/lib/active_support/cache/synchronized_memory_store.rb
  164. +1 −1 vendor/rails/activesupport/lib/active_support/callbacks.rb
  165. +6 −6 vendor/rails/activesupport/lib/active_support/core_ext/array/grouping.rb
  166. +18 −22 vendor/rails/activesupport/lib/active_support/core_ext/bigdecimal/conversions.rb
  167. +24 −9 vendor/rails/activesupport/lib/active_support/core_ext/date/calculations.rb
  168. +19 −5 vendor/rails/activesupport/lib/active_support/core_ext/date_time/calculations.rb
  169. +2 −2 vendor/rails/activesupport/lib/active_support/core_ext/enumerable.rb
  170. +1 −1 vendor/rails/activesupport/lib/active_support/core_ext/file/atomic.rb
  171. +1 −1 vendor/rails/activesupport/lib/active_support/core_ext/hash/conversions.rb
  172. +1 −1 vendor/rails/activesupport/lib/active_support/core_ext/hash/except.rb
  173. +6 −3 vendor/rails/activesupport/lib/active_support/core_ext/module/synchronization.rb
  174. +2 −1 vendor/rails/activesupport/lib/active_support/core_ext/rexml.rb
  175. +2 −0 vendor/rails/activesupport/lib/active_support/core_ext/string.rb
  176. +13 −0 vendor/rails/activesupport/lib/active_support/core_ext/string/behavior.rb
  177. +19 −0 vendor/rails/activesupport/lib/active_support/core_ext/string/inflections.rb
  178. +25 −10 vendor/rails/activesupport/lib/active_support/core_ext/time/calculations.rb
  179. +19 −0 vendor/rails/activesupport/lib/active_support/inflector.rb
  180. +1 −1 vendor/rails/activesupport/lib/active_support/memoizable.rb
  181. +5 −0 vendor/rails/activesupport/lib/active_support/multibyte/chars.rb
  182. +7 −1 vendor/rails/activesupport/lib/active_support/test_case.rb
  183. +53 −41 vendor/rails/activesupport/lib/active_support/time_with_zone.rb
  184. +1 −1 vendor/rails/activesupport/lib/active_support/values/time_zone.rb
  185. +30 −0 vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/definitions/Asia/Colombo.rb
  186. +23 −0 vendor/rails/activesupport/test/core_ext/date_ext_test.rb
  187. +75 −0 vendor/rails/activesupport/test/core_ext/date_time_ext_test.rb
  188. +14 −0 vendor/rails/activesupport/test/core_ext/hash_ext_test.rb
  189. +6 −0 vendor/rails/activesupport/test/core_ext/string_ext_test.rb
  190. +74 −6 vendor/rails/activesupport/test/core_ext/time_ext_test.rb
  191. +64 −10 vendor/rails/activesupport/test/core_ext/time_with_zone_test.rb
  192. +6 −0 vendor/rails/activesupport/test/inflector_test.rb
  193. +8 −0 vendor/rails/activesupport/test/inflector_test_cases.rb
  194. +4 −0 vendor/rails/activesupport/test/multibyte_chars_test.rb
  195. +2 −0 vendor/rails/railties/CHANGELOG
  196. +37 −8 vendor/rails/railties/Rakefile
  197. +13 −0 vendor/rails/railties/lib/commands/console.rb
  198. +9 −9 vendor/rails/railties/lib/commands/plugin.rb
  199. +2 −2 vendor/rails/railties/lib/commands/process/spawner.rb
  200. +0 −1 vendor/rails/railties/lib/rails_generator/generators/components/mailer/templates/unit_test.rb
  201. +28 −8 vendor/rails/railties/lib/tasks/databases.rake
View
@@ -2,10 +2,12 @@
This is an example of how to use Searchgasm in a rails app. Searchgasm is simple searching, ordering, and pagination all in one plugin.
-Checkout Searchgasm here: http://github.com/binarylogic/searchgasm
+This application live: http://searchgasm_example.binarylogic.com
Quick tutorial on how to build this application here: http://www.binarylogic.com/2008/9/7/tutorial-pagination-ordering-and-searching-with-searchgasm
+Searchgasm: http://github.com/binarylogic/searchgasm
+
=== Key files
Here are the files you want to glance at:
View
@@ -1,3 +1,4 @@
class UserGroup < ActiveRecord::Base
has_many :users
+ has_many :orders, :through => :users
end
@@ -7,6 +7,10 @@ This is the preferred method. Really nice, check out jquery_setup.js on how to s
<legend>Search Users</legend>
<% f.fields_for @search.conditions do |users| %>
+ Match ANY or ALL of the conditions:<br />
+ <%= users.select :any, [["All", false], ["Any", true]] %><br />
+ <br />
+
First name keywords:<br />
<%= users.text_field :first_name_keywords %><br />
<br />
@@ -7,6 +7,10 @@ Good ol' regular http requests.
<legend>Search Users</legend>
<% f.fields_for @search.conditions do |users| %>
+ Match ANY or ALL of the conditions:<br />
+ <%= users.select :any, [["All", false], ["Any", true]] %><br />
+ <br />
+
First name keywords:<br />
<%= users.text_field :first_name_keywords %><br />
<br />
@@ -9,10 +9,13 @@ If you are wanting to do unobtrusive javascript take a look at the jQuery exampl
<legend>Search Users</legend>
<% f.fields_for @search.conditions do |users| %>
+ Match ANY or ALL of the conditions:<br />
+ <%= users.select :any, [["All", false], ["Any", true]] %><br />
+ <br />
+
First name keywords:<br />
<%= users.text_field :first_name_keywords %><br />
<br />
-
First name sounds like: (try &quot;bin&quot;, this is a custom condition, checkout config/initializers/searchgasm.rb)<br />
<%= users.text_field :first_name_sounds_like %><br />
<br />
@@ -24,13 +27,11 @@ If you are wanting to do unobtrusive javascript take a look at the jQuery exampl
Email ends with:<br />
<%= users.text_field :email_ends_with %><br />
<br />
-
<% users.fields_for users.object.orders do |orders| %>
Has orders with a total greater than:<br />
$<%= orders.text_field :total_gt %><br />
<br />
<% end %>
-
<% users.fields_for users.object.user_group do |user_group| %>
Belongs to user group with name that starts with:<br />
<%= user_group.text_field :name_starts_with %><br />
@@ -43,4 +44,4 @@ If you are wanting to do unobtrusive javascript take a look at the jQuery exampl
<div id="users">
<%= render :partial => "users" %>
-</div>
+</div>
View
@@ -82,14 +82,14 @@ def gem_version
def load_rubygems
require 'rubygems'
-
- unless rubygems_version >= '0.9.4'
- $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+ min_version = '1.1.1'
+ unless rubygems_version >= min_version
+ $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
exit 1
end
rescue LoadError
- $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+ $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
exit 1
end
View
@@ -5,7 +5,7 @@
# ENV['RAILS_ENV'] ||= 'production'
# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.1.1' unless defined? RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
Oops, something went wrong.

0 comments on commit f818abf

Please sign in to comment.