jekyll-rp_logs 0.1.6 → 0.2.0

data/lib/jekyll/rp_logs/parse_skype_12hour.rb

@@ -1,56 +1,44 @@
 module Jekyll
   module RpLogs
-
-    class Skype12Parser < RpLogs::Parser #This is for the date format [6/12/2015 7:01:45 PM]
-
+    # This is for the date format [6/12/2015 7:01:45 PM]
+    class Skype12Parser < RpLogs::Parser
       # Add this class to the parsing dictionary
-      FORMAT_STR = 'Skype12'
+      FORMAT_STR = "Skype12"
       RpLogGenerator.add self
 
-      # Stuff
-      class << self
-        NICK = /([\w\-\\\[\]\{\}\^\`\|\s\'\)\(]+)/
-        DATE_REGEXP = /(\[\d?\d\/\d?\d\/\d\d\d\d\s\d?\d\:\d\d\:\d\d\s(AM|PM)\])/ 
-        FLAGS = /((?:![A-Z]+ )*)/
-  	  BAD_STUFF = /[^a-zA-Z\-\_]/
-  	  
-  	 # Crappy but works
-  	  USER_AT_HOST = /\(\w+@[^)]+\)/
-  #Not needed?	  JUNK = /#{DATE_REGEXP} \* #{MODE}#{NICK} (sets mode:|is now known as|(#{USER_AT_HOST} (has joined|Quit|has left))).*$/
-        EMOTE = /^#{FLAGS}#{DATE_REGEXP}\s#{NICK}:\s(\4)([^\n]*)$/
-        TEXT  = /^#{FLAGS}#{DATE_REGEXP}\s#{NICK}:\s([^\n]*)$/
+      NICK = /(?<nick>[\w\-\\\[\]{}\^`|\s')(]+)/
+      DATE_REGEXP = /(?<timestamp>\[\d?\d\/\d?\d\/\d\d\d\d\s\d?\d\:\d\d\:\d\d\s(AM|PM)\])/
+      TIMESTAMP_FORMAT = "[%m/%d/%Y %I:%M:%S %p]"
+      MSG = /(?<msg>[^\n]*)/
+      BAD_STUFF = /[^a-zA-Z\-\_]/
 
-        TIMESTAMP_FORMAT = '[%m/%d/%Y %I:%M:%S %p]'
+      EMOTE = /^#{FLAGS}#{DATE_REGEXP}\s#{NICK}:\s\k<nick>#{MSG}$/
+      TEXT  = /^#{FLAGS}#{DATE_REGEXP}\s#{NICK}:\s#{MSG}$/
 
-        def parse_line(line, options = {}) 
-          case line
-          #when JUNK
-            #nil
-          when EMOTE
-  		print "1"
-            date = DateTime.strptime($2, TIMESTAMP_FORMAT)
-            contents = $6
-  		  flags = $1
-  		  sendername = $4.tr(' ', '-').gsub(BAD_STUFF, "")
-            Parser::LogLine.new(date, options, sender: sendername, contents: contents, \
-            flags: flags, type: :rp)
-          when TEXT
-  		print "2"
-            date = DateTime.strptime($2, TIMESTAMP_FORMAT)
-  		  contents = $5
-  		  flags = $1
-  		  sendername = $4.tr(' ', '-').gsub(BAD_STUFF, "")
-            Parser::LogLine.new(date, options, sender: sendername, contents: contents, \
-              flags: flags, type: :ooc)
-          else
-            print "3"
-  		  # Only put text and emotes in the log
-            nil
-          end
+      def self.parse_line(line, options = {})
+        case line
+        when EMOTE
+          type = :rp
+        when TEXT
+          type = :ooc
+        else
+          # Only put text and emotes in the log
+          return nil
         end
+        # Preserve all the matches before the gsub
+        date = DateTime.strptime($LAST_MATCH_INFO[:timestamp], TIMESTAMP_FORMAT)
+        contents = $LAST_MATCH_INFO[:msg]
+        flags = $LAST_MATCH_INFO[:flags]
+        sendername = $LAST_MATCH_INFO[:nick].tr(" ", "-").gsub(BAD_STUFF, "")
+        LogLine.new(
+          date,
+          options,
+          sender: sendername,
+          contents: contents,
+          flags: flags,
+          type: type
+        )
       end
-
-    end  
-
+    end
   end
 end

data/lib/jekyll/rp_logs/parse_skype_24hour.rb

@@ -1,52 +1,44 @@
 module Jekyll
   module RpLogs
-
-    class Skype24Parser < RpLogs::Parser #This is for the date format [05.06.15 10:58:47]
-
+    # This is for the date format [05.06.15 10:58:47]
+    class Skype24Parser < RpLogs::Parser
       # Add this class to the parsing dictionary
-      FORMAT_STR = 'Skype24'
+      FORMAT_STR = "Skype24"
       RpLogGenerator.add self
 
-      # Stuff
-      class << self
-        NICK = /([\w\-\\\[\]\{\}\^\`\|\s\']+)/
-        DATE_REGEXP = /(\[\d\d.\d\d.\d\d\s\d\d\:\d\d\:\d\d\])/ 
-        FLAGS = /((?:![A-Z]+ )*)/
-  	  BAD_STUFF = /[^a-zA-Z\-\_]/
-  	 # Crappy but works
-  	  USER_AT_HOST = /\(\w+@[^)]+\)/
-  #Not needed?	  JUNK = /#{DATE_REGEXP} \* #{MODE}#{NICK} (sets mode:|is now known as|(#{USER_AT_HOST} (has joined|Quit|has left))).*$/
-        EMOTE = /^#{FLAGS}#{DATE_REGEXP}\s#{NICK}:\s(\3)([^\n]*)$/
-        TEXT  = /^#{FLAGS}#{DATE_REGEXP}\s#{NICK}:\s([^\n]*)$/
+      NICK = /(?<nick>[\w\-\\\[\]\{\}\^\`\|\s\']+)/
+      DATE_REGEXP = /(?<timestamp>\[\d\d.\d\d.\d\d\s\d\d\:\d\d\:\d\d\])/
+      TIMESTAMP_FORMAT = "[%d.%m.%y %H:%M:%S]"
+      MSG = /(?<msg>[^\n]*)/
+      BAD_STUFF = /[^a-zA-Z\-\_]/
 
-        TIMESTAMP_FORMAT = '[%d.%m.%y %H:%M:%S]'
+      EMOTE = /^#{FLAGS}#{DATE_REGEXP}\s#{NICK}:\s\k<nick>#{MSG}$/
+      TEXT  = /^#{FLAGS}#{DATE_REGEXP}\s#{NICK}:\s#{MSG}$/
 
-        def parse_line(line, options = {}) 
-          case line
-         # when JUNK
-           # nil
-          when EMOTE
-            date = DateTime.strptime($2, TIMESTAMP_FORMAT)
-  		  contents = $5
-  		  flags = $1
-  		  sendername = $3.tr(' ', '-').gsub(BAD_STUFF, "")
-            Parser::LogLine.new(date, options, sender: sendername, contents: contents, \
-            flags: flags, type: :rp)
-          when TEXT
-            date = DateTime.strptime($2, TIMESTAMP_FORMAT)
-  		  contents = $4
-  		  flags = $1
-  		  sendername = $3.tr(' ', '-').gsub(BAD_STUFF, "")
-            Parser::LogLine.new(date, options, sender: sendername, contents: contents, \
-              flags: flags, type: :ooc)
-          else
-            # Only put text and emotes in the log
-            nil
-          end
+      def self.parse_line(line, options = {})
+        case line
+        when EMOTE
+          type = :rp
+        when TEXT
+          type = :ooc
+        else
+          # Only put text and emotes in the log
+          return nil
         end
+        # Preserve all the matches before the gsub
+        date = DateTime.strptime($LAST_MATCH_INFO[:timestamp], TIMESTAMP_FORMAT)
+        contents = $LAST_MATCH_INFO[:msg]
+        flags = $LAST_MATCH_INFO[:flags]
+        sendername = $LAST_MATCH_INFO[:nick].tr(" ", "-").gsub(BAD_STUFF, "")
+        LogLine.new(
+          date,
+          options,
+          sender: sendername,
+          contents: contents,
+          flags: flags,
+          type: type
+        )
       end
-
-    end  
-
+    end
   end
 end

data/lib/jekyll/rp_logs/parse_weechat.rb

@@ -1,46 +1,46 @@
 module Jekyll
   module RpLogs
-
+    ##
+    # Parses logs in the default format of [Weechat](https://weechat.org/)
     class WeechatParser < RpLogs::Parser
-
       # Add this class to the parsing dictionary
-      FORMAT_STR = 'weechat'
+      FORMAT_STR = "weechat"
       RpLogGenerator.add self
 
-      # Stuff
-      class << self
-        MODE = /([+%@&~!]?)/
-        NICK = /([\w\-\\\[\]\{\}\^\`\|]+)/
-        DATE_REGEXP = /(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)/
-
-        FLAGS = /((?:![A-Z]+ )*)/
-        JUNK =  /#{DATE_REGEXP}\t<?-->?\t.*$/
-        EMOTE = /^#{FLAGS}#{DATE_REGEXP}\t \*\t#{NICK}\s+([^\n]*)$/
-        TEXT  = /^#{FLAGS}#{DATE_REGEXP}\t#{MODE}#{NICK}\t([^\n]*)$/
-
-        TIMESTAMP_FORMAT = '%Y-%m-%d %H:%M:%S'
-
-        def parse_line(line, options = {}) 
-          case line
-          when JUNK
-            return nil
-          when EMOTE
-            date = DateTime.strptime($2, TIMESTAMP_FORMAT)
-            return Parser::LogLine.new(date, options, sender: $3, contents: $4, \
-              flags: $1, type: :rp)
-          when TEXT
-            date = DateTime.strptime($2, TIMESTAMP_FORMAT)
-            mode = if $3 != '' then $3 else ' ' end
-            return Parser::LogLine.new(date, options, sender: $4, contents: $5, \
-              flags: $1, type: :ooc, mode: mode)
-          else
-            # Only put text and emotes in the log
-            return nil
-          end
+      # Date is repeated in each type of message
+      DATE_REGEXP = /(?<timestamp>\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)/
+      TIMESTAMP_FORMAT = "%Y-%m-%d %H:%M:%S"
+
+      # Regular expressions for matching each type of line
+      JUNK =  /#{DATE_REGEXP}\t<?-->?\t.*$/
+      EMOTE = /^#{FLAGS}#{DATE_REGEXP}\t \*\t#{NICK}\s+(?<msg>[^\n]*)$/
+      TEXT  = /^#{FLAGS}#{DATE_REGEXP}\t#{MODE}#{NICK}\t(?<msg>[^\n]*)$/
+
+      def self.parse_line(line, options = {})
+        case line
+        when JUNK
+          return nil
+        when EMOTE
+          type = :rp
+        when TEXT
+          type = :ooc
+          mode = $LAST_MATCH_INFO[:mode]
+          mode = " " if mode == ""
+        else
+          # Only put text and emotes in the log
+          return nil
         end
+        date = DateTime.strptime($LAST_MATCH_INFO[:timestamp], TIMESTAMP_FORMAT)
+        LogLine.new(
+          date,
+          options,
+          sender: $LAST_MATCH_INFO[:nick],
+          contents: $LAST_MATCH_INFO[:msg],
+          flags: $LAST_MATCH_INFO[:flags],
+          type: type,
+          mode: mode
+        )
       end
-
-    end  
-
+    end
   end
 end

data/lib/jekyll/rp_logs/rp_arcs.rb

@@ -2,9 +2,9 @@
 
 module Jekyll
   module RpLogs
-
     # Holds arc information
     class Arc
+      include Comparable
 
       attr_accessor :name, :rps
 
@@ -17,41 +17,39 @@ module Jekyll
         # potential future idea: directories for each arc
       end
 
-      def <<(rp_page) 
+      def <<(rp_page)
         @rps << rp_page
       end
 
       def start_date
-        @rps.map { |rp_page| rp_page.data['start_date'] }.min
+        @rps.map { |rp_page| rp_page[:time_line] || rp_page[:start_date] }.min
       end
 
       def end_date
-        @rps.map { |rp_page| rp_page.data['last_post_time'] }.max
+        @rps.map { |rp_page| rp_page[:last_post_time] }.max
       end
 
-      def is_arc?
+      def arc?
         true
       end
 
       def to_s
-        self.name
+        name
       end
 
-      def eql?(arc)
-        self.class.equal?(arc.class) && (self.name == arc.name) && (self.rps.equal?(arc.rps))
+      def eql?(other)
+        self.class == other.class &&
+          name == other.name &&
+          rps == other.rps
       end
 
       def hash
-        self.name.hash
+        name.hash
       end
 
       # actually by... start.. date?
-      def <=>(o)
-        if self.class == o.class 
-          self.name <=> o.name 
-        else
-          nil
-        end
+      def <=>(other)
+        name <=> other.name if self.class == other.class
       end
 
       def inspect
@@ -63,7 +61,6 @@ module Jekyll
 
         { "name" => @name, "rps" => @rps }
       end
-
     end
   end
 end