Travis Update

artflakes · Feb 8, 2012 · a031bfb · a031bfb
1 parent 333daa4
commit a031bfb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,9 @@
 script: bundle exec rake
 rvm:
   - 1.8.7
-  - 1.9.1
   - 1.9.2
+  - 1.9.3
   - ruby-head
   - ree
   - rbx
-  - rbx-2.0
   - jruby
diff --git a/lib/request_log_analyzer/aggregator/database_inserter.rb b/lib/request_log_analyzer/aggregator/database_inserter.rb
@@ -36,7 +36,11 @@ def aggregate(request)
       request.lines.each do |line|
         class_columns = database.get_class(line[:line_type]).column_names.reject { |column| ['id', 'source_id', 'request_id'].include?(column) }
         attributes = Hash[*line.select { |(k, v)| class_columns.include?(k.to_s)}.flatten]
-        attributes.each{|k,v| attributes[k] = v.force_encoding("UTF-8") if v.is_a?(String) }
+
+        # Fix encoding patch for 1.9.2
+        attributes.each do |k,v|
+          attributes[k] = v.force_encoding("UTF-8") if v.is_a?(String) && "".respond_to?("force_encoding")
+        end
 
         @request_object.send("#{line[:line_type]}_lines").build(attributes)
       end