adam 1.0.2 → 1.0.3

data/lib/adam.rb

@@ -1,5 +1,5 @@
 module Adam
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
   
   autoload :Killmail, 'adam/killmail'
   autoload :KillLog, 'adam/kill_log'

data/lib/adam/kill.rb

@@ -56,11 +56,11 @@ module Adam
         
       end
 
-      killmail << "\n"
       killmail << "\n"
 
       destroyed_items = loot.select { |l| l.dropped == false }
       unless destroyed_items.empty?
+        killmail << "\n"
         killmail << "Destroyed items:\n"
         killmail << "\n"
         destroyed_items.each do |loot|
@@ -74,6 +74,7 @@ module Adam
 
       dropped_items = loot.select { |l| l.dropped == true }
       unless dropped_items.empty?
+        killmail << "\n"
         killmail << "Dropped items:\n"
         killmail << "\n"
         dropped_items.each do |loot|

data/lib/adam/killmail.rb

@@ -93,7 +93,7 @@ module Adam
         kill.loot = []
         
         if source =~ /Destroyed items:/
-          source[/Destroyed items:\n\n(((.+)\n)*)/, 1].split("\n").each_with_index do |snippet, i|
+          source[/Destroyed items:\n\n(((.+)\n?)*)/, 1].split("\n").each_with_index do |snippet, i|
             loot = Adam::Kill::Loot.new do |l|
               l.name       = snippet[/([^,\(\)]+)/, 1] or raise ValidationError.new(source), "Destroyed item #{i+1} name malformed"
               l.quantity   = snippet =~ /Qty: ([0-9]+)/ ? snippet[/Qty: ([0-9]+)/, 1].to_i : 1
@@ -107,7 +107,7 @@ module Adam
         end
         
         if source =~ /Dropped items:/
-          source[/Dropped items:\n\n(((.+)\n)*)/, 1].split("\n").each_with_index do |snippet, i|
+          source[/Dropped items:\n\n(((.+)\n?)*)/, 1].split("\n").each_with_index do |snippet, i|
             loot = Adam::Kill::Loot.new do |l|
               l.name       = snippet[/([^,\(\)]+)/, 1] or raise ValidationError.new(source), "Dropped item #{i+1} name malformed"
               l.quantity   = snippet =~ /Qty: ([0-9]+)/ ? snippet[/Qty: ([0-9]+)/, 1].to_i : 1

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Johannes Gorset