spf-query 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad212d3a18fdf143d0a478c9b703a51fd790b704
-  data.tar.gz: 85e5eaf89a001162b200707971c1aeeccf59fac8
+  metadata.gz: 3f08907e297e77ca52db4ffb426fa8d45fd5f87a
+  data.tar.gz: 36acdb178979d12cf7ad78a9a2f7627597dfff63
 SHA512:
-  metadata.gz: ebdda6c3f7346574531cdcd5c2739e5424077fe768712298cc239a6c7f46e68fc799b2d0921d63b528ad78102a5424e2f03312818d4c9586472a0e8d569849b3
-  data.tar.gz: e3a139ead34ca81521bd4ff91696d5152db75b9380d364f39acdfc9d3a98f047bb1344933d372c2dddf083732c131239d6564e6964a23e463f73e836c3930bd1
+  metadata.gz: f5095e9712837d7ab82489e6c30f90eeb87ad51801f3b849e4b499455b246d28f0bd16908d1d2430ebf3bd3cd36d3531cdd4a6b3518661e2081a51c5ff4f3c5a
+  data.tar.gz: bb9e67f1784092715923ff03abe85d1311841af967672e14396bc412de915ad8bd6e5cf9a1ef33496f3374c05d170da5b21f4b265004a1ad99dbcd485ff18de8

data/ChangeLog.md

@@ -1,3 +1,10 @@
+### 0.1.2 / 2015-07-07
+
+#### parser
+
+* Convert all chars and literals to Strings.
+* Properly transform macro_strings that contain a single literal into a String.
+
 ### 0.1.1 / 2015-07-06
 
 * Raise {SPF::Query::SenderIDFound} from {SPF::Query::Record.parse} if

data/lib/spf/query/macro_string.rb

@@ -16,6 +16,14 @@ module SPF
         @elements[*arguments]
       end
 
+      def to_a
+        @elements
+      end
+
+      def to_ary
+        @elements
+      end
+
       def to_s
         @elements.join
       end

data/lib/spf/query/parser.rb

@@ -224,16 +224,21 @@ module SPF
           IP.new(address,cidr_length.to_i)
         end
 
-        rule(char: simple(:c)) { c }
-        rule(literal: simple(:text)) { text }
+        rule(char: simple(:c)) { c.to_s }
+        rule(literal: simple(:text)) { text.to_s }
         rule(macro: subtree(:options)) do
           letter = options.fetch(:letter).to_sym
 
           Macro.new(letter,options)
         end
 
-        rule(macro_string: [simple(:text)])     { text }
-        rule(macro_string: sequence(:elements)) { MacroString.new(elements) }
+        rule(macro_string: sequence(:elements)) do
+          if elements.length == 1 && elements.first.kind_of?(String)
+            elements.first
+          else
+            MacroString.new(elements)
+          end
+        end
 
         rule(modifier: {name: simple(:name)}) do
           Modifier.new(name.to_sym)

data/lib/spf/query/version.rb

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

data/spec/parser_spec.rb

@@ -575,6 +575,64 @@ describe Parser do
   end
 
   describe Parser::Transform do
+    describe "c" do
+      let(:char) { 'c' }
+
+      subject { super().apply(char: char) }
+
+      it "should convert to a String" do
+        expect(subject).to be_kind_of(String)
+        expect(subject).to be == char
+      end
+    end
+
+    describe "literal" do
+      let(:string) { '_spf.google.com' }
+
+      subject { super().apply(literal: string) }
+
+      it "should convert to a String" do
+        expect(subject).to be_kind_of(String)
+        expect(subject).to be == string
+      end
+    end
+
+    describe "macro_string" do
+      context "containing a single literal string" do
+        let(:string) { '_spf.google.com' }
+
+        subject { super().apply(macro_string: [{literal: string}]) }
+
+        it "should convert to a String" do
+          expect(subject).to be == string
+        end
+      end
+
+      context "containing a mix of macro_expands and literals" do
+        let(:string1) { 'foo'  }
+        let(:macro)   { 's'    }
+        let(:string2) { 'bar'  }
+
+        subject do
+          super().apply(
+            macro_string: [
+              {literal: string1},
+              {macro: {letter: macro}},
+              {literal: string2}
+            ]
+          )
+        end
+
+        it "should convert to a String" do
+          expect(subject).to           be_kind_of(MacroString)
+          expect(subject[0]).to        be == string1
+          expect(subject[1]).to        be_kind_of(Macro)
+          expect(subject[1].letter).to be == macro.to_sym
+          expect(subject[2]).to        be == string2
+        end
+      end
+    end
+
     describe "directive" do
       subject do
         super().apply(directive: {qualifier: '~', name: 'all'})

data/spec/query_spec.rb

@@ -23,7 +23,7 @@ describe SPF::Query do
       let(:domain) { 'getlua.com' }
 
       it "should prefer the SPF type record over other TXT records" do
-        expect(subject.query(domain)).to be == %{v=spf1 include:mail.zendesk.com include:servers.mcsv.net include:_spf.google.com include:sendgrid.net include:mktomail.com -all}
+        expect(subject.query(domain)).to be == %{v=spf1 include:_spf.google.com include:mail.zendesk.com include:servers.mcsv.net -all}
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spf-query
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - nicktitle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet