spf 0.0.36 → 0.0.37

data/lib/spf/eval.rb

@@ -127,7 +127,7 @@ class SPF::Server
       end
   end
 
-  def dns_lookup(domain, rr_type)
+  def dns_lookup(domain, rr_type, &block)
     if SPF::MacroString === domain
       domain = domain.expand
       # Truncate overlong labels at 63 bytes (RFC 4408, 8.1/27)
@@ -142,7 +142,7 @@ class SPF::Server
 
     packet = nil
     begin
-      packet = @dns_resolver.getresources(domain, rr_type)
+      packet = block_given? ? yield(domain, rr_type) : @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/model.rb

@@ -567,8 +567,8 @@ class SPF::Mech < SPF::Term
 
     def nested_record(server=nil, request=nil, loose_match = false)
       return @nested_record if @nested_record
+      return nil unless server and request
       authority_domain = self.domain(server, request)
-      return nil unless request
       sub_request = request.new_sub_request({:authority_domain => authority_domain})
       return @nested_record = server.select_record(sub_request, loose_match)
     end
@@ -810,6 +810,7 @@ class SPF::Mod < SPF::Term
 
     def nested_record(server=nil, request=nil)
       return @nested_record if @nested_record
+      return nil unless server and request
       server.count_dns_interactive_term(request)
       authority_domain = self.domain(server, request)
       sub_request = request.new_sub_request({:authority_domain => authority_domain})

data/lib/spf/version.rb

@@ -1,5 +1,5 @@
 module SPF
-  VERSION = '0.0.36'
+  VERSION = '0.0.37'
 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.36"
+  s.version = "0.0.37"
 
   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.36
+  version: 0.0.37
   prerelease: 
 platform: ruby
 authors: