regulos 0.1.1 → 0.2.0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
+#### v0.2.0
+* Add basic event filtering
+
 #### v0.1.1
 * Add more tests
 * Fix event determination for deaths
+
 #### v0.1.0
 * Initial parser

data/README.md

@@ -12,7 +12,9 @@
 
 * require 'regulos'
 * log = Regulos::CombatLog.parse "/path/to/combatlog.txt"
-* log.events
+* log.filter :only    => {:event => ["Heal"]
+* events = log.filter :exclude => {:event => ["Heal", "CriticalHeal"]
+* events.first.full_message
 
 
 #### Methods on Event

data/lib/regulos.rb

@@ -2,4 +2,5 @@ lib = File.expand_path('../', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 
 require "regulos/combat_log/file.rb"
+require "regulos/combat_log/event_collection.rb"
 require "regulos/combat_log/event.rb"

data/lib/regulos/combat_log/event/base.rb

@@ -1,3 +1,5 @@
+require "digest/md5"
+
 module Regulos
   module CombatLog
     module Event
@@ -10,8 +12,8 @@ module Regulos
               :Heal           => "5", 
               :BuffGain       => "6",
               :BuffFade       => "7",
-              :Affliction     => "8",
-              :Dissipate      => "9",
+              :DebuffGain     => "8",
+              :DebuffFade     => "9",
               :AttackMiss     => "10",
               :Death          => "11",
               :UnknownDeath   => "12",
@@ -34,7 +36,19 @@ module Regulos
         end
 
         def inspect
-          "<#{self.class}>"
+          "<#{self.class} id=#{id}>"
+        end
+
+        def id
+          @id ||= Digest::MD5.hexdigest( [time, full_message].join ) if time && full_message
+        end
+
+        def ==(other)
+          other.id == id
+        end
+
+        def name
+          self.class.to_s.split("::").last
         end
 
         def code
@@ -50,11 +64,11 @@ module Regulos
         end
 
         def buff?
-          code == :BuffGain
+          code == :BuffGain || code == :BuffFade
         end
 
         def debuff?
-          code == :Affliction
+          code == :DebuffGain || code == :DebuffFade
         end
 
         def process attributes

data/lib/regulos/combat_log/event/{affliction.rb → debuff_fade.rb}

@@ -1,7 +1,7 @@
 module Regulos
   module CombatLog
     module Event
-      class Affliction < Base
+      class DebuffFade < Base
       end
     end
   end

data/lib/regulos/combat_log/event/{dissipate.rb → debuff_gain.rb}

@@ -1,7 +1,7 @@
 module Regulos
   module CombatLog
     module Event
-      class Dissipate < Base
+      class DebuffGain < Base
       end
     end
   end

data/lib/regulos/combat_log/event_collection.rb

@@ -0,0 +1,45 @@
+require "delegate"
+module Regulos
+  module CombatLog
+    class EventCollection < Array
+      class FilterException < RuntimeError;end
+
+      attr_reader :events
+
+      def initialize(events=[])
+        @events = events
+        super(@events)
+      end
+
+      def inspect
+        "<#{self.class} size=#{size}"
+      end
+
+      # Search the collection
+      # e.g. :only => {:event => ["Heal", "BuffGain"]}
+      # e.g. :only => {:target => [:player]}  #NYI
+      def filter(options={})
+        if options[:only] && options[:exclude] 
+          raise FilterException, "You can't specify both 'only' and 'exclude'."
+        end
+
+        return only(options[:only])       if options[:only]
+        return exclude(options[:exclude]) if options[:exclude]
+      end
+
+      protected
+      def only(options)
+        filter_events(:only, options[:event])    if options[:event]
+      end
+
+      def exclude(options)
+        filter_events(:exclude, options[:event]) if options[:event]
+      end
+
+      def filter_events mode, keys
+        mode = mode == :only ? :select : :reject
+        EventCollection.new send(mode){|e| keys.include?(e.name) }
+      end
+    end
+  end
+end

data/lib/regulos/combat_log/file.rb

@@ -13,7 +13,7 @@ module Regulos
       attr_reader :path, :events
       def initialize(options={})
         @path = ::File.exist?( options[:path] ) ? options[:path] : raise(FileNotFoundError, "The specified combat log does not exist.")
-        @events = []
+        @events = EventCollection.new []
       end
 
       def parse
@@ -21,6 +21,10 @@ module Regulos
         data.each{|row| @events << Event.handle(row) }
       end
 
+      def filter options
+        events.filter(options) 
+      end
+
       def inspect
         "<Regulos::CombatLog::File path=#{@path}>"
       end

data/lib/regulos/version.rb

@@ -1,7 +1,7 @@
 module Regulos
   MAJOR_VERSION = "0"
-  MINOR_VERSION = "1"
-  BUG_VERSION   = "1"
+  MINOR_VERSION = "2"
+  BUG_VERSION   = "0"
 
   VERSION = [ MAJOR_VERSION, MINOR_VERSION, BUG_VERSION ].join "."
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - James Cook
@@ -40,7 +40,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/regulos/combat_log/event/affliction.rb
 - lib/regulos/combat_log/event/attack_hit.rb
 - lib/regulos/combat_log/event/attack_miss.rb
 - lib/regulos/combat_log/event/base.rb
@@ -52,7 +51,8 @@ files:
 - lib/regulos/combat_log/event/damage.rb
 - lib/regulos/combat_log/event/damage_over_time.rb
 - lib/regulos/combat_log/event/death.rb
-- lib/regulos/combat_log/event/dissipate.rb
+- lib/regulos/combat_log/event/debuff_fade.rb
+- lib/regulos/combat_log/event/debuff_gain.rb
 - lib/regulos/combat_log/event/dodge.rb
 - lib/regulos/combat_log/event/end_cast.rb
 - lib/regulos/combat_log/event/fall_damage.rb
@@ -66,6 +66,7 @@ files:
 - lib/regulos/combat_log/event/unknown.rb
 - lib/regulos/combat_log/event/unknown_death.rb
 - lib/regulos/combat_log/event.rb
+- lib/regulos/combat_log/event_collection.rb
 - lib/regulos/combat_log/file.rb
 - lib/regulos/version.rb
 - lib/regulos.rb