dnz-client 0.0.7 → 0.0.8

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.8 2009-11-19
+
+* Support for custom_search API with categories call.
+
 === 0.0.7 2009-11-16
 
 * Support for multiple values in a filter

data/Rakefile

@@ -5,8 +5,6 @@ require 'fileutils'
 require './lib/dnz'
 
 Hoe.plugin :newgem
-# Hoe.plugin :website
-# Hoe.plugin :cucumberfeatures
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)

data/lib/dnz/client.rb

@@ -100,13 +100,18 @@ module DNZ
 
     # Get a list of all categories using the 'category' facet.
     #
+    # ==== Options
+    #
+    # * <tt>:custom_search</tt> - The name of a custom search created at http://digitalnz.org
+    #
     # ==== Example
     #   categories = client.categories
     #   categories.each do |category|
     #     puts category.name
     #   end
-    def categories
-      search('*:*', :facets => 'category', :facet_num_results => 100).facets['category'].values
+    def categories(options = {})
+      options = options.merge(:facets => 'category', :facet_num_results => 100)
+      search('*:*', options).facets['category'].values
     end
 
     # Run a search using the digitalnz.org API.

data/lib/dnz/search.rb

@@ -75,7 +75,7 @@ module DNZ
 
     # The number of pages available for the current search.
     def pages
-      num_results_requested < result_count ? (result_count.to_f / num_results_requested).ceil : 0
+      num_results_requested < result_count ? (result_count.to_f / num_results_requested).ceil : 1
     end
 
     # The number of results requested via the :num_results option (see <tt>Client.search</tt>).
@@ -83,12 +83,17 @@ module DNZ
       @num_results_requested || 20
     end
 
+    def inspect
+      self.to_s
+    end
+
     def to_s
       {
-        :results => self.results.length,
+        :results => self.result_count,
         :facets => self.facets.length,
         :page => self.page,
-        :pages => self.pages
+        :pages => self.pages,
+        :per_page => self.num_results_requested
       }.inspect
     end
     

data/lib/dnz.rb

@@ -4,5 +4,5 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'dnz/client'
 
 module Dnz
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/spec/dnz/client_spec.rb

@@ -141,6 +141,11 @@ describe Client do
       @client.should_receive(:search).with('*:*', :facets => 'category', :facet_num_results => 100).and_return(@search)
       @client.categories
     end
+
+    it 'should run a search with custom_search' do
+      @client.should_receive(:search).with('*:*', :facets => 'category', :facet_num_results => 100, :custom_search => 'test').and_return(@search)
+      @client.categories(:custom_search => 'test')
+    end
     
     it 'should return the categories facet' do
       @client.categories.should == @categories

data/tasks/rspec.rake

@@ -1,18 +1,6 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  require 'spec'
-end
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-EOS
-  exit(0)
-end
+require 'spec'
+require 'spec/rake/spectask'
+
 
 desc "Run the specs under spec"
 Spec::Rake::SpecTask.new do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dnz-client
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Jeremy Wells
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 +13:00
+date: 2009-11-19 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency