rmsgen 0.0.5 → 0.0.6

data/lib/acts_like/string.rb

@@ -0,0 +1,13 @@
+require 'forwardable'
+
+module ActsLike
+  module String
+    extend Forwardable
+
+    def initialize(str='')
+      @str = str
+    end
+
+    def_delegators :@str, :to_s, :gsub!, :[], :strip, :<<, :empty?
+  end
+end

data/lib/rmsgen.rb

@@ -2,6 +2,17 @@ require 'yaml'
 require 'erb'
 
 module Rmsgen
+  %w{ header
+      footer
+      plain_text
+      url
+      polnote_url_request
+      indented_line
+      duration
+  }.each do |fname|
+    require File.join(File.dirname(__FILE__), 'rmsgen', 'parts', fname)
+  end
+
   %w{ part_group
       polnote
       titleizer
@@ -9,13 +20,14 @@ module Rmsgen
       script
       inquirer
       runtime
+      part
       link
+      imap_client
       imap_polnote_group
       fs_polnote_group
+      polnote_group
+
   }.each do |fname|
     require File.join(File.dirname(__FILE__), 'rmsgen', fname)
   end
 end
-
-
-

data/lib/rmsgen/compresser.rb

@@ -1,13 +1,12 @@
 module Rmsgen
   class Compresser
-    def initialize(polnote)
-      @polnote = polnote
-      @parts = polnote.parts
+    def initialize(part_group=[])
+      @part_group = part_group
       run!
     end
 
     def body
-      @parts.join PartGroup::DELIMETER
+      @part_group.join PartGroup::DELIMETER
     end
 
     private
@@ -19,15 +18,15 @@ module Rmsgen
     end
 
     def rm_header
-      @parts.delete_if { |x| x =~ /Return-Path:/ }
+      @part_group.delete_if { |x| x.is_a?(Rmsgen::Parts::Header) }
     end
 
     def rm_footer
-      @parts.delete_if { |x| x =~ /Dr Richard Stallman/ } 
+      @part_group.delete_if { |x| x.is_a?(Rmsgen::Parts::Footer) }
     end
 
     def single_line_paragraphs
-      @parts.each { |part| part.gsub!("\n", '') }
+      @part_group.each { |part| part.gsub!("\n", ' ') }
     end
   end
 end

data/lib/rmsgen/fs_polnote_group.rb

@@ -1,12 +1,22 @@
 module Rmsgen
   class FsPolnoteGroup
     def initialize(dir=nil)
-      splat_dir = "#{dir}/*"
-      @raw_notes = Dir[splat_dir].map { |f| File.read(f) }
-      @notes = @raw_notes.map { |note| Rmsgen::Polnote.new(:body => note) }
+      @note_bodies = note_bodies_from_directory(dir)
+      @notes = build_many_polnotes(@note_bodies)
     end
+
     def all
       @notes
     end
+
+    private
+
+    def note_bodies_from_directory(dir)
+      Dir["#{dir}/*"].map { |f| File.read(f) }
+    end
+
+    def build_many_polnotes(note_bodies)
+      note_bodies.map { |body| Rmsgen::Polnote.new(:body => body)  }
+    end
   end
 end

data/lib/rmsgen/imap_client.rb

@@ -0,0 +1,60 @@
+require 'rmsgen'
+require 'net/imap'
+require 'forwardable'
+
+module Rmsgen
+  class IMAPClient
+    INBOX = 'INBOX'
+    RMS_EMAIL = 'rms@gnu.org'
+    RFC822 = 'RFC822'
+
+    extend Forwardable
+
+    def initialize(options)
+      @server = options['imap_server']
+      @login = options['imap_login']
+      @password = options['imap_password']
+      @imap_client = Net::IMAP.new(@server)
+    end
+
+    def_delegators :@imap_client, :select, :search, :fetch, :copy, :store, :expunge
+  
+    def authenticate
+      @imap_client.authenticate('LOGIN', @login, @password)
+    end
+
+    def fetch_polnote_messages_from_inbox(&block)
+      authenticate
+      select INBOX
+      find_all_from_rms(&block)
+    end
+
+    def find_by_id(id)
+      select INBOX
+      fetch_message_body(id)
+    end
+
+    private
+
+    def find_all_from_rms
+      search_for_notes.map do |id|
+        if block_given?
+          yield(fetch_message_body(id), id)
+        else
+          fetch_message_body(id)
+        end
+      end
+    end
+
+    def search_for_notes(&block)
+      search(["FROM", RMS_EMAIL], &block)
+    end
+
+    def fetch_message_body(id)
+      fetch_result = fetch id, RFC822
+      if fetch_result && fetch_result.any?
+        fetch_result[0].attr[RFC822]
+      end
+    end
+  end
+end

data/lib/rmsgen/imap_polnote_group.rb

@@ -1,26 +1,14 @@
 module Rmsgen
   class IMAPPolnoteGroup
-    require 'net/imap'
 
-    attr_reader :note_ids
-
-    def initialize(options={})
-      @imap_options = options
-      @login  = options['imap_login']
-      @password = options['imap_password']
-      @note_ids = init_note_ids || []
-    end
-
-    def fetch_notes
-      authenticate
-      follow_inbox
-      find_all_from_rms
+    def initialize(imap_client)
+      @imap_client = imap_client
     end
 
-    def init_note_ids
-      authenticate
-      follow_inbox
-      imap.search(["FROM", 'rms@gnu.org'])
+    def all
+      @imap_client.fetch_polnote_messages_from_inbox do |body, id|
+        Polnote.new :body => body, :id => id
+      end
     end
 
     def find(id)
@@ -29,42 +17,21 @@ module Rmsgen
     end
 
     def archive_polnote(id)
+      @imap_client.authenticate 
       follow_inbox
-      archived = false
-      imap.search(["FROM", 'rms@gnu.org']).each do |note_id|
-        if note_id.to_i == id.to_i
-          imap.copy id.to_i, 'INBOX.old-messages' 
-          imap.store(id.to_i, "+FLAGS", [:Deleted])
-          imap.expunge
-          archived = true
-        end
-      end
-      archived
+      move_to_archives(id)
     end
 
     private
-
-    def imap
-      @imap ||= Net::IMAP.new(@imap_options['imap_server'])
-    end
-
-    def authenticate
-      imap.authenticate 'LOGIN', @login, @password 
+    
+    def move_to_archives(id)
+      @imap_client.copy id.to_i, 'INBOX.old-messages' 
+      @imap_client.store(id.to_i, "+FLAGS", [:Deleted])
+      @imap_client.expunge
     end
 
     def follow_inbox
-      imap.select 'INBOX' 
-    end
-
-    def find_all_from_rms
-      @note_ids.map { |id| fetch_message_body(id) }
-    end
-
-    def fetch_message_body(id)
-      fetch_result = imap.fetch id, 'RFC822' 
-      if fetch_result && fetch_result.any?
-        fetch_result[0].attr['RFC822']
-      end
+      @imap_client.select 'INBOX' 
     end
   end
 end

data/lib/rmsgen/inquirer.rb

@@ -1,11 +1,5 @@
 module Rmsgen
   class Inquirer
-    PARTS = { :url => /^http/, 
-      :note =>/\[Link/,
-        :duration => /^For.*week.*$/,
-        :indendation => /^   / 
-    }
-
     attr_reader :polnote
 
     def initialize polnote, stdout=$stdout, answers=nil
@@ -35,13 +29,13 @@ module Rmsgen
 
     def run!
       @parts.each do |part|
-        if part =~ PARTS[:duration]
+        if part.is_a?(Rmsgen::Parts::Duration)
           inquire_about_expiration
-        elsif part =~ PARTS[:url]
+        elsif part.is_a?(Rmsgen::Parts::Url)
           inquire_about_link part 
-        elsif part =~ PARTS[:note]
+        elsif part.is_a?(Rmsgen::Parts::PolnoteUrlRequest)
           inquire_about_polnote_link part  
-        elsif part =~ PARTS[:indendation]
+        elsif part.is_a?(Rmsgen::Parts::IndentedLine)
           append_to_previous_paragraph part 
         else
           @parts_seen << part

data/lib/rmsgen/part.rb

@@ -0,0 +1,19 @@
+module Rmsgen
+  module Part
+
+    TOKEN_PARTS = {
+      /^http/ => Rmsgen::Parts::Url,
+      /Return-Path:/ => Rmsgen::Parts::Header,
+      /\[Link/i => Rmsgen::Parts::PolnoteUrlRequest,
+      /Dr Richard Stallman/ => Rmsgen::Parts::Footer,
+      /^   / => Rmsgen::Parts::IndentedLine,
+      /^For.*week.*$/ => Rmsgen::Parts::Duration
+    }
+
+    def self.parse(raw)
+      token_part = TOKEN_PARTS.find { |pattern, part| raw =~ pattern }
+      return Rmsgen::Parts::PlainText.new(raw) unless token_part
+      token_part[1].new(raw)
+    end
+  end
+end

data/lib/rmsgen/part_group.rb

@@ -1,23 +1,51 @@
-class PartGroup < Array
-  attr_reader :text
+require 'forwardable'
 
-  DELIMETER = "\n\n"
+class PartGroup
+  extend Forwardable
+  include Comparable
+
+  # Carriage return new line.
+  #
+  CRNL        = /\r\n/
+  CRNL_CRNL   = /\r\n\r\n/
+  DELIMETER   = "\n\n"
+  NL          = /\n/
+  NL_NL       = /\n\n/
+  NL_PLACEHOLDER = '[newline]'
+  SPACE       = ' '
+
+  attr_reader :text, :parts
+
+  def_delegators :@parts, :delete_if, :<<, :each, :join, 
+    :inject, :each_with_index, :[], :map, :size
 
   def initialize(text)
     @text = text
+    @parts = []
     assign_parts!
   end
 
+  def <=>(other)
+    parts.map(&:to_s) <=> other.map(&:to_s)
+  end
+
+  private
+
   def assign_parts!
-    if @text.match /\r\n\r\n/
-      @text.gsub!(/\r\n\r\n/, "\n\n")
-      @text.gsub!(/\r\n/, " ")
-      @text.gsub!(/\n\n\n\n/, "")
-    else
-      @text.gsub!(/\n\n/, '[newline]')
-      @text.gsub!(/\n/, ' ')
-      @text.gsub!('[newline]', "\n\n")
-    end
-    @text.split(DELIMETER).delete_if(&:empty?).each { |p| self << p }
+    massage_linebreaks
+    parts = @text.split(DELIMETER)
+    assign_parsed_parts(parts)
+    @parts.delete_if(&:empty?)
+  end
+
+  def assign_parsed_parts(parts)
+    parts.each { |p| @parts << Rmsgen::Part.parse(p) }
+  end
+
+  def massage_linebreaks
+    @text.gsub!(CRNL_CRNL, DELIMETER)
+    @text.gsub!(CRNL, SPACE)
+    @text.gsub!(NL_NL, NL_PLACEHOLDER)
+    @text.gsub!(NL_PLACEHOLDER, DELIMETER)
   end
 end

data/lib/rmsgen/parts/duration.rb

@@ -0,0 +1,7 @@
+module Rmsgen
+  module Parts
+    class Duration
+      include ActsLike::String
+    end
+  end
+end

data/lib/rmsgen/parts/footer.rb

@@ -0,0 +1,7 @@
+module Rmsgen
+  module Parts
+    class Footer
+      include ActsLike::String
+    end
+  end
+end

data/lib/rmsgen/parts/header.rb

@@ -0,0 +1,9 @@
+require 'acts_like/string'
+
+module Rmsgen
+  module Parts
+    class Header
+      include ActsLike::String
+    end
+  end
+end

data/lib/rmsgen/parts/indented_line.rb

@@ -0,0 +1,7 @@
+module Rmsgen
+  module Parts
+    class IndentedLine
+      include ActsLike::String
+    end
+  end
+end

data/lib/rmsgen/parts/plain_text.rb

@@ -0,0 +1,5 @@
+module Rmsgen::Parts
+  class PlainText
+    include ActsLike::String
+  end
+end

data/lib/rmsgen/parts/polnote_url_request.rb

@@ -0,0 +1,8 @@
+module Rmsgen
+  module Parts
+    class PolnoteUrlRequest
+      include ActsLike::String
+    end
+  end
+end
+

data/lib/rmsgen/parts/url.rb

@@ -0,0 +1,5 @@
+module Rmsgen::Parts
+  class Url
+    include ActsLike::String
+  end
+end

data/lib/rmsgen/polnote.rb

@@ -19,15 +19,23 @@ module Rmsgen
     end
 
     def titleize
-      @title = Titleizer.new(self).body
+      @title = Titleizer.new(self).to_html
     end
 
     def inquire
       @body = Inquirer.new(self).body
     end
 
-    def parts
-      PartGroup.new(@body)
+    def include?(pattern)
+      @body.include?(pattern)
+    end
+
+    def gsub!(x, y)
+      @body.gsub!(x, y)
+    end
+
+    def split(x)
+      @body.split(x)
     end
 
     def to_html
@@ -38,10 +46,14 @@ module Rmsgen
       ERB.new(File.read(URGENT_TEMPLATE)).result(binding)
     end
 
+    def parts
+      PartGroup.new(@body)
+    end
+
     private
 
     def compress!
-      @body = Compresser.new(self).body
+      @body = Compresser.new(parts).body
     end
 
     def sanitize_urgent_attribute(attribute)

data/lib/rmsgen/polnote_group.rb

@@ -0,0 +1,19 @@
+module Rmsgen
+  module PolnoteGroup
+    def self.fetch(source)
+      polnote_group = group(source)
+      polnote_group.all
+    end
+
+
+    private
+
+    def self.group(source)
+      case source
+      when String then Rmsgen::FsPolnoteGroup.new(source) 
+      else
+        Rmsgen::IMAPPolnoteGroup.new(source)
+      end
+    end
+  end
+end

data/lib/rmsgen/runtime.rb

@@ -1,10 +1,11 @@
 module Rmsgen
   class Runtime
+
     def initialize(config)
       @config = config
       raise "Ensure you have populated a config file" unless @config
-      @output = @config['output_file']
-      @notes = fetch_notes 
+      @output = config['output_file']
+      @notes = PolnoteGroup.fetch(polnote_source)
       run!
     end
 
@@ -12,13 +13,26 @@ module Rmsgen
       puts 'no polnotes in queue' if @notes.empty?
       @notes.each do |note|
         system('clear')
-        polnote = Rmsgen::Inquirer.inquire_about_note(note)
+        polnote = Rmsgen::Polnote.new(:body => note)
+        Rmsgen::Inquirer.inquire_about_note(polnote)
         write(polnote)
       end
     end
 
     private
 
+    def polnote_source
+      @config['email_dir'] || Rmsgen::IMAPClient.new(imap_options)
+    end
+
+    def imap_options  
+      { 
+        'imap_server' => @config['imap_server'],
+        'imap_login' => @config['imap_login'],
+        'imap_password' => @config['imap_password'] 
+      }
+    end
+
     def write(note)
       if @output
         File.open(@output, 'a') do |file|
@@ -29,24 +43,5 @@ module Rmsgen
         puts
       end
     end
-
-    def fetch_notes
-      if @config['email_dir']
-        notes = Dir["#{@config['email_dir']}/*"].map { |f| File.read(f) }
-      else
-        notes = fetch_notes_from_imap
-      end
-      notes.map { |note| Rmsgen::Polnote.new(:body => note) } if notes
-    end
-
-    def fetch_notes_from_imap
-      options = { 
-        'imap_server' => @config['imap_server'],
-        'imap_login' => @config['imap_login'],
-        'imap_password' => @config['imap_password'] 
-      }
-
-      Rmsgen::IMAPPolnoteGroup.new(options).fetch_notes
-    end
   end
 end

data/lib/rmsgen/titleizer.rb

@@ -11,16 +11,11 @@ module Rmsgen
       @title   = options[:title]
       @body    = polnote.body
       @script  = Script.new($stdout)
-
       run!
     end
 
-    def body
-      ERB.new(File.read(TEMPLATE)).result(binding)
-    end
-
     def to_html
-      body
+      ERB.new(File.read(TEMPLATE)).result(binding)
     end
 
     private
@@ -29,12 +24,12 @@ module Rmsgen
       @title = capitalize(get_title_from_options_or_script)
     end
 
-    def get_title_from_options_or_script
-      @title || @script.prompt_for_title
+    def capitalize(str)
+      str.split(SPACE).map(&:capitalize).join(SPACE)
     end
 
-    def capitalize(title=SPACE)
-      title.split(SPACE).map(&:capitalize).join(SPACE)
+    def get_title_from_options_or_script
+      @title || @script.prompt_for_title
     end
 
     def today_format

data/lib/rmsgen/version.rb

@@ -1,3 +1,3 @@
 module Rmsgen
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/fixtures/urgent_note

@@ -25,8 +25,7 @@ for raising the debt ceiling.
 
 http://
 
-Once in a while, when enough people demand it, Obama does what he
-ought to do.
+Once in a while, when enough people demand it, Obama does what he ought to do.
 
 -- 
 Dr Richard Stallman

data/spec/imap_client_spec.rb

@@ -0,0 +1,70 @@
+require 'rmsgen'
+
+describe Rmsgen::IMAPClient do
+  let(:imap_options) do
+    { 
+      'imap_server' => 'mail.example.com',
+      'imap_login' => 'login',
+      'imap_password' => 'password'
+    }
+  end
+
+  it 'authenticates with the server' do
+    net_imap_instance = mock
+    Net::IMAP.should_receive(:new).with('mail.example.com').and_return(net_imap_instance)
+    net_imap_instance.should_receive(:authenticate).with('LOGIN', 'login', 'password').and_return(nil)
+    imap_client = Rmsgen::IMAPClient.new(imap_options)
+    imap_client.authenticate
+  end
+
+  context 'fetches messages from the inbox' do
+    before do
+      @net_imap_instance = mock(:search => [], :select => [])
+      @message_collection = mock(:message_collection)
+      Net::IMAP.should_receive(:new).with('mail.example.com').and_return(@net_imap_instance)
+      @client = Rmsgen::IMAPClient.new(imap_options)
+      @client.should_receive(:authenticate).once
+    end
+
+    after do
+      @client.fetch_polnote_messages_from_inbox
+    end
+
+    it 'delegates select to the imap client' do
+      @net_imap_instance.should_receive(:select).once.with('INBOX')
+    end
+
+    it 'delegates search to ' do
+      @net_imap_instance.should_receive(:search).once.with(["FROM", 'rms@gnu.org'])
+    end
+
+    it 'delegates fetch to imap client and uses RFC822' do
+      @net_imap_instance.should_receive(:search).and_return([1])
+      fetch_result = [mock(:notes, :attr => { "RFC822" => 'Hello World'} )]
+      @net_imap_instance.should_receive(:fetch).once.with(1, 'RFC822').and_return(fetch_result)
+    end
+  end
+
+  context 'finding a single message body' do
+    let(:net_imap_instance) { mock(:net_imap, :select => nil, :fetch => []) }
+    let(:client) do
+      Rmsgen::IMAPClient.new(imap_options)
+    end
+
+    before do
+      Net::IMAP.should_receive(:new).with('mail.example.com').and_return(net_imap_instance)
+    end
+
+    after do
+      client.find_by_id(1)
+    end
+
+    it 'delegates select to imap client' do
+      net_imap_instance.should_receive(:select).once.with('INBOX')
+    end
+
+    it 'calls fetch for the id' do
+      net_imap_instance.should_receive(:fetch).with(1, 'RFC822').once
+    end
+  end
+end

data/spec/imap_polnote_group_spec.rb

@@ -1,45 +1,34 @@
 require 'rmsgen'
 
 describe Rmsgen::IMAPPolnoteGroup do
-  context 'fetching notes' do
-    let(:imap) { double('foo') }
-    let(:options) do { 
-        'imap_server' => 'foo.bar.com',
-        'imap_login'  => 'login',
-        'imap_password' => 'password'} 
-    end
+  context 'fetching notes from an imap server' do
+    let(:imap) { double('imap client') }
 
-    let(:do_fetch) do
-      imap.should_receive(:search).any_number_of_times
+    let(:set_imap_expectations_and_get_all) do
+      imap.should_receive(:fetch_polnote_messages_from_inbox).any_number_of_times
       imap.should_receive(:authenticate).any_number_of_times
+      imap.should_receive(:search).any_number_of_times
       Net::IMAP.should_receive(:new).any_number_of_times.and_return(imap)
       imap.should_receive(:select).any_number_of_times
-      Rmsgen::IMAPPolnoteGroup.new(options).fetch_notes
+      Rmsgen::IMAPPolnoteGroup.new(imap).all
     end
 
-    it 'authenticates with imap server' do
-      imap.should_receive(:authenticate).any_number_of_times.with('LOGIN', 'login', 'password')
-      do_fetch
+    after(:each) do
+      set_imap_expectations_and_get_all
     end
 
     it 'selects the inbox folder' do
       imap.should_receive(:select).any_number_of_times.with('INBOX')
-      do_fetch
-    end
-
-    it 'searches for messages from rms' do
-      imap.should_receive(:search).once.with(["FROM", 'rms@gnu.org'])
-      do_fetch
     end
 
     it 'fetches each message' do
-      message_id = double('message_id')
-      search_result = [message_id] 
 
-      imap.stub(:search) { search_result }
+    #  message_id = double('message_id')
+    #  search_result = [message_id] 
+
+    #  imap.stub(:search) { search_result }
 
-      imap.should_receive(:fetch).with(message_id, 'RFC822')
-      do_fetch
+    #  imap.should_receive(:fetch).with(message_id, 'RFC822')
     end
   end
 end

data/spec/part_group_spec.rb

@@ -3,19 +3,16 @@ require 'rmsgen'
 describe PartGroup do
   it "accepts text as input" do
     input = "hello\n\nworld"
-    p = PartGroup.new(input)
-    p.text.should be == input
+    PartGroup.new(input).text.should be == input
   end
 
   it "output list of parts ordered by appearance" do
     input = "\n\n\n\n1\n\n2\n\n3\n\n4"
-    p = PartGroup.new(input)
-    p.should == ['1', '2', '3', '4']
+    PartGroup.new(input).should == ['1', '2', '3', '4']
   end
 
   it "splits input into parts based on carriage return and newline" do
     input = "1\r\n\r\n2\r\n\r\n3\r\n\r\n4"
-    p = PartGroup.new(input)
-    p.should == ['1', '2', '3', '4']
+    PartGroup.new(input).should == ['1', '2', '3', '4']
   end
 end

data/spec/part_spec.rb

@@ -0,0 +1,51 @@
+require 'rmsgen'
+
+describe Rmsgen::Parts::PlainText do
+  context 'behaving like a string' do
+    it 'returns the input string' do
+      p = Rmsgen::Parts::PlainText.new('foo')
+      p.to_s.should == 'foo'
+    end
+  end
+end
+
+describe Rmsgen::Parts::PolnoteUrlRequest do
+  context 'behaving like a string' do
+    it 'returns the input string' do
+      p = Rmsgen::Parts::PolnoteUrlRequest.new('foo')
+      p.to_s.should == 'foo'
+    end
+  end
+end
+
+describe Rmsgen::Part do
+  context 'parse' do
+    it 'detects a url' do
+      subject.parse('http').should be_instance_of(Rmsgen::Parts::Url)
+    end
+
+    it 'detects the headers' do
+      subject.parse('Return-Path:').should be_instance_of(Rmsgen::Parts::Header)
+    end
+
+    it 'detects an indented line' do
+      subject.parse('   hello world').should be_instance_of(Rmsgen::Parts::IndentedLine)
+    end
+
+    it 'detects a duration' do
+      subject.parse('For one week').should be_instance_of(Rmsgen::Parts::Duration)
+    end
+
+    it 'detects plain text' do
+      subject.parse('bla blah blah').should be_instance_of(Rmsgen::Parts::PlainText)
+    end
+
+    it 'detects a polnote url request' do
+      subject.parse('[Link to a polnote]').should be_instance_of(Rmsgen::Parts::PolnoteUrlRequest)
+    end
+
+    it 'detects a downcased polnote url request' do
+      subject.parse('[link').should be_instance_of(Rmsgen::Parts::PolnoteUrlRequest) 
+    end
+  end
+end

data/spec/polnote_group.rb

@@ -0,0 +1,24 @@
+require 'rmsgen'
+
+describe Rmsgen::PolnoteGroup do
+  context '.fetch' do
+    context 'from a file system' do
+      it 'collects file contents' do
+        file_system_polnote_group = mock
+        file_system_polnote_group.should_receive(:all)
+        Rmsgen::PolnoteGroup.should_receive(:group).and_return(file_system_polnote_group)
+        Rmsgen::PolnoteGroup.fetch('/some/path')
+      end
+    end
+
+    context 'from an imap server' do
+      it 'collects email contents' do
+        imap_polnote_group = mock
+        imap_polnote_group.should_receive(:all)
+        Rmsgen::PolnoteGroup.should_receive(:group).and_return(imap_polnote_group)
+        imap_options = { 'imap_server' => 'foo.test.com', 'imap_login' => 'login', 'imap_password' => 'password' }
+        Rmsgen::PolnoteGroup.fetch(imap_options)
+      end
+    end
+  end
+end

data/spec/polnote_spec.rb

@@ -2,7 +2,6 @@ require 'rmsgen'
 require 'fake_gets'
 
 describe Rmsgen::Polnote do
-
   def fixture(name)
     File.read("spec/fixtures/#{name}")
   end
@@ -21,7 +20,7 @@ describe Rmsgen::Polnote do
 
     it "has parts" do
       note = Rmsgen::Polnote.new(:body => imap_note)
-      note.parts.should == ['hello', 'world']
+      note.parts.size.should be == 2
     end
   end
 
@@ -29,12 +28,8 @@ describe Rmsgen::Polnote do
     let(:note) { fixture(:link_to_polnote) }
 
     it 'parses the body' do
-      text_a = "rainbow"
-      polnote_url = "http://somenote"
-      text_b = "blue"
-
       $stdout = StringIO.new
-      $stdin = FakeGetMany.new(text_a, polnote_url, text_b)
+      $stdin = FakeGetMany.new('rainbow', 'http://somenote', 'blue')
       polnote = Rmsgen::Polnote.new(:body => note)
       polnote.inquire
       polnote.to_html.should ==

data/spec/runtime_spec.rb

@@ -12,23 +12,13 @@ describe Rmsgen::Runtime do
 
     context 'when and there is a note' do
       let(:runtime) { Rmsgen::Runtime }
-      let(:imap) { mock(:imap) }
-      let(:search_result) { mock(:search_result) }
+      let(:imap) { stub(:imap) }
 
       it 'fetches the note' do
         $stdout = StringIO.new
         $stdin = FakeGet.new('hello')
-        Net::IMAP.should_receive(:new).with('mail.test.org') { imap }
-        runtime.any_instance.stub(:system)
-        imap_note = mock(:note)
-        notes = [imap_note] 
-
-        imap_note.stub(:attr) { {"RFC822"=>"hello world"} }
-        imap.stub(:authenticate)
-        imap.stub(:select)
-
-        imap.stub(:search) { [search_result] }
-        imap.stub(:fetch) { notes }
+        Rmsgen::IMAPClient.should_receive(:new).and_return(imap)
+        imap.should_receive(:fetch_polnote_messages_from_inbox).and_return([])
         expect { runtime.new(config).run! }.to_not raise_error
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmsgen
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-19 00:00:00.000000000Z
+date: 2011-09-30 00:00:00.000000000Z
 dependencies: []
 description: A library to help generate html markup from RMS emails
 email:
@@ -46,15 +46,26 @@ files:
 - features/support/env.rb
 - features/support/hooks.rb
 - features/urgent_polnote.feature
+- lib/acts_like/string.rb
 - lib/rmsgen.rb
 - lib/rmsgen/cli/main.rb
 - lib/rmsgen/compresser.rb
 - lib/rmsgen/fs_polnote_group.rb
+- lib/rmsgen/imap_client.rb
 - lib/rmsgen/imap_polnote_group.rb
 - lib/rmsgen/inquirer.rb
 - lib/rmsgen/link.rb
+- lib/rmsgen/part.rb
 - lib/rmsgen/part_group.rb
+- lib/rmsgen/parts/duration.rb
+- lib/rmsgen/parts/footer.rb
+- lib/rmsgen/parts/header.rb
+- lib/rmsgen/parts/indented_line.rb
+- lib/rmsgen/parts/plain_text.rb
+- lib/rmsgen/parts/polnote_url_request.rb
+- lib/rmsgen/parts/url.rb
 - lib/rmsgen/polnote.rb
+- lib/rmsgen/polnote_group.rb
 - lib/rmsgen/runtime.rb
 - lib/rmsgen/script.rb
 - lib/rmsgen/titleizer.rb
@@ -69,9 +80,12 @@ files:
 - spec/fixtures/multiline_note
 - spec/fixtures/urgent_note
 - spec/fs_polnote_group_spec.rb
+- spec/imap_client_spec.rb
 - spec/imap_polnote_group_spec.rb
 - spec/inqirer_spec.rb
 - spec/part_group_spec.rb
+- spec/part_spec.rb
+- spec/polnote_group.rb
 - spec/polnote_spec.rb
 - spec/runtime_spec.rb
 - spec/support/fake_gets.rb