mwmitchell-rsolr-ext 0.5.6 → 0.5.7

data/lib/rsolr-ext/request.rb

@@ -15,11 +15,11 @@ module RSolr::Ext::Request
       :phrase_filters, # quoted fq params,
       :facets
     ]
-
+    
     def map_per_page(value,output)
       output[:rows] = value.to_i
     end
-
+    
     def map_page(value,output)
       raise ':per_page must be set when using :page' unless output[:rows]
       page = value.to_s.to_i-1

data/lib/rsolr-ext/response.rb

@@ -6,16 +6,12 @@ module RSolr::Ext::Response
   
   class Base < Mash
     
-    attr_reader :raw_response
-    
-    def initialize(raw_response)
-      @raw_response = raw_response
-      super(raw_response)
-      RSolr::Ext::HashMethodizer.methodize!(self)
+    def header
+      self[:responseHeader]
     end
     
     def ok?
-      response_header.status == 0
+      header[:status] == 0
     end
     
   end
@@ -26,17 +22,27 @@ module RSolr::Ext::Response
     include Facetable
     
     def initialize(*a)
-      super
+      super(*a)
       activate_pagination!
     end
     
+    def response
+      self[:response]
+    end
+    
+    def docs
+      response[:docs]
+    end
+    
+    private
+    
     def activate_pagination!
-      response.docs.each{ |d| d.extend DocExt }
-      d = response.docs
+      d = self[:response][:docs]
+      d.each{|dhash| dhash.extend DocExt }
       d.extend Pageable
-      d.start = response_header.params[:start].to_s.to_i
-      d.per_page = response_header.params[:rows].to_s.to_i
-      d.total = response.num_found
+      d.start = self[:responseHeader][:params][:start].to_s.to_i
+      d.per_page = self[:responseHeader][:params][:rows].to_s.to_i
+      d.total = self[:response][:numFound]
     end
     
   end
@@ -46,13 +52,13 @@ module RSolr::Ext::Response
   end
   
   # 
-  class RSolr::Ext::Response::Luke < Base
+  class Luke < Base
     
     # Returns an array of fields from the index
     # An optional rule can be used for "grepping" field names:
     # field_list(/_facet$/)
     def field_list(rule=nil)
-      fetch(:fields).select do |k,v|
+      self[:fields].select do |k,v|
         rule ? k =~ rule : true
       end.collect{|k,v|k}
     end

data/lib/rsolr-ext.rb

@@ -15,11 +15,10 @@ module RSolr
   
   module Ext
     
-    VERSION = '0.5.6'
+    VERSION = '0.5.7'
     
     autoload :Request, 'rsolr-ext/request.rb'
     autoload :Response, 'rsolr-ext/response.rb'
-    autoload :HashMethodizer, 'rsolr-ext/hash_methodizer.rb'
     autoload :Mapable, 'rsolr-ext/mapable.rb'
     
   end

data/rsolr-ext.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 	s.name = "rsolr-ext"
-	s.version = "0.5.6"
-	s.date = "2009-03-17"
+	s.version = "0.5.7"
+	s.date = "2009-03-18"
 	s.summary = "An extension lib for RSolr"
 	s.email = "goodieboy@gmail.com"
 	s.homepage = "http://github.com/mwmitchell/rsolr_ext"
@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
     "lib/core_ext.rb",
     "lib/mash.rb",
     
-    "lib/rsolr-ext/hash_methodizer.rb",
     "lib/rsolr-ext/mapable.rb",
     
     "lib/rsolr-ext/request/queryable.rb",
@@ -32,7 +31,6 @@ Gem::Specification.new do |s|
     "rsolr-ext.gemspec"
 	]
 	s.test_files = [
-	  'test/hash_methodizer_test.rb',
 	  'test/request_test.rb',
 	  'test/response_test.rb',
 	  'test/test_unit_test_case.rb',

data/test/response_test.rb

@@ -7,22 +7,35 @@ class RSolrExtResponseTest < Test::Unit::TestCase
   test 'base response class' do
     raw_response = eval(mock_query_response)
     r = RSolr::Ext::Response::Base.new(raw_response)
+    assert r.respond_to?(:header)
     assert r.ok?
   end
   
   test 'standard response class' do
     raw_response = eval(mock_query_response)
     r = RSolr::Ext::Response::Standard.new(raw_response)
+    assert r.respond_to?(:response)
     assert r.ok?
-    assert_equal 10, r.response.docs.size
-    assert_equal 'EXPLICIT', r.response_header.params.echo_params
-    assert_equal r['responseHeader'], r.response_header
-    assert_equal r[:responseHeader], r.response_header
-    assert_equal 1, r.response.docs.previous_page
-    assert_equal 1, r.response.docs.next_page
+    assert_equal 10, r[:response][:docs].size
+    assert_equal 'EXPLICIT', r[:responseHeader][:params][:echoParams]
+    assert_equal 1, r[:response][:docs].previous_page
+    assert_equal 1, r[:response][:docs].next_page
     #
-    assert r.response.docs.kind_of?(RSolr::Ext::Response::Pageable)
+    assert r[:response][:docs].kind_of?(RSolr::Ext::Response::Pageable)
     assert r.kind_of?(RSolr::Ext::Response::Facetable)
   end
   
+  test 'standard response doc ext methods' do
+    raw_response = eval(mock_query_response)
+    r = RSolr::Ext::Response::Standard.new(raw_response)
+    doc = r.docs.first
+    assert doc.has?(:cat, /^elec/)
+    assert ! doc.has?(:cat, 'elec')
+    assert doc.has?(:cat, 'electronics')
+    
+    assert 'electronics', doc.get(:cat)
+    assert_nil doc.get(:xyz)
+    assert_equal 'def', doc.get(:xyz, :default=>'def')
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwmitchell-rsolr-ext
 version: !ruby/object:Gem::Version 
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-17 00:00:00 -07:00
+date: 2009-03-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,7 +25,6 @@ extra_rdoc_files:
 files: 
 - lib/core_ext.rb
 - lib/mash.rb
-- lib/rsolr-ext/hash_methodizer.rb
 - lib/rsolr-ext/mapable.rb
 - lib/rsolr-ext/request/queryable.rb
 - lib/rsolr-ext/request.rb
@@ -65,7 +64,6 @@ signing_key:
 specification_version: 2
 summary: An extension lib for RSolr
 test_files: 
-- test/hash_methodizer_test.rb
 - test/request_test.rb
 - test/response_test.rb
 - test/test_unit_test_case.rb

data/lib/rsolr-ext/hash_methodizer.rb

@@ -1,51 +0,0 @@
-#
-# A hash modifier that creates method readers from key names.
-# NOTE: reader methods are created recursively.
-# The method names are the same as the key names,
-# except that the values are snake-cased, for example:
-#   - QTime -> q_time
-#   - debugQuery -> debug_query
-#
-class RSolr::Ext::HashMethodizer
-  
-  class << self
-    
-    def snake_case(v)
-      v = v.to_s
-      return v.downcase if v =~ /^[A-Z]+$/
-      v.gsub(/([A-Z]+)(?=[A-Z][a-z]?)|\B[A-Z]/, '_\&') =~ /_*(.*)/
-      return $+.downcase
-    end
-    
-    def methodize!(h)
-      h.keys.each do |k|
-        meth = snake_case(k)
-        meth = meth.gsub(/[^_a-z]/i, '_').gsub(/^_+/i, '')
-        val_key = case k
-        when String
-          "'#{k}'"
-        when Symbol
-          ":#{k}"
-        else
-          raise 'Supports only string/symbol keys!'
-        end
-        h.instance_eval <<-RUBY
-        def #{meth}
-          val = self[#{val_key}]
-          if val.respond_to?(:each_pair)
-            RSolr::Ext::HashMethodizer.methodize!(val)
-          elsif val.is_a?(Array)
-            val.each do |item|
-              RSolr::Ext::HashMethodizer.methodize!(item) if item.respond_to?(:each_pair)
-            end
-          end
-          val
-        end
-        RUBY
-      end
-
-    end
-  
-  end
-  
-end

data/test/hash_methodizer_test.rb

@@ -1,55 +0,0 @@
-require 'test_unit_test_case'
-require File.join(File.dirname(__FILE__), '..', 'lib', 'rsolr-ext')
-
-class RSolrExtRequestTest < Test::Unit::TestCase
-  
-  def testable_hash
-    {';key-with-invalid-method-chars'=>1, :name=>'Sam', :age=>90, :kids=>['Fred', 'Betty'], :favorites=>{:red=>1, :blue=>9}}
-  end
-  
-  test 'the default behavior of a hash, after methodize!' do
-    my_hash = testable_hash
-    
-    original_methods = my_hash.methods
-    key_count = my_hash.keys.size
-    
-    RSolr::Ext::HashMethodizer.methodize!(my_hash)
-    
-    assert_equal key_count, my_hash.keys.size
-    
-    [:name, :age, :kids, :favorites].each do |k|
-      assert my_hash.keys.include?(k)
-    end
-    
-    assert_equal 1, my_hash[:favorites][:red]
-    assert_equal 9, my_hash[:favorites][:blue]
-    
-    assert_equal Hash, my_hash.class
-    
-    # make sure that the difference in method size is the size of the keys in my_hash
-    assert_equal my_hash.methods.size - key_count, original_methods.size
-    
-    assert my_hash.respond_to?(:key_with_invalid_method_chars)
-  end
-  
-  test 'the method accessors on a modified hash' do
-    
-    my_hash = testable_hash
-    
-    assert_raise NoMethodError do
-      my_hash.favorites
-    end
-    
-    RSolr::Ext::HashMethodizer.methodize!(my_hash)
-    
-    assert_equal my_hash[:name], my_hash.name
-    assert_equal my_hash[:age], my_hash.age
-    assert_equal my_hash[:kids], my_hash.kids
-    assert_equal my_hash[:favorites], my_hash.favorites
-    
-    assert_equal my_hash[:favorites][:blue], my_hash.favorites.blue
-    assert_equal my_hash[:favorites][:red], my_hash.favorites.red
-    
-  end
-  
-end