spf 0.0.25 → 0.0.26

data/lib/spf/eval.rb

@@ -189,8 +189,8 @@ class SPF::Server
       end
     end
 
-    if (not records.any? and
-        @query_rr_types == QUERY_RR_TYPES_ALL or
+    if (not records.flatten.any? and
+        @query_rr_types == QUERY_RR_TYPE_ALL or
         @query_rr_types & QUERY_RR_TYPE_TXT)
       # NOTE:
       #   This deliberately violates RFC 4406 (Sender ID), 4.4/3 (4.4.1):

data/lib/spf/model.rb

@@ -494,8 +494,6 @@ class SPF::Mech < SPF::Term
       params =  @ip_network.to_addr
       params += '/' + @ip_network.pfxlen.to_s if
         @ip_network.pfxlen != self.default_ipv6_prefix_length
-      puts "params: #{params}"
-      puts self.inspect
       return params
     end
 
@@ -543,7 +541,7 @@ class SPF::Mech < SPF::Term
       return false if
         SPF::Result::Fail     === result or
         SPF::Result::SoftFail === result or
-        SPF::Result::Neutral  === result or
+        SPF::Result::Neutral  === result
 
       server.throw_result('permerror', request,
         "Include domain '#{authority_domain}' has no applicable sender policy") if

data/lib/spf/request.rb

@@ -26,7 +26,7 @@ class SPF::Request
     @versions          = options[:versions]
     @scope             = options[:scope]             || :mfrom
     @scope             = @scope.to_sym if String === @scope
-    @_authority_domain = options[:authority_domain]
+    @authority_domain  = options[:authority_domain]
     @identity          = options[:identity]
     @ip_address        = options[:ip_address]
     @helo_identity     = options[:helo_identity]
@@ -112,7 +112,7 @@ class SPF::Request
   end
 
   def new_sub_request(options)
-    obj = self.class.new(opt.merge(options))
+    obj = self.class.new(@opt.merge(options))
     obj.super_request = self
     obj.root_request  = super_request.root_request
     @sub_requests << obj
@@ -120,7 +120,7 @@ class SPF::Request
   end
 
   def authority_domain
-    return (@_authority_domain or @domain)
+    return (@authority_domain or @domain)
   end
 
   def state(field, value = nil)

data/lib/spf/version.rb

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