spf 0.0.6 → 0.0.7

data/lib/spf/model.rb

@@ -302,21 +302,18 @@ class SPF::Mech < SPF::Term
 
     ipv4_prefix_length = @ipv4_prefix_length
     ipv6_prefix_length = @ipv6_prefix_length
-    addr_rr_type       = request.ip_address.version == 4 ? 'A' : 'AAAA'
-    packet             = server.dns_lookup(domain, addr_rr_type)
-    server.count_void_dns_lookup(request) unless (rrs = packet.answer)
+    packet             = server.dns_lookup(domain, 'ANY')
+    server.count_void_dns_lookup(request) unless (rrs = packet)
 
     rrs.each do |rr|
-      if rr.type == 'A'
+      if Resolv::DNS::Resource::IN::A === rr
         network = IP.new("#{rr.address}/#{ipv4_prefix_length}")
         @ip_netblocks << network
         return true if network.contains?(request.ip_address)
-      elsif rr.type == 'AAAA'
+      elsif Resolv::DNS::Resource::IN::AAAA === rr
         network = IP.new("#{rr.address}/#{ipv6_prefix_length}")
         @ip_netblocks << network
         return true if network.contains?(request.ip_address_v6)
-      elsif rr.type == 'CNAME'
-        # Ignore -- we should have gotten the A/AAAA records anyway.
       else
         # Unexpected RR type.
         # TODO: Generate debug info or ignore silently.
@@ -358,13 +355,13 @@ class SPF::Mech < SPF::Term
     def params
       params = ''
       if @domain_spec
-        params += ':' + @domain_spec if @domain_spec
+        params += ':' + @domain_spec.to_s if @domain_spec
       end
       if @ipv4_prefix_length and @ipv4_prefix_length != self.default_ipv4_prefix_length
-        params += '/' + @ipv4_prefix_length
+        params += '/' + @ipv4_prefix_length.to_s
       end
       if @ipv6_prefix_length and @ipv6_prefix_length != DEFAULT_IPV6_PREFIX_LENGTH
-        params += '//' + @ipv6_prefix_length
+        params += '//' + @ipv6_prefix_length.to_s
       end
       return params
     end
@@ -791,6 +788,7 @@ class SPF::Record
 
   def ip_netblocks
     @ip_netblocks.flatten!
+    return @ip_netblocks
   end
 
   def parse
@@ -857,7 +855,7 @@ class SPF::Record
       # Looks like a modifier:
       mod_text  = $1
       mod_name  = $2.downcase
-      mod_class = MOD_CLASSES[mod_name]
+      mod_class = self.class::MOD_CLASSES[mod_name]
       if mod_class
         # Known modifier.
         term = mod = mod_class.new_from_string(mod_text)

data/lib/spf/version.rb

@@ -1,5 +1,5 @@
 module SPF
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 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.6"
+  s.version = "0.0.7"
 
   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.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -119,9 +119,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3002258988282268889
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: