spf-query 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ff5617efe1d25eb977c95ea135429a293fec88e
-  data.tar.gz: ac75eeee0b297184a1501bc87d74e849cbb5900d
+  metadata.gz: ad212d3a18fdf143d0a478c9b703a51fd790b704
+  data.tar.gz: 85e5eaf89a001162b200707971c1aeeccf59fac8
 SHA512:
-  metadata.gz: b6c50e12e4bf16b1386acdf25763e9edfa2e1fc5eb053853f8d3e233152bbec8936eb7f69da239aa2cdc142e7de4893aaa4f123d03c47a18ca80000bdd96ede2
-  data.tar.gz: fe9187d1722b7c20f8d8ec03e1e5244c7ed9762e2b96d056e19f582531071a5e2811638a693909df893eaccf0e339c5b9eb10e00fcc89428953dd6964f800451
+  metadata.gz: ebdda6c3f7346574531cdcd5c2739e5424077fe768712298cc239a6c7f46e68fc799b2d0921d63b528ad78102a5424e2f03312818d4c9586472a0e8d569849b3
+  data.tar.gz: e3a139ead34ca81521bd4ff91696d5152db75b9380d364f39acdfc9d3a98f047bb1344933d372c2dddf083732c131239d6564e6964a23e463f73e836c3930bd1

data/.travis.yml

@@ -3,9 +3,8 @@ rvm:
 - 1.9.3
 - 2.0
 - 2.1
-- ruby-head
-- jruby-19mode
-- jruby-head
+- 2.2
+- jruby
 - rbx-2
 matrix:
   allow_failures:

data/ChangeLog.md

@@ -1,3 +1,8 @@
+### 0.1.1 / 2015-07-06
+
+* Raise {SPF::Query::SenderIDFound} from {SPF::Query::Record.parse} if
+  [Sender ID](http://www.openspf.org/SPF_vs_Sender_ID) is detected.
+
 ### 0.1.0 / 2015-07-01
 
 * Initial release:

data/Gemfile

@@ -4,6 +4,7 @@ gemspec
 
 group :development do
   gem 'rake'
+  gem 'rubygems-tasks', '~> 0.2'
   gem 'rspec', '~> 3.0'
 
   gem 'kramdown'

data/Rakefile

@@ -10,7 +10,8 @@ rescue LoadError => e
 end
 
 require 'rake'
-require 'bundler/gem_tasks'
+require 'rubygems/tasks'
+Gem::Tasks.new
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new

data/lib/spf/query/exceptions.rb

@@ -4,5 +4,8 @@ module SPF
   module Query
     class InvalidRecord < Parslet::ParseFailed
     end
+
+    class SenderIDFound < InvalidRecord
+    end
   end
 end

data/lib/spf/query/parser.rb

@@ -272,6 +272,8 @@ module SPF
       # @return [Record]
       #   The parsed SPF record.
       #
+      # @raise [Parslet::ParseError]
+      #
       def self.parse(spf)
         Transform.new.apply(new.parse(spf))
       end

data/lib/spf/query/record.rb

@@ -134,14 +134,22 @@ module SPF
       # @raise [InvalidRecord]
       #   The SPF record could not be parsed.
       #
+      # @raise [SenderIDFound]
+      #
       # @see Parser.parse
       #
       # @api public
       #
       def self.parse(spf)
-        Parser.parse(spf)
-      rescue Parslet::ParseFailed => error
-        raise(InvalidRecord.new(error.message,error.cause))
+        if spf.include?('spf2.0')
+          raise(SenderIDFound,"Sender ID was found in place of SPF")
+        end
+
+        begin
+          Parser.parse(spf)
+        rescue Parslet::ParseFailed => error
+          raise(InvalidRecord.new(error.message,error.cause))
+        end
       end
 
       #

data/lib/spf/query/version.rb

@@ -1,5 +1,5 @@
 module SPF
   module Query
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/spec/record_spec.rb

@@ -173,6 +173,16 @@ describe SPF::Query::Record do
         }.to raise_error(InvalidRecord)
       end
     end
+
+    context "when given a SenderID record" do
+      let(:sender_id) { "spf2.0/mfrom,pra or spf2.0/pra,mfrom" }
+
+      it "should raise a SenderIDFound exception" do
+        expect {
+          described_class.parse(sender_id)
+        }.to raise_error(SenderIDFound)
+      end
+    end
   end
 
   describe ".query" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spf-query
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - nicktitle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -118,4 +118,3 @@ test_files:
 - spec/query_spec.rb
 - spec/record_spec.rb
 - spec/spec_helper.rb
-has_rdoc: