pipio 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a27a6c6a854887062351e5a362482a44990ce35e
-  data.tar.gz: 455730fbf37e619f747cfe89d0612fb42ee85999
+  metadata.gz: a14d4d97d6bee17bf6a0889212efae784e929d64
+  data.tar.gz: 6bcc28a685bc84d70b81031d71023bd8ed5c1413
 SHA512:
-  metadata.gz: 0192a3e9a130603f28698edc216007c30321a921c4b66a6a3cea5368a02262f0be2037802408b5a7576552c1d625e246da06447f4f5ac37ccd735695b18c86c0
-  data.tar.gz: 532da7ab24471befe059573f39d99dd65b214de408783215f0e3e73272088550d03d531834b882a4af14349b7904c1c3e50ce371947ae3bf562f61cf96acb07b
+  metadata.gz: 88e2f94f3c5e2f668338f853e64f61dae962ea75f26b91b72f4485dbf645b3d52975dc88a7f9eaae7363aab6cabf01f160bcee533c7c6ff524b3e3fb397b786f
+  data.tar.gz: 063b79775485aae8282c2e783d44dc485bbdfaa661be142a1aa5461764355ca6d3c5997a884ba3cb1ed1685b0a34b254c87d85c3f5fadf5dd413a149b9b2e628

data/NEWS.md

@@ -1,4 +1,13 @@
-## 0.0.1 (unreleased)
+## v0.0.2
+
+* Remove ending newlines from Message subclasses' `to_s` output
+* Remove `Chat#start_time_xmlschema` in favor of `Chat#start_time`, which
+  returns an actual Time object
+* Output chat message times using Adium's timezone format (`-0400`, not
+  `-04:00`)
+* Internal: pass around aliases as an array instead of a comma-delimited string
+
+## 0.0.1
 
 Extract Pidgin2Adium, commit hash 96c443fd244b3d2d57564bf17c68d3ec1bcb48ff, into
 this library, Pipio. There are also other commits in this release that are not in

data/README.md

@@ -9,10 +9,9 @@ message objects in `Pipio::Chat#messages`.
 To deal with meta-information about the chat itself:
 
     path_to_chat_log = File.expand_path('~/path/to/chat_log.html') # or .txt
-    chat = Pipio.parse(path_to_chat_log, "Gabe B-W,Gabe,Other Alias")
+    chat = Pipio.parse(path_to_chat_log, ["Gabe B-W", "Gabe", "Other Alias"])
     if chat
       puts "Screen name of the person you chatted with: #{chat.their_screen_name}"
-      puts "Time the chat started: #{chat.start_time_xmlschema}"
       puts "Chat contents, in adium format:"
       puts chat.to_s
     else
@@ -23,7 +22,7 @@ To deal with meta-information about the chat itself:
 
 Or, to deal with individual messages in a chat:
 
-    chat = Pipio.parse("/path/to/log/file.html", "gabe,gbw,gabeb-w")
+    chat = Pipio.parse("/path/to/log/file.html", ["gabe", "gbw", "gabeb-w"])
     chat.each do |message|
       puts "Screen name of person who sent this message: #{message.sender_screen_name}"
       puts "Alias of person who sent this message: #{message.sender_alias}"

data/lib/pipio/chat.rb

@@ -11,8 +11,8 @@ module Pipio
 
     attr_reader :messages
 
-    def start_time_xmlschema
-      @metadata.start_time.xmlschema
+    def start_time
+      @metadata.start_time
     end
 
     def my_screen_name
@@ -28,7 +28,7 @@ module Pipio
     end
 
     def to_s
-      map(&:to_s).join("\n")
+      messages.join("\n")
     end
 
     # Iterate over each Message.

data/lib/pipio/messages/auto_reply_message.rb

@@ -1,7 +1,7 @@
 module Pipio
   class AutoReplyMessage < XMLMessage
     def to_s
-      %(<message sender="#{sender_screen_name}" time="#{adium_formatted_time}" auto="true" alias="#{@sender_alias}">#{@styled_body}</message>\n)
+      %(<message sender="#{sender_screen_name}" time="#{adium_formatted_time}" auto="true" alias="#{@sender_alias}">#{@styled_body}</message>)
     end
   end
 end

data/lib/pipio/messages/message.rb

@@ -17,7 +17,7 @@ module Pipio
     private
 
     def adium_formatted_time
-      @time.xmlschema
+      @time.xmlschema.sub(/:00$/, "00")
     end
   end
 end

data/lib/pipio/messages/status_message.rb

@@ -20,7 +20,7 @@ module Pipio
     attr_reader :status
 
     def to_s
-      %(<status type="#{@status}" sender="#{@sender_screen_name}" time="#{adium_formatted_time}" alias="#{@sender_alias}"/>\n)
+      %(<status type="#{@status}" sender="#{@sender_screen_name}" time="#{adium_formatted_time}" alias="#{@sender_alias}"/>)
     end
   end
 end

data/lib/pipio/messages/xml_message.rb

@@ -11,7 +11,7 @@ module Pipio
     attr_reader :body
 
     def to_s
-      %(<message sender="#{@sender_screen_name}" time="#{adium_formatted_time}" alias="#{@sender_alias}">#{@styled_body}</message>\n)
+      %(<message sender="#{@sender_screen_name}" time="#{adium_formatted_time}" alias="#{@sender_alias}">#{@styled_body}</message>)
     end
 
     private

data/lib/pipio/parsers/basic_parser.rb

@@ -1,7 +1,7 @@
 module Pipio
   class BasicParser
     def initialize(source_file_path, my_aliases, line_regex, line_regex_status, cleaner)
-      @my_aliases = my_aliases.split(',')
+      @my_aliases = my_aliases
       @line_regex = line_regex
       @line_regex_status = line_regex_status
       @my_alias = @my_aliases.first

data/lib/pipio/version.rb

@@ -1,3 +1,3 @@
 module Pipio
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/features/parsing_an_html_file_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+
+describe "Parse a Pidgin HTML log file" do
+  it "outputs the correct data" do
+    chat = Pipio.parse(path_to_input_fixture, ["Gabe B-W"])
+
+    expect(chat.to_s).to eq expected_output_with_current_timezone_offset.strip
+  end
+
+  def path_to_output_fixture
+    File.join(SPEC_ROOT, "fixtures", "output.xml")
+  end
+
+  def expected_output_with_current_timezone_offset
+    File.read(path_to_output_fixture).gsub("-0400", timezone_offset)
+  end
+
+  def timezone_offset
+    Time.now.strftime("%z")
+  end
+
+  def path_to_input_fixture
+    File.join(SPEC_ROOT, "fixtures", "input.html")
+  end
+end

data/spec/fixtures/input.html

@@ -0,0 +1,3 @@
+<head><meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Conversation with them@gmail.com at 3/16/2014 11:55:43 PM on jiggerificbug (aim)</title></head><h3>Conversation with them@gmail.com at 3/16/2014 11:55:43 PM on jiggerificbug (aim)</h3>
+<font color="#A82F2F"><font size="2">(2014-03-16 23:55:48)</font> <b>Some Rando:</b></font> Hi<br/>
+<font color="#16569E"><font size="2">(2014-03-16 23:55:50)</font> <b>Gabe B-W:</b></font> Hi back<br/>

data/spec/fixtures/output.xml

@@ -0,0 +1,2 @@
+<message sender="them@gmail.com" time="2014-03-16T23:55:48-0400" alias="Some Rando"><div><span style="font-family: Helvetica; font-size: 12pt;">Hi</span></div></message>
+<message sender="jiggerificbug" time="2014-03-16T23:55:50-0400" alias="Gabe B-W"><div><span style="font-family: Helvetica; font-size: 12pt;">Hi back</span></div></message>

data/spec/pipio/chat_spec.rb

@@ -37,12 +37,12 @@ describe Pipio::Chat do
     end
   end
 
-  describe '#start_time_xmlschema' do
-    it 'is the start time of the chat in xmlschema format' do
+  describe '#start_time' do
+    it 'is the start time of the chat' do
       time = Time.now
       chat = Pipio::Chat.new([], metadata(start_time: time))
 
-      expect(chat.start_time_xmlschema).to eq(time.xmlschema)
+      expect(chat.start_time).to eq(time)
     end
   end
 

data/spec/pipio/messages/auto_reply_message_spec.rb

@@ -9,7 +9,7 @@ describe Pipio::AutoReplyMessage, '#to_s' do
 
   it 'has the correct time' do
     time = Time.now
-    formatted_time = time.xmlschema
+    formatted_time = time.xmlschema.sub(/:00$/, "00")
     expect(auto_reply_message(time: time).to_s).to include %(time="#{formatted_time}")
   end
 

data/spec/pipio/messages/event_spec.rb

@@ -7,7 +7,7 @@ describe Pipio::Event, '#to_s' do
 
   it 'has the correct time' do
     time = Time.now
-    formatted_time = time.xmlschema
+    formatted_time = time.xmlschema.sub(/:00$/, "00")
     result = create_event(time: time).to_s
     expect(result).to include %(time="#{formatted_time}")
   end

data/spec/pipio/messages/status_message_spec.rb

@@ -7,7 +7,7 @@ describe Pipio::StatusMessage, '#to_s' do
 
   it 'has the correct time' do
     time = Time.now
-    formatted_time = time.xmlschema
+    formatted_time = time.xmlschema.sub(/:00$/, "00")
     result = create_status_message(time: time).to_s
     expect(result).to include %(time="#{formatted_time}")
   end
@@ -28,10 +28,6 @@ describe Pipio::StatusMessage, '#to_s' do
     expect(create_status_message.to_s).to match(/^<status/)
   end
 
-  it 'ends in a newline' do
-    expect(create_status_message.to_s).to match(/\n$/)
-  end
-
   def create_status_message(opts = {})
     opts[:sender_screen_name] ||= 'jim_sender'
     opts[:time] ||= Time.now

data/spec/pipio/messages/xml_message_spec.rb

@@ -9,7 +9,7 @@ describe Pipio::XMLMessage, '#to_s' do
 
   it 'has the correct time' do
     time = Time.now
-    formatted_time = time.xmlschema
+    formatted_time = time.xmlschema.sub(/:00$/, "00")
     expect(create_xml_message(time: time).to_s).to include %(time="#{formatted_time}")
   end
 

data/spec/pipio/metadata_spec.rb

@@ -1,8 +1,8 @@
 describe Pipio::Metadata do
   context '#service' do
-    it "returns the service" do
-      metadata = Pipio::Metadata.new(service: 'aim')
-      expect(metadata.service).to eq('aim')
+    it "returns the service name" do
+      metadata = Pipio::Metadata.new(service: "aim")
+      expect(metadata.service).to eq "aim"
     end
   end
 

data/spec/pipio/parser_factory_spec.rb

@@ -1,5 +1,5 @@
 describe Pipio::ParserFactory do
-  let(:aliases) { '' }
+  let(:aliases) { [] }
 
   %w(html htm HTML).each do |html_extension|
     context "when passed a .#{html_extension} file" do

data/spec/pipio/parsers/html_log_parser_spec.rb

@@ -149,12 +149,12 @@ describe Pipio::HtmlLogParser do
     end
   end
 
-  def build_chat(aliases = 'Gabe B-W', &block)
+  def build_chat(aliases = ['Gabe B-W'], &block)
     file = create_chat_file('file.html', &block)
-    Pipio::HtmlLogParser.new(file.path, aliases).parse
+    Pipio::HtmlLogParser.new(file.path, Array(aliases)).parse
   end
 
-  def first_line_of_chat(aliases = 'Gabe B-W', &block)
-    build_chat(aliases, &block).messages.first
+  def first_line_of_chat(aliases = ['Gabe B-W'], &block)
+    build_chat(Array(aliases), &block).messages.first
   end
 end

data/spec/pipio/parsers/text_log_parser_spec.rb

@@ -30,8 +30,8 @@ describe Pipio::TextLogParser do
     end
   end
 
-  def build_chat(aliases = 'Gabe B-W', &block)
+  def build_chat(aliases = ['Gabe B-W'], &block)
     path = create_chat_file('file.txt', &block).path
-    Pipio::TextLogParser.new(path, aliases).parse
+    Pipio::TextLogParser.new(path, Array(aliases)).parse
   end
 end

data/spec/pipio_spec.rb

@@ -58,6 +58,6 @@ describe Pipio, ".parse" do
   end
 
   def aliases
-    ''
+    []
   end
 end

data/spec/spec_helper.rb

@@ -9,6 +9,8 @@ require 'mocha/api'
 
 Dir['spec/support/**/*.rb'].each { |f| require File.expand_path(f) }
 
+SPEC_ROOT = File.dirname(__FILE__)
+
 RSpec.configure do |config|
   config.mock_with :mocha
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipio
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Gabe Berke-Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -106,6 +106,9 @@ files:
 - lib/pipio/time_parser.rb
 - lib/pipio/version.rb
 - pipio.gemspec
+- spec/features/parsing_an_html_file_spec.rb
+- spec/fixtures/input.html
+- spec/fixtures/output.xml
 - spec/pipio/alias_registry_spec.rb
 - spec/pipio/chat_spec.rb
 - spec/pipio/cleaners/html_cleaner_spec.rb
@@ -161,6 +164,9 @@ signing_key:
 specification_version: 4
 summary: A fast, easy way to parse Pidgin (gaim) logs
 test_files:
+- spec/features/parsing_an_html_file_spec.rb
+- spec/fixtures/input.html
+- spec/fixtures/output.xml
 - spec/pipio/alias_registry_spec.rb
 - spec/pipio/chat_spec.rb
 - spec/pipio/cleaners/html_cleaner_spec.rb