dkim-query 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfa693ecdb8c2ff6703070e894ae88739d830987
-  data.tar.gz: 117784a2b3ca90a0c171c1356bb868a5545a3559
+  metadata.gz: 9edb13bac9ddda5033d398b1c07f76f53bb4c71a
+  data.tar.gz: ded310d3e3c0f5153d9ac331a17165d6054d8af8
 SHA512:
-  metadata.gz: 684c484de0d8d30171f6250376907c693b69d994ead22f2d1f0b353eaef4bbc917ce5e50b17ee7e5477b5df4bbaa5ff839546557fc72b18aa9b5d52551e51853
-  data.tar.gz: f15924f5559ad378f3429426f39aeebc437aea1b9bccbebd9f3e2275336542fb7b609e8f994bf30660018af6711418d8b4832d313df7060244b2df7568e01d73
+  metadata.gz: a0b532e63fbd541c7f4784dc85ac4666ced8599b20d341a638ff92e9d6f59da150d882fc0e10f4756b246ca40fbbff892d9ba066ae120a0c6ff799b33775f476
+  data.tar.gz: ff4d52fa874948a45396629d77f7b9f174bb89db9622b2c6fc24a4752f700216fb50fc44efb5ca4c0deb0dc658988cfd07ae14d413182a7c6e5ec8e3890d1bf2

data/ChangeLog.md

@@ -1,3 +1,7 @@
+### 0.2.6 / 2016-07-3
+
+* Fixed a typo in the parser rules.
+
 ### 0.2.5 / 2016-06-17
 
 * Added `mandrill` and `google` to the list of default DKIM selectors.

data/lib/dkim/query/parser.rb

@@ -96,8 +96,11 @@ module DKIM
       #
       # Section 2.4: Common ABNF Tokens
       #
-      rule(:hypthenated_word) do
-        alpha >> ((alpha | digit | str('-')).repeat(0) >> (alpha | digit)).maybe
+      rule(:hyphenated_word) do
+        alpha >> (
+          (str('-').absnt? >> (alpha | digit)) |
+          (str('-').repeat(0) >> (alpha | digit))
+        ).repeat(0)
       end
       rule(:base64string) do
         (alpha | digit | str('+') | str('/') | fws).repeat(1) >>

data/lib/dkim/query/version.rb

@@ -1,6 +1,6 @@
 module DKIM
   module Query
     # dkim-query version
-    VERSION = '0.2.5'
+    VERSION = '0.2.6'
   end
 end

data/spec/parser_spec.rb

@@ -60,6 +60,13 @@ describe Parser do
           ]
         }
       end
+
+      it "should parse h=abc-123-xyz" do
+        expect(subject.parse('h=abc-123-xyz')).to be == {
+          name: 'h',
+          value: {string: 'abc-123-xyz'}
+        }
+      end
     end
 
     describe "k" do
@@ -71,6 +78,13 @@ describe Parser do
           value: {symbol: 'rsa'}
         }
       end
+
+      it "should parse k=abc-123-xyz" do
+        expect(subject.parse('k=abc-123-xyz')).to be == {
+          name: 'k',
+          value: {string: 'abc-123-xyz'}
+        }
+      end
     end
 
     describe "n" do
@@ -122,6 +136,13 @@ describe Parser do
           value: [{symbol: 'email'}, {symbol: '*'}]
         }
       end
+
+      it "should parse s=abc-123-xyz" do
+        expect(subject.parse('s=abc-123-xyz')).to be == {
+          name: 's',
+          value: {string: 'abc-123-xyz'}
+        }
+      end
     end
 
     describe "t" do
@@ -140,6 +161,13 @@ describe Parser do
           value: {symbol: 's'}
         }
       end
+
+      it "should parse t=abc-123-xyz" do
+        expect(subject.parse('t=abc-123-xyz')).to be == {
+          name: 't',
+          value: {string: 'abc-123-xyz'}
+        }
+      end
     end
   end
 
@@ -151,6 +179,35 @@ describe Parser do
     end
 
     describe "hyphenated_word" do
+      subject { super().hyphenated_word }
+
+      it "should parse abc" do
+        expect(subject.parse('abc')).to be == 'abc'
+      end
+
+      it "should parse abc123" do
+        expect(subject.parse('abc123')).to be == 'abc123'
+      end
+
+      it "should parse a-b-c" do
+        expect(subject.parse('a-b-c')).to be == 'a-b-c'
+      end
+
+      it "should parse a---b---c" do
+        expect(subject.parse('a---b---c')).to be == 'a---b---c'
+      end
+
+      it "should not parse -a" do
+        expect { subject.parse('-a') }.to raise_error(Parslet::ParseFailed)
+      end
+
+      it "should not parse a-" do
+        expect { subject.parse('a-') }.to raise_error(Parslet::ParseFailed)
+      end
+
+      it "should not parse -" do
+        expect { subject.parse('-') }.to raise_error(Parslet::ParseFailed)
+      end
     end
 
     describe "base64string" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dkim-query
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - nicktitle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet