spf 0.0.36 → 0.0.37

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -127,7 +127,7 @@ class SPF::Server
127
127
  end
128
128
  end
129
129
 
130
- def dns_lookup(domain, rr_type)
130
+ def dns_lookup(domain, rr_type, &block)
131
131
  if SPF::MacroString === domain
132
132
  domain = domain.expand
133
133
  # Truncate overlong labels at 63 bytes (RFC 4408, 8.1/27)
@@ -142,7 +142,7 @@ class SPF::Server
142
142
 
143
143
  packet = nil
144
144
  begin
145
- packet = @dns_resolver.getresources(domain, rr_type)
145
+ packet = block_given? ? yield(domain, rr_type) : @dns_resolver.getresources(domain, rr_type)
146
146
  rescue Resolv::TimeoutError => e
147
147
  raise SPF::DNSTimeoutError.new(
148
148
  "Time-out on DNS '#{rr_type}' lookup of '#{domain}'")
@@ -567,8 +567,8 @@ class SPF::Mech < SPF::Term
567
567
 
568
568
  def nested_record(server=nil, request=nil, loose_match = false)
569
569
  return @nested_record if @nested_record
570
+ return nil unless server and request
570
571
  authority_domain = self.domain(server, request)
571
- return nil unless request
572
572
  sub_request = request.new_sub_request({:authority_domain => authority_domain})
573
573
  return @nested_record = server.select_record(sub_request, loose_match)
574
574
  end
@@ -810,6 +810,7 @@ class SPF::Mod < SPF::Term
810
810
 
811
811
  def nested_record(server=nil, request=nil)
812
812
  return @nested_record if @nested_record
813
+ return nil unless server and request
813
814
  server.count_dns_interactive_term(request)
814
815
  authority_domain = self.domain(server, request)
815
816
  sub_request = request.new_sub_request({:authority_domain => authority_domain})
@@ -1,5 +1,5 @@
1
1
  module SPF
2
- VERSION = '0.0.36'
2
+ VERSION = '0.0.37'
3
3
  end
4
4
 
5
5
  # vim:sw=2 sts=2
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "spf"
8
- s.version = "0.0.36"
8
+ s.version = "0.0.37"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Andrew Flury", "Julian Mehnle"]
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spf
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.36
4
+ version: 0.0.37
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors: