adam 1.5.0 → 1.5.1

data/README.md

@@ -48,14 +48,36 @@ Adam is a library for all things [EVE](http://www.eveonline.com/).
 
 * Ruby 1.9
 * Hpricot
-* ActiveRecord (see note)
-* MySQL (see note)
-
-Note: ActiveRecord and MySQL are only required if you don't want to roll your own implementation for the "SolarSystem", "Item" and "Faction" classes.
+* ActiveRecord
 
 ## Install
 
-    gem install adam
+Adam can be installed as a Ruby gem or a Ruby on Rails plugin:
+
+    # Install as a gem
+    $ gem install adam
+    
+    # Install as a Ruby on Rails plugin
+    $ rails plugin install git://github.com/jgorset/adam.git
+    
+Adam defines ActiveRecord models for `Item`, `SolarSystem` and `Faction` if your application hasn't already done so, but you'll need to
+populate database tables for each model:
+
+    $ mysql adam < db/factions.sql
+    $ mysql adam < db/solar_systems.sql
+    $ mysql adam < db/items.sql
+    
+Finally, you'll need to configure Adam so it can connect to your database:
+
+    Adam::configure do |c|
+      c.database.adapter = 'mysql2'
+      c.database.username = 'username'
+      c.database.password = 'password'
+      c.database.name = 'database'
+      c.database.host = 'localhost'
+    end
+    
+That's it, you're done.
 
 ## License
 

data/lib/adam.rb

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

data/lib/adam/api.rb

@@ -0,0 +1,46 @@
+require 'uri'
+require 'net/http'
+
+module Adam
+  
+  class API
+    
+    @@character_portrait_uri = "http://image.eveonline.com/Character/"
+    
+    # Retrieves a character portrait.
+    #
+    # Parameters:
+    # * +options+ - A hash with these keys:
+    #   * +id+ - An integer describing an EVE Online character id.
+    #   * +size+ - An integer describing what size to retrieve. Valid sizes are 32, 64, 128 or 256.
+    def character_portrait(options = {})
+      request(@@character_portrait_uri + "#{options[:id]}_#{options[:size]}.jpg")
+    end
+    
+    private
+    
+    # Queries the EVE Online API for data.
+    #
+    # Parameters:
+    # * +uri+ - A string describing the URI to send a request to.
+    def request(uri)
+      uri = URI.parse(uri)
+      
+      response, body = nil, nil
+      Net::HTTP.new(uri.host, uri.port).start do |http|
+        tries = 0
+        begin
+          response, body = http.get("#{uri.path}?#{uri.query}")
+        rescue Timeout::Error
+          tries += 1
+          sleep 5
+          retry if tries < 3
+        end
+      end
+      
+      body
+    end
+    
+  end
+  
+end

data/lib/adam/image.rb

@@ -63,21 +63,22 @@ module Adam
     def self.request(uri)
       uri = URI.parse(uri)
       
-      response, body = nil, nil
-      Net::HTTP.new(uri.host, uri.port).start do |http|
-        tries = 0
-        begin
-          response, body = http.get("#{uri.path}?#{uri.query}")
-        rescue Timeout::Error
-          tries += 1
-          if tries < 3
-            sleep 5
-            retry
-          end
-        end
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.open_timeout = 3
+      http.read_timeout = 20
+      
+      request = Net::HTTP::Get.new(uri.path)
+      request['user-agent'] = "Adam #{Adam::VERSION}"
+      
+      tries = 0
+      begin
+        tries += 1
+        response = http.request(request)
+      rescue Timeout::Error
+        sleep 5 and retry if tries < 3
       end
       
-      body
+      response.body
     end
     
   end

data/lib/adam/kill.rb

@@ -24,7 +24,7 @@ module Adam
     def to_killmail
 
       killmail = ""
-      killmail << time.strftime("%Y.%m.%d %H:%M")
+      killmail << time.strftime("%Y.%m.%d %H:%M\n")
       killmail << "\n"
       killmail << "Victim: #{victim.pilot}\n"
       killmail << "Corp: #{victim.corporation}\n"

data/lib/adam/killmail.rb

@@ -69,7 +69,7 @@ module Adam
             involved_party = Adam::Kill::InvolvedParty.new do |ip|
               ip.type                   = :PC
               ip.pilot                  = 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} pilot malformed"
-              ip.security_status        = snippet[/Security: ([\-\.0-9]+)/, 1].to_f or raise ValidationError.new(source), "Involved party #{i+1} security malformed"
+              ip.security_status        = (snippet[/Security: ([\-\.0-9]+)/, 1] or raise ValidationError.new(source), "Involved party #{i+1} security malformed").to_f
               ip.corporation            = snippet[/Corp: ([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} corporation malformed"
               ip.alliance               = snippet[/Alliance: ([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} alliance malformed"
               ip.faction                = snippet[/Faction: ([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} faction malformed"
@@ -115,7 +115,7 @@ module Adam
         if source =~ /Destroyed items:/
           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.name       = snippet[/([^,\(\)]+[^,\(\) ]{1})/, 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
               l.cargo = snippet[/(Cargo)/] ? true : false
               l.drone_bay  = snippet[/(Drone Bay)/] ? true : false
@@ -129,7 +129,7 @@ module Adam
         if source =~ /Dropped items:/
           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.name       = snippet[/([^,\(\)]+[^,\(\) ]{1})/, 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
               l.cargo = snippet[/(Cargo)/] ? true : false
               l.drone_bay  = snippet[/(Drone Bay)/] ? true : false

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Johannes Gorset
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 +02:00
+date: 2010-10-16 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +27,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/adam/api.rb
 - lib/adam/configuration.rb
 - lib/adam/image.rb
 - lib/adam/kill.rb