rmsgen 0.0.3 → 0.0.5

data/features/multiple_url.feature

@@ -3,9 +3,8 @@ Feature: Inquiring about multiple urls
   As a helper
   I want to be be able to input information on multiple urls
 
-  @setup_polnote_directory
-  Scenario: Two urls
-    Given a file named "polnote" with:
+  Scenario: It asks for a title and link text
+    Given a polnote:
     """
     A story about something.
 
@@ -15,17 +14,12 @@ Feature: Inquiring about multiple urls
 
     http://test.com
     """
-    And I cd to ".."
-    Given a file named "config.yml" with:
-    """
-    email_dir: polnotes
-    """
-    Given I run `rmsgen -c config.yml` interactively
-    And I type "The Title"
-    And I type "something"
-    And I type "something"
+    Given I run rmsgen
+    And I type "The Title" for the title
+    And I type "something" for the link text
+    And I type "something else" for the link text
     Then the output should contain:
     """
     <p>A story about <a href='http://test.com'>something</a>.</p>
-    <p>And <a href='http://test.com'>something</a> else</p>
+    <p>And <a href='http://test.com'>something else</a></p>
     """

data/features/raw_email.feature

@@ -3,9 +3,8 @@ Feature: Generate polnote from full email
   As a helper
   I want a pol note from a full raw email
 
-  @setup_polnote_directory
   Scenario: Raw email is stripped to just the body
-    Given a file named "polnote" with:
+    Given a polnote:
     """
     Return-Path: <rms@gnu.org>
     X-Original-To: stallman-helpers@netpurgatory.com
@@ -43,12 +42,7 @@ Feature: Generate polnote from full email
     Skype: No way! That's nonfree (freedom-denying) software.
     Use free telephony http://directory.fsf.org/category/tel/
     """
-    And I cd to ".."
-    Given a file named "config.yml" with:
-    """
-    email_dir: polnotes
-    """
-    Given I run `rmsgen -c config.yml` interactively
+    Given I run rmsgen
     And I type "A title"
     And I type "Text"
     Then the output should contain:

data/features/setting_title.feature

@@ -4,19 +4,18 @@ Feature: Helper sets title
   I want to be asked for title text 
   and shown the proper html output
 
-  @setup_polnote_directory
-  Scenario: Helper sets title
-    Given a file named "polnote" with:
+  Background:
+    Given a polnote:
     """
     A story about something.
     """
+    And I run rmsgen
 
-    And I cd to ".."
-    And a file named "config.yml" with:
-    """
-    email_dir: polnotes
-    """
+  Scenario: Helper sets title
+    When I type "I Like Turtles" 
+    Then I should see a title for "I Like Turtles"
 
-    When I run `rmsgen -c config.yml` interactively
-    And I type "I Like Turtles" 
+  Scenario: Helper capitalizes each word in the title
+    When I type "i like turtles" 
     Then I should see a title for "I Like Turtles"
+

data/features/standard_pol_note.feature

@@ -5,20 +5,15 @@ Feature: Managing a standard polnote
 
   @setup_polnote_directory
   Scenario: A standard polnote 
-    Given a file named "polnote" with:
+    Given a polnote:
     """
     A story about something.
 
     http://test.com
     """
-    And I cd to ".."
-    Given a file named "config.yml" with:
-    """
-    email_dir: polnotes
-    """
-    Given I run `rmsgen -c config.yml` interactively
-    And I type "The Title"
-    And I type "something"
+    Given I run rmsgen
+    And I type "The Title" for the title
+    And I type "something" for the link text
 
     Then the output should contain:
     """ 

data/features/step_definitions/urgent_polnote_steps.rb

@@ -7,6 +7,7 @@ Given /^I am ready to do polnotes/ do
 end
 
 Given /^an urgent polnote exists$/ do
+  cd 'polnotes'
   polnote = fixture("urgent_note")  
   write_file("urgent", polnote)
   cd '..'

data/features/support/hooks.rb

@@ -1,8 +0,0 @@
-Before('@setup_polnote_directory') do
-  Given %{a directory named "polnotes"}
-  Given %{I cd to "polnotes"}
-end
-
-Before('@urgent_note') do
-  Given %{an urgent polnote exists}
-end

data/features/urgent_polnote.feature

@@ -4,29 +4,24 @@ Feature: Urgent Polnotes
   I want to see the html output for the polnote section
   and for the urgent section
 
-  @setup_polnote_directory @urgent_note
   Scenario: I see the html for the polnote section
+    Given I am ready to do polnotes
+    Given an urgent polnote exists
     Given a file named "config.yml" with:
     """
     email_dir: polnotes
     """
-    Given I run `rmsgen -c config.yml` interactively
+    Given I run rmsgen
 
-    When I type "Urgent Note"
-    And I type "01 July 2011"
-    And I type "tell"
+    When I type "Urgent Note" for the title
+    And I type "01 July 2011" 
+    And I type "tell" for the link text
 
     Then I should see a title for "Urgent Note"
     And the output should contain:
     """
     What day does it expire? 
     """
-
-    And the output should contain:
-    """
-    <!-- Expires 01 July 2011 -->
-    """
-
     Then the output should not contain:
     """
     <p>For one week:</p>

data/lib/rmsgen/fs_polnote_group.rb

@@ -3,7 +3,7 @@ module Rmsgen
     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(note) }
+      @notes = @raw_notes.map { |note| Rmsgen::Polnote.new(:body => note) }
     end
     def all
       @notes

data/lib/rmsgen/imap_polnote_group.rb

@@ -2,10 +2,13 @@ module Rmsgen
   class IMAPPolnoteGroup
     require 'net/imap'
 
-    def initialize(imap, options={})
-      @imap = 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
@@ -14,10 +17,10 @@ module Rmsgen
       find_all_from_rms
     end
 
-    def note_ids
+    def init_note_ids
       authenticate
       follow_inbox
-      @imap.search(["FROM", 'rms@gnu.org'])
+      imap.search(["FROM", 'rms@gnu.org'])
     end
 
     def find(id)
@@ -26,14 +29,13 @@ module Rmsgen
     end
 
     def archive_polnote(id)
-      authenticate
       follow_inbox
       archived = false
-      @imap.search(["FROM", 'rms@gnu.org']).each do |note_id|
+      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
+          imap.copy id.to_i, 'INBOX.old-messages' 
+          imap.store(id.to_i, "+FLAGS", [:Deleted])
+          imap.expunge
           archived = true
         end
       end
@@ -42,24 +44,26 @@ module Rmsgen
 
     private
 
+    def imap
+      @imap ||= Net::IMAP.new(@imap_options['imap_server'])
+    end
+
     def authenticate
-      @imap.authenticate 'LOGIN', @login, @password 
+      imap.authenticate 'LOGIN', @login, @password 
     end
 
     def follow_inbox
-      @imap.select 'INBOX' 
+      imap.select 'INBOX' 
     end
 
     def find_all_from_rms
-      if note_ids && note_ids.any?
-        note_ids.map { |id| fetch_message_body(id) }
-      end
+      @note_ids.map { |id| fetch_message_body(id) }
     end
 
     def fetch_message_body(id)
-      fetch_result = @imap.fetch id, 'BODY[TEXT]' 
+      fetch_result = imap.fetch id, 'RFC822' 
       if fetch_result && fetch_result.any?
-        fetch_result[0].attr['BODY[TEXT]']
+        fetch_result[0].attr['RFC822']
       end
     end
   end

data/lib/rmsgen/inquirer.rb

@@ -63,7 +63,12 @@ module Rmsgen
     end
 
     def inquire_about_expiration
-      @polnote.expires_on = @script.prompt_for_expiry_date
+      if @answers.empty?
+        answer = @script.prompt_for_expiry_date
+      else
+        answer = @answers.shift
+      end
+      @polnote.expires_on = answer
     end
 
     def append_to_previous_paragraph part 

data/lib/rmsgen/polnote.rb

@@ -3,12 +3,14 @@ module Rmsgen
     attr_accessor :id, :title, :body, :expires_on
 
     URGENT_SUBJECT = 'Subject: Urgent note'
-    TEMPLATE = File.join(File.dirname(__FILE__), '..', 'templates', 'polnote.erb')
 
-    def initialize(source, options={})
-      @body   = source.dup
-      @urgent = source.include? URGENT_SUBJECT
-      @id     = options[:id]
+    POLNOTE_TEMPLATE = File.join(File.dirname(__FILE__), '..', 'templates', 'polnote.erb')
+    URGENT_TEMPLATE = File.join(File.dirname(__FILE__), '..', 'templates', 'urgent.erb')
+
+    def initialize(attributes={})
+      @body   = attributes[:body]
+      @urgent = sanitize_urgent_attribute(attributes[:urgent]) || (@body && @body.include?(URGENT_SUBJECT))
+      @id     = attributes[:id]
       compress!
     end
 
@@ -29,7 +31,11 @@ module Rmsgen
     end
 
     def to_html
-      ERB.new(File.read(TEMPLATE)).result(binding)
+      ERB.new(File.read(POLNOTE_TEMPLATE)).result(binding)
+    end
+
+    def to_urgent_html
+      ERB.new(File.read(URGENT_TEMPLATE)).result(binding)
     end
 
     private
@@ -37,5 +43,11 @@ module Rmsgen
     def compress!
       @body = Compresser.new(self).body
     end
+
+    def sanitize_urgent_attribute(attribute)
+      return false if attribute == 'false'
+      return true if attribute == 'true'
+      attribute
+    end
   end
 end

data/lib/rmsgen/runtime.rb

@@ -9,14 +9,11 @@ module Rmsgen
     end
 
     def run!
-      if @notes
-        @notes.each do |note|
-          system('clear')
-          polnote = Rmsgen::Inquirer.inquire_about_note(note)
-          write(polnote)
-        end
-      else
-        puts 'no polnotes in queue'
+      puts 'no polnotes in queue' if @notes.empty?
+      @notes.each do |note|
+        system('clear')
+        polnote = Rmsgen::Inquirer.inquire_about_note(note)
+        write(polnote)
       end
     end
 
@@ -39,18 +36,17 @@ module Rmsgen
       else
         notes = fetch_notes_from_imap
       end
-      notes.map { |note| Rmsgen::Polnote.new(note) } if notes
+      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'] 
       }
 
-      imap = Net::IMAP.new(@config['imap_server'])
-      Rmsgen::IMAPPolnoteGroup.new(imap, options).fetch_notes
+      Rmsgen::IMAPPolnoteGroup.new(options).fetch_notes
     end
-
   end
 end

data/lib/rmsgen/titleizer.rb

@@ -1,14 +1,17 @@
 module Rmsgen
   class Titleizer
+    SPACE = ' '
+    UNDERSCORE = '_'
+
     TEMPLATE = File.join(File.dirname(__FILE__), '..', 'templates', 'title.erb')
 
     attr_reader :title
 
     def initialize(polnote, options={})
-      @body = polnote.body
-      @title = options[:title]
+      @title   = options[:title]
+      @body    = polnote.body
+      @script  = Script.new($stdout)
 
-      @script = Script.new($stdout)
       run!
     end
 
@@ -16,28 +19,34 @@ module Rmsgen
       ERB.new(File.read(TEMPLATE)).result(binding)
     end
 
-    def today_format
-      Date.today.strftime('%d %B %Y')
+    def to_html
+      body
     end
 
-    def today_underscore
-      today_format.gsub(' ', '_')
+    private
+
+    def run!
+      @title = capitalize(get_title_from_options_or_script)
     end
 
-    def title_underscore
-      @title.gsub(' ', '_')
+    def get_title_from_options_or_script
+      @title || @script.prompt_for_title
     end
 
-    def to_html
-      body
+    def capitalize(title=SPACE)
+      title.split(SPACE).map(&:capitalize).join(SPACE)
     end
 
-    private
-    
-    def run!
-      @title = @script.prompt_for_title unless @title
-      body
+    def today_format
+      Date.today.strftime('%d %B %Y')
     end
 
+    def today_underscore
+      today_format.gsub(SPACE, UNDERSCORE)
+    end
+
+    def title_underscore
+      @title.gsub(SPACE, UNDERSCORE)
+    end
   end
 end

data/lib/rmsgen/version.rb

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

data/lib/templates/polnote.erb

@@ -1,2 +1,2 @@
-<%= "<!-- Expires #{@expires_on} -->" if @expires_on %><%= @title %><% parts.map do |part| %><% if part =~ /<!--/ %><%= part %><% else %><p><%= part %></p><% end %>
+<%= @title %><% parts.map do |part| %><% if part =~ /<!--/ %><%= part %><% else %><p><%= part %></p><% end %>
 <% end %>

data/lib/templates/urgent.erb

@@ -0,0 +1,3 @@
+<li><%= "<!-- Expires #{@expires_on} -->" if @expires_on %>
+<% parts.map do |part| %><% if part =~ /<!--/ %><%= part %><% else %><p><%= part %></p><% end %><% end %>
+</li>

data/spec/imap_polnote_group_spec.rb

@@ -2,8 +2,9 @@ require 'rmsgen'
 
 describe Rmsgen::IMAPPolnoteGroup do
   context 'fetching notes' do
-    let(:imap) { double('imap') }
+    let(:imap) { double('foo') }
     let(:options) do { 
+        'imap_server' => 'foo.bar.com',
         'imap_login'  => 'login',
         'imap_password' => 'password'} 
     end
@@ -11,8 +12,9 @@ describe Rmsgen::IMAPPolnoteGroup do
     let(:do_fetch) do
       imap.should_receive(:search).any_number_of_times
       imap.should_receive(:authenticate).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(imap, options).fetch_notes
+      Rmsgen::IMAPPolnoteGroup.new(options).fetch_notes
     end
 
     it 'authenticates with imap server' do
@@ -36,7 +38,7 @@ describe Rmsgen::IMAPPolnoteGroup do
 
       imap.stub(:search) { search_result }
 
-      imap.should_receive(:fetch).with(message_id, 'BODY[TEXT]')
+      imap.should_receive(:fetch).with(message_id, 'RFC822')
       do_fetch
     end
   end

data/spec/inqirer_spec.rb

@@ -7,7 +7,7 @@ describe Rmsgen::Inquirer do
   let(:stdout) { StringIO.new }
 
   describe "inquires about a note which is indented" do
-    let(:note) { Rmsgen::Polnote.new("foo\n\nhttp://\n\n   bar") }
+    let(:note) { Rmsgen::Polnote.new(:body => "foo\n\nhttp://\n\n   bar") }
 
     subject { Rmsgen::Inquirer.new(note, stdout) }
 
@@ -22,7 +22,7 @@ describe Rmsgen::Inquirer do
   end
 
   describe "it inquires about each link in a note" do
-    let(:note) { Rmsgen::Polnote.new("foo\n\nhttp://\n\nbar\n\nhttp://") }
+    let(:note) { Rmsgen::Polnote.new(:body => "foo\n\nhttp://\n\nbar\n\nhttp://") }
     subject { Rmsgen::Inquirer.new(note, stdout) }
 
     before do
@@ -37,7 +37,7 @@ describe Rmsgen::Inquirer do
 
   describe "inquiring about a duration" do
     it "asks for the end date of the duration" do
-      note = Rmsgen::Polnote.new("For one week:\n\nUrgent: blah blah blah")
+      note = Rmsgen::Polnote.new(:body => "For one week:\n\nUrgent: blah blah blah")
       $stdin = FakeGetMany.new("July 1")
       Rmsgen::Inquirer.new(note, stdout)
       note.expires_on.should be == "July 1"
@@ -46,7 +46,7 @@ describe Rmsgen::Inquirer do
 
   describe 'when a blank answer is given' do
     it 'returns the polnote text without links' do
-      note = Rmsgen::Polnote.new("foo bar\n\nhttp://")
+      note = Rmsgen::Polnote.new(:body => "foo bar\n\nhttp://")
       $stdin = FakeGetMany.new("")
       inquirer = Rmsgen::Inquirer.new(note, stdout)
       inquirer.body.should be == "foo bar"

data/spec/polnote_spec.rb

@@ -9,7 +9,7 @@ describe Rmsgen::Polnote do
 
   context "urgent polnote truthfully responds to urgent?" do
     let(:urgent) { fixture(:urgent_note) }  
-    let(:polnote) { Rmsgen::Polnote.new(urgent) } 
+    let(:polnote) { Rmsgen::Polnote.new(:body => urgent) } 
 
     it "truthfully responds to urgent?" do
       polnote.urgent?.should be true
@@ -20,7 +20,7 @@ describe Rmsgen::Polnote do
     let(:imap_note) { fixture(:imap_note) }
 
     it "has parts" do
-      note = Rmsgen::Polnote.new(imap_note)
+      note = Rmsgen::Polnote.new(:body => imap_note)
       note.parts.should == ['hello', 'world']
     end
   end
@@ -35,7 +35,7 @@ describe Rmsgen::Polnote do
 
       $stdout = StringIO.new
       $stdin = FakeGetMany.new(text_a, polnote_url, text_b)
-      polnote = Rmsgen::Polnote.new(note)
+      polnote = Rmsgen::Polnote.new(:body => note)
       polnote.inquire
       polnote.to_html.should ==
         %Q{<p>Somewhere over the <a href='http://rainbow.org'>rainbow</a>.</p>
@@ -52,7 +52,7 @@ describe Rmsgen::Polnote do
       text_a = "Somewhere"
       text_b = "Candy"
       $stdin = FakeGetMany.new(text_a, text_b)
-      polnote = Rmsgen::Polnote.new(multiline_note)
+      polnote = Rmsgen::Polnote.new(:body => multiline_note)
       polnote.inquire
       polnote.to_html.should == "<p> <a href='http://unicorns.org'>Somewhere</a> over the rainbow skies are blue</p>\n<p>Candy is sweet and unicorns are too</p>\n\n"
     end

data/spec/runtime_spec.rb

@@ -23,7 +23,7 @@ describe Rmsgen::Runtime do
         imap_note = mock(:note)
         notes = [imap_note] 
 
-        imap_note.stub(:attr) { {"BODY[TEXT]"=>"hello world"} }
+        imap_note.stub(:attr) { {"RFC822"=>"hello world"} }
         imap.stub(:authenticate)
         imap.stub(:select)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmsgen
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-09 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-09-19 00:00:00.000000000Z
 dependencies: []
 description: A library to help generate html markup from RMS emails
 email:
@@ -62,6 +61,7 @@ files:
 - lib/rmsgen/version.rb
 - lib/templates/polnote.erb
 - lib/templates/title.erb
+- lib/templates/urgent.erb
 - rmsgen.gemspec
 - spec/fake_gets.rb
 - spec/fixtures/imap_note
@@ -75,7 +75,6 @@ files:
 - spec/polnote_spec.rb
 - spec/runtime_spec.rb
 - spec/support/fake_gets.rb
-has_rdoc: true
 homepage: ''
 licenses: []
 post_install_message: 
@@ -96,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rmsgen
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A library to help generate html markup from RMS emails