rsolr 0.10.1 → 0.11.0

data/CHANGES.txt

@@ -1,3 +1,9 @@
+0.11.0 - November 17, 2009
+  Removed pagination feature yet again... keeping it in RSolr::Ext until a better API can be thought up.
+  Updated Xout with fixed version - thanks to Mat Brown
+    - bug in escaping consecutive special characters
+    - moved regexp patterns out of loop, into "static" variables instead
+
 0.10.1 - November 13, 2009
   Same changes as 0.10.0 -- but fixing version number problems
 
@@ -18,7 +24,6 @@
         solr.paginate 1, 10, '/music', :q=>''
     - handler paths can also be set by method names:
         solr.paginate_music 1, 10
-  Added required java libs to RSolr gem
   Removed :dist_dir option from Direct connection options -- you gotta load your own java libs. See examples/direct.rb
   Updated specs
 

data/README.rdoc

@@ -74,27 +74,6 @@ A shortcut for the above example:
   response = solr.documents :q=>'test'
 
 
-===Doc Pagination
-RSolr is compatible with WillPaginate. To use pagination, call the "paginate" method:
-  response = solr.paginate current_page, per_page, :q=>'*:*'
-
-You can also set a handler path:
-  response = solr.paginate current_page, per_page, '/music', :q=>'*:*'
-
-Handler paths can also be set using a paginate_* method call like so:
-  response = solr.paginate_music current_page, per_page, :q=>'testing'
-
-====Pagination Responses
-The response['docs'] array from a paginate method has the following methods:
-  start, per_page, total, current_page, total_pages, previous_page, next_page, has_next?, has_previous?
-
-For example:
-  result = solr.paginate 1, 2, :q=>'*:*'
-  result['response']['docs'].has_next?
-
-To use with WillPaginate:
-  <%= will_paginate result['response']['docs'] %>
-
 == Updating Solr
 Updating can be done using native Ruby structures. Hashes are used for single documents and arrays are used for a collection of documents (hashes). These structures get turned into simple XML "messages". Raw XML strings can also be used.
 

data/lib/rsolr/client.rb

@@ -13,29 +13,7 @@ class RSolr::Client
   # Send a request to a request handler using the method name.
   # Also proxies to the #paginate method if the method starts with "paginate_"
   def method_missing(method_name, *args, &blk)
-    handler = method_name.to_s
-    if handler =~ /^paginate_/
-      handler = handler.sub(/^paginate_/, '')
-      page, per_page = args[0..1]
-      paginate(page, per_page, "/#{handler}", *args[2..-1], &blk)
-    else
-      request("/#{handler}", *args, &blk)
-    end
-  end
-  
-  # Accepts a page/per-page value for paginating docs
-  # Example:
-  #   solr.paginate 1, 10, :q=>'blah'
-  def paginate page, per_page, *request_args
-    if request_args.size == 2
-      params = request_args.last
-    elsif request_args.last.is_a? Hash
-      params = request_args.last
-    else
-      params = request_args.push({}).last
-    end
-    params[:start], params[:rows] = RSolr::Pagination.page_and_per_page_to_start_and_rows page, per_page
-    self.request(*request_args).extend RSolr::Pagination
+    request("/#{method_name}", *args, &blk)
   end
   
   # sends data to the update handler

data/lib/rsolr.rb

@@ -8,17 +8,11 @@ require 'xout'
 
 module RSolr
   
-  VERSION = '0.10.1'
+  VERSION = '0.11.1'
   
   autoload :Message, 'rsolr/message'
   autoload :Client, 'rsolr/client'
   autoload :Connection, 'rsolr/connection'
-  autoload :Pagination, 'rsolr/pagination'
-  
-  # returns path to this file directory
-  def self.dir
-    File.expand_path(File.dirname(__FILE__))
-  end
   
   # Http connection. Example:
   #   RSolr.connect

data/lib/xout.rb

@@ -1,5 +1,7 @@
 class Xout
   
+  VERSION = '0.1.0'
+  
   attr_reader :name, :text, :attrs, :children
   
   def initialize node_name, *args, &block
@@ -36,8 +38,6 @@ class Xout
     '<?xml version="1.0" encoding="UTF-8"?>' + to_xml
   end
   
-  protected
-  
   # builds an XML attribute string.
   # escapes each attribute value by running it through #escape_attr
   def create_attrs hash
@@ -45,21 +45,43 @@ class Xout
     " #{r}" unless r.empty?
   end
   
-  # minimal escaping for attribute values
-  def escape_attr input
-    escape input, '&'=>'&amp;', '<'=>'&lt;', '>'=>'&gt;', "'"=>'&apos;', '"'=>'&quote;'
-  end
-  
-  # minimal escaping for text
-  def escape_text input
-    escape input, '&'=>'&amp;', '<'=>'&lt;', '>'=>'&gt;'
+  module Escapable
+    
+    def text_mapping
+      @text_mapping ||= {'&'=>'&amp;', '<'=>'&lt;', '>'=>'&gt;'}
+    end
+
+    def text_regexp
+      @text_regexp ||= /[#{text_mapping.keys.join}]/
+    end
+
+    def attr_mapping
+      @attr_mapping ||= {'&'=>'&amp;', '<'=>'&lt;', '>'=>'&gt;', "'"=>'&apos;', '"'=>'&quote;'}
+    end
+
+    def attr_regexp
+      @attr_regexp ||= /[#{attr_mapping.keys.join}]/
+    end
+    
+    # minimal escaping for attribute values
+    def escape_attr input
+      escape input, attr_regexp, attr_mapping
+    end
+
+    # minimal escaping for text
+    def escape_text input
+      escape input, text_regexp, text_mapping
+    end
+
+    # accepts a string input and a hash mapping of characters => replacement values:
+    # Example:
+    #   escape 'My <string>cat</strong>', '<'=>'&gt;', '>'=>'&lt;'
+    def escape input, regexp, map
+      input.gsub(regexp) { | char | map[char] || char }
+    end
+    
   end
   
-  # accepts a string input and a hash mapping of characters => replacement values:
-  # Example:
-  #   escape 'My <string>cat</strong>', '<'=>'&gt;', '>'=>'&lt;'
-  def escape input, map
-    input.gsub(/[#{map.keys.join}]+/) { | char | map[char] || char }
-  end
+  include Escapable
   
 end

data/rsolr.gemspec

@@ -1,7 +1,8 @@
 Gem::Specification.new do |s|
+  
   s.name = "rsolr"
-  s.version = "0.10.1"
-  s.date = "2009-11-13"
+  s.version = "0.11.0"
+  s.date = "2009-11-17"
   s.summary = "A Ruby client for Apache Solr"
   s.email = "goodieboy@gmail.com"
   s.homepage = "http://github.com/mwmitchell/rsolr"
@@ -16,7 +17,6 @@ Gem::Specification.new do |s|
     "lib/rsolr/connection/net_http.rb",
     "lib/rsolr/connection.rb",
     "lib/rsolr/message.rb",
-    "lib/rsolr/pagination.rb",
     "lib/rsolr.rb",
     "lib/xout.rb",
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rsolr
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 -05:00
+date: 2009-11-17 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +30,6 @@ files:
 - lib/rsolr/connection/net_http.rb
 - lib/rsolr/connection.rb
 - lib/rsolr/message.rb
-- lib/rsolr/pagination.rb
 - lib/rsolr.rb
 - lib/xout.rb
 - LICENSE

data/lib/rsolr/pagination.rb

@@ -1,59 +0,0 @@
-module RSolr::Pagination
-  
-  def self.extended solr_response
-    d = solr_response['response']['docs']
-    d.extend Paginator
-    d.per_page = solr_response['responseHeader']['params']['rows'].to_s.to_i
-    d.start = solr_response['response']['start'].to_s.to_i
-    d.total = solr_response['response']['numFound'].to_s.to_i
-  end
-  
-  def self.page_and_per_page_to_start_and_rows page, per_page
-    rows = per_page.to_s.to_i
-    page = page.to_s.to_i-1
-    page = page < 1 ? 0 : page
-    start = page * rows
-    [start, rows]
-  end
-  
-  module Paginator
-    
-    attr_accessor :start, :per_page, :total
-    
-    # Returns the current page calculated from 'rows' and 'start'
-    # WillPaginate hook
-    def current_page
-      return 1 if start < 1
-      per_page_normalized = per_page < 1 ? 1 : per_page
-      @current_page ||= (start / per_page_normalized).ceil + 1
-    end
-
-    # Calcuates the total pages from 'numFound' and 'rows'
-    # WillPaginate hook
-    def total_pages
-      @total_pages ||= per_page > 0 ? (total / per_page.to_f).ceil : 1
-    end
-
-    # returns the previous page number or 1
-    # WillPaginate hook
-    def previous_page
-      @previous_page ||= (current_page > 1) ? current_page - 1 : 1
-    end
-
-    # returns the next page number or the last
-    # WillPaginate hook
-    def next_page
-      @next_page ||= (current_page == total_pages) ? total_pages : current_page+1
-    end
-
-    def has_next?
-      current_page < total_pages
-    end
-
-    def has_previous?
-      current_page > 1
-    end
-    
-  end
-  
-end