jekyll-rp_logs 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec8569c69aba55a9738cc87e9bd75a95aed979db
-  data.tar.gz: 93b26e248ffd74d24b02bcfe6b614e25c5b9ab71
+  metadata.gz: b50e2e5ddc01c17271bd3f5fdc368bf2138c0063
+  data.tar.gz: ed204ce52ae1b9b0c117a5de0cd09495d28b1bef
 SHA512:
-  metadata.gz: a937eab32cf98413108b37b7d1e7b98feab2b39eaba957a319d2e184b7745a6bc83675fc5eb18740937a351660ee5b7a1e3dde212f0d9c9f3fe776c1235b3d64
-  data.tar.gz: 33881e67f10c0cd07b16aa3229c27f15f321cfec558c48a01a70f479360bdda688e048dc997aa454f2c4d3786250f45c5a67114c32c7fb271a57ac61d0db4508
+  metadata.gz: 9b74f2fbe01956091be2536021c7022031dece3260fac9acfa1dee28d22b6c7a8f7a2758671115650d72c9e99debadb66cc37716dd8680cf63373ef8af91d3ec
+  data.tar.gz: 1b82113c2a20f972992af4d6bcc2966e98379eb44ae4551b3500265d8d623902d5943fda3095b3b0191c6e9cd34e453c00822b2e8e13da13787938f28ca4d9f1

data/.codeclimate.yml

@@ -0,0 +1,46 @@
+# This is a sample .codeclimate.yml configured for Engine analysis on Code
+# Climate Platform. For an overview of the Code Climate Platform, see here:
+# http://docs.codeclimate.com/article/300-the-codeclimate-platform
+
+# Under the engines key, you can configure which engines will analyze your repo.
+# Each key is an engine name. For each value, you need to specify enabled: true
+# to enable the engine as well as any other engines-specific configuration.
+
+# For more details, see here:
+# http://docs.codeclimate.com/article/289-configuring-your-repository-via-codeclimate-yml#platform
+
+# For a list of all available engines, see here:
+# http://docs.codeclimate.com/article/296-engines-available-engines
+
+engines:
+# to turn on an engine, add it here and set enabled to `true`
+# to turn off an engine, set enabled to `false` or remove it
+  rubocop:
+    enabled: true
+  eslint:
+    enabled: true
+  csslint:
+    enabled: true
+
+# Engines can analyze files and report issues on them, but you can separately
+# decide which files will receive ratings based on those issues. This is
+# specified by path patterns under the ratings key.
+
+# For more details see here:
+# http://docs.codeclimate.com/article/289-configuring-your-repository-via-codeclimate-yml#platform
+
+# Note: If the ratings key is not specified, this will result in a 0.0 GPA on your dashboard.
+
+ratings:
+  paths:
+  - lib/**
+  - "**.rb"
+  - .themes/default/source/_sass/*
+  - .themes/default/source/js/*
+
+# You can globally exclude files from being analyzed by any engine using the
+# exclude_paths key.
+
+exclude_paths:
+- spec/**/*
+# - vendor/**/*

data/.gitignore

@@ -3,7 +3,13 @@
 /Gemfile.lock
 /_yardoc/
 /coverage/
+/dev_site/
 /doc/
 /pkg/
+/spec/examples.txt
 /spec/reports/
 /tmp/
+
+## Sublime
+jekyll-rp_logs.sublime-project
+jekyll-rp_logs.sublime-workspace

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/.themes/default/source/_config.yml.default

@@ -14,7 +14,7 @@ destination: _site
 
 # Build settings
 markdown: kramdown
-exclude: 
+exclude:
   - LICENSE
   - README.md
   - Gemfile
@@ -30,10 +30,20 @@ rp_tag_dir: /tags
 rp_tag_index_layout: tag_index
 rp_tag_title_prefix: "RPs tagged "
 
+# The max number of seconds between two mergeable lines. Lines further apart
+# in time than this will not be merged.
+max_seconds_between_posts: 3
+
+# All characters that can denote the beginning of an OOC line, for the purposes
+# of strict_ooc and automatically converting OOC emotes to OOC text.
+ooc_start_delimiters: "(["
+
 collections:
   # The RPs must be in a directory named exactly this, prefixed by an underscore.
-  # So by default: _rps/ 
-  # If you change this, you also need to change the collection key name in rp_log_converter.rb
+  # So by default: _rps/
+  # This entry must be the first in the collections map, if you need to add
+  # more collections for some reason. Don't forget to update the `type` down
+  # below if you change this.
   rps:
     output: true
 

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.2.1
+
+addons:
+  code_climate:
+    repo_token: 581494fc227ee2896caed3f9fa42eb5a86aaba66ce9f51a9838114888f97d3b1
+
+script: bundle exec rspec spec

data/CHANGELOG.md

@@ -0,0 +1,55 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [0.2.0] - 2015-10-26
+### Added
+- The RP log directory can now be renamed ([#15])
+- Two config options to control the inner workings of the plugin: ([#38])
+  - `max_seconds_between_posts` - for the time limit on post merges
+  - `ooc_start_delimiters` - for what characters denote the start of OOC text ([#25])
+- `splits_by_character` setting to correctly handle clients that don't split by word ([#23])
+- Informational messages when converting RPs (can be quieted using Jekyll's config settings) ([#31])
+- Unit tests for most files, making development a lot easier
+- `time_line` option to allow RPs to be custom sorted inside arcs
+- Set up code linting with [RuboCop](https://github.com/bbatsov/rubocop)
+- Set up [Travis CI testing](https://travis-ci.org/xiagu/jekyll-rp_logs) and code coverage + [CodeClimate](https://codeclimate.com/github/xiagu/jekyll-rp_logs) ([#18])
+- `!MERGE` flag to force lines to merge ([#8])
+- `!SPLIT` flag to force lines to stay separate  ([#7])
+- Rake task `deploy` to set up a development site ([#4])
+- Rake task `serve` to deploy and then serve a development site ([#4])
+
+### Changed
+- Instead of just `(`, `[` now denotes OOC by default too ([#25])
+- Warnings when errors are encountered now use Jekyll's logger
+- Switched to using a wrapper class, `Jekyll::RpLogs::Page`, instead of just raw `Jekyll::Page`
+- `Parser` now has default values for some regular expression matchers that are commonly used:
+  - `MODE`, `NICKS`, and `FLAGS`
+- Double quotes are used (nearly) universally
+
+### Removed
+- `LogLine` is no longer an inner class of `Parser`. This will break any custom parsers written.
+- Most methods of `RpLogGenerator` are private now, but this shouldn't break anything unless you were doing naughty things with it.
+
+### Fixed
+- Clients who split posts in the middle of words can be handled correctly now ([#23])
+- The RP log directory is renameable again ([#15])
+- You can actually turn off conversion now
+- Special HTML characters are escaped in input text ([#11])
+- The time difference in merged lines needs to be non-negative
+- Set required Ruby version to `~> 2.1` ([#32])
+
+
+[0.2.0]: https://github.com/xiagu/jekyll-rp_logs/compare/v0.1.6...v0.2.0
+
+[#11]: https://github.com/xiagu/jekyll-rp_logs/issues/11
+[#15]: https://github.com/xiagu/jekyll-rp_logs/issues/15
+[#23]: https://github.com/xiagu/jekyll-rp_logs/issues/23
+[#25]: https://github.com/xiagu/jekyll-rp_logs/issues/25
+[#31]: https://github.com/xiagu/jekyll-rp_logs/issues/31
+[#32]: https://github.com/xiagu/jekyll-rp_logs/issues/32
+[#18]: https://github.com/xiagu/jekyll-rp_logs/issues/18
+[#38]: https://github.com/xiagu/jekyll-rp_logs/issues/38
+[#8]: https://github.com/xiagu/jekyll-rp_logs/issues/8
+[#7]: https://github.com/xiagu/jekyll-rp_logs/issues/7
+[#4]: https://github.com/xiagu/jekyll-rp_logs/issues/4

data/README.md

@@ -1,13 +1,36 @@
 # Jekyll::RpLogs
 
+[![Build Status](https://travis-ci.org/xiagu/web-character-sheets.svg?branch=master)](https://travis-ci.org/xiagu/web-character-sheets)
+[![Test Coverage](https://codeclimate.com/github/xiagu/jekyll-rp_logs/badges/coverage.svg)](https://codeclimate.com/github/xiagu/jekyll-rp_logs/coverage)
+[![Code Climate](https://codeclimate.com/github/xiagu/jekyll-rp_logs/badges/gpa.svg)](https://codeclimate.com/github/xiagu/jekyll-rp_logs)
+[![Gem Version](https://badge.fury.io/rb/jekyll-rp_logs.svg)](http://badge.fury.io/rb/jekyll-rp_logs)
+
+This plugin provides support for building prettified versions of raw RP logs. Extra noise is stripped out during the building to keep the process as simple as possible: paste in entire log, add title and tags, and go.
+
+The result of building all the test files can be seen here. http://andrew.rs/projects/jekyll-rp_logs/
+
+## Features
+* Link to a specific post by its timestamp
+* Show and hide OOC chatter at will
+* Responsive layout is readable even on phones
+* Can be extended to support more log formats via custom parsers (pull requests welcome!)
+* Supports multiple formats per file, for those times where you switched IRC clients in the middle of something. Or moved from IRC to Skype, or vice versa.
+* Infers characters involved in each RP by the nicks speaking
+* Generates a static site that can be hosted anywhere, without needing to run anything more than a web server
+
 ## Installation
 
-### Bundler
-Create a file named Gemfile with the following contents:
+### Bundler (Recommended)
+
+Install the bundle gem with
+
+    gem install bundle
+
+Create a file named `Gemfile` with the following contents:
 
 ```ruby
 source 'https://rubygems.org'
- 
+
 group :jekyll_plugins do
   gem "jekyll-rp_logs"
 end
@@ -17,50 +40,43 @@ end
 
 And then execute:
 
-    $ bundle
+    bundle
 
 The Gemfile group will tell Jekyll to load the gem, and let you keep it up to date easily with Bundler.
 
 ### Manually
 Alternatively, install it yourself as:
 
-    $ gem install jekyll-rp_logs
+    gem install jekyll-rp_logs
 
 In this case you'll need to tell Jekyll to load the gem somehow, such as option 2 on the [Installing a plugin](http://jekyllrb.com/docs/plugins/#installing-a-plugin) instructions.
 
 ## Usage
 
 ### Making a new site
-Require the gem in your Rakefile to get access to its exposed tasks:
-
-	echo "require 'jekyll/rp_logs'" >> Rakefile
 
-To set up a new site in the current directory, execute:
+To get started with a new site, create a fresh build directory that will be used to hold the Jekyll input files. Here, all of your raw logs, styling, and templates will be stored.
 
-	rake rp_logs:new
+In this directory, create a file named `Rakefile` and require the gem to get access to its exposed tasks like so:
 
-Then edit `_config.yml` and fill in the needed info for your setup.
+	echo "require 'jekyll/rp_logs'" > Rakefile
 
-**Warning:** Don't tell Jekyll to output to a directory that has anything useful in it -- it deletes anything in the `destination` directory whenever you build the site.
+To set up a Jekyll site skeleton in the current directory, execute:
 
-### Building the site
-Run this command: 
-	
-	jekyll build
+	rake rp_logs:new
 
-Optionally, add the `--watch` flag to automatically rebuild if you add more logs. Then get the output to somewhere that's served by a webserver, either by setting your `destination` to something there or by copying it manually.
+This will pull in all the necessary files (SASS, `_includes`, default config, etc) for Jekyll to build the site.
 
-**Warning again:** Destination folders are cleaned whenever Jekyll builds the site. Seriously, don't tell Jekyll to output to a directory that has anything useful in it.
+*Important:* To allow Jekyll to actually use the plugin, create a Gemfile as specified above in the [Bundler](#bundler-recommended) section and place it into the build directory.
 
-### Adding RPs
-Dump all of them into the `_rps/` directory of the site.
+Edit `_config.yml` and fill in the needed info for your setup.
 
-All joins, parts, and quits are stripped, so you don't have to bother pulling those out. All lines that are emotes (`/me`) are RP, and all other lines are OOC by default. Consecutive posts from the same person with timestamps less than a few seconds apart are merged together.
+**Warning:** Don't tell Jekyll to output to a directory that has anything useful in it -- it deletes anything in the `destination` directory whenever you build the site.
 
-To flag an OOC line as RP, or vice versa, use
+Now you should be ready to build!
 
-* `!RP ` before the timestamp to manually flag the line as RP
-* `!OOC ` before the timestamp to manually flag the line as OOC
+### Adding RPs
+Dump all of the raw logs into the `_rps/` directory of the site.
 
 #### YAML Front Matter
 In order to be picked up and parsed by Jekyll, each file needs a [YAML front matter](http://jekyllrb.com/docs/frontmatter/). One field is required:
@@ -69,28 +85,65 @@ In order to be picked up and parsed by Jekyll, each file needs a [YAML front mat
 
 These are all optional (they have default values, configurable in `_config.yml`):
 
-* `start_date` - Any valid YAML date, such as `YYYY-MM-DD`. - Displayed on the RP page, and used to sort in the index. If left blank, will be inferred from the first timestamp.
+* `arc_name` - YAML list - names of story arcs that the RP belongs to
 * `canon` - true/false - Whether the RP is considered canonical (whatever that means to you). Sorts RPs into one of two categories in the index.
 * `complete` - true/false - Whether the RP is finished, or is still incomplete. Incomplete RPs are flagged as such on the index.
 * `format` - YAML list - What format(s) the logs are in, e.g., `[weechat]`
 * `rp_tags` - comma separated list - A list of tags that describe the contents, such as characters involved or events that occur.
-* `arc_name` - YAML list - names of story arcs that the RP belongs to
+* `start_date` - Any valid YAML date, such as `YYYY-MM-DD`. - Displayed on the RP page, and used to sort in the index. If left blank, will be inferred from the first timestamp.
 
-There are also some more options you can toggle:
+There are also some more options you can toggle. Some are needed for giving the parser more information about oddities in posts, so that it can merge split posts correctly.
 
-* `strict_ooc` - true/false - If true, only lines beginning with `(` are considered OOC by default.
-* `merge_text_into_rp` - YAML list - A list of nicks whose clients split actions into normal text, like [IRCCloud did for a while](https://twitter.com/XiaguZ/status/590773722593763328).
 * `infer_char_tags` - true/false - If false, don't infer the characters in the RP by the nicks who do emotes.
+* `merge_text_into_rp` - YAML list - A list of nicks whose clients split actions into normal text, like [IRCCloud did for a while](https://twitter.com/XiaguZ/status/590773722593763328).
+* `splits_by_character` - YAML list - A list of nicks whose clients split posts by characters and not by words. (For example, splitting "hello" into "hel" "lo".)
+* `strict_ooc` - true/false - If true, only lines beginning with `(` are considered OOC by default.
+
+#### Formatting the logs
+The goal of this plugin is to make updating logs as easy and painless as possible. The goal is to be able to paste a log in, add trivial metadata at the top, and be good to go. Here's everything the plugin does for you so you don't have to:
+* All joins, parts, and quits are stripped, so you don't have to bother pulling those out
+* All lines that are emotes (`/me`) are interpreted as RP, and all other lines are OOC by default
+* Lines starting with `(` or `[` are interpreted as OOC, even if they're an emote. (These characters are configurable in `_config.yml`.)
+* Consecutive posts from the same person with timestamps less than or equal to 3 seconds apart are merged together. (The exact amount of time is configurable in `_config.yml`.)
+
+To flag an OOC line as RP, or vice versa, use
+
+* `!RP ` before the timestamp to manually flag the line as RP
+* `!OOC ` before the timestamp to manually flag the line as OOC
+
+To force a line to be merged, or prevent it from being merged, use
+
+* `!MERGE ` before the timestamp to force the line to be merged into the previous one, regardless of the time between them
+* `!SPLIT ` before the timestamp to force the line to be kept separate from the previous one, regardless of the time between them
+
+These flags can be combined.
+
+### Building the site
+Run this command:
+
+	jekyll build
+
+Optionally, add the `--watch` flag to automatically rebuild if you add more logs. Then get the output to somewhere that's served by a webserver, either by setting your `destination` to something there or by copying it manually.
+
+**Warning again:** Destination folders are cleaned whenever Jekyll builds the site. Seriously, don't tell Jekyll to output to a directory that has anything useful in it.
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies.
+
+To install this gem onto your local machine, run `rake install`.
+
+To install the gem and create, then serve a development site to test your changes, run `rake deploy`. This will do a bunch of things:
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+* Create the `dev_site` directory
+* Populate it with a `Gemfile` and `Rakefile` as mentioned in the installation instructions
+* Run `bundle` and `rake rp_logs:new`
+* Copy test logs from `test/` into the site's `_rps/` directory
+* Run `jekyll serve` to build and host the site at `localhost:4000` so you can see it!
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/jekyll-rp_logs/fork )
+1. Fork it ( https://github.com/xiagu/jekyll-rp_logs/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/Rakefile

@@ -1,8 +1,45 @@
 require "bundler/gem_tasks"
+require "rake/clean"
 
-task :setup do |t, args|
-	mkdir_p "_rps"
-	cp_n "_config.yml.default" "_config.yml"
-	cp_n "_sass/_custom-vars.scss.default" "_sass/_custom-vars.scss"
-	cp_n "_sass/_custom-rules.scss.default" "_sass/_custom-rules.scss"
+directory "dev_site"
+
+file "dev_site/Gemfile" => "dev_site" do |tsk|
+  File.open(tsk.name, "w") do |f|
+    f << <<-END.gsub(/^\s+\|/, "")
+      |source "https://rubygems.org"
+      |
+      |group :jekyll_plugins do
+      |  gem "jekyll-rp_logs"
+      |end
+    END
+  end
+end
+
+file "dev_site/Rakefile" => "dev_site" do |tsk|
+  File.open(tsk.name, "w") do |f|
+    f << 'require "jekyll/rp_logs"'
+  end
+end
+
+CLEAN.include("dev_site/*")
+
+desc "Create and populate the dev_site directory, ready for building or serving"
+task deploy: ["clean", "dev_site", "dev_site/Gemfile", "dev_site/Rakefile", "install"] do
+  Bundler.with_clean_env do
+    Dir.chdir("dev_site") do
+      sh "bundle --quiet"
+      sh "bundle exec rake rp_logs:new"
+      # Copy test data in!
+      cp_r "../test/_rps", "."
+    end
+  end
+end
+
+desc "Deploys the site to the dev_site directory and serves it for testing"
+task serve: ["deploy"] do
+  Bundler.with_clean_env do
+    Dir.chdir("dev_site") do
+      sh "bundle exec jekyll serve --trace --config _config.yml"
+    end
+  end
 end

data/jekyll-rp_logs.gemspec

@@ -18,13 +18,18 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/xiagu/jekyll-rp_logs"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|dev_site)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.8"
+  spec.add_development_dependency "rspec", "~> 3"
+  spec.add_development_dependency "simplecov", "~> 0.9"
+  spec.add_development_dependency "codeclimate-test-reporter"
 
   spec.add_runtime_dependency "jekyll", "~> 2.5"
   spec.add_runtime_dependency "rake", "~> 10.0"
+  
+  spec.required_ruby_version = "~> 2.1"
 end

data/lib/jekyll/rp_logs/parse_irssi_xchat.rb

@@ -1,47 +1,45 @@
 module Jekyll
   module RpLogs
-
     class IrssiXChatParser < RpLogs::Parser
-
       # Add this class to the parsing dictionary
-      FORMAT_STR = 'irssi-xchat'
+      FORMAT_STR = "irssi-xchat"
       RpLogGenerator.add self
 
-      # Stuff
-      class << self
-        MODE = /([+%@&~!]?)/
-        NICK = /([\w\-\\\[\]\{\}\^\`\|]+)/
-        DATE_REGEXP = /(\d\d:\d\d)/
-
-        FLAGS = /((?:![A-Z]+ )*)/
-        # TODO: Update to match join/part/quit format
-        JUNK =  /#{DATE_REGEXP}\t<?-->?\t.*$/ 
-        EMOTE = /^#{FLAGS}#{DATE_REGEXP} {16}\* \| #{NICK}\s+([^\n]*)$/
-        TEXT  = /^#{FLAGS}#{DATE_REGEXP} < *#{MODE}#{NICK}> \| ([^\n]*)$/
-
-        TIMESTAMP_FORMAT = '%H:%M'
-
-        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_REGEXP = /(?<timestamp>\d\d:\d\d)/
+      TIMESTAMP_FORMAT = "%H:%M"
+
+      MSG = /(?<msg>[^\n]*)/
+
+      # TODO: Update to match join/part/quit format
+      JUNK =  /#{DATE_REGEXP}\t<?-->?\t.*$/
+      EMOTE = /^#{FLAGS}#{DATE_REGEXP} {16}\* \| #{NICK}\s+#{MSG}$/
+      TEXT  = /^#{FLAGS}#{DATE_REGEXP} <#{MODE}? *#{NICK}> \| #{MSG}$/
+
+      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/parse_mirc.rb

@@ -1,54 +1,52 @@
 module Jekyll
   module RpLogs
-
     class MIRCParser < RpLogs::Parser
-
       # Add this class to the parsing dictionary
-      FORMAT_STR = 'MIRC'
+      FORMAT_STR = "MIRC"
       RpLogGenerator.add self
 
-      # Stuff
-      class << self
-        MODE = /([+%@&~!]?)/
-        NICK = /([\w\-\\\[\]\{\}\^\`\|]+)/
-        DATE_REGEXP = /(\d\d \d\d \d\d\[\d\d:\d\d\])/ #Remember to change this for your date format
-  	  #For example, this regex is for, mm dd yy[HH:nn] or 06 14 15[18:48]
-  	  #The default mirc date format is HH:nn
+      # Remember to change this for your date format
+      # For example, this regex is for, mm dd yy[HH:nn] or 06 14 15[18:48]
+      # The default mirc date format is HH:nn
+      DATE_REGEXP = /(?<timestamp>\d\d \d\d \d\d\[\d\d:\d\d\])/
+      # Also make sure to change this - http://pubs.opengroup.org/onlinepubs/009695399/functions/strptime.html
+      # If you are using the default mirc format, this should be "[%H:%M]"
+      TIMESTAMP_FORMAT = "%m %d %y[%H:%M]"
 
-  	  #Also make sure to change this - http://pubs.opengroup.org/onlinepubs/009695399/functions/strptime.html
-  	  TIMESTAMP_FORMAT = '%m %d %y[%H:%M]'
-  	  #If you are using the default mirc format, this should be '[%H:%M]'
-  	  
-        FLAGS = /((?:![A-Z]+ )*)/
-  	  # Crappy but works
-  	  # The ()?((?=\d{4})(\d\d))? bit of code is to remove the  and two random numbers in front of lines. 
-  	  #This assumes that you have a two digit date code stating your time stamp.
-  	  USER_AT_HOST = /\(\w+@[^)]+\)/
-  	  JUNK = /()?((?=\d{4})(\d\d))?#{DATE_REGEXP} \* #{MODE}#{NICK} (sets mode:|is now known as|(#{USER_AT_HOST} (has joined|Quit|has left))).*$/
-        EMOTE = /^#{FLAGS}()?((?=\d{4})(\d\d))?#{DATE_REGEXP}\s\*\s#{MODE}#{NICK}\s+([^\n]*)$/
-        TEXT  = /^#{FLAGS}()?((?=\d{4})(\d\d))?#{DATE_REGEXP}\s<#{MODE}#{NICK}>\s([^\n]*)$/
+      # Crappy but works
+      USER_AT_HOST = /\(\w+@[^)]+\)/
+      MSG = /(?<msg>[^\n]*)/
+      # The ()?((?=\d{4})(\d\d))? bit of code is to remove the  and two random numbers in front of lines.
+      # This assumes that you have a two digit date code stating your time stamp.
+      JUNK = /()?((?=\d{4})(\d\d))?#{DATE_REGEXP} \* #{MODE}#{NICK} (sets mode:|is now known as|(#{USER_AT_HOST} (has joined|Quit|has left))).*$/
+      EMOTE = /^#{FLAGS}()?((?=\d{4})(\d\d))?#{DATE_REGEXP}\s\*\s#{MODE}#{NICK}\s+#{MSG}$/
+      TEXT  = /^#{FLAGS}()?((?=\d{4})(\d\d))?#{DATE_REGEXP}\s<#{MODE}#{NICK}>\s#{MSG}$/
 
-        def parse_line(line, options = {}) 
-          case line
-          when JUNK
-            nil
-          when EMOTE
-            date = DateTime.strptime($5, TIMESTAMP_FORMAT)
-            Parser::LogLine.new(date, options, sender: $7, contents: $8, \
-              flags: $1, type: :rp)
-          when TEXT
-            date = DateTime.strptime($5, TIMESTAMP_FORMAT)
-            mode = if $6 != '' then $6 else ' ' end
-            Parser::LogLine.new(date, options, sender: $7, contents: $8, \
-              flags: $1, type: :ooc, mode: mode)
-          else
-            # Only put text and emotes in the log
-            nil
-          end
+      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