adam 1.5.1 → 1.6.0

data/lib/adam.rb

@@ -1,6 +1,6 @@
-module Adam
-  VERSION = '1.5.1'
-  
+require 'adam/version'
+
+module Adam  
   autoload :Killmail, 'adam/killmail'
   autoload :KillLog, 'adam/kill_log'
   autoload :Kill, 'adam/kill'
@@ -9,12 +9,12 @@ module Adam
   autoload :Configuration, 'adam/configuration'
   
   CONFIGURATION = Configuration.new(
-    :database => {
-      :adapter => 'mysql2',
-      :username => 'username',
-      :password => 'password',
-      :name => 'database',
-      :host => 'localhost'
+    database: {
+      adapter: 'pg',
+      username: 'username',
+      password: 'password',
+      name: 'database',
+      host: 'localhost'
     }
   )
   

data/lib/adam/kill.rb

@@ -74,8 +74,10 @@ module Adam
         destroyed_items.each do |loot|
           killmail << "#{loot.name}"
           killmail << ", Qty: #{loot.quantity}" if loot.quantity > 1
-          killmail << " (Cargo)" if loot.cargo
-          killmail << " (Drone Bay)" if loot.drone_bay
+          killmail << " (Cargo)"        if loot.location == :cargo_bay
+          killmail << " (Drone Bay)"    if loot.location == :drone_bay
+          killmail << " (Implant)"      if loot.location == :implant
+          killmail << " (Copy) (Cargo)" if loot.location == :copy
           killmail << "\n"
         end
       end
@@ -88,8 +90,10 @@ module Adam
         dropped_items.each do |loot|
           killmail << "#{loot.name}"
           killmail << ", Qty: #{loot.quantity}" if loot.quantity > 1
-          killmail << " (Cargo)" if loot.cargo
-          killmail << " (Drone Bay)" if loot.drone_bay
+          killmail << " (Cargo)"        if loot.location == :cargo_bay
+          killmail << " (Drone Bay)"    if loot.location == :drone_bay
+          killmail << " (Implant)"      if loot.location == :implant
+          killmail << " (Copy) (Cargo)" if loot.location == :copy
           killmail << "\n"
         end
       end
@@ -132,7 +136,7 @@ module Adam
   # * +ship+ - A string describing the name of the ship that was destroyed.
   # * +damage_taken+ - An integer describing damage taken.
   class Kill::Victim
-    attr_accessor :pilot, :corporation, :alliance, :faction, :ship, :damage_taken
+    attr_accessor :pilot, :corporation, :alliance, :faction, :ship, :damage_taken, :moon
     
     def initialize
       yield self if block_given?
@@ -173,19 +177,9 @@ module Adam
   # Accessors:
   # * +name+ - A string describing the name of the item.
   # * +quantity+ - An integer describing the quantity of the item.
-  # * +cargo+ - A boolean describing whether or not this item was in the cargo hold.
-  # * +drone_bay+ - A boolean describing whether or not this item was in the drone bay.
   # * +dropped+ - A boolean describing whether or not this item was dropped.
   class Kill::Loot
-    attr_accessor :name, :quantity, :cargo, :drone_bay, :dropped
-    
-    def cargo?
-      cargo
-    end
-    
-    def dropped?
-      dropped
-    end
+    attr_accessor :name, :quantity, :dropped, :location
     
     def initialize
       yield self if block_given?

data/lib/adam/kill_log.rb

@@ -93,8 +93,10 @@ module Adam
             k.loot << Adam::Kill::Loot.new do |l|
               l.name           = Item.find(loot_element['typeID']).name
               l.quantity       = loot_element['qtyDropped'].to_i
-              l.cargo     = loot_element['flag'] == '5' ? true : false
-              l.drone_bay      = loot_element['flag'] == '87' ? true : false
+              l.location       = :cargo_bay if loot_element['flag'] == '5'
+              l.location       = :drone_bay if loot_element['flag'] == '87'
+              l.location       = :implant   if loot_element['flag'] == '89'
+              l.location       = :copy      if loot_element['singleton'] == '2'
               l.dropped        = true
             end
           end
@@ -103,8 +105,10 @@ module Adam
             k.loot << Adam::Kill::Loot.new do |l|
               l.name           = Item.find(loot_element['typeID']).name
               l.quantity       = loot_element['qtyDestroyed'].to_i
-              l.cargo     = loot_element['flag'] == '5' ? true : false
-              l.drone_bay      = loot_element['flag'] == '87' ? true : false
+              l.location       = :cargo_bay if loot_element['flag'] == '5'
+              l.location       = :drone_bay if loot_element['flag'] == '87'
+              l.location       = :implant   if loot_element['flag'] == '89'
+              l.location       = :copy      if loot_element['singleton'] == '2'
               l.dropped        = false
             end
           end

data/lib/adam/killmail.rb

@@ -37,7 +37,11 @@ module Adam
         raise ValidationError.new(source), "No solar system called '#{kill.solar_system.name}' exists" unless SolarSystem.exists? :name => kill.solar_system.name
   
         kill.victim = Adam::Kill::Victim.new do |v|
-          v.pilot         = source[/Victim: ([a-zA-Z0-9]{1}[a-zA-Z0-9'. -]{1,48}[a-zA-Z0-9.]{1})/, 1] or raise ValidationError.new(source), "Victim pilot malformed"
+          if source =~ /Victim:/
+            v.pilot       = source[/Victim: ([a-zA-Z0-9]{1}[a-zA-Z0-9'. -]{1,48}[a-zA-Z0-9.]{1})/, 1] or raise ValidationError.new(source), "Victim pilot malformed"
+          elsif source =~ /Moon:/
+            v.moon        = source[/Moon: ([a-zA-Z0-9]{1}[a-zA-Z0-9'. -]{1,48}[a-zA-Z0-9.]{1})/, 1] or raise ValidationError.new(source), "Victim moon malformed"
+          end
           v.corporation   = source[/Corp: ([a-zA-Z0-9]{1}[a-zA-Z0-9'. -]{1,48}[a-zA-Z0-9.]{1})/, 1] or raise ValidationError.new(source), "Victim corporation malformed"
           v.alliance      = source[/Alliance: ([a-zA-Z0-9]{1}[a-zA-Z0-9'. -]{1,48}[a-zA-Z0-9.]{1})/, 1] or raise ValidationError.new(source), "Victim alliance malformed"
           v.faction       = source[/Faction: ([a-zA-Z0-9]{1}[a-zA-Z0-9'. -]{1,48}[a-zA-Z0-9.]{1})/, 1] or raise ValidationError.new(source), "Victim faction malformed"
@@ -54,7 +58,7 @@ module Adam
         
         raise ValidationError.new(source), "No faction called '#{kill.victim.faction}' exists" if kill.victim.faction and !Faction.exists? :name => kill.victim.faction
         raise ValidationError.new(source), "No ship called '#{kill.victim.ship}' exists" unless Item.exists? :name => kill.victim.ship
-        
+        raise ValidationError.new(source), "No moon called '#{kill.victim.moon}' exists" unless Moon.exists? :name => kill.victim.moon if kill.victim.moon
         
         kill.involved_parties = []
         
@@ -115,13 +119,15 @@ 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})/, 1] or raise ValidationError.new(source), "Destroyed item #{i+1} name malformed"
+              l.name       = snippet[/([^\(\)]+[^\s\(\)]{1})/, 1].gsub(/\b, Qty: \d+\b$/, "") 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
+              l.location   = :cargo_bay if snippet[/(Cargo)/]
+              l.location   = :drone_bay if snippet[/(Drone Bay)/]
+              l.location   = :implant   if snippet[/(Implant)/]
+              l.location   = :copy      if snippet[/(Copy)/]
               l.dropped    = false
             end
-            existing_loot = kill.loot.select { |el| el.name.eql?(loot.name) and el.cargo.eql?(loot.cargo) and el.drone_bay.eql?(loot.drone_bay) and el.dropped.eql?(loot.dropped) }[0]
+            existing_loot = kill.loot.select { |el| el.name.eql?(loot.name) and el.location.eql?(loot.location) and el.dropped.eql?(loot.dropped) }[0]
             existing_loot ? existing_loot.quantity += loot.quantity : kill.loot << loot
           end
         end
@@ -129,13 +135,15 @@ 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})/, 1] or raise ValidationError.new(source), "Dropped item #{i+1} name malformed"
+              l.name       = snippet[/([^\(\)]+[^\s\(\)]{1})/, 1].gsub(/\b, Qty: \d+\b$/, "") 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
+              l.location   = :cargo_bay if snippet[/(Cargo)/]
+              l.location   = :drone_bay if snippet[/(Drone Bay)/]
+              l.location   = :implant   if snippet[/(Implant)/]
+              l.location   = :copy      if snippet[/(Copy)/]
               l.dropped    = true
             end
-            existing_loot = kill.loot.select { |el| el.name.eql?(loot.name) and el.cargo.eql?(loot.cargo) and el.drone_bay.eql?(loot.drone_bay) and el.dropped.eql?(loot.dropped) }[0]
+            existing_loot = kill.loot.select { |el| el.name.eql?(loot.name) and el.location.eql?(loot.location) and el.dropped.eql?(loot.dropped) }[0]
             existing_loot ? existing_loot.quantity += loot.quantity : kill.loot << loot
           end
         end

data/lib/adam/version.rb

@@ -0,0 +1,3 @@
+module Adam
+  VERSION = '1.6.0'
+end

metadata

@@ -1,33 +1,44 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: adam
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 5
-  - 1
-  version: 1.5.1
+version: !ruby/object:Gem::Version
+  version: 1.6.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Johannes Gorset
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-16 00:00:00 +02:00
-default_executable: 
-dependencies: []
-
-description: 
+date: 2012-05-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70350302582640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70350302582640
+- !ruby/object:Gem::Dependency
+  name: hpricot
+  requirement: &70350311558720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70350311558720
+description: Adam is a library for all things EVE
 email: jgorset@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/adam/api.rb
+files:
 - lib/adam/configuration.rb
 - lib/adam/image.rb
 - lib/adam/kill.rb
@@ -37,42 +48,34 @@ files:
 - lib/adam/killboard.rb
 - lib/adam/killmail/validation_error.rb
 - lib/adam/killmail.rb
+- lib/adam/version.rb
 - lib/adam.rb
 - lib/models/faction.rb
 - lib/models/item.rb
 - lib/models/solar_system.rb
 - README.md
-has_rdoc: true
-homepage: http://github.com/frkt/adam
+homepage: http://github.com/jgorset/adam
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.9'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Adam is a library for all things EVE
 test_files: []
-

data/lib/adam/api.rb

@@ -1,46 +0,0 @@
-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