binged 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/binged.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{binged}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Faustino"]
-  s.date = %q{2010-03-07}
+  s.date = %q{2010-03-08}
   s.description = %q{A wrapper for the bing api}
   s.email = %q{kevin.faustino@gmail.com}
   s.extra_rdoc_files = [

data/lib/binged/search/web.rb

@@ -1,10 +1,12 @@
 module Binged
   module Search
-    
+
     # A class that encapsulated the Bing Web Search source
     # @todo Add support for adult and market filtering
     class Web < Base
-      
+
+      SEARCH_RESULTS_LIMIT = 1000
+
       SUPPORTED_FILE_TYPES = [:doc, :dwf, :feed, :htm, :html, :pdf, :ppt, :ps, :rtf, :text, :txt, :xls]
 
       # @param [Binged::Client] client
@@ -18,7 +20,7 @@ module Binged
       end
 
       # Add query to search
-      # 
+      #
       # @param [String] query The search term to be sent to Bing
       # @return [self]
       def containing(query)
@@ -26,36 +28,36 @@ module Binged
         self
       end
 
-      # Retrieve results of the web search
-      # 
+      # Retrieve results of the web search. Limited to first 1000 results.
+      #
       # @return [Hash] A hash of the results returned from Bing
       def fetch
-        if @fetch.nil?    
+        if @fetch.nil?
           response = perform
-          @fetch = Hashie::Mash.new(response["SearchResponse"]["Web"]) if response
+          @fetch = Hashie::Mash.new(response["SearchResponse"]["Web"])
         end
 
-        @fetch || []
+        @fetch
       end
-            
+
       # Add filtering based on a file type
-      # 
+      #
       # @example
       #   web_search.file_type(:pdf) # Isolate search to PDF files
-      # 
+      #
       # @param [Symbol] type A symbol of a {SUPPORTED_FILE_TYPES}
       # @return [self]
       # @see http://msdn.microsoft.com/en-us/library/dd250876.aspx Description of all supported file types
-      def file_type(type)        
+      def file_type(type)
         @query['Web.FileType'] = type if SUPPORTED_FILE_TYPES.include?(type)
         self
       end
-      
-      # Isolate search results to a specific site      
-      #  
+
+      # Isolate search results to a specific site
+      #
       # @example
       #   web_search.from_site('www.ruby-lang.org')
-      # 
+      #
       # @param [String] site Web site address to limit search results to
       # @return [self]
       def from_site(site)
@@ -64,17 +66,17 @@ module Binged
       end
 
       # Set the page number of the results to display
-      # 
+      #
       # @param [Fixnum] num The page number of the search results
       # @return [self]
       def page(num=1)
-        offset = num - 1
-        @query['Web.Offset'] = @results_per_page * offset
+        @offset = num - 1
+        @query['Web.Offset'] = @results_per_page * @offset
         self
       end
 
       # The amount of results to display per page. Initialized to 20 per page.
-      # 
+      #
       # @param [Fixnum] num The number of results per page
       # @return [self]
       def per_page(num)
@@ -83,6 +85,18 @@ module Binged
         self
       end
 
+      # The total amount of pages available
+      #
+      # @return[Fixnum] Amount of pages
+      def total_pages
+        bing_total = fetch.total.to_i
+        if bing_total < SEARCH_RESULTS_LIMIT
+          bing_total / @results_per_page
+        else
+          SEARCH_RESULTS_LIMIT / @results_per_page
+        end
+      end
+
     end
   end
 end

data/spec/binged/search/web_spec.rb

@@ -50,13 +50,28 @@ module Binged
         it "should return the results of the search" do
           @response.results.size.should == 20
         end
-
+        
         it "should support dot notation" do
           result = @response.results.first
           result.title.should == "Ruby Programming Language"
           result.description.should == "Ruby is… A dynamic, open source programming language with a focus on simplicity and productivity. It has an elegant syntax that is ..."
           result.url.should == "http://www.ruby-lang.org/en/"
         end
+        
+        context "total pages" do
+          
+          it "should return of maximum amount of pages that does not exceed the the Bing limit" do
+            bing_limit = 1000
+            @response.should_receive(:total).and_return(bing_limit + 1)
+            @search.total_pages.should == 50
+          end
+          
+          it "should calculate the total amount of pages if the Bing results are less than the maximum limit" do
+            @response.should_receive(:total).and_return(500)
+            @search.total_pages.should == 25
+          end                  
+          
+        end
 
       end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Kevin Faustino
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-07 00:00:00 -05:00
+date: 2010-03-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency