rspec-dns 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWZhYzZhZTc5ZjFiZWY2MzRhMjIwMWMyYzhhNjQ2N2M3YWQxYWEyZg==
-  data.tar.gz: !binary |-
-    YTNiNTQyZWU5ZTBmM2ZhYTMzMmI4MjFhMjAyNGFmMWFhYWE3ZGQ0MQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZTAyZWQ5NGM5YWRhNmI3YzIxOWNiZGUxMzcxNWE5ZTI1ZjY1YjVkYjY5YjI2
-    YjBhMTEzMWQ2OGEzYWYxYTE4MGJjOTFlYzRiNWQ0ZjJkODcyZmUzZmNhZjgw
-    YWFiZWE1MzQzMTk0Mzk0OTMyZDk3ZjcyOTI4YmZlNjJkNjYwN2I=
-  data.tar.gz: !binary |-
-    NmEzYmE0ZjdiYmJhODJlZjllYjhjMjVkZGQ3MjMxZDc0Njc1NDE5ZjAxZjZj
-    YTdiNDE3ZjQzMTQxZjc1ODhlMjZlZTgzMTQyNTZjNTY1Y2M1M2NmYTE4ZTJm
-    MDIwZTIzOTRmZWUxNzE0ZmYyNzY0YjA5ZDg2ZGJkZjA1Y2YyZDE=
+SHA1:
+  metadata.gz: e2d0c99bfad61e22a989ccc3544a63b9a84bb7f1
+  data.tar.gz: c8f66c1099c58144d58bf5bc7887ba0367f2d6ed
+SHA512:
+  metadata.gz: af49390d95c4cbf8ae1fc2ba64734c8796f4b73224e5009affe4e04f6fc56869b76e1bd9a203c41091038b0c0e5dbce88f39972da85464c941c44b2899ac59d5
+  data.tar.gz: 4b6215758311f378b00bedfe13e4a54a4a5646aa00aa53d0b113b4af47d157b7259af629100c521c09aff2dbf8d9f73de0078f868f094977c069f53d27acce87

data/README.md

@@ -61,6 +61,7 @@ Currently the following chaining methods are supported:
 - in\_authority
 - refuse\_request
 - config
+- in\_zone\_file
 
 Here's some usage examples:
 
@@ -77,9 +78,13 @@ Here's some usage examples:
     expect('example.com').to have_dns.with_type('A').at_least(3)
   end
 
-  it 'check with configuration' do
+  it 'checks with configuration' do
     expect('example.com').to have_dns.with_type('A').config(nameserver: '192.0.2.4')
   end
+
+  it 'checks zone file("example.zone") with specified origin("example.com.")' do
+    expect('example.com').to have_dns.with_type('A').in_zone_file('example.zone', 'example.com.')
+  end
 ```
 
 The other method chains are actually [Dnsruby](http://dnsruby.rubyforge.org/classes/Dnsruby/RR.html) attributes on the record. You can prefix them with `and_`, `with_`, `and_with` or whatever your heart desires. The predicate is what is checked. The rest is syntactic sugar.

data/lib/rspec-dns/have_dns.rb

@@ -17,7 +17,9 @@ RSpec::Matchers.define :have_dns do
       matched = _options.all? do |option, value|
         begin
           # To distinguish types because not all Resolv returns have type
-          if value.is_a? String
+          if ipaddr = (IPAddr.new(value) rescue nil) # IPAddr(v4/v6)?
+            ipaddr.include?(record.send(option).to_s)
+          elsif value.is_a? String
             record.send(option).to_s == value
           elsif value.is_a? Regexp
             record.send(option).to_s =~ value
@@ -84,6 +86,11 @@ RSpec::Matchers.define :have_dns do
     @config = c
   end
 
+  chain :in_zone_file do |file = nil, origin = '.'|
+    @zone_file = file
+    @zone_origin = origin
+  end
+
   def method_missing(m, *args, &block)
     if m.to_s =~ /(and\_with|and|with)?\_(.*)$/
       _options[$2.to_sym] = args.first
@@ -126,6 +133,12 @@ RSpec::Matchers.define :have_dns do
   end
 
   def _records
+    if @zone_file
+      @_records = Dnsruby::Message.new
+      rrs = Dnsruby::ZoneReader.new(@zone_origin).process_file(@zone_file)
+      rrs.each { |rr| @_records.add_answer(rr) }
+    end
+
     @_records ||= begin
       config = _config || {}
       # Backwards compatible config option for rspec-dnsruby

data/rspec-dns.gemspec

@@ -1,5 +1,5 @@
 Gem::Specification.new do |s|
-  s.version       = '0.1.3'
+  s.version       = '0.1.4'
   s.name          = 'rspec-dns'
   s.authors       = ['Seth Vargo', 'Alexey Lapitsky', 'Johannes Russek', 'Hiroshi OTA']
   s.email         = 'alexey@spotify.com'

data/spec/rspec-dns/example.zone

@@ -0,0 +1,14 @@
+$TTL 86400
+
+@ IN SOA  ns.example.com.  root.example.com. (
+          2014122413  ; Serial
+          3600        ; Refresh
+          900         ; Retry
+          604800      ; Expire
+          900         ; Minimum
+          )
+          IN NS        ns
+          IN MX   40   mail
+          IN A         192.0.2.4
+www       IN A         192.0.2.4
+www       IN AAAA      2001:DB8:6C::430

data/spec/rspec-dns/have_dns_spec.rb

@@ -31,6 +31,16 @@ describe 'rspec-dns matchers' do
           .and_address('2001:DB8:6C::430')
       end
 
+      it 'can evalutate an A/AAAA record with IPAddr range' do
+        stub_records(['example.com 86400 A 192.0.2.4',
+                      'example.com 86400 AAAA 2001:DB8:6c::430'])
+
+        expect('example.com').to have_dns.with_type('A')
+          .and_address('192.0.2.0/24')
+        expect('example.com').to have_dns.with_type('AAAA')
+          .and_address('2001:DB8:6C::/64')
+      end
+
       it 'can evalutate a CNAME record' do
         stub_records(['www.example.com 300 IN CNAME example.com'])
 
@@ -106,6 +116,47 @@ describe 'rspec-dns matchers' do
       end
     end
 
+    context 'with zone file' do
+      it 'can evalutate records in zone file with origin' do
+        file = 'spec/rspec-dns/example.zone'
+        origin =  'example.com.'
+
+        expect('example.com').to have_dns.with_type('NS')
+          .and_domainname('ns.example.com')
+          .in_zone_file(file, origin)
+        expect('example.com').to have_dns.with_type('A')
+          .and_address('192.0.2.4')
+          .in_zone_file(file, origin)
+        expect('example.com').to have_dns.with_type('MX')
+          .and_preference(40).and_exchange('mail.example.com')
+          .in_zone_file(file, origin)
+        expect('www.example.com').to have_dns.with_type('A')
+          .and_address('192.0.2.4')
+          .in_zone_file(file, origin)
+        expect('www.example.com').to have_dns.with_type('AAAA')
+          .and_address('2001:DB8:6C::430')
+          .in_zone_file(file, origin)
+      end
+      it 'can evalutate records in zone file without origin' do
+        file = 'spec/rspec-dns/example.zone'
+
+        expect('.').to have_dns.with_type('NS')
+          .and_domainname('ns').in_zone_file(file)
+        expect('www').to have_dns.with_type('A')
+          .and_address('192.0.2.4').in_zone_file(file)
+      end
+      it 'can evalutate records with dns servers if file is nil' do
+        file = nil
+        stub_records(['example.com 86400 A 192.0.2.4'])
+        expect('example.com').to have_dns.with_type('A')
+          .and_address('192.0.2.4')
+          .in_zone_file(file)
+        expect('example.com').to have_dns.with_type('A')
+          .and_address('192.0.2.4')
+          .in_zone_file
+      end
+    end
+
     context 'with changable connection timeout' do
       it 'is_expected.to timeout within 3 seconds in default' do
         stub_records(['example.com 86400 A 192.168.100.100']) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-dns
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Seth Vargo
@@ -11,34 +11,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
@@ -71,6 +71,7 @@ files:
 - lib/rspec-dns.rb
 - lib/rspec-dns/have_dns.rb
 - rspec-dns.gemspec
+- spec/rspec-dns/example.zone
 - spec/rspec-dns/have_dns_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/spotify/rspec-dns
@@ -83,22 +84,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: rspec-dns provides an easy-to-use DSL for testing your DNS records are responding
   as they should.
 test_files:
+- spec/rspec-dns/example.zone
 - spec/rspec-dns/have_dns_spec.rb
 - spec/spec_helper.rb
-has_rdoc: