adam 1.2.0 → 1.3.1

data/lib/adam.rb

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

data/lib/adam/kill.rb

@@ -78,7 +78,7 @@ module Adam
         destroyed_items.each do |loot|
           killmail << "#{loot.name}"
           killmail << ", Qty: #{loot.quantity}" if loot.quantity > 1
-          killmail << " (Cargo)" if loot.cargo_hold
+          killmail << " (Cargo)" if loot.cargo
           killmail << " (Drone Bay)" if loot.drone_bay
           killmail << "\n"
         end
@@ -92,7 +92,7 @@ module Adam
         dropped_items.each do |loot|
           killmail << "#{loot.name}"
           killmail << ", Qty: #{loot.quantity}" if loot.quantity > 1
-          killmail << " (Cargo)" if loot.cargo_hold
+          killmail << " (Cargo)" if loot.cargo
           killmail << " (Drone Bay)" if loot.drone_bay
           killmail << "\n"
         end
@@ -177,14 +177,14 @@ module Adam
   # Accessors:
   # * +name+ - A string describing the name of the item.
   # * +quantity+ - An integer describing the quantity of the item.
-  # * +cargo_hold+ - A boolean describing whether or not this item was in the cargo hold.
+  # * +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_hold, :drone_bay, :dropped
+    attr_accessor :name, :quantity, :cargo, :drone_bay, :dropped
     
-    def cargo_hold?
-      cargo_hold
+    def cargo?
+      cargo
     end
     
     def dropped?

data/lib/adam/kill_log.rb

@@ -1,5 +1,8 @@
 require 'adam/kill_log/validation_error'
-require 'models' unless defined?(SolarSystem) and defined?(Item)
+
+SolarSystem rescue require 'models/solar_system'
+Item rescue require 'models/item'
+Faction rescue require 'models/faction'
 
 require 'hpricot'
 require 'time'
@@ -90,7 +93,7 @@ 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_hold     = loot_element['flag'] == '5' ? true : false
+              l.cargo     = loot_element['flag'] == '5' ? true : false
               l.drone_bay      = loot_element['flag'] == '87' ? true : false
               l.dropped        = true
             end
@@ -100,7 +103,7 @@ 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_hold     = loot_element['flag'] == '5' ? true : false
+              l.cargo     = loot_element['flag'] == '5' ? true : false
               l.drone_bay      = loot_element['flag'] == '87' ? true : false
               l.dropped        = false
             end

data/lib/adam/killmail.rb

@@ -1,5 +1,8 @@
 require 'adam/killmail/validation_error'
-require 'models' unless defined?(SolarSystem) and defined?(Item) and defined?(Faction)
+
+SolarSystem rescue require 'models/solar_system'
+Item rescue require 'models/item'
+Faction rescue require 'models/faction'
 
 require 'time'
 
@@ -114,11 +117,11 @@ module Adam
             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
-              l.cargo_hold = snippet[/(Cargo)/] ? true : false
+              l.cargo = snippet[/(Cargo)/] ? true : false
               l.drone_bay  = snippet[/(Drone Bay)/] ? true : false
               l.dropped    = false
             end
-            existing_loot = kill.loot.select { |el| el.name.eql?(loot.name) and el.cargo_hold.eql?(loot.cargo_hold) 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.cargo.eql?(loot.cargo) and el.drone_bay.eql?(loot.drone_bay) and el.dropped.eql?(loot.dropped) }[0]
             existing_loot ? existing_loot.quantity += loot.quantity : kill.loot << loot
           end
         end
@@ -128,11 +131,11 @@ module Adam
             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
-              l.cargo_hold = snippet[/(Cargo)/] ? true : false
+              l.cargo = snippet[/(Cargo)/] ? true : false
               l.drone_bay  = snippet[/(Drone Bay)/] ? true : false
               l.dropped    = true
             end
-            existing_loot = kill.loot.select { |el| el.name.eql?(loot.name) and el.cargo_hold.eql?(loot.cargo_hold) 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.cargo.eql?(loot.cargo) and el.drone_bay.eql?(loot.drone_bay) and el.dropped.eql?(loot.dropped) }[0]
             existing_loot ? existing_loot.quantity += loot.quantity : kill.loot << loot
           end
         end

data/lib/models/faction.rb

@@ -0,0 +1,8 @@
+require 'active_record'
+
+unless ActiveRecord::Base.connected?
+  database_configuration = YAML::load_file(File.dirname(__FILE__) + '/../../config/database.yml')
+  ActiveRecord::Base.establish_connection YAML::load_file(File.dirname(__FILE__) + '/../../config/database.yml')
+end
+
+class Faction < ActiveRecord::Base; end

data/lib/models/item.rb

@@ -0,0 +1,8 @@
+require 'active_record'
+
+unless ActiveRecord::Base.connected?
+  database_configuration = YAML::load_file(File.dirname(__FILE__) + '/../../config/database.yml')
+  ActiveRecord::Base.establish_connection YAML::load_file(File.dirname(__FILE__) + '/../../config/database.yml')
+end
+
+class Item < ActiveRecord::Base; end

data/lib/models/solar_system.rb

@@ -0,0 +1,8 @@
+require 'active_record'
+
+unless ActiveRecord::Base.connected?
+  database_configuration = YAML::load_file(File.dirname(__FILE__) + '/../../config/database.yml')
+  ActiveRecord::Base.establish_connection YAML::load_file(File.dirname(__FILE__) + '/../../config/database.yml')
+end
+
+class SolarSystem < ActiveRecord::Base; end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 0
-  version: 1.2.0
+  - 3
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Johannes Gorset
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-01 00:00:00 +02:00
+date: 2010-10-04 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -39,7 +39,9 @@ files:
 - lib/adam/killmail/validation_error.rb
 - lib/adam/killmail.rb
 - lib/adam.rb
-- lib/models.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

data/lib/models.rb

@@ -1,8 +0,0 @@
-require 'active_record'
-
-database_configuration = YAML::load_file(File.dirname(__FILE__) + '/../config/database.yml')
-ActiveRecord::Base.establish_connection(database_configuration)
-
-class Item < ActiveRecord::Base; end
-class SolarSystem < ActiveRecord::Base; end
-class Faction < ActiveRecord::Base; end