adam 1.1.1 → 1.1.2

data/README.md

@@ -1,6 +1,6 @@
 # Adam
 
-* http://github.com/frkt/adam
+* http://github.com/jgorset/adam
 
 ## Description
 
@@ -36,9 +36,9 @@ Adam is a library for all things [EVE](http://www.eveonline.com/).
     kill.loot[0].name             # => Warp Disruptor II
     kill.loot[0].quantity         # => 1
   
-    kill.to_killmail              # => Kill log's killmail equivalent.
+    kill.to_s                     # => Kill log's killmail equivalent.
   
-### Import a killboard
+### Import killmails
   
     killboard = Adam::Killboard.new :uri => 'http://invicta.eve-kill.net/', :feed_uri =>  'http://feed.evsco.net/?a=feed&corp=Invicta.&combined=true'
     killboard.killmails :week => 1, :year => 2010

data/config/database.yml

@@ -1,4 +1,4 @@
-adapter:  mysql2
+adapter:  mysql
 database: eve_arena_development
 username: root
 password: frkt

data/lib/adam.rb

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

data/lib/adam/kill.rb

@@ -92,9 +92,9 @@ module Adam
     alias_method :to_s, :to_killmail
     
     def digest
-      string = time.to_s + victim.pilot.to_s + victim.ship.to_s + solar_system.to_s + victim.damage_taken.to_s
+      string = "#{time}#{victim.pilot}#{victim.ship}#{solar_system.name}#{victim.damage_taken}"
       involved_parties.sort! { |x, y| x.damage_done <=> y.damage_done }
-      involved_parties.each { |p| string += p.pilot.to_s + p.damage_done.to_s }
+      involved_parties.each { |p| string << "#{p.pilot}#{p.damage_done}" }
       Digest::MD5.hexdigest(string)
     end
     

data/lib/adam/killmail.rb

@@ -79,7 +79,7 @@ module Adam
           when 2
             involved_party = Adam::Kill::InvolvedParty.new do |ip|
               ip.type                   = "NPC"
-              ip.ship                   = snippet[/Name: ([^\/]+)/, 1] or raise ValidationError.new(source), "Involved party #{i+1} ship malformed"
+              ip.ship                   = snippet[/Name: ([a-zA-Z0-9]{1}[a-zA-Z0-9'. -]{1,48}[a-zA-Z0-9.]{1})/, 1] or raise ValidationError.new(source), "Involved party #{i+1} ship malformed"
               ip.damage_done            = (snippet[/Damage Done: ([0-9]+)/, 1] or raise ValidationError.new(source), "Involved party #{i+1} damage malformed").to_i
               ip.final_blow             = snippet =~ /\(laid the final blow\)/ ? true : false
               

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Johannes Gorset
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 +02:00
+date: 2010-10-01 00:00:00 +02:00
 default_executable: 
 dependencies: []