Dex 0.4.2 → 0.4.3

data/lib/Dex.rb

@@ -86,41 +86,46 @@ class Dex
     end
 
     def insert e, other=Hash[]
-      if e.is_a?(Hash)
-        e = OpenStruct.new(e)
+      msg     = :message
+      bt      = :backtrace
+      ex      = :exception
+      stat    = :status
+      
+      final = Hash[ msg => 'Unknown', ex => 'Unknown', stat => 0, :created_at=>Time.now.utc ]
+      if e.respond_to?(:exception)
+        final[ msg ] = e.message
+        final[ bt  ] = e.backtrace
+        final[ ex  ] = e.exception.class.name
+      else
+        final.update e
       end
 
-      unless other.keys.empty?
-        keys=other.keys.map(&:to_sym)
-        new_keys = keys - fields
-        unless new_keys.empty?
-          db.alter_table table_name do
-            new_keys.each { |k|
-              add_column k, :string
-            }
-          end
+      final.update other
+
+      keys     = final.keys.map(&:to_sym)
+      new_keys = keys - fields
+      
+      unless new_keys.empty?
+        db.alter_table table_name do
+          new_keys.each { |k|
+            add_column k, :string
+          }
         end
       end
       
-      h = Hash[
-        :message   => e.message || "Unknown", 
-        :exception => e.exception.is_a?(String) ? e.exception : (e.exception ? e.exception.class.name : "Unknown"),
-        :backtrace => (e.backtrace && e.backtrace.join("\n")) || "",
-        :status    => 0,
-        :created_at => Time.now.utc
-      ]
+      final[ bt ] = (final[bt] || []).join("\n")
       
-      safe_other = other.inject({}) { |m, (k,v)|  
-                                      case v
-                                      when Array, Hash
-                                        m[k] = v.inspect 
-                                      else
-                                        m[k] = v
-                                      end
-                                      m
+      final.keys.each { |k|
+        v = final[k]
+        case v
+        when Array, Hash
+          final[k] = v.inspect 
+        else
+          final[k] = v
+        end
       }
       
-      table.insert h.merge(safe_other)
+      table.insert final
     end
 
     def remove_field name

data/lib/Dex/version.rb

@@ -1,3 +1,3 @@
 class Dex
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/Dex.rb

@@ -139,6 +139,22 @@ describe "Dex :insert" do
     }
   end
 
+  it "accepts a single Hash with an overriding :created_at" do
+    dex = new_dex "custom hash"
+    rollback(dex) {
+      dex.insert :exception=>"Nginx Error", :message=>"upstream not found", :backtrace=>["file:12:txt"], :created_at=>Time.parse("2001/01/01 01:01:01")
+      last(dex)[:created_at].to_s.should == Time.parse("2001/01/01 01:01:01").to_s
+    }
+  end
+
+  it "accepts a single Hash with an overriding :status" do
+    dex = new_dex "custom hash"
+    rollback(dex) {
+      dex.insert :exception=>"Nginx Error", :message=>"upstream not found", :backtrace=>["file:12:txt"], :status=>1
+      last(dex)[:status].should == 1
+    }
+  end
+
 end # === Dex :insert
 
 describe "Dex :keep_only" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Dex
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors: