chef-solr 0.8.8 → 0.8.10

data/VERSION

@@ -1 +1 @@
-0.8.8
+0.8.10

data/lib/chef/solr.rb

@@ -35,7 +35,7 @@ require 'uri'
 class Chef
   class Solr
 
-    VERSION = "0.8.8"
+    VERSION = "0.8.9"
 
     include Chef::Mixin::XMLEscape
 

data/lib/chef/solr/application/solr.rb

@@ -163,6 +163,16 @@ class Chef
           if Chef::Config[:daemonize]
             Chef::Daemon.daemonize("chef-solr")
           end
+
+          # Need to redirect stdout and stderr so Java process inherits them.
+          # If -L wasn't specified, Chef::Config[:log_location] will be an IO
+          # object, otherwise it will be a String.
+          if Chef::Config[:log_location].kind_of?(String)
+            logfile = File.new(Chef::Config[:log_location], "w")
+            STDOUT.reopen(logfile)
+            STDERR.reopen(logfile)
+          end
+          
           Dir.chdir(Chef::Config[:solr_jetty_path]) do
             command = "java -Xmx#{Chef::Config[:solr_heap_size]} -Xms#{Chef::Config[:solr_heap_size]}"
             command << " -Dsolr.data.dir=#{Chef::Config[:solr_data_path]}"

data/lib/chef/solr/index.rb

@@ -112,7 +112,11 @@ class Chef
           if value.kind_of?(Array)
             fields[key] = Array.new
             value.each do |v|
-              fields[key] << v.to_s
+              if v.kind_of?(Hash)
+                flatten_and_expand(v, fields, key)
+              else
+                fields[key] << v.to_s
+              end    
             end
           else
             fields[key] = value.to_s
@@ -125,8 +129,11 @@ class Chef
         check_value(value)
         if value.kind_of?(Array)
           value.each do |v|
-            check_value(v)
-            fields[key] << v.to_s unless fields[key].include?(v.to_s)
+            if v.kind_of?(Hash)
+              flatten_and_expand(v, fields, key)
+            else
+              fields[key] << v.to_s unless fields[key].include?(v.to_s)
+            end    
           end
         else
           fields[key] << value.to_s unless fields[key].include?(value.to_s)

data/spec/chef/solr/index_spec.rb

@@ -112,6 +112,26 @@ describe Chef::Solr::Index do
       end
     end
 
+    it "should call itself recursively for hashes nested in arrays" do
+      @index.flatten_and_expand({ :one => [ { :two => "three" }, { :four => { :five => "six" } } ] }, @fields)
+      {
+        "one_X_five" => "six",
+        "one_four" => "five",
+        "one_X" => [ "three", "five" ],
+        "two" => "three",
+        "one_four_X" => "six",
+        "X_four" => "five",
+        "X_four_five" => "six",
+        "one" => [ "two", "four" ],
+        "one_four_five" => "six",
+        "five" => "six",
+        "X_two" => "three",
+        "one_two" => "three"
+      }.each do |k, v|
+        @fields[k].should == v
+      end
+    end
+
   end
 
   describe "set_field_value" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 8
-  version: 0.8.8
+  - 10
+  version: 0.8.10
 platform: ruby
 authors: 
 - Adam Jacob
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 -07:00
+date: 2010-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,8 @@ dependencies:
         segments: 
         - 0
         - 8
-        - 8
-        version: 0.8.8
+        - 10
+        version: 0.8.10
   type: :runtime
   version_requirements: *id003
 description: