jruby_streaming_update_solr_server 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/jruby_streaming_update_solr_server.rb

@@ -52,7 +52,7 @@ end
 class  StreamingUpdateSolrServer
 
   # Hang onto the java #add for internal use
-  alias_method :sussadd, :add 
+  alias_method :sussadd, :add
   
   # Add a document to the SUSS 
   # @param [SolrInputDocument, #each_pair] doc The SolrInputDocument or hash (or hash-like object
@@ -86,7 +86,7 @@ class  StreamingUpdateSolrServer
   
   def add doc
     if doc.is_a? org.apache.solr.common.SolrInputDocument
-      susadd doc
+      sussadd doc
     elsif doc.respond_to? :each_pair
       newdoc = SolrInputDocument.new
       doc.each_pair do |f,v|
@@ -124,21 +124,31 @@ class SolrInputDocument
   def << fv
     field = fv[0]
     value = fv[1]
-    if field.is_a?(Symbol)
-      field = field.to_s
-    end
-    self.addField(field, value)
-    self[field]
-  end
+    self.add(field, value)
+   end
+  
+  # Add a value to a field. Will add all elements of an array in turn
+  # @param [Symbol, String] field The field to add a value or values to
+  # @param [String, Numeric, #each] val The value or array-like of values to add.
+  # @return [Array<String,Numeric>] An array of the field's values after this addition
   
   def add(field, val)
     if field.is_a?(Symbol)
       field = field.to_s
     end
-    self.addField(field, val)
+    if val.is_a? String or val.is_a? Numeric
+      self.addField(field, val)
+    else
+      begin
+        val.each {|v| self.add(field, v)}
+      rescue NoMethodError => e
+        raise NoMethodError, "SolrInputDocument values must be a string, numeric, or an array-like (responds to #each) of same, not #{val.inspect}"
+      end
+    end
     self[field]
   end  
   
+  
   # Get a list of the currently-set values for the passed field
   #
   # Note that this will always return either nil (not found) or an array, even of one element
@@ -152,13 +162,7 @@ class SolrInputDocument
     end
     f = self.get(field)
     return nil if (f == nil)
-    
-    v = f.value
-    if v.class == Java::JavaUtil::ArrayList
-      return v.to_a
-    else 
-      return [v]
-    end
+    return f.values.to_a
   end
   
   # Set the value(s) for the given field, destroying any values that were already in there
@@ -180,8 +184,8 @@ class SolrInputDocument
     if field.is_a?(Symbol)
       field = field.to_s
     end
-    self.setField(field, value)
-    self[field]
+    self.removeField(field)
+    self.add(field, value)
   end
   
   
@@ -208,9 +212,36 @@ class SolrInputDocument
       raise ArgumentError, "Argument must respond to #each_pair"
     end
     h.each_pair do |k,v|
-      self << [k,v]
+      self.add(k, v)
+    end
+  end
+  
+  # pretty-print
+  # @return A string representation of the fields and values
+  def to_s
+    return "SolrInputDocument #{self.object_id}\n  " + (self.keys.map {|k| "#{k} => #{self[k].inspect}"}).join("\n  ")
+  end
+
+
+  # Get the list of keys for this document
+  # @return [Array<String>] The list of keys
+  
+  def keys
+    return self.keySet.to_a
+  end
+
+  # Does this doc contain the given key?
+  # @param [Symbol, String] field The field whose presence you want to check
+  # @return [Boolean] True if the key is present
+  
+  def has_key? field
+    if field.is_a?(Symbol)
+      field = field.to_s
     end
+    return self.containsKey(field)
   end
+
+  
 end
 
 

metadata

@@ -1,37 +1,37 @@
 --- !ruby/object:Gem::Specification 
 name: jruby_streaming_update_solr_server
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
-  - Bill Dueber
+- Bill Dueber
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 -05:00
+date: 2010-04-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: thoughtbot-shoulda
-    type: :development
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-      version: 
-  - !ruby/object:Gem::Dependency 
-    name: yard
-    type: :development
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: yard
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Some sugar on top of StreamingUpdateSolrServer for use within JRuby
 email: bill@dueber.com
 executables: []
@@ -39,44 +39,44 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-  - LICENSE
-  - README.rdoc
+- LICENSE
+- README.rdoc
 files: 
-  - .document
-  - .gitignore
-  - LICENSE
-  - README.rdoc
-  - Rakefile
-  - VERSION
-  - jars/apache-solr-solrj-1.5-dev.jar
-  - jars/commons-codec-1.3.jar
-  - jars/commons-httpclient-3.1.jar
-  - jars/commons-logging-1.1.1.jar
-  - jars/slf4j-api-1.5.5.jar
-  - jars/slf4j-jdk14-1.5.5 2.jar
-  - lib/jruby_streaming_update_solr_server.rb
-  - test/helper.rb
-  - test/test_jruby_streaming_update_solr_server.rb
+- .document
+- .gitignore
+- LICENSE
+- README.rdoc
+- Rakefile
+- VERSION
+- jars/apache-solr-solrj-1.5-dev.jar
+- jars/commons-codec-1.3.jar
+- jars/commons-httpclient-3.1.jar
+- jars/commons-logging-1.1.1.jar
+- jars/slf4j-api-1.5.5.jar
+- jars/slf4j-jdk14-1.5.5 2.jar
+- lib/jruby_streaming_update_solr_server.rb
+- test/helper.rb
+- test/test_jruby_streaming_update_solr_server.rb
 has_rdoc: true
 homepage: http://github.com/billdueber/jruby_streaming_update_solr_server
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-  - --charset=UTF-8
+- --charset=UTF-8
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
   version: 
 requirements: []
 
@@ -86,5 +86,5 @@ signing_key:
 specification_version: 3
 summary: Simple jruby interface into StreamingUpdateSolrServer
 test_files: 
-  - test/helper.rb
-  - test/test_jruby_streaming_update_solr_server.rb
+- test/helper.rb
+- test/test_jruby_streaming_update_solr_server.rb