lib/ronin/mac_address.rb in ronin-1.0.0.pre3 vs lib/ronin/mac_address.rb in ronin-1.0.0.pre4

@@ -1,23 +1,22 @@
 #
-# Ronin - A Ruby platform for exploit development and security research.
+# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
-# Copyright (c) 2009-2010 Hal Brodigan (postmodern.mod3 at gmail.com)
+# This file is part of Ronin.
 #
-# This program is free software; you can redistribute it and/or modify
+# Ronin is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# Ronin is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 require 'ronin/address'
 require 'ronin/ip_address_mac_address'
 require 'ronin/model'
@@ -39,16 +38,12 @@
     #   The IP Address that most recently used the MAC Address.
     #
     # @since 1.0.0
     #
     def recent_ip_address
-      relation = self.ip_address_mac_addresses.first(
+      self.ip_address_mac_addresses.all(
         :order => [:created_at.desc]
-      )
-
-      if relation
-        return relation.ip_address
-      end
+      ).ip_addresses.first
     end
 
     #
     # Converts the MAC address to an Integer.
     #