escargot 0.0.2 → 0.0.3

data/README.markdown

@@ -13,7 +13,7 @@ and (if you want to use the **optional** distributed indexing mode) Redis.
 Usage
 =======
 
-First, [download and start ElasticSearch](http://www.elasticsearch.com/docs/elasticsearch/setup/installation/) (it's really simple). With the default setup of
+First, [download](http://www.elasticsearch.org/download/) and [start ElasticSearch](http://www.elasticsearch.org/guide/reference/setup/installation.html) (it's really simple). With the default setup of
 of ElasticSearch (listening to localhost and port 9200) no configuration of the plugin is 
 necessary. 
 
@@ -132,14 +132,14 @@ Pagination
   
 Query DSL
 ----------------
-Instead of a string, you can pass a query in ElasticSearch's [Query DSL](http://www.elasticsearch.com/docs/elasticsearch/rest_api/query_dsl/)
+Instead of a string, you can pass a query in ElasticSearch's [Query DSL](http://www.elasticsearch.org/guide/reference/query-dsl/)
 giving you access to the full range of search features. 
 
-    Bird.search(:match_all => true}  
+    Bird.search(:match_all => { })  
       
     Bird.search(:fuzzy => {:name => 'oriale'})
 
-    Bird.search(:custom_score => {:query => {:match_all => true}, :script => "random()"})
+    Bird.search(:custom_score => {:query => {:match_all => { } }, :script => "random()"})
     
     Bird.search(:dis_max => {
       :tie_breaker => 0.7,
@@ -162,7 +162,27 @@ giving you access to the full range of search features.
         }
       }
     )
-  
+
+ 
+Query DSL with API Search
+----------------  
+Any query Hash in Escargot a is a Query DSL by default, so anything you put in the first param is wrapper with
+the term "query", but sometimes you need puts some params out Query DSL, using options of [API Search](http://www.elasticsearch.org/guide/reference/api/search/), you can do this
+using the option *:query_dsl => false* in the query Hash, of course remember to put the term *:query => {your query}* to work correctly
+    
+    User.search (
+        :track_scores =>true, 
+        :sort =>[ {
+                    :name => {:reverse => true }
+                  }
+                ],
+        :query => {
+                    :term => {:name => "john"}
+                  }, 
+        :query_dsl => false
+    )
+
+
 Facets
 ----------------
   
@@ -234,7 +254,7 @@ If you want the search to be insensitive to accents and other diacritics:
     end
 
 The full list of available options for index creation is documented at
-[http://www.elasticsearch.com/docs/elasticsearch/index_modules/](http://www.elasticsearch.com/docs/elasticsearch/index_modules/)
+[http://www.elasticsearch.org/guide/reference/index-modules/](http://www.elasticsearch.org/guide/reference/index-modules/)
 
 Mapping options
 ----------------
@@ -259,7 +279,7 @@ Some examples:
     end
 
 
-See the [ElasticSearch Documentation](http://www.elasticsearch.com/docs/elasticsearch/mapping/) for mappings.
+See the [ElasticSearch Documentation](http://www.elasticsearch.org/guide/reference/mapping/) for mappings.
 
 Distributed indexing
 =======

data/lib/escargot.rb

@@ -42,7 +42,8 @@ module Escargot
     end
     
     if query.kind_of?(Hash)
-      query = {:query => query}
+      query_dsl = query.delete(:query_dsl)
+      query = {:query => query} if (query_dsl.nil? || query_dsl)
     end
     $elastic_search_client.search(query, options)
   end

data/lib/escargot/activerecord_ex.rb

@@ -68,7 +68,7 @@ module Escargot
         fields_list = [fields_list] unless fields_list.kind_of?(Array)
         
         if !options[:query]
-          options[:query] = {:match_all => true}
+          options[:query] = {:match_all => { } }
         elsif options[:query].kind_of?(String)
           options[:query] = {:query_string => {:query => options[:query]}}
         end

data/lib/escargot/version.rb

@@ -1,3 +1,3 @@
 module Escargot
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/nrt_enqueue_test.rb

@@ -17,7 +17,11 @@ class NrtEnqueue < Test::Unit::TestCase
     User.create(:name => 'Peter the Young')
     User.create(:name => 'Peter the Old')
     User.create(:name => 'Bob the Skinny')
-    User.create(:name => 'Jamie the Flying Machine')    
+    User.create(:name => 'Jamie the Flying Machine')
+
+    # the Resque tasks have not run yet, so there should be nothing in the index
+    # but now run the Resque tasks and check that the index is good for each test
+    Resque.run!
   end
   
   def teardown
@@ -26,9 +30,6 @@ class NrtEnqueue < Test::Unit::TestCase
   end
   
   def test_document_creation
-    # the Resque tasks have not run yet, so there should be nothing in the index
-    # but now run the Resque tasks and check that the index is good
-    Resque.run!
     User.refresh_index
 
     assert_equal 5, User.search("*").total_entries
@@ -38,10 +39,8 @@ class NrtEnqueue < Test::Unit::TestCase
   end
   
   def test_document_updates
-    # now run the Resque tasks and check that the index is good
-    Resque.run!
     User.refresh_index
-
+    
     assert_equal 5, User.search("*").total_entries
 
     # make a change in a document
@@ -62,8 +61,6 @@ class NrtEnqueue < Test::Unit::TestCase
   end
   
   def test_document_deletes
-    # now run the Resque tasks and check that the index is good
-    Resque.run!
     User.refresh_index
 
     assert_equal User.search("*").total_entries, 5

data/test/search_test.rb

@@ -46,6 +46,17 @@ class BasicSearchTest < Test::Unit::TestCase
     assert_equal results.total_entries, 2
     assert_equal User.search_count(:term => {:name => "john"}), 2
   end
+  
+  def test_search_without_query_dsl
+    # By default in Escargot any query Hash is a Query DSL, so anything you put in the first param is wrapper with
+    # this "query = {:query => {query}}", but sometimes if you need puts some params OUT Query DSL you can do this
+    # putting in the query Hash the option ":query_dsl => false", of course remember to put the term ":query => {your query}"
+    # to work correctly
+
+    results = User.search(:sort =>[{ :country_code => {:reverse => true }}] , :query => {:term => {:name => "john"}}, :query_dsl => false,:track_scores =>true)
+    assert_equal results.first.name, 'John the Skinny Too'
+  end
+  
 
   def test_facets
     assert_equal User.facets(:country_code)[:country_code]["ca"], 2

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: escargot
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Angel Faus
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 -03:00
+date: 2011-04-05 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency