Permalink
Browse files

Version bump to 2.1.5.1

  • Loading branch information...
1 parent 0b143d6 commit 3c9adb078bd8583b4361ccd41aaa24b1a42f3bee @mikel mikel committed Mar 28, 2010
Showing with 25 additions and 14 deletions.
  1. +10 −0 CHANGELOG.rdoc
  2. +1 −1 Rakefile
  3. +2 −1 lib/mail/version.rb
  4. +12 −12 spec/mail/network/retriever_methods/pop3_spec.rb
View
@@ -1,3 +1,13 @@
+== Sun 28 Mar 2010 09:02:20 UTC Mikel Lindsaar <raasdnil@gmail.com>
+
+* Version bump to 2.1.5.1
+* Fixed net/pop3.rb regression for Ruby 1.8.6
+* Merged in Jeremy Kemper's updates:
+ * Bump vendored treetop to 1.4.4
+ * Use Mikel's treetop for cucumber workaround
+ * Use LOAD_PATH for spec_helper instead of relative requires
+ * Force treetop from git so cucumber doesn't pull in old version
+
== Sun Mar 28 07:01:07 UTC 2010 Mikel Lindsaar <raasdnil@gmail.com>
* Version bump to 2.1.5
View
@@ -8,7 +8,7 @@ require 'cucumber/rake/task'
spec = Gem::Specification.new do |s|
s.name = "mail"
- s.version = "2.1.5"
+ s.version = "2.1.5.1"
s.author = "Mike Lindsaar"
s.email = "raasdnil@gmail.com"
s.homepage = "http://github.com/mikel/mail"
View
@@ -4,7 +4,8 @@ module VERSION
MAJOR = 2
MINOR = 1
TINY = 5
+ MICRO = 1
- STRING = [MAJOR, MINOR, TINY].join('.')
+ STRING = [MAJOR, MINOR, TINY, MICRO].join('.')
end
end
@@ -25,7 +25,7 @@
messages << message
end
- messages.map(&:raw_source).sort.should == MockPOP3.popmails.map(&:pop).sort
+ messages.map { |m| m.raw_source }.sort.should == MockPOP3.popmails.map { |p| p.pop }.sort
MockPOP3.should_not be_started
end
@@ -37,7 +37,7 @@
messages << message
end
- messages.map(&:raw_source).sort.should == MockPOP3.popmails.map(&:pop).sort
+ messages.map { |m| m.raw_source }.sort.should == MockPOP3.popmails.map { |p| p.pop }.sort
MockPOP3.should_not be_started
end
@@ -47,29 +47,29 @@
it "should handle the :count option" do
messages = Mail.find(:count => :all, :what => :last, :order => :asc)
- messages.map(&:raw_source).sort.should == MockPOP3.popmails.map(&:pop)
+ messages.map { |m| m.raw_source }.sort.should == MockPOP3.popmails.map { |p| p.pop }
message = Mail.find(:count => 1, :what => :last)
- message.raw_source.should == MockPOP3.popmails.map(&:pop).last
+ message.raw_source.should == MockPOP3.popmails.map { |p| p.pop }.last
messages = Mail.find(:count => 2, :what => :last, :order => :asc)
- messages[0..1].collect {|m| m.raw_source}.should == MockPOP3.popmails.map(&:pop)[-2..-1]
+ messages[0..1].collect {|m| m.raw_source}.should == MockPOP3.popmails.map { |p| p.pop }[-2..-1]
end
it "should handle the :what option" do
messages = Mail.find(:count => :all, :what => :last)
- messages.map(&:raw_source).sort.should == MockPOP3.popmails.map(&:pop)
+ messages.map { |m| m.raw_source }.sort.should == MockPOP3.popmails.map { |p| p.pop }
messages = Mail.find(:count => 2, :what => :first, :order => :asc)
- messages.map(&:raw_source).should == MockPOP3.popmails.map(&:pop)[0..1]
+ messages.map { |m| m.raw_source }.should == MockPOP3.popmails.map { |p| p.pop }[0..1]
end
it "should handle the :order option" do
messages = Mail.find(:order => :desc, :count => 5, :what => :last)
- messages.map(&:raw_source).should == MockPOP3.popmails.map(&:pop)[-5..-1].reverse
+ messages.map { |m| m.raw_source }.should == MockPOP3.popmails.map { |p| p.pop }[-5..-1].reverse
messages = Mail.find(:order => :asc, :count => 5, :what => :last)
- messages.map(&:raw_source).should == MockPOP3.popmails.map(&:pop)[-5..-1]
+ messages.map { |m| m.raw_source }.should == MockPOP3.popmails.map { |p| p.pop }[-5..-1]
end
it "should find the last 10 messages by default" do
@@ -86,7 +86,7 @@
messages = Mail.last(:count => 5)
messages.should be_instance_of(Array)
- messages.map(&:raw_source).should == MockPOP3.popmails.map(&:pop)[-5..-1]
+ messages.map { |m| m.raw_source }.should == MockPOP3.popmails.map { |p| p.pop }[-5..-1]
end
it "should find the last received message" do
@@ -104,7 +104,7 @@
messages = Mail.first(:count => 5)
messages.should be_instance_of(Array)
- messages.map(&:raw_source).should == MockPOP3.popmails.map(&:pop)[0..4]
+ messages.map { |m| m.raw_source }.should == MockPOP3.popmails.map { |p| p.pop }[0..4]
end
it "should find the first received message" do
@@ -122,7 +122,7 @@
messages = Mail.all
messages.size.should == MockPOP3.popmails.size
- messages.map(&:raw_source).should == MockPOP3.popmails.map(&:pop)
+ messages.map { |m| m.raw_source }.should == MockPOP3.popmails.map { |p| p.pop }
end
end

0 comments on commit 3c9adb0

Please sign in to comment.