luggage 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05ff8f011e4e73d7be9c891dac56c206f28d9fc4
-  data.tar.gz: 92a3d1845a0de22df435c7f3e78eec6150a69f24
+  metadata.gz: 4dcaf5c5940857410afb20c4e5bca8e13dcd7104
+  data.tar.gz: 019ce4b62e899a33b2119bb24b1d0f327ea3c634
 SHA512:
-  metadata.gz: 00a3930bf00f7376a0b43f8f25b857b7f44b1c3b68d5fe80e9bcde1127914eb546cb80b2692d6580d270c15966246a01157948621914725d63107ec0f395f6cd
-  data.tar.gz: 2c8fed78b22756f2a80d26f1bbd558c75faba9161a3b3b624688c4cdb2dcf91fbd1d9401987fabebb28a1b8d9b3396ff771f9d31cd0b41099442885fb9912f0f
+  metadata.gz: 99b5fea709397491179ab1f6c19c6e2b04ea6b933f2eae238f39e2d670120c02520618e01763315d31a2a1aa44a40f3ec55901af07a0635c441d1c7ddeb01408
+  data.tar.gz: da1204cc9373fa4703403ace74d4058b8458011fce034df33baa80903091ec22e069d8282f0dee25de7aedebbdbe52eb547e04102d7bf553cbb43b9da9bbcbb3

data/CHANGES.md

@@ -1,5 +1,9 @@
 #Changes
 
+## 1.1.2
+
+* Remove hidden reliance on ActiveRecord's `#present?` helper. - Ben Hamill
+
 ## 1.1.1
 
 * Fix bug when trying to use XOAUTH to authenticate. - Ben Hamill

data/lib/luggage/mailbox.rb

@@ -28,7 +28,9 @@ module Luggage
     # Returns true if this mailbox exists on the remote server, false otherwise
     #
     def exists?
-      @exists ||= connection.list("", name).present?
+      return @exists if instance_variable_defined?(:@exists)
+
+      @exists = !connection.list("", name).empty?
     end
 
     # Deletes this mailbox on the remote server

data/lib/luggage/message.rb

@@ -36,7 +36,7 @@ module Luggage
     # `connection` should be an authenticated Imap connection
     # `mailbox` should be either a Mailbox or a string describing a remote mailbox
     # `args[:date]` when this message is appended to the remote server, this is the date which will be used
-    # `args[:template]` use this file as the initial raw email content.  
+    # `args[:template]` use this file as the initial raw email content.
     # `args[:message_id]` use this as for the Message-ID header.  This header is used to identify messages across requests
     #
     def initialize(connection, mailbox, args = {}, &block)
@@ -87,10 +87,10 @@ module Luggage
     #
     def exists?
       mailbox.select!
-      connection.uid_search("HEADER Message-ID #{message_id}").present?
+      connection.uid_search("HEADER Message-ID #{message_id}")
     end
 
-    # Proxy all other methods to this instance's Mail::Message 
+    # Proxy all other methods to this instance's Mail::Message
     #
     def method_missing(meth, *args, &block)
        if mail.respond_to?(meth)
@@ -117,16 +117,15 @@ module Luggage
     end
 
     def mail
-      reload unless @mail.present?
+      reload if @mail.nil?
       @mail
     end
 
     def uid
-      unless @uid.present?
-        mailbox.select!
-        @uid = fetch_uid
-      end
-      @uid
+      return @uid if instance_variable_defined?(:@uid)
+
+      mailbox.select!
+      @uid = fetch_uid
     end
 
     def fetch_uid

data/lib/luggage/version.rb

@@ -1,3 +1,3 @@
 module Luggage
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/luggage/factory_spec.rb

@@ -42,9 +42,9 @@ describe Luggage::Factory do
   describe "#mailboxes" do
     before(:each) do
       connection.stub(:list).
-        and_return([ 
-          OpenStruct.new(:name => "Mailbox_1"), 
-          OpenStruct.new(:name => "Mailbox_2"), 
+        and_return([
+          OpenStruct.new(:name => "Mailbox_1"),
+          OpenStruct.new(:name => "Mailbox_2"),
           OpenStruct.new(:name => "Mailbox_3"),
           OpenStruct.new(:name => "Mailbox_4") ])
     end

data/spec/luggage/message_spec.rb

@@ -62,7 +62,7 @@ describe Luggage::Message do
     end
 
     it "sets date if passed" do
-      date = 2.days.ago
+      date = Date.today - 2
       expect(Luggage::Message.new(connection, :mailbox, :date => date).date).to eq(date)
     end
 
@@ -90,7 +90,7 @@ describe Luggage::Message do
     it "fetches raw email" do
       connection.should_receive(:uid_fetch).
         with([1], ["FLAGS", "INTERNALDATE", "BODY.PEEK[]"]).
-        and_return( [{:attr => {"BODY[]" => "raw_body", "FLAGS" => [], "INTERNALDATE" => 1.day.ago.to_s}}]  )
+        and_return( [{:attr => {"BODY[]" => "raw_body", "FLAGS" => [], "INTERNALDATE" => (Time.now - 60 * 60 * 24).to_s}}]  )
 
       message.reload
     end
@@ -98,7 +98,7 @@ describe Luggage::Message do
     it "fetches flags" do
       connection.should_receive(:uid_fetch).
         with([1], ["FLAGS", "INTERNALDATE", "BODY.PEEK[]"]).
-        and_return( [{:attr => {"BODY[]" => "raw_body", "FLAGS" => [], "INTERNALDATE" => 1.day.ago.to_s}}]  )
+        and_return( [{:attr => {"BODY[]" => "raw_body", "FLAGS" => [], "INTERNALDATE" => (Time.now - 60 * 60 * 24).to_s}}]  )
 
       message.reload
     end
@@ -120,7 +120,7 @@ describe Luggage::Message do
     end
 
     it "appends message to mailbox" do
-      message_date = 2.days.ago
+      message_date = Date.today - 2
       message.stub(:raw_message).and_return("Random Content")
       message.stub(:flags).and_return([:Seen])
       message.stub(:date).and_return(message_date)

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'rspec'
 require 'rspec/mocks'
 require 'rspec/expectations'
-require 'active_support/time'
 require 'pry'
 
 require 'luggage'
@@ -24,7 +23,13 @@ shared_context "factories" do
     c.stub(:select)
     c.stub(:send_command)
     c.stub(:uid_store)
-    c.stub(:uid_fetch).and_return( [{:attr => {"BODY[]" => "raw_body", "FLAGS" => [], "INTERNALDATE" => 1.day.ago.to_s}}]  )
+    c.stub(:uid_fetch).and_return([{
+      :attr => {
+        "BODY[]" => "raw_body",
+        "FLAGS" => [],
+        "INTERNALDATE" => (Time.now - 60 * 60 * 24).to_s
+      }
+    }])
     c.stub(:uid_search).and_return([1])
     c.stub(:list).and_return([])
     c

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luggage
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Ryan Michael