dnz-client 0.1.1 → 0.1.2

data/History.txt

@@ -1,6 +1,10 @@
+=== 0.1.2 2010-05-24
+
+* Fix for bug where facet values would not be returned in order.
+
 === 0.1.1 2010-05-24
 
-* Add support for fetching individual record metadata.
+* Add support for fetching individual record metadata. [ paulflewelling ]
 
 === 0.1.0 2010-05-13
 
@@ -9,7 +13,7 @@
 
 === 0.0.9 2010-04-23
 
-* Support for previewing custom searches
+* Support for previewing custom searches.
 
 === 0.0.8 2009-11-19
 
@@ -17,7 +21,7 @@
 
 === 0.0.7 2009-11-16
 
-* Support for multiple values in a filter
+* Support for multiple values in a filter.
 
 === 0.0.5 2009-09-15
 

data/lib/dnz/client.rb

@@ -133,7 +133,7 @@ module DNZ
     #     puts category.name
     #   end
     def categories(options = {})
-      options = options.merge(:facets => 'category', :facet_num_results => 100)
+      options = options.merge(:facets => 'category', :facet_num_results => 100, :num_results => 0)
       search('*:*', options).facets['category'].values
     end
 

data/lib/dnz/facet.rb

@@ -41,28 +41,30 @@ module DNZ
 
     def initialize(client, search, doc)
       @name = doc.xpath('facet-field').text
-      @values = {}
+      @values = []
       @search = search
 
       doc.xpath('values').first.children.each do |value_doc|
         value = DNZ::FacetValue.new(client, self, value_doc)
-        @values[value.name] = value if value.valid?
+        @values << value if value.valid?
       end
     end
     
     # An array of FacetValue objects
     def values
-      @values.values
+      @values
     end
 
     # Retrieve a FacetValue by name
     def [](index)
-      @values[index]
+      @values.detect{|value| value.name == index }
     end
     
     # Enumerate the FacetValue objects
     def each
-      @values.each {|key, value| yield value }
+      @values.each do |value|
+        yield value
+      end
     end
     
     def to_s

data/lib/dnz/record.rb

@@ -3,12 +3,12 @@ require 'dnz/memoizable'
 require 'dnz/namespace_array'
 
 module DNZ
+  # This class is for fetching record metadata from DigitalNZ.
   class Record
     def self.find(id)
       self.new(Client.connection, id)
     end
 
-
     def initialize(client, id)
       @client = client
       options = {:id => id}
@@ -17,24 +17,21 @@ module DNZ
       parse_record
     end
 
-
-    def method_missing(method, *args, &block)
+    def method_missing(method, * args, & block)
       if attribute = document.root.attributes[method.to_s.upcase]
         attribute.to_s
       else
-        @data.send(method, *args, &block)
+        @data.send(method, * args, & block)
       end
     end
 
+    private
 
-private
     # Return a Nokogiri document for the XML
     def document
       @doc ||= Nokogiri::XML(@xml)
     end
 
-
-
     # Parse the result into an array of DNZ::Result
     def parse_record
       @data = NamespaceArray.new

data/lib/dnz/results.rb

@@ -107,7 +107,6 @@ module DNZ
     # Parse the facets into an array of DNZ::FacetArray
     def parse_facets      
       @facets = FacetArray.new
-
       doc.xpath('//facets/facet').each do |facet_xml|
         @facets << DNZ::Facet.new(@client, @search, facet_xml)
       end

data/lib/dnz.rb

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

data/spec/dnz/client_spec.rb

@@ -193,12 +193,12 @@ describe Client do
       end
 
       it 'should run a search for categories facet' do
-        @client.should_receive(:search).with('*:*', :facets => 'category', :facet_num_results => 100).and_return(@search)
+        @client.should_receive(:search).with('*:*', :facets => 'category', :facet_num_results => 100, :num_results => 0).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.should_receive(:search).with('*:*', :facets => 'category', :facet_num_results => 100, :num_results => 0, :custom_search => 'test').and_return(@search)
         @client.categories(:custom_search => 'test')
       end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jeremy Wells