whois 1.1.6 → 1.1.7

data/CHANGELOG.rdoc

@@ -1,6 +1,11 @@
 = Changelog
 
 
+== Release 1.1.7
+
+* FIXED: method `to_time' not defined in DateTime (NameError) when the library is used with Ruby 1.9.1 and Rails (closes #24)
+
+
 == Release 1.1.6
 
 * NEW: Added simple .in.ua TLD parser (whois.in.ua). It seems that .in.ua is handled separately from .ua.

data/lib/core_ext.rb

@@ -2,7 +2,8 @@ unless :to_proc.respond_to?(:to_proc)
   class Symbol
     # Turns the symbol into a simple proc, 
     # which is especially useful for enumerations.
-    # 
+    # Extracted from ActiveSupport.
+    #
     # Examples
     #
     #   # The same as people.collect { |p| p.name }
@@ -22,15 +23,15 @@ end
 require 'date'
 
 class DateTime
-  # Ruby 1.9 has DateTime#to_time which internally relies on Time. We define our own #to_time which allows
-  # DateTimes outside the range of what can be created with Time.
-  remove_method :to_time if instance_methods.include?(:to_time)
-
-  # Attempts to convert self to a Ruby Time object; returns self if out of range of Ruby Time class
-  # Extracted from ActiveSupport.
-  #
-  # If self has an offset other than 0, self will just be returned unaltered, since there's no clean way to map it to a Time.
-  def to_time
-    self.offset == 0 ? ::Time.utc(year, month, day, hour, min, sec) : self
+  # Don't remove method if exists or it will conflict with ActiveRecord.
+  # See http://github.com/weppos/whois/issues#issue/24
+  unless method_defined?(:to_time)
+    # Attempts to convert self to a Ruby Time object; returns self if out of range of Ruby Time class
+    # Extracted from ActiveSupport.
+    #
+    # If self has an offset other than 0, self will just be returned unaltered, since there's no clean way to map it to a Time.
+    def to_time
+      self.offset == 0 ? ::Time.utc(year, month, day, hour, min, sec) : self
+    end
   end
 end

data/lib/whois/version.rb

@@ -19,7 +19,7 @@ module Whois
   module Version
     MAJOR = 1
     MINOR = 1
-    PATCH = 6
+    PATCH = 7
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/whois.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whois}
-  s.version = "1.1.6"
+  s.version = "1.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simone Carletti"]
-  s.date = %q{2010-05-26}
+  s.date = %q{2010-05-27}
   s.default_executable = %q{ruby-whois}
   s.description = %q{    Whois is an intelligent WHOIS client and parser written in pure Ruby.     It can query registry data for IPv4, IPv6 and top level domains,     parse and convert responses into easy-to-use Ruby objects.
 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whois
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 1
-  - 6
-  version: 1.1.6
+  - 7
+  version: 1.1.7
 platform: ruby
 authors: 
 - Simone Carletti
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 +02:00
+date: 2010-05-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency