spf 0.0.15 → 0.0.16

data/lib/spf/model.rb

@@ -365,7 +365,7 @@ class SPF::Mech < SPF::Term
       if @ipv4_prefix_length and @ipv4_prefix_length != self.default_ipv4_prefix_length
         params += '/' + @ipv4_prefix_length.to_s
       end
-      if @ipv6_prefix_length and @ipv6_prefix_length != DEFAULT_IPV6_PREFIX_LENGTH
+      if @ipv6_prefix_length and @ipv6_prefix_length != self.default_ipv6_prefix_length
         params += '//' + @ipv6_prefix_length.to_s
       end
       return params
@@ -458,9 +458,9 @@ class SPF::Mech < SPF::Term
     end
 
     def params
-      params =  ':' + @ip_network.short
-      params += '/' + @ip_network.pfxlen if
-        @ip_network.pfxlen != DEFAULT_IPV6_PREFIX_LENGTH
+      params =  @ip_network.to_addr
+      params += '/' + @ip_network.pfxlen.to_s if
+        @ip_network.pfxlen != self.default_ipv6_prefix_length
       return params
     end
 
@@ -543,7 +543,7 @@ class SPF::Mech < SPF::Term
       if @ipv4_prefix_length and @ipv4_prefix_length != self.default_ipv4_prefix_length
         params += '/' + @ipv4_prefix_length
       end
-      if @ipv6_prefix_length and @ipv6_prefix_length != DEFAULT_IPV6_PREFIX_LENGTH
+      if @ipv6_prefix_length and @ipv6_prefix_length != self.default_ipv6_prefix_length
         params += '//' + @ipv6_prefix_length
       end
       return params
@@ -667,12 +667,13 @@ class SPF::Mod < SPF::Term
     NAME = 'uknown'
   end
 
-  class SPF::Mod::Exp < SPF::Mod
+  class SPF::Mod::Exp < SPF::GlobalMod
 
     attr_reader :domain_spec
 
     NAME       = 'exp'
-    PRECEDENCE = 0.2
+
+    def precedence; 0.2; end
 
     def parse_params(required = true)
       self.parse_domain_spec(required)
@@ -714,7 +715,8 @@ class SPF::Mod < SPF::Term
     attr_reader :domain_spec
 
     NAME       = 'redirect'
-    PRECEDENCE = 0.8
+
+    def precedence; 0.8; end
 
     def init(options = {})
       super(options)

data/lib/spf/version.rb

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

data/spf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "spf"
-  s.version = "0.0.15"
+  s.version = "0.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Flury", "Julian Mehnle"]
-  s.date = "2013-10-29"
+  s.date = "2013-11-05"
   s.description = "    An object-oriented Ruby implementation of the Sender Policy Framework (SPF)\n    e-mail sender authentication system, fully compliant with RFC 4408.\n"
   s.email = ["code@agari.com", "aflury@agari.com", "jmehnle@agari.com"]
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spf
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec