spf 0.0.37 → 0.0.38

data/lib/spf/eval.rb

@@ -68,8 +68,9 @@ class SPF::Server
       DEFAULT_MAX_NAME_LOOKUPS_PER_MX_MECH
     @max_name_lookups_per_ptr_mech = options[:max_name_lookups_per_ptr_mech] ||
       DEFAULT_MAX_NAME_LOOKUPS_PER_PTR_MECH
-    @max_void_dns_lookups          = options[:max_void_dns_lookups]          ||
-      DEFAULT_MAX_VOID_DNS_LOOKUPS
+
+    # TODO: We should probably do this for the above maximums (allow nil maximums).
+    @max_void_dns_lookups          = options.has_key?(:max_void_dns_lookups) ? options[:max_void_dns_lookups] : DEFAULT_MAX_VOID_DNS_LOOKUPS
 
     @raise_exceptions = options.has_key?(:raise_exceptions) ? options[:raise_exceptions] : true
 
@@ -127,7 +128,7 @@ class SPF::Server
       end
   end
 
-  def dns_lookup(domain, rr_type, &block)
+  def dns_lookup(domain, rr_type)
     if SPF::MacroString === domain
       domain = domain.expand
       # Truncate overlong labels at 63 bytes (RFC 4408, 8.1/27)
@@ -142,7 +143,7 @@ class SPF::Server
 
     packet = nil
     begin
-      packet = block_given? ? yield(domain, rr_type) : @dns_resolver.getresources(domain, rr_type)
+      packet = @dns_resolver.getresources(domain, rr_type)
     rescue Resolv::TimeoutError => e
       raise SPF::DNSTimeoutError.new(
         "Time-out on DNS '#{rr_type}' lookup of '#{domain}'")

data/lib/spf/version.rb

@@ -1,5 +1,5 @@
 module SPF
-  VERSION = '0.0.37'
+  VERSION = '0.0.38'
 end
 
 # vim:sw=2 sts=2

data/spf.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "spf"
-  s.version = "0.0.37"
+  s.version = "0.0.38"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Flury", "Julian Mehnle"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spf
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.38
   prerelease: 
 platform: ruby
 authors: