cloud_search 0.0.8 → 0.0.9

data/README.md

@@ -51,7 +51,8 @@ resp     = searcher.with_fields(:actor, :director, :title, :year, :text_relevanc
 ``` ruby
 searcher = CloudSearch::Searcher.new
 resp     = searcher.with_fields(:actor, :director, :title, :year, :text_relevance)
-         .with_boolean_query("year:2000")
+         .as_boolean_query
+         .with_query("year:2000")
          .search
 ```
 

data/lib/cloud_search/searcher.rb

@@ -6,6 +6,7 @@ module CloudSearch
 
     def initialize
       @response = SearchResponse.new
+      @filters  = []
     end
 
     def search
@@ -21,9 +22,13 @@ module CloudSearch
       self
     end
 
-    def with_boolean_query(query)
+    def with_filter(filter)
+      @filters << filter
+      self
+    end
+
+    def as_boolean_query
       @boolean = true
-      with_query query
       self
     end
 
@@ -70,6 +75,7 @@ module CloudSearch
       "#{CloudSearch.config.search_url}/search".tap do |u|
         u.concat("?#{query_parameter}=#{query}&size=#{items_per_page}&start=#{start}")
         u.concat("&return-fields=#{URI.escape(@fields.join(","))}") if @fields && @fields.any?
+        u.concat("&#{filter_expression}") if @filters.any?
       end
     end
 
@@ -78,6 +84,10 @@ module CloudSearch
     def query_parameter
       boolean_query? ? "bq" : "q"
     end
+
+    def filter_expression
+      @filters.join("&")
+    end
   end
 end
 

data/lib/cloud_search/version.rb

@@ -1,3 +1,3 @@
 module CloudSearch
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/cloud_search/searcher_spec.rb

@@ -27,25 +27,33 @@ describe CloudSearch::Searcher do
       subject.with_query("foo")
       subject.query.should == "foo"
     end
+
+    it "returns cloud search url with foo query" do
+      subject.with_query("foo").url.should == "#{url_prefix}q=foo&size=10&start=0"
+    end
+
+    it "returns cloud search url with foo query" do
+      subject.with_query("f&oo").url.should == "#{url_prefix}q=f%26oo&size=10&start=0"
+    end
+
+    it "returns cloud search url with foo* query" do
+      subject.with_query("foo*").url.should == "#{url_prefix}q=foo*&size=10&start=0"
+    end
   end
 
-  describe "#with_boolean_query" do
+  describe "#as_boolean_query" do
     it "sets the query mode to 'boolean'" do
-      subject.with_boolean_query("year:2000")
+      subject.as_boolean_query
       subject.should be_boolean_query
     end
 
     it "returns the searcher instance" do
-      subject.with_boolean_query("year:2000").should == subject
-    end
-
-    it "sets the query term" do
-      subject.with_boolean_query("year:2000")
-      subject.query.should == "year:2000"
+      subject.as_boolean_query.should == subject
     end
 
     it "uses 'bq' to specify the query in the URL" do
-      subject.with_boolean_query("year:2000")
+      subject.as_boolean_query
+      subject.with_query("year:2000")
       subject.url.should == "#{url_prefix}bq=year:2000&size=10&start=0"
     end
   end
@@ -58,6 +66,10 @@ describe CloudSearch::Searcher do
     it "setup more thane one value" do
       subject.with_fields(:foo, :bar, :foobar)
     end
+
+    it "returns cloud search url with foo and bar fields" do
+      subject.with_fields(:foo, :bar).url.should == "#{url_prefix}q=&size=10&start=0&return-fields=foo,bar"
+    end
   end
 
   describe "#items_per_page" do
@@ -80,6 +92,10 @@ describe CloudSearch::Searcher do
       subject.with_items_per_page(100)
       subject.items_per_page.should == 100
     end
+
+    it "returns cloud search url with size equals 20" do
+      subject.with_items_per_page(20).url.should == "#{url_prefix}q=&size=20&start=0"
+    end
   end
 
   describe "#page_number" do
@@ -110,6 +126,22 @@ describe CloudSearch::Searcher do
       subject.at_page(-1)
       subject.page_number.should == 1
     end
+
+    it "returns cloud search url with start at 11" do
+      subject.at_page(2).url.should == "#{url_prefix}q=&size=10&start=11"
+    end
+  end
+
+  describe "#with_filter" do
+    it "adds the filter to the query" do
+      subject.with_query("foo").with_filter("t-product_active=1")
+      subject.url.should == "#{url_prefix}q=foo&size=10&start=0&t-product_active=1"
+    end
+
+    it "can be used to add several filter expressions to the query" do
+      subject.with_query("foo").with_filter("t-product_active=1").with_filter("t-brand_active=1")
+      subject.url.should == "#{url_prefix}q=foo&size=10&start=0&t-product_active=1&t-brand_active=1"
+    end
   end
 
   describe "#start" do
@@ -127,30 +159,6 @@ describe CloudSearch::Searcher do
     it "returns default cloud search url" do
       subject.url.should == "#{url_prefix}q=&size=10&start=0"
     end
-
-    it "returns cloud search url with foo query" do
-      subject.with_query("foo").url.should == "#{url_prefix}q=foo&size=10&start=0"
-    end
-
-    it "returns cloud search url with foo query" do
-      subject.with_query("f&oo").url.should == "#{url_prefix}q=f%26oo&size=10&start=0"
-    end
-
-    it "returns cloud search url with foo* query" do
-      subject.with_query("foo*").url.should == "#{url_prefix}q=foo*&size=10&start=0"
-    end
-
-    it "returns cloud search url with size equals 20" do
-      subject.with_items_per_page(20).url.should == "#{url_prefix}q=&size=20&start=0"
-    end
-
-    it "returns cloud search url with start at 19" do
-      subject.at_page(2).url.should == "#{url_prefix}q=&size=10&start=11"
-    end
-
-    it "returns cloud search url with foo and bar fields" do
-      subject.with_fields(:foo, :bar).url.should == "#{url_prefix}q=&size=10&start=0&return-fields=foo,bar"
-    end
   end
 
   describe "#search" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud_search
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors: