epp-client-secdns 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  data.tar.gz: a1ea9eee89730360b7cc8fa50aba54f22704d37b87a89e3d39a9184c3c81de57a7e5b32278222ad4b594e93a5880df63645b342e04a251bca07792e68f914e63
-  metadata.gz: fb438b27e8a1cedd0169335318c80ac4bd4ec23bc9239fa0a7d56766cf09b3a0f35a22efa298d32ca2e5256f3ba6761ec341426cad794bf74a5d22bfc8dd4ed4
+  metadata.gz: 1650c6539c0e8047075211f9d8f934c521473d1657ffb7f300f1f8280ab003bdbe6843cb499453f0ffff6b1528edcfd002bff67512a5d36f16b081e4fa40bbcf
+  data.tar.gz: 48f56471cb4d15e7e42fa6783064d72ec266f177b7d132dbdf6c29dfa0cf41974a1171a8d7ec8c449e782853673dde6c4057436754d5541d281fcf42d09632a8
 SHA1: 
-  data.tar.gz: 32607b7e2652ce1351571eef9151f214b9aedf36
-  metadata.gz: 04125363983cecefedfe63e6f68d50073187085d
+  metadata.gz: 388f0b7cd8556735afc356474070191e4267da30
+  data.tar.gz: 9399f224290ad9532045070f0f2e3e108db4c0fc

data/Rakefile

@@ -2,9 +2,9 @@
 require 'rake'
 require 'rdoc/task'
 require 'rubygems/package_task'
-require "bundler/gem_helper"
+require 'bundler/gem_helper'
 
-MY_GEMS = Dir['*.gemspec'].map {|g| g.sub(/.*-(.*)\.gemspec/, '\1')}
+MY_GEMS = Dir['*.gemspec'].map { |g| g.sub(/.*-(.*)\.gemspec/, '\1') }
 
 MY_GEMS.each do |g|
   namespace g do
@@ -26,10 +26,10 @@ task :build   => 'all:build'
 task :install => 'all:install'
 task :push => 'all:push'
 
-desc "Generate documentation for the Rails framework"
+desc 'Generate documentation for the Rails framework'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'doc/rdoc'
-  rdoc.title    = "Documentation"
+  rdoc.title    = 'Documentation'
 
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.options << '--charset' << 'utf-8'
@@ -38,4 +38,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('ChangeLog')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-

data/epp-client-secdns.gemspec

@@ -8,12 +8,12 @@ Gem::Specification.new do |gem|
   gem.email         = ['m@absolight.fr']
   gem.description   = 'SecDNS EPP client library.'
   gem.summary       = 'SecDNS EPP client library'
-  gem.homepage       = "https://github.com/Absolight/epp-client"
+  gem.homepage      = 'https://github.com/Absolight/epp-client'
 
   gem.required_ruby_version = '>= 1.8.7'
-  gem.required_rubygems_version = ">= 1.3.6"
+  gem.required_rubygems_version = '>= 1.3.6'
 
-  gem.files         = [
+  gem.files = [
     'ChangeLog',
     'Gemfile',
     'MIT-LICENSE',
@@ -30,7 +30,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency "bundler", ">= 1.0.0"
+  gem.add_development_dependency 'bundler', '>= 1.0.0'
   gem.add_dependency('nokogiri', '~> 1.4')
   gem.add_dependency('builder',  '>= 2.1.2')
 end

data/lib/epp-client/secdns.rb

@@ -1,10 +1,11 @@
 module EPPClient
+  # This implements the DNSSEC bits.
   module SecDNS
-    SCHEMAS_SECDNS = %w[
+    SCHEMAS_SECDNS = %w(
       secDNS-1.1
-    ]
+    ).freeze
 
-    EPPClient::SCHEMAS_URL.merge!(SCHEMAS_SECDNS.inject({}) do |a,s|
+    EPPClient::SCHEMAS_URL.merge!(SCHEMAS_SECDNS.inject({}) do |a, s|
       a[s.sub(/-1\.1$/, '')] = "urn:ietf:params:xml:ns:#{s}" if s =~ /-1\.1$/
       a[s] = "urn:ietf:params:xml:ns:#{s}"
       a
@@ -65,16 +66,16 @@ module EPPClient
       ret = super
       ret_secdns = {}
       if (maxSigLife = xml.xpath('epp:extension/secDNS:infData/secDNS:maxSigLife', EPPClient::SCHEMAS_URL)).size > 0
-	ret_secdns[:maxSigLife] = maxSigLife.text
+        ret_secdns[:maxSigLife] = maxSigLife.text
       end
       ret_secdns[:dsData] = xml.xpath('epp:extension/secDNS:infData/secDNS:dsData', EPPClient::SCHEMAS_URL).map do |s|
-	parse_ds_data(s)
+        parse_ds_data(s)
       end
       ret_secdns[:keyData] = xml.xpath('epp:extension/secDNS:infData/secDNS:keyData', EPPClient::SCHEMAS_URL).map do |s|
-	parse_key_data(s)
+        parse_key_data(s)
       end
 
-      ret[:secDNS] = ret_secdns unless ret_secdns.values.reject {|v| v.nil?}.size == 0
+      ret[:secDNS] = ret_secdns unless ret_secdns.values.count(&:nil?) == 0
       ret
     end
 
@@ -97,27 +98,24 @@ module EPPClient
     def domain_create_xml(domain) #:nodoc:
       ret = super
 
-      if domain.key?(:maxSigLife) || domain.key?(:dsData) || domain.key?(:keyData)
-	ext = extension do |xml|
-	  xml.create( :xmlns => EPPClient::SCHEMAS_URL['secDNS']) do
-	    if domain.key?(:maxSigLife)
-	      xml.maxSigLife(domain[:maxSigLife])
-	    end
-	    if domain.key?(:dsData)
-	      domain[:dsData].each do |ds|
-		make_ds_data(xml, ds)
-	      end
-	    elsif domain.key?(:keyData)
-	      domain[:keyData].each do |key|
-		make_key_data(xml, key)
-	      end
-	    end
-	  end
-	end
-	return insert_extension(ret, ext)
-      else
-	return ret
+      return ret unless domain.key?(:maxSigLife) || domain.key?(:dsData) || domain.key?(:keyData)
+
+      ext = extension do |xml|
+        xml.create(:xmlns => EPPClient::SCHEMAS_URL['secDNS']) do
+          xml.maxSigLife(domain[:maxSigLife]) if domain.key?(:maxSigLife)
+          if domain.key?(:dsData)
+            domain[:dsData].each do |ds|
+              make_ds_data(xml, ds)
+            end
+          elsif domain.key?(:keyData)
+            domain[:keyData].each do |key|
+              make_key_data(xml, key)
+            end
+          end
+        end
       end
+
+      insert_extension(ret, ext)
     end
 
     # Extends the EPPClient::Domain#domain_update so that secDNS informations
@@ -156,89 +154,92 @@ module EPPClient
     def domain_update_xml(domain) #:nodoc:
       ret = super
 
-      if domain.key?(:secDNS)
-	sd = domain[:secDNS]
-	ext = extension do |xml|
-	  xml.update(sd[:urgent] == true ? {:urgent => true}: {}, {:xmlns => EPPClient::SCHEMAS_URL['secDNS']}) do
-	    if sd.key?(:rem)
-	      xml.rem do
-		if sd[:rem].key?(:all) && sd[:rem][:all] == true
-		  xml.all true
-		elsif sd[:rem].key?(:dsData)
-		  sd[:rem][:dsData].each do |ds|
-		    make_ds_data(xml, ds)
-		  end
-		elsif sd[:rem].key?(:keyData)
-		  sd[:rem][:keyData].each do |key|
-		    make_key_data(xml, key)
-		  end
-		end
-	      end
-	    end
-	    if sd.key?(:add)
-	      xml.add do
-		if sd[:add].key?(:dsData)
-		  sd[:add][:dsData].each do |ds|
-		    make_ds_data(xml, ds)
-		  end
-		elsif sd[:add].key?(:keyData)
-		  sd[:add][:keyData].each do |key|
-		    make_key_data(xml, key)
-		  end
-		end
-	      end
-	    end
-	    if sd.key?(:chg) && sd[:chg].key?(:maxSigLife)
-	      xml.chg do
-		xml.maxSigLife sd[:chg][:maxSigLife]
-	      end
-	    end
-	  end
-	end
-	return insert_extension(ret, ext)
-      else
-	return ret
+      return ret unless domain.key?(:secDNS)
+
+      sd = domain[:secDNS]
+
+      ext = extension do |xml|
+        xml.update(sd[:urgent] == true ? { :urgent => true } : {}, :xmlns => EPPClient::SCHEMAS_URL['secDNS']) do
+          if sd.key?(:rem)
+            xml.rem do
+              if sd[:rem].key?(:all) && sd[:rem][:all] == true
+                xml.all true
+              elsif sd[:rem].key?(:dsData)
+                sd[:rem][:dsData].each do |ds|
+                  make_ds_data(xml, ds)
+                end
+              elsif sd[:rem].key?(:keyData)
+                sd[:rem][:keyData].each do |key|
+                  make_key_data(xml, key)
+                end
+              end
+            end
+          end
+          if sd.key?(:add)
+            xml.add do
+              if sd[:add].key?(:dsData)
+                sd[:add][:dsData].each do |ds|
+                  make_ds_data(xml, ds)
+                end
+              elsif sd[:add].key?(:keyData)
+                sd[:add][:keyData].each do |key|
+                  make_key_data(xml, key)
+                end
+              end
+            end
+          end
+          if sd.key?(:chg) && sd[:chg].key?(:maxSigLife)
+            xml.chg do
+              xml.maxSigLife sd[:chg][:maxSigLife]
+            end
+          end
+        end
       end
+
+      insert_extension(ret, ext)
     end
 
     private
+
     def make_key_data(xml, key)
       xml.keyData do
-	xml.flags key[:flags]
-	xml.protocol key[:protocol]
-	xml.alg key[:alg]
-	xml.pubKey key[:pubKey]
+        xml.flags key[:flags]
+        xml.protocol key[:protocol]
+        xml.alg key[:alg]
+        xml.pubKey key[:pubKey]
       end
     end
+
     def make_ds_data(xml, ds)
       xml.dsData do
-	xml.keyTag ds[:keyTag]
-	xml.alg ds[:alg]
-	xml.digestType ds[:digestType]
-	xml.digest ds[:digest]
-	make_key_data(xml, ds[:keyData]) if ds.key?(:keyData)
+        xml.keyTag ds[:keyTag]
+        xml.alg ds[:alg]
+        xml.digestType ds[:digestType]
+        xml.digest ds[:digest]
+        make_key_data(xml, ds[:keyData]) if ds.key?(:keyData)
       end
     end
+
     def parse_key_data(xml)
       {
-	:flags => xml.xpath("secDNS:flags", EPPClient::SCHEMAS_URL).text.to_i,
-	:protocol => xml.xpath("secDNS:protocol", EPPClient::SCHEMAS_URL).text.to_i,
-	:alg => xml.xpath("secDNS:alg", EPPClient::SCHEMAS_URL).text.to_i,
-	:pubKey => xml.xpath("secDNS:pubKey", EPPClient::SCHEMAS_URL).text,
+        :flags => xml.xpath('secDNS:flags', EPPClient::SCHEMAS_URL).text.to_i,
+        :protocol => xml.xpath('secDNS:protocol', EPPClient::SCHEMAS_URL).text.to_i,
+        :alg => xml.xpath('secDNS:alg', EPPClient::SCHEMAS_URL).text.to_i,
+        :pubKey => xml.xpath('secDNS:pubKey', EPPClient::SCHEMAS_URL).text,
       }
     end
+
     def parse_ds_data(xml)
       ret = {
-	:keyTag => xml.xpath("secDNS:keyTag", EPPClient::SCHEMAS_URL).text.to_i,
-	:alg => xml.xpath("secDNS:alg", EPPClient::SCHEMAS_URL).text.to_i,
-	:digestType => xml.xpath("secDNS:digestType", EPPClient::SCHEMAS_URL).text.to_i,
-	:digest => xml.xpath("secDNS:digest", EPPClient::SCHEMAS_URL).text
+        :keyTag => xml.xpath('secDNS:keyTag', EPPClient::SCHEMAS_URL).text.to_i,
+        :alg => xml.xpath('secDNS:alg', EPPClient::SCHEMAS_URL).text.to_i,
+        :digestType => xml.xpath('secDNS:digestType', EPPClient::SCHEMAS_URL).text.to_i,
+        :digest => xml.xpath('secDNS:digest', EPPClient::SCHEMAS_URL).text,
       }
       if (keyData = xml.xpath('secDNS:keyData', EPPClient::SCHEMAS_URL)).size > 0
-	ret[:keyData] = parse_key_data(keyData)
+        ret[:keyData] = parse_key_data(keyData)
       end
       ret
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: epp-client-secdns
 version: !ruby/object:Gem::Version 
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors: 
 - Mathieu Arnold
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-02-10 00:00:00 Z
+date: 2016-02-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler