<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -4,3 +4,4 @@ tmp/*
 log/*
 .DS_Store
 config/deploy.rb
+*.sqlite3</diff>
      <filename>.gitignore</filename>
    </modified>
    <modified>
      <diff>@@ -3,7 +3,8 @@
 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
-Quick tutoiral on how to build this application here: http://www.binarylogic.com/2008/9/7/tutorial-pagination-ordering-and-searching-with-searchgasm
+
+Quick tutorial on how to build this application here: http://www.binarylogic.com/2008/9/7/tutorial-pagination-ordering-and-searching-with-searchgasm
 
 === Key files
 
@@ -31,4 +32,4 @@ After you have set up the gems and migrated your database you can generate the d
 The populate task will create 8 user groups with 0 to 150 users each. Each user can have upto 7 orders. (see lib/tasks/populate.rb)
 
 
-Copyright (c) 2008 [Ben Johnson](http://github.com/binarylogic) of [Binary Logic](http://www.binarylogic.com), released under the MIT license
\ No newline at end of file
+Copyright (c) 2008 {Ben Johnson}[http://github.com/binarylogic] of {Binary Logic}[http://www.binarylogic.com], released under the MIT license
\ No newline at end of file</diff>
      <filename>README.rdoc</filename>
    </modified>
    <modified>
      <diff>@@ -25,7 +25,6 @@ Rails::Initializer.run do |config|
   # config.gem &quot;bj&quot;
   # config.gem &quot;hpricot&quot;, :version =&gt; '0.6', :source =&gt; &quot;http://code.whytheluckystiff.net&quot;
   # config.gem &quot;aws-s3&quot;, :lib =&gt; &quot;aws/s3&quot;
-  #config.gem :searchgasm
   config.gem &quot;populator&quot;, :version =&gt; &quot;&gt;=0.2.4&quot;
   config.gem &quot;faker&quot;,     :version =&gt; &quot;&gt;=0.3.1&quot;
 
@@ -48,7 +47,7 @@ Rails::Initializer.run do |config|
   
   #if RAILS_ENV == &quot;development&quot; # putting this in environments/development.rb doesn't work, not sure why
   #  config.plugin_paths = [&quot;#{RAILS_ROOT}/../../Ruby Libs&quot;]
-  #  config.plugins = [:searchgasm, :each_with_info]
+  #  config.plugins = [:searchgasm]
   #  require &quot;ruby-debug&quot;
   #end
 </diff>
      <filename>config/environment.rb</filename>
    </modified>
    <modified>
      <diff>@@ -7,9 +7,6 @@ ActionController::Routing::Routes.draw do |map|
   map.namespace :rails_ajax do |namespace|
     namespace.resources :users
   end
-  map.namespace :prototype do |namespace|
-    namespace.resources :users
-  end
   map.namespace :jquery do |namespace|
     namespace.resources :users
   end</diff>
      <filename>config/routes.rb</filename>
    </modified>
    <modified>
      <diff>@@ -83,8 +83,15 @@ module Searchgasm #:nodoc:
       
       # Makes using searchgasm in the console less annoying and keeps the output meaningful and useful
       def inspect
-        options_as_nice_string = ::ActiveRecord::Base.valid_find_options.collect { |name| &quot;#{name}: #{send(name)}&quot; }.join(&quot;, &quot;)
-        &quot;#&lt;#{klass} #{options_as_nice_string}&gt;&quot;
+        current_find_options = {}
+        (::ActiveRecord::Base.valid_find_options - [:conditions]).collect do |option|
+          value = send(option)
+          next if value.nil?
+          current_find_options[option] = value
+        end
+        conditions_hash = conditions.conditions
+        current_find_options[:conditions] = conditions_hash if !conditions_hash.blank?
+        &quot;#&lt;#{klass}Search #{current_find_options.inspect}&gt;&quot;
       end
       
       def limit=(value)</diff>
      <filename>vendor/plugins/searchgasm-1.0.2/lib/searchgasm/search/base.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>bf266c59343fc3d8415f88f0e3f71de37c287c0c</id>
    </parent>
  </parents>
  <author>
    <name>Ben Johnson</name>
    <email>benjohnson@ben-johnsons-macbook-pro.local</email>
  </author>
  <url>http://github.com/binarylogic/searchlogic_example/commit/dc934234f84ba48bc1eb3024d24f302c93f7fce5</url>
  <id>dc934234f84ba48bc1eb3024d24f302c93f7fce5</id>
  <committed-date>2008-09-12T23:15:20-07:00</committed-date>
  <authored-date>2008-09-12T23:15:20-07:00</authored-date>
  <message>Merged croakers branch</message>
  <tree>27482db6e276cf2fe665825f60105855435adf62</tree>
  <committer>
    <name>Ben Johnson</name>
    <email>benjohnson@ben-johnsons-macbook-pro.local</email>
  </committer>
</commit>
