asari 0.4.0 → 0.5.0

data/lib/asari.rb

@@ -1,5 +1,6 @@
 require "asari/version"
 
+require "asari/collection"
 require "asari/exceptions"
 
 require "httparty"
@@ -53,15 +54,12 @@ class Asari
   def search(term, options = {})
     return [] if self.class.mode == :sandbox
 
-    url = "http://search-#{search_domain}.us-east-1.cloudsearch.amazonaws.com/#{api_version}/search?q=#{CGI.escape(term)}"
+    page_size = options[:page_size] || 10
 
-    if options[:page_size]
-      url << "&size=#{options[:page_size]}"
-    end
+    url = "http://search-#{search_domain}.us-east-1.cloudsearch.amazonaws.com/#{api_version}/search?q=#{CGI.escape(term)}&size=#{page_size}"
 
     if options[:page]
-      size = options[:page_size] || 10
-      start = (options[:page] - 1) * size + 1
+      start = (options[:page] - 1) * page_size
       url << "&start=#{start}"
     end
 
@@ -77,7 +75,7 @@ class Asari
       raise Asari::SearchException.new("#{response.response.code}: #{response.response.msg}")
     end
 
-    response.parsed_response["hits"]["hit"].map { |h| h["id"] }
+    Asari::Collection.new(response, page_size)
   end
 
   # Public: Add an item to the index with the given ID.

data/lib/asari/collection.rb

@@ -0,0 +1,35 @@
+class Asari
+  class Collection < BasicObject
+    attr_reader :current_page
+    attr_reader :page_size
+    attr_reader :total_entries
+
+    # Internal: This object should really only ever be instantiated from within
+    # Asari code. The Asari Collection knows how to build itself from an
+    # HTTParty::Response object representing a search query result from
+    # CloudSearch.
+    #
+    # We also have to pass the page size in directly, because the CloudSearch
+    # response doesn't have any data about page size. It's cool, though. I
+    # guess.
+    #
+    def initialize(httparty_response, page_size)
+      resp = httparty_response.parsed_response
+      @total_entries = resp["hits"]["found"]
+      @page_size = page_size
+
+      start = resp["hits"]["start"]
+      @current_page = (start / page_size) + 1
+
+      @data = resp["hits"]["hit"].map { |h| h["id"] }
+    end
+
+    def offset
+      (@current_page - 1) * @page_size
+    end
+
+    def method_missing(method, *args, &block)
+      @data.send(method, *args, &block)
+    end
+  end
+end

data/lib/asari/version.rb

@@ -1,3 +1,3 @@
 class Asari
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asari
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70161865408960 !ruby/object:Gem::Requirement
+  requirement: &70182006566380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70161865408960
+  version_requirements: *70182006566380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70161865407860 !ruby/object:Gem::Requirement
+  requirement: &70182006565620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70161865407860
+  version_requirements: *70182006565620
 description: Asari s a Ruby interface for AWS CloudSearch
 email:
 - tommy@wellbredgrapefruit.com
@@ -47,6 +47,7 @@ files:
 - asari.gemspec
 - lib/asari.rb
 - lib/asari/active_record.rb
+- lib/asari/collection.rb
 - lib/asari/exceptions.rb
 - lib/asari/version.rb
 - spec/active_record_spec.rb