mwmitchell-rsolr 0.5.7 → 0.5.8

data/CHANGES.txt

@@ -1,3 +1,7 @@
+0.5.7 - January 5, 2009
+	Changed name from Solr to RSolr, changed all references to Solr to RSolr
+	Added new tests for RSolr::Mapper and RSolr::Message
+	
 0.5.6 - December 30, 2008
 	solr.gemspec cleanedup thanks to shairontoledo on github! :)
 	Added Solr::Response::Query::Facet module with helpers from the delsolr project

data/LICENSE

@@ -1,192 +1,4 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
+Copyright 2008-2009 Matt Mitchell
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -198,4 +10,58 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.
+
+========================================================================
+
+For use of the lib/Mash/extlib code:
+
+========================================================================
+
+Copyright (c) 2008 Sam Smoot.
+ 
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+ 
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+---
+---
+ 
+Some portions of blank.rb and mash.rb are verbatim copies of software
+licensed under the MIT license. That license is included below:
+ 
+Copyright (c) 2005-2008 David Heinemeier Hansson
+ 
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+ 
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,25 +1,36 @@
-=Solr
+=RSolr
 
 A Ruby client for Apache Solr. Has transparent JRuby support by using "org.apache.solr.servlet.DirectSolrConnection" as a connection adapter.
 
+==Installation:
+  gem sources -a http://gems.github.com
+  sudo gem install mwmitchell-rsolr
+
+Simple usage:
+  require 'rubygems'
+  require 'rsolr'
+  rsolr = RSolr.connect(:http)
+  response = rsolr.query(:q=>'*:*')
+
+
 To run tests:
   
-  Copy a Solr 1.3.0 (or later) distribution into this directory and rename to "apache-solr"
-  Start Solr HTTP:    rake start_test_server
+  Copy an Apache Solr 1.3.0/or later (http://apache.seekmeup.com/lucene/solr/1.3.0/) distribution into this directory and rename to "apache-solr"
+  Start Solr HTTP:    rake rsolr:start_test_server
   MRI Ruby:           rake
   JRuby:              jruby -S rake
 
 To get a connection in MRI/standard Ruby:
   
-  solr = Solr.connect(:http)
+  solr = RSolr.connect(:http)
 
-To get a direct connection in jRuby using DirectSolrConnection:
+To get a direct connection (no http) in jRuby using DirectSolrConnection:
   
-  solr = Solr.connect(:direct, :home_dir=>'/path/to/solr/home', :dist_dir=>'/path/to/solr/distribution')
+  solr = RSolr.connect(:direct, :home_dir=>'/path/to/solr/home', :dist_dir=>'/path/to/solr/distribution')
 
-You can set Solr params that will be sent for every request:
+You can set RSolr params that will be sent on every request:
   
-  solr = Solr.connect(:http, :global_params=>{:wt=>:ruby, :echoParams=>'EXPLICIT'})
+  solr = RSolr.connect(:http, :global_params=>{:wt=>:ruby, :echoParams=>'EXPLICIT'})
 
 
 == Requests
@@ -30,13 +41,13 @@ Once you have a connection, you can execute queries, updates etc..
   response = solr.query(:q=>'washington', :facet=>true, :facet.limit=>-1, :facet.field=>'cat', :facet.field=>'inStock')
   response = solr.find_by_id(1)
 
-* thanks to a little Ruby magic, we can chain symbols to create Solr "dot" syntax: :facet.field=>'cat'
+Thanks to a little Ruby magic, we can chain symbols to create Solr "dot" syntax: :facet.field=>'cat'
 
 Using the #search method makes building more complex Solr queries easier:
   
   response = solr.search 'my search', :filters=>{:price=>(0.00..10.00)}
   response.docs.each do |doc|
-    doc.price
+    doc[:price]
   end
 
 ====Pagination
@@ -89,12 +100,12 @@ Commit & Optimize
 
 
 ==Response Formats
-The default response format is Ruby. When the :wt param is set to :ruby, the response is eval'd and wrapped up in a nice Solr::Response class. You can get an unwrapped response by setting the :wt to "ruby" - notice, the string -- not a symbol. All other response formats are available as expected, :wt=>'xml' etc.. Currently, the only response format that gets eval'd and wrapped is :ruby.
+The default response format is Ruby. When the :wt param is set to :ruby, the response is eval'd and wrapped up in a nice RSolr::Response class. You can get an unwrapped response by setting the :wt to "ruby" - notice, the string -- not a symbol. All other response formats are available as expected, :wt=>'xml' etc.. Currently, the only response format that gets eval'd and wrapped is :ruby.
 
-You can access the original request context (path, params, url etc.) from response.source. The response.source is a hash that contains the generated params, url, path, post data, headers etc.. This could be useful for debugging and testing.
+You can access the original request context (path, params, url etc.) from response.request. The response.request is a hash that contains the generated params, url, path, post data, headers etc., very useful for debugging and testing.
 
 ==Data Mapping
-The Solr::Mapper::Base class provides some nice ways of mapping data. You provide a hash mapping and a "data source". The keys of the hash mapping become the Solr field names. The values of the hash mapping get processed differently based on the value. The data source must be an Enumerable type object. The hash mapping is processed for each item in the data source.
+The RSolr::Mapper::Base class provides some nice ways of mapping data. You provide a hash mapping and a "data source". The keys of the hash mapping become the Solr field names. The values of the hash mapping get processed differently based on the value. The data source must be an Enumerable type object. The hash mapping is processed for each item in the data source.
 
 ===Hash Map Processing
 If the value is a string, the value of the String is used as the final Solr field value. If the value is a Symbol, the Symbol is used as a key on the data source. An Enumerable type does the same as the Symbol, but for each item in the set. The most interesting and flexible processing occurs when the value is a Proc. When a Proc is used as a hash mapping value, the mapper executes the Proc's #call method, passing in the current data source item.
@@ -128,7 +139,7 @@ If the value is a string, the value of the String is used as the final Solr fiel
     }
   ]
   
-  mapper = Solr::Mapper::Base(mapping)
+  mapper = RSolr::Mapper::Base(mapping)
   mapped_data = mapper.map(data_source)
   
   # the following would be true...
@@ -150,9 +161,9 @@ If the value is a string, the value of the String is used as the final Solr fiel
   ]
 
 ===RSS Mapper
-There is currently one built in mapper, Solr::Mapper::RSS. Here's an example usage:
+There is currently one built in mapper, RSolr::Mapper::RSS. Here's an example usage:
   
-  mapper = Solr::Mapper::RSS.new
+  mapper = RSolr::Mapper::RSS.new
   mapping = {
     :channel=>:'channel.title',
     :url=>:'channel.link',
@@ -165,26 +176,26 @@ There is currently one built in mapper, Solr::Mapper::RSS. Here's an example usa
   mapped_data = m.map('http://site.com/feed.rss')
 
 ==Indexing
-Solr (ruby) comes with a simple indexer that makes use of the Solr mapper. Here's an example, using the "mapping" and "mapped_data" variables above (RSS mapper):
+RSolr comes with a simple indexer that makes use of the Solr mapper. Here's an example, using the "mapping" and "mapped_data" variables above (RSS mapper):
 
-  solr = Solr.connect(:http)
-  i = Solr::Indexer.new(solr, mapping)
+  solr = RSolr.connect(:http)
+  i = RSolr::Indexer.new(solr, mapping)
   i.index(mapped_data)
 
 
 ==HTTP Client Adapter
-You can specify the Ruby http client to use by setting Solr::Connection::Adapter::HTTP.client_adapter to one of:
+You can specify the http client adapter to use by setting RSolr::Connection::Adapter::HTTP.client_adapter to one of:
   :net_http     uses the standard Net::HTTP library
   :curb         uses the Ruby "curl" bindings
 
 Example:
 	
-  Solr::Connection::Adapter::HTTP.client_adapter = :curb
-	
+  RSolr::Connection::Adapter::HTTP.client_adapter = :curb
+
 Example of using the HTTP client only:
   
-  hclient = Solr::HTTPClient.connect(url, :curb)
-  hclient = Solr::HTTPClient.connect(url, :net_http)
+  hclient = RSolr::HTTPClient.connect(url, :curb)
+  hclient = RSolr::HTTPClient.connect(url, :net_http)
 
 After reading this http://apocryph.org/2008/11/09/more_indepth_analysis_ruby_http_client_performance/ - I would recommend using the :curb adapter. NOTE: You can't use the :curb adapter under jRuby. To install curb:
 

data/examples/direct.rb

@@ -14,7 +14,7 @@ response = solr.search 'ipod', :filters=>{:price=>(0..50)}, :per_page=>2, :page=
 solr.delete_by_query('*:*')
 
 response.docs.each do |doc|
-  if doc.has?('timestamp')
-    puts doc.timestamp
+  if doc.has?(:timestamp)
+    puts doc[:timestamp]
   end
 end

data/examples/http.rb

@@ -10,7 +10,7 @@ response = solr.search 'ipod', :filters=>{:price=>(0..50)}, :per_page=>2, :page=
 solr.delete_by_query('*:*')
 
 response.docs.each do |doc|
-  if doc.has?('timestamp')
-    puts doc.timestamp
+  if doc.has?(:timestamp)
+    puts doc[:timestamp]
   end
 end

data/lib/core_ext.rb

@@ -5,4 +5,12 @@ class Symbol
     [self.to_s, m.to_s].join('.').to_sym
   end
   
+end
+
+class Hash
+  
+  def to_mash
+    self.is_a?(Mash) ? self : Mash.new(self)
+  end
+  
 end

data/lib/mash.rb

@@ -0,0 +1,149 @@
+
+# From the ExtLib gem library: http://github.com/sam/extlib/tree/master
+
+class Mash < Hash
+
+  # @param constructor<Object>
+  #   The default value for the mash. Defaults to an empty hash.
+  #
+  # @details [Alternatives]
+  #   If constructor is a Hash, a new mash will be created based on the keys of
+  #   the hash and no default value will be set.
+  def initialize(constructor = {})
+    if constructor.is_a?(Hash)
+      super()
+      update(constructor)
+    else
+      super(constructor)
+    end
+  end
+
+  # @param key<Object> The default value for the mash. Defaults to nil.
+  #
+  # @details [Alternatives]
+  #   If key is a Symbol and it is a key in the mash, then the default value will
+  #   be set to the value matching the key.
+  def default(key = nil)
+    if key.is_a?(Symbol) && include?(key = key.to_s)
+      self[key]
+    else
+      super
+    end
+  end
+
+  alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
+  alias_method :regular_update, :update unless method_defined?(:regular_update)
+
+  # @param key<Object> The key to set.
+  # @param value<Object>
+  #   The value to set the key to.
+  #
+  # @see Mash#convert_key
+  # @see Mash#convert_value
+  def []=(key, value)
+    regular_writer(convert_key(key), convert_value(value))
+  end
+
+  # @param other_hash<Hash>
+  #   A hash to update values in the mash with. The keys and the values will be
+  #   converted to Mash format.
+  #
+  # @return <Mash> The updated mash.
+  def update(other_hash)
+    other_hash.each_pair { |key, value| regular_writer(convert_key(key), convert_value(value)) }
+    self
+  end
+
+  alias_method :merge!, :update
+
+  # @param key<Object> The key to check for. This will be run through convert_key.
+  #
+  # @return <TrueClass, FalseClass> True if the key exists in the mash.
+  def key?(key)
+    super(convert_key(key))
+  end
+
+  # def include? def has_key? def member?
+  alias_method :include?, :key?
+  alias_method :has_key?, :key?
+  alias_method :member?, :key?
+
+  # @param key<Object> The key to fetch. This will be run through convert_key.
+  # @param *extras<Array> Default value.
+  #
+  # @return <Object> The value at key or the default value.
+  def fetch(key, *extras)
+    super(convert_key(key), *extras)
+  end
+
+  # @param *indices<Array>
+  #   The keys to retrieve values for. These will be run through +convert_key+.
+  #
+  # @return <Array> The values at each of the provided keys
+  def values_at(*indices)
+    indices.collect {|key| self[convert_key(key)]}
+  end
+
+  # @param hash<Hash> The hash to merge with the mash.
+  #
+  # @return <Mash> A new mash with the hash values merged in.
+  def merge(hash)
+    self.dup.update(hash)
+  end
+
+  # @param key<Object>
+  #   The key to delete from the mash.\
+  def delete(key)
+    super(convert_key(key))
+  end
+
+  # @param *rejected<Array[(String, Symbol)] The mash keys to exclude.
+  #
+  # @return <Mash> A new mash without the selected keys.
+  #
+  # @example
+  #   { :one => 1, :two => 2, :three => 3 }.except(:one)
+  #     #=> { "two" => 2, "three" => 3 }
+  def except(*keys)
+    super(*keys.map {|k| convert_key(k)})
+  end
+
+  # Used to provide the same interface as Hash.
+  #
+  # @return <Mash> This mash unchanged.
+  def stringify_keys!; self end
+
+  # @return <Hash> The mash as a Hash with string keys.
+  def to_hash
+    Hash.new(default).merge(self)
+  end
+
+  protected
+  # @param key<Object> The key to convert.
+  #
+  # @param <Object>
+  #   The converted key. If the key was a symbol, it will be converted to a
+  #   string.
+  #
+  # @api private
+  def convert_key(key)
+    key.kind_of?(Symbol) ? key.to_s : key
+  end
+
+  # @param value<Object> The value to convert.
+  #
+  # @return <Object>
+  #   The converted value. A Hash or an Array of hashes, will be converted to
+  #   their Mash equivalents.
+  #
+  # @api private
+  def convert_value(value)
+    if value.class == Hash
+      value.to_mash
+    elsif value.is_a?(Array)
+      value.collect { |e| convert_value(e) }
+    else
+      value
+    end
+  end
+end

data/lib/rsolr/connection/adapter/common_methods.rb

@@ -39,7 +39,6 @@ module RSolr::Connection::Adapter::CommonMethods
   
   # send a request to the adapter (allows requests like /admin/luke etc.)
   def send_request(handler_path, params={}, data=nil)
-    params = map_params(params)
     @adapter.send_request(handler_path, params, data)
   end
   

data/lib/rsolr/connection/base.rb

@@ -19,13 +19,13 @@ class RSolr::Connection::Base
       :debugQuery=>true
     }
     opts[:global_params] = default_global_params.merge(opts[:global_params])
-    @opts=opts
+    @opts = opts
   end
   
   # sets default params etc.. - could be used as a mapping hook
   # type of request should be passed in here? -> map_params(:query, {})
   def map_params(params)
-    opts[:global_params].dup.merge(params).dup
+    opts[:global_params].dup.merge(params).to_mash
   end
   
   # send request to the select handler

data/lib/rsolr/connection/search_ext.rb

@@ -1,6 +1,7 @@
 module RSolr::Connection::SearchExt
   
-  def search(q_param, params={})
+  def search(params={})
+    params = params.to_mash
     if params[:fields]
       fields = params.delete :fields
       params[:fl] = fields.is_a?(Array) ? fields.join(' ') : fields
@@ -35,7 +36,7 @@ module RSolr::Connection::SearchExt
       end
     end
     #params[:qt] ||= :dismax
-    params[:q] = build_query(q_param)
+    params[:q] = build_query(params[:q])
     self.query params
   end
   

data/lib/rsolr/response/base.rb

@@ -3,31 +3,23 @@
 # So far, all response classes extend this
 class RSolr::Response::Base
   
-  attr_reader :source
+  # the object that contains the original :body, :params, full solr :query, post :data etc.
+  attr_reader :input
   
-  attr_reader :raw_response, :data, :header, :params, :status, :query_time
+  attr_reader :data, :header, :params, :status, :query_time
   
-  def initialize(data)
-    if data.is_a?(Hash) and data.has_key?(:body)
-      @raw_response = data[:body]
-      @data = Kernel.eval(@raw_response)
-      @source = data
-    else
-      if data.is_a?(String)
-        @raw_response = data
-        @data = Kernel.eval(@raw_response)
-      elsif data.is_a?(Hash)
-        @data = data
-      end
-    end
-    @header = @data['responseHeader']
-    @params = @header['params']
-    @status = @header['status']
-    @query_time = @header['QTime']
+  def initialize(input)
+    input = {:body=>input} if input.is_a?(String)
+    @input = input
+    @data = Kernel.eval(input[:body]).to_mash
+    @header = @data[:responseHeader]
+    @params = @header[:params]
+    @status = @header[:status]
+    @query_time = @header[:QTime]
   end
   
   def ok?
-    self.status==0
+    self.status == 0
   end
   
 end

data/lib/rsolr/response/index_info.rb

@@ -9,14 +9,15 @@ class RSolr::Response::IndexInfo < RSolr::Response::Base
   
   def initialize(data)
     super(data)
-    @index = @data['index']
-    @directory = @data['directory']
-    @has_deletions = @index['hasDeletions']
-    @optimized = @index['optimized']
-    @current = @index['current']
-    @max_doc = @index['maxDoc']
-    @num_docs = @index['numDocs']
-    @version = @index['version']
+    @index = @data[:index]
+    @directory = @data[:directory]
+    # index fields
+    @has_deletions = @index[:hasDeletions]
+    @optimized = @index[:optimized]
+    @current = @index[:current]
+    @max_doc = @index[:maxDoc]
+    @num_docs = @index[:numDocs]
+    @version = @index[:version]
   end
   
 end

data/lib/rsolr/response/query.rb

@@ -2,15 +2,7 @@
 module RSolr::Response::Query
   
   # module for adding helper methods to each Hash document
-  module DocExt
-    
-    def self.extended(base)
-      base.keys.each do |k,v|
-        base.instance_eval <<-EOF
-        def #{k}; self['#{k.to_s}']; end
-        EOF
-      end
-    end
+  class Doc < Mash
     
     # Helper method to check if value/multi-values exist for a given key.
     # The value can be a string, or a RegExp
@@ -20,7 +12,7 @@ module RSolr::Response::Query
     # doc.has?(:id, 'h009', /^u/i)
     def has?(k, *values)
       return if self[k].nil?
-      return true if self.has_key?(k) and values.empty?
+      return true if self.key?(k) and values.empty?
       target = self[k]
       if target.is_a?(Array)
         values.each do |val|
@@ -30,7 +22,7 @@ module RSolr::Response::Query
         return values.any? {|val| val.is_a?(Regexp) ? (target =~ val) : (target == val)}
       end
     end
-
+    
   end
   
   # from the delsolr project -> http://github.com/avvo/delsolr/tree/master/lib/delsolr/response.rb
@@ -150,19 +142,16 @@ module RSolr::Response::Query
     include RSolr::Response::Query::Facets
     
     attr_reader :response, :docs, :num_found, :start
-  
+    
     alias :total :num_found
     alias :offset :start
-  
+    
     def initialize(data)
       super(data)
-      @response = @data['response']
-      @docs = @response['docs']
-      @docs.each do |d|
-        d.extend RSolr::Response::Query::DocExt
-      end
-      @num_found = @response['numFound']
-      @start = @response['start']
+      @response = @data[:response]
+      @docs = @response[:docs].collect{ |d| Doc.new(d) }
+      @num_found = @response[:numFound]
+      @start = @response[:start]
     end
   
   end

data/lib/rsolr.rb

@@ -3,11 +3,11 @@
 proc {|base, files|
   $: << base unless $:.include?(base) || $:.include?(File.expand_path(base))
   files.each {|f| require f}
-}.call(File.dirname(__FILE__), ['core_ext'])
+}.call(File.dirname(__FILE__), ['core_ext', 'mash'])
 
 module RSolr
   
-  VERSION = '0.5.7'
+  VERSION = '0.5.8'
   
   autoload :Message, 'rsolr/message'
   autoload :Response, 'rsolr/response'

data/test/connection/direct_test.rb

@@ -11,7 +11,7 @@ class ConnectionDirectTest < RSolrBaseTest
   def setup
     base = File.expand_path( File.dirname(__FILE__) )
     dist = File.join(base, '..', '..', 'apache-solr')
-    home = File.join(dist, 'example', 'rsolr')
+    home = File.join(dist, 'example', 'solr')
     @solr = RSolr.connect(:direct, :home_dir=>home, :dist_dir=>dist)
     @solr.delete_by_query('*:*')
     @solr.commit

data/test/connection/test_methods.rb

@@ -62,20 +62,18 @@ module ConnectionTestMethods
     assert r.is_a?(RSolr::Response::Query::Base)
     assert_equal Array, r.docs.class
     first = r.docs.first
-    assert first.respond_to?(:price)
-    assert first.respond_to?(:cat)
-    assert first.respond_to?(:id)
-    assert first.respond_to?(:timestamp)
     
     # test the has? method
     assert first.has?('price', 1.00)
+    assert ! first.has?('price', 10.00)
     assert first.has?('cat', 'electronics')
     assert first.has?('cat', 'something else')
+    assert first.has?(:cat, 'something else')
     
     assert first.has?('cat', /something/)
     
     # has? only works with strings at this time
-    assert_nil first.has?(:cat)
+    assert first.has?(:cat)
     
     assert false == first.has?('cat', /zxcv/)
   end

data/test/message_test.rb

@@ -17,7 +17,9 @@ class MessageTest < RSolrBaseTest
     result = RSolr::Message.add({:id=>1}, :boost=>200.00) do |hash_doc, doc_xml_attrs|
       doc_xml_attrs[:boost] = 10
     end
-    assert_equal '<add boost="200.0"><doc><field name="id" boost="10">1</field></doc></add>', result
+    assert result =~ /add boost="200.0"/
+    assert result =~ /boost="10"/
+    #assert_equal '<add boost="200.0"><doc><field name="id" boost="10">1</field></doc></add>', result
   end
   
   def test_delete_by_id

data/test/test_helpers.rb

@@ -4,6 +4,10 @@ require 'test/unit'
 
 class RSolrBaseTest < Test::Unit::TestCase
   
+  def assert_class(expected, instance)
+    assert_equal expected, instance.class
+  end
+  
   def default_test
     
   end
@@ -17,7 +21,7 @@ end
 #end
 
 def mock_query_response
-  {'responseHeader'=>{
+  %({'responseHeader'=>{
     'status'=>0,'QTime'=>43,'params'=>{
       'q'=>'*:*','wt'=>'ruby','echoParams'=>'EXPLICIT'
     }
@@ -35,5 +39,5 @@ def mock_query_response
       {'id'=>'3007WFP','inStock'=>true,'includes'=>'USB cable','manu'=>'Dell, Inc.','name'=>'Dell Widescreen UltraSharp 3007WFP','popularity'=>6,'price'=>2199.0,'sku'=>'3007WFP','timestamp'=>'2008-11-21T17:21:55.724Z','weight'=>401.6,'cat'=>['electronics','monitor'],'spell'=>['Dell Widescreen UltraSharp 3007WFP'],'features'=>['30" TFT active matrix LCD, 2560 x 1600, .25mm dot pitch, 700:1 contrast']},
       {'id'=>'VA902B','inStock'=>true,'manu'=>'ViewSonic Corp.','name'=>'ViewSonic VA902B - flat panel display - TFT - 19"','popularity'=>6,'price'=>279.95,'sku'=>'VA902B','timestamp'=>'2008-11-21T17:21:55.734Z','weight'=>190.4,'cat'=>['electronics','monitor'],'spell'=>['ViewSonic VA902B - flat panel display - TFT - 19"'],'features'=>['19" TFT active matrix LCD, 8ms response time, 1280 x 1024 native resolution']}]
     }
-  }
+  })
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwmitchell-rsolr
 version: !ruby/object:Gem::Version 
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -36,6 +36,7 @@ files:
 - examples/http.rb
 - examples/direct.rb
 - lib/core_ext.rb
+- lib/mash.rb
 - lib/rsolr.rb
 - lib/rsolr/connection/adapter/common_methods.rb
 - lib/rsolr/connection/adapter/direct.rb

data/test/connection/search_ext_test_methods.rb

@@ -1,17 +0,0 @@
-raise 'Not yet implemented!'
-
-module SearchExtTestMethods
-  
-  def test_facet_response_methods
-    @response.facets
-    @response.facet_fields
-    @response.facet_queries
-    @response.facet_fields_by_hash
-    @response.facet_field(:feed_language_facet)
-    @response.facet_field_values(:feed_language_facet)
-    @response.facet_field_by_hash(:feed_language_facet)
-    @response.facet_field_by_hash(:feed_language_facet)
-    @response.facet_field_count(:feed_title_facet, 'ScienceDaily: Latest Science News')
-  end
-  
-end

data/test/pagination_test.rb

@@ -1,58 +0,0 @@
-require File.join(File.dirname(__FILE__), 'test_helpers')
-
-class PaginationTest < RSolrBaseTest
-  
-  def create_response(params={})
-    response = RSolr::Response::Query::Base.new(mock_query_response)
-    response.params.merge! params
-    response
-  end
-  
-  # test the Solr::Connection pagination methods
-  def test_connection_calculate_start
-    dummy_connection = RSolr::Connection::Base.new(nil)
-    assert_equal 15, dummy_connection.send(:calculate_start, 2, 15)
-    assert_equal 450, dummy_connection.send(:calculate_start, 10, 50)
-    assert_equal 0, dummy_connection.send(:calculate_start, 0, 50)
-  end
-  
-  def test_connection_modify_params_for_pagination
-    dummy_connection = RSolr::Connection::Base.new(nil)
-    p = dummy_connection.send(:modify_params_for_pagination, {:page=>1})
-    assert_equal 0, p[:start]
-    assert_equal 10, p[:rows]
-    #
-    p = dummy_connection.send(:modify_params_for_pagination, {:page=>10, :per_page=>100})
-    assert_equal 900, p[:start]
-    assert_equal 100, p[:rows]
-  end
-  
-  def test_math
-    response = create_response({'rows'=>5})
-    assert_equal response.params['rows'], response.per_page
-    assert_equal 26, response.total
-    assert_equal 1, response.current_page
-    assert_equal 6, response.total_pages
-    
-    # now switch the rows (per_page)
-    # total and current page should remain the same value
-    # page_count should change
-    
-    response = create_response({'rows'=>2})
-    assert_equal response.params['rows'], response.per_page
-    assert_equal 26, response.total
-    assert_equal 1, response.current_page
-    assert_equal 13, response.total_pages
-    
-    # now switch the start
-    
-    response = create_response({'rows'=>3})
-    response.instance_variable_set '@start', 4
-    assert_equal response.params['rows'], response.per_page
-    assert_equal 26, response.total
-    # 2 per page, currently on the 10th item
-    assert_equal 2, response.current_page
-    assert_equal 9, response.total_pages
-  end
-  
-end