couchrest_model_search 0.0.5 → 0.0.6

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.0.6
+  -- `escaped_search` now available on database (raw result response)
+
 v0.0.5
   -- new feature: `escaped_search` (see README)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    couchrest_model_search (0.0.4)
+    couchrest_model_search (0.0.5)
       couchrest_model (~> 1.0.0)
 
 GEM

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/couchrest_model_search.rb

@@ -66,7 +66,25 @@ module CouchRest
   end
 end
 
+module CouchRest
+  module Search
+    module Escape
+      def escape_special_characters(query)
+        new_query = query.dup
+        lucene_special_characters.map {|c| new_query.gsub!(c, %{\\} + c)}
+        new_query
+      end
+
+      def lucene_special_characters
+        @lucene_special_characters ||= %w[\ + - && || ! ( ) { } [ ] ^ " ~ * ? :]
+      end
+    end
+  end
+end
+
 class CouchRest::Database
+  include CouchRest::Search::Escape
+
   def search(klass, view_fn, query, options={})
     url = CouchRest.paramify_url("#{@root}/_fti/_design/#{klass}/#{view_fn}", options.merge(:q => query))
     ActiveSupport::Notifications.instrument("search.lucene",
@@ -74,22 +92,25 @@ class CouchRest::Database
       CouchRest.get url
     end
   end
+
+  def escaped_search(klass, view_fn, query, options={})
+    search klass, view_fn, escape_special_characters(query), options
+  end
 end
 
 class CouchRest::Model::Base
-  def self.search(query, view_fn="by_fulltext", options={})
-    options[:include_docs] = true
-    ret = self.database.search(self.to_s, view_fn, query, options)
-    ret['rows'].map {|r| self.new(r['doc'])}
-  end
+  class << self
+    include CouchRest::Search::Escape
 
-  def self.escaped_search(query, view_fn="by_fulltext", options={})
-    self.lucene_special_characters.map {|c| query.gsub!(c, %{\\} + c)}
-    self.search query, view_fn, options
-  end
+    def search(query, view_fn="by_fulltext", options={})
+      options[:include_docs] = true
+      ret = self.database.search(self.to_s, view_fn, query, options)
+      ret['rows'].map {|r| self.new(r['doc'])}
+    end
 
-  def self.lucene_special_characters
-    @lucene_special_characters ||= %w[\ + - && || ! ( ) { } [ ] ^ " ~ * ? :]
+    def escaped_search(query, view_fn="by_fulltext", options={})
+      self.search escape_special_characters(query), view_fn, options
+    end
   end
   
   # example search functions

data/spec/couchrest_model_search_spec.rb

@@ -17,12 +17,19 @@ describe "CouchrestModelSearch" do
   end  
 end
 
-describe "##escaped_search" do
+describe "CouchRest::Model::Base##escaped_search" do
   it "should escape the first parameter, then pass all args off to the search method" do
     Article.should_receive(:search).with('hello\:there', "by_fulltext", {}).and_return nil
     Article.escaped_search "hello:there"
   end
 end
+
+describe "CouchRest::Database##escaped_search" do
+  it "should escape the third parameter, then pass all args off to the search method" do
+    Article.database.should_receive(:search).with(Article, "by_fulltext", 'hello\:there', {}).and_return nil
+    Article.database.escaped_search Article, "by_fulltext", "hello:there"
+  end
+end
   
 describe "overwrite design doc" do  
   class CustomArticle < CouchRest::Model::Base

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: couchrest_model_search
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Dorren Chen