cloud_search 0.0.5 → 0.0.6

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+*.sw*
 *.rbc
 .bundle
 .config

data/Guardfile

@@ -3,7 +3,7 @@
 
 guard 'rspec', :version => 2 do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
   watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
 end

data/cloud_search.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "vcr"       , "~> 2.2"
   gem.add_development_dependency "webmock"
 
-  gem.add_dependency "em-http-request"       , "~> 1.0"
+  # gem.add_dependency "em-http-request"       , "~> 1.0"
+  gem.add_dependency "rest-client", "~> 1.6.7"
 end
 

data/lib/cloud_search.rb

@@ -1,4 +1,5 @@
-require "em-http"
+# require "em-http"
+require "rest_client"
 require "json"
 require "cloud_search/version"
 

data/lib/cloud_search/indexer.rb

@@ -18,23 +18,9 @@ module CloudSearch
     end
 
     def index
-      response, message = nil
-      EM.run do
-        http = EM::HttpRequest.new(url).post :body => documents_json, :head => headers
-
-        http.callback {
-          message  = "#{http.response_header.status} - #{http.response.length} bytes\n#{url}\n"
-          response = JSON.parse(http.response)
-
-          EM.stop
-        }
-
-        http.errback {
-          message = "#{url}\n#{http.error}"
-
-          EM.stop
-        }
-      end
+      cloud_search_response = RestClient.post url, documents_json, headers
+      message               = "#{cloud_search_response.code} - #{cloud_search_response.length} bytes\n#{url}\n"
+      response              = JSON.parse cloud_search_response.body
 
       [response, message]
     end

data/lib/cloud_search/search_response.rb

@@ -4,25 +4,25 @@ module CloudSearch
     attr_accessor :http_code
 
     def results
-      (_hits and _hits['hit']) or []
+      _hits["hit"] || []
     end
 
     def hits
-      (_hits and _hits['found']) or 0
+      _hits["found"] || 0
     end
 
     def found?
-      hits >= 1
+      hits > 0
     end
 
     def body=(body)
-      @body = body
+      @body = body || {}
       calculate_pages
       @body
     end
 
     def items_per_page
-      @items_per_page or 10
+      @items_per_page || 10
     end
 
     alias :page_size :items_per_page
@@ -38,18 +38,19 @@ module CloudSearch
     end
 
     private
+
     def calculate_pages
       num_full_pages = hits / items_per_page
       @total_pages   = hits % items_per_page > 0 ? num_full_pages + 1 : num_full_pages
       @total_pages   = 1 if @total_pages == 0
 
-      start = (_hits and _hits["start"]) || 0
+      start = _hits["start"] || 0
       @current_page = (start / items_per_page) + 1
       @current_page = @total_pages if @current_page > @total_pages
     end
 
     def _hits
-      body and body['hits']
+      body["hits"] || {}
     end
   end
 end

data/lib/cloud_search/searcher.rb

@@ -1,27 +1,15 @@
+require 'uri'
+
 module CloudSearch
   class Searcher
     include ConfigurationChecking
 
     def search
-      response = SearchResponse.new
-
-      EM.run do
-        http = EM::HttpRequest.new(url).get
-
-        http.callback do
-          response.http_code = http.response_header.status
-          response.body = JSON.parse(http.response)
+      response              = SearchResponse.new
 
-          EM.stop
-        end
-
-        http.errback do
-          response.http_code = http.error
-          response.body = http.response
-
-          EM.stop
-        end
-      end
+      cloud_search_response = RestClient.get url
+      response.http_code    = cloud_search_response.code
+      response.body         = JSON.parse(cloud_search_response.body)
 
       response.items_per_page = items_per_page
       response
@@ -39,7 +27,7 @@ module CloudSearch
     end
 
     def query
-      @query or ''
+      URI.escape(@query || '').gsub('&', '%26')
     end
 
     def boolean_query?
@@ -78,8 +66,8 @@ module CloudSearch
       check_configuration_parameters
 
       "#{CloudSearch.config.search_url}/search".tap do |u|
-        u.concat("?#{query_parameter}=#{CGI.escape(query)}&size=#{items_per_page}&start=#{start}")
-        u.concat("&return-fields=#{CGI.escape(@fields.join(","))}") unless @fields.nil? or @fields.empty?
+        u.concat("?#{query_parameter}=#{query}&size=#{items_per_page}&start=#{start}")
+        u.concat("&return-fields=#{URI.escape(@fields.join(","))}") if @fields && @fields.any?
       end
     end
 

data/lib/cloud_search/version.rb

@@ -1,3 +1,3 @@
 module CloudSearch
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/cloud_search/search_response_spec.rb

@@ -3,20 +3,20 @@ require "spec_helper"
 describe CloudSearch::SearchResponse do
   subject { described_class.new }
 
-  before do
-    subject.body = YAML.load_file File.expand_path("../../fixtures/full.yml", __FILE__)
-  end
-
   context "when there are results" do
+    before do
+      subject.body = YAML.load_file File.expand_path("../../fixtures/full.yml", __FILE__)
+    end
+
     describe "#results" do
       it "list matched documents" do
-        subject.results.inject([]){ |acc, i| acc << i['data']['title']}.flatten(1)
-        .should == ["Star Wars: The Clone Wars", 
-                    "Star Wars", 
-                    "Star Wars: Episode II - Attack of the Clones", 
-                    "Star Wars: Episode V - The Empire Strikes Back", 
-                    "Star Wars: Episode VI - Return of the Jedi", 
-                    "Star Wars: Episode I - The Phantom Menace", 
+        subject.results.map{ |item| item['data']['title'] }.flatten
+        .should == ["Star Wars: The Clone Wars",
+                    "Star Wars",
+                    "Star Wars: Episode II - Attack of the Clones",
+                    "Star Wars: Episode V - The Empire Strikes Back",
+                    "Star Wars: Episode VI - Return of the Jedi",
+                    "Star Wars: Episode I - The Phantom Menace",
                     "Star Wars: Episode III - Revenge of the Sith"]
       end
     end
@@ -40,7 +40,7 @@ describe CloudSearch::SearchResponse do
     end
 
     describe "#items_per_page" do
-      it "returns items per page" do
+      it "returns items per page as default 10" do
         subject.items_per_page.should == 10
       end
     end
@@ -52,7 +52,7 @@ describe CloudSearch::SearchResponse do
     end
 
     describe "#offset" do
-      it "returns offset" do
+      it "returns offset as default 0" do
         subject.offset.should == 0
       end
     end
@@ -97,6 +97,118 @@ describe CloudSearch::SearchResponse do
       it "returns offset" do
         subject.offset.should == 0
       end
-    end   
+    end
+  end
+
+  context "pagination" do
+    let(:seven_hits) { YAML.load_file File.expand_path("../../fixtures/full.yml", __FILE__) }
+
+    it "returns number of pages based on hits" do
+      subject.items_per_page = 8
+      subject.body = seven_hits
+      subject.total_pages.should == 1
+
+      subject.items_per_page = 7
+      subject.body = seven_hits
+      subject.total_pages.should == 1
+
+      subject.items_per_page = 6
+      subject.body = seven_hits
+      subject.total_pages.should == 2
+
+      subject.items_per_page = 5
+      subject.body = seven_hits
+      subject.total_pages.should == 2
+
+      subject.items_per_page = 4
+      subject.body = seven_hits
+      subject.total_pages.should == 2
+
+      subject.items_per_page = 3
+      subject.body = seven_hits
+      subject.total_pages.should == 3
+
+      subject.items_per_page = 2
+      subject.body = seven_hits
+      subject.total_pages.should == 4
+
+      subject.items_per_page = 1
+      subject.body = seven_hits
+      subject.total_pages.should == 7
+    end
+
+    it "returns current page based on start and items per page" do
+      subject.items_per_page = 3
+      seven_hits['hits']['start'] = nil
+      subject.body = seven_hits
+      subject.current_page.should == 1
+
+      subject.items_per_page = 3
+      seven_hits['hits']['start'] = 0
+      subject.body = seven_hits
+      subject.current_page.should == 1
+
+      subject.items_per_page = 3
+      seven_hits['hits']['start'] = 2
+      subject.body = seven_hits
+      subject.current_page.should == 1
+
+      subject.items_per_page = 3
+      seven_hits['hits']['start'] = 3
+      subject.body = seven_hits
+      subject.current_page.should == 2
+
+      subject.items_per_page = 3
+      seven_hits['hits']['start'] = 4
+      subject.body = seven_hits
+      subject.current_page.should == 2
+
+      subject.items_per_page = 3
+      seven_hits['hits']['start'] = 5
+      subject.body = seven_hits
+      subject.current_page.should == 2
+
+      subject.items_per_page = 3
+      seven_hits['hits']['start'] = 6
+      subject.body = seven_hits
+      subject.current_page.should == 3
+    end
+
+    it "calculates offset based on current page and items_per_page" do
+      subject.items_per_page = 3
+      seven_hits['hits']['start'] = nil
+      subject.body = seven_hits
+      subject.offset.should == 0
+
+      subject.items_per_page = 3
+      seven_hits['hits']['start'] = 0
+      subject.body = seven_hits
+      subject.offset.should == 0
+
+      subject.items_per_page = 3
+      seven_hits['hits']['start'] = 2
+      subject.body = seven_hits
+      subject.offset.should == 0
+
+      subject.items_per_page = 3
+      seven_hits['hits']['start'] = 3
+      subject.body = seven_hits
+      subject.offset.should == 3
+
+      subject.items_per_page = 3
+      seven_hits['hits']['start'] = 4
+      subject.body = seven_hits
+      subject.offset.should == 3
+
+      subject.items_per_page = 3
+      seven_hits['hits']['start'] = 5
+      subject.body = seven_hits
+      subject.offset.should == 3
+
+      subject.items_per_page = 3
+      seven_hits['hits']['start'] = 6
+      subject.body = seven_hits
+      subject.offset.should == 6
+    end
   end
 end

data/spec/cloud_search/searcher_spec.rb

@@ -46,7 +46,7 @@ describe CloudSearch::Searcher do
 
     it "uses 'bq' to specify the query in the URL" do
       subject.with_boolean_query("year:2000")
-      subject.url.should == "#{url_prefix}bq=year%3A2000&size=10&start=0"
+      subject.url.should == "#{url_prefix}bq=year:2000&size=10&start=0"
     end
   end
 
@@ -124,6 +124,14 @@ describe CloudSearch::Searcher 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
@@ -133,7 +141,7 @@ describe CloudSearch::Searcher do
     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%2Cbar"
+      subject.with_fields(:foo, :bar).url.should == "#{url_prefix}q=&size=10&start=0&return-fields=foo,bar"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud_search
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -108,13 +108,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: em-http-request
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.6.7
 description: A wraper to Amazon CloudSearch's API
 email:
 - willian@willianfernandes.com.br