epp-nokogiri 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71d59991d2919cdb4aad9190b0bc63180131a360
-  data.tar.gz: 3c7a053f95d318c44b9b3fa318504e023d935418
+  metadata.gz: e6e7fa3bf419c26b5dfe8c73e2ca66eb6942e9ea
+  data.tar.gz: 21a0b82439f9698eb7756135ca2c9de2af2f7a9e
 SHA512:
-  metadata.gz: f724761625a2ad59796c0ff40b1f6dff946db06474766026e1a0ffa3b0b93f425bb07cb8ab121d0ea395f32a6002d176b4f44f7966c96c4462fd45c5de465707
-  data.tar.gz: 26afc81dd24651048e21d45c7e3fadbf8a6c88d326c0467f3751834435e7605f0408ae5dd46f9cdd2f2e7b54e37bbd495120a10beb44316ab3265e5553f1e51e
+  metadata.gz: 94f98ba053dcff2948f243ac1f69ed483622be3603ffd14962099b2d7322077f37836b7cd0d3ca80c40b8d1b55ff6db33d60c44439bd271cc93b24ff7e853c77
+  data.tar.gz: 9ff30e2a6a30c84d488855c37e1149237c8bbd339c642a4a95fb45ab9e33255d1f87a12a0862a56de63208e46fda58782342e81a922c50e5aae15ec480b1f21a

data/epp.gemspec

@@ -5,9 +5,9 @@ require "epp/version"
 Gem::Specification.new do |s|
   s.name        = "epp-nokogiri"
   s.version     = Epp::VERSION
-  s.authors     = ["Josh Delsman", "Delwyn de Villiers", "Priit Haamer"]
-  s.email       = ["jdelsman@ultraspeed.com", "delwyn.d@gmail.com", "priit@edicy.com"]
-  s.homepage    = "https://github.com/priithaamer/epp"
+  s.authors     = ['Josh Delsman', 'Delwyn de Villiers', 'Priit Haamer', 'Tanel Jakobsoo']
+  s.email       = ['jdelsman@ultraspeed.com', 'delwyn.d@gmail.com', 'priit@edicy.com', 'tanel@voog.com']
+  s.homepage    = "https://github.com/Voog/epp"
   s.summary     = %q{EPP (Extensible Provisioning Protocol) for Ruby}
   s.description = %q{Basic functionality for connecting and making requests on EPP (Extensible Provisioning Protocol) servers}
   s.license     = 'MIT'
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("uuidtools", [">= 0"])
 
   s.add_development_dependency("shoulda", [">= 0"])
+  s.add_development_dependency("minitest", [">= 0"])
   s.add_development_dependency("mocha", [">= 0"])
   s.add_development_dependency("rake", [">= 0"])
 end

data/lib/epp/server.rb

@@ -2,7 +2,7 @@ module Epp #:nodoc:
   class Server
     include RequiresParameters
 
-    attr_accessor :tag, :password, :server, :port, :lang, :services, :extensions, :version, :key, :cert
+    attr_accessor :tag, :password, :server, :port, :xmlns, :xmlns_xsi, :xsi_schema_location, :lang, :services, :extensions, :version, :key, :cert
 
     # ==== Required Attrbiutes
     #
@@ -13,6 +13,9 @@ module Epp #:nodoc:
     # ==== Optional Attributes
     #
     # * <tt>:port</tt> - The EPP standard port is 700. However, you can choose a different port to use.
+    # * <tt>:xmlns</tt> - The EPP xmlns value. Default is 'urn:ietf:params:xml:ns:epp-1.0'.
+    # * <tt>:xmlns_xsi</tt> - The EPP xmlns:xsi value. Default is 'http://www.w3.org/2001/XMLSchema-instance'.
+    # * <tt>:xsi_schema_location</tt> - The EPP xsi:schemaLocation value. Default is 'urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd'.
     # * <tt>:lang</tt> - Set custom language attribute. Default is 'en'.
     # * <tt>:services</tt> - Use custom EPP services in the <login> frame. The defaults use the EPP standard domain, contact and host 1.0 services.
     # * <tt>:extensions</tt> - URLs to custom extensions to standard EPP. Use these to extend the standard EPP (e.g., Nominet uses extensions). Defaults to none.
@@ -26,6 +29,9 @@ module Epp #:nodoc:
       @password   = attributes[:password]
       @server     = attributes[:server]
       @port       = attributes[:port]       || 700
+      @xmlns      = attributes[:xmlns]      || 'urn:ietf:params:xml:ns:epp-1.0'
+      @xmlns_xsi  = attributes[:xmlns_xsi]  || 'http://www.w3.org/2001/XMLSchema-instance'
+      @xsi_schema_location = attributes[:xsi_schema_location] || 'urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd'
       @lang       = attributes[:lang]       || "en"
       @services   = attributes[:services]   || ["urn:ietf:params:xml:ns:domain-1.0", "urn:ietf:params:xml:ns:contact-1.0", "urn:ietf:params:xml:ns:host-1.0"]
       @extensions = attributes[:extensions] || []
@@ -39,9 +45,9 @@ module Epp #:nodoc:
     def build_epp_request(&block)
       builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
         xml.epp(
-          'xmlns' => 'urn:ietf:params:xml:ns:epp-1.0',
-          'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-          'xsi:schemaLocation' => 'urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd'
+          'xmlns' => xmlns,
+          'xmlns:xsi' => xmlns_xsi,
+          'xsi:schemaLocation' => xsi_schema_location
         ) do
           yield xml if block_given?
         end
@@ -154,9 +160,11 @@ module Epp #:nodoc:
               xml.lang lang
             }
             xml.svcs {
-              xml.objURI "urn:ietf:params:xml:ns:domain-1.0"
-              xml.objURI "urn:ietf:params:xml:ns:contact-1.0"
-              xml.objURI "urn:ietf:params:xml:ns:host-1.0"
+              unless services.empty?
+                services.each do |uri|
+                  xml.objURI uri
+                end
+              end
               
               unless extensions.empty?
                 xml.svcExtension {
@@ -198,7 +206,7 @@ module Epp #:nodoc:
       if result_code == acceptable_response
         return true
       else
-        result_message = doc.css('epp response result msg').first.text.strip
+        result_message = response.css('epp response result msg').first.text.strip
 
         raise EppErrorResponse.new(:xml => response, :code => result_code, :message => result_message)
       end

data/lib/epp/version.rb

@@ -1,3 +1,3 @@
 module Epp
-  VERSION = "1.0.1"
+  VERSION = '1.1.0'
 end

data/test/test_epp.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EppTest < Test::Unit::TestCase
+class EppTest < Minitest::Test
   context "EPP" do
     context "server" do
       setup do
@@ -31,9 +31,8 @@ class EppTest < Test::Unit::TestCase
           epp = Epp::Server.new(:server => "a", :tag => "a")
         end
 
-        assert_nothing_raised do
-          epp = Epp::Server.new(:server => "a", :tag => "a", :password => "a")
-        end
+        # Assert nothing raised
+        assert Epp::Server.new(:server => "a", :tag => "a", :password => "a")
       end
 
       should "set instance variables for attributes" do
@@ -195,9 +194,8 @@ class EppTest < Test::Unit::TestCase
           e = EppErrorResponse.new(:xml => "a", :code => "a")
         end
 
-        assert_nothing_raised do
-          e = EppErrorResponse.new(:xml => "a", :code => "a", :message => "a")
-        end
+        # Assert nothing raised
+        assert EppErrorResponse.new(:xml => "a", :code => "a", :message => "a")
       end
 
       should "print error message to string" do

data/test/test_helper.rb

@@ -1,12 +1,13 @@
 require 'rubygems'
-require 'test/unit'
+require 'minitest/autorun'
+# require 'test/unit'
 require 'shoulda'
-require 'mocha'
+require 'mocha/setup'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'epp'
 
-class Test::Unit::TestCase
+class Minitest::Test
 end

data/test/xml/new_request.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<epp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:ietf:params:xml:ns:epp-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd"/>
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd"/>

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: epp-nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Josh Delsman
 - Delwyn de Villiers
 - Priit Haamer
+- Tanel Jakobsoo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -54,6 +55,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +103,7 @@ email:
 - jdelsman@ultraspeed.com
 - delwyn.d@gmail.com
 - priit@edicy.com
+- tanel@voog.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -116,7 +132,7 @@ files:
 - test/xml/socket_preparation.xml
 - test/xml/test_request.xml
 - test/xml/test_response.xml
-homepage: https://github.com/priithaamer/epp
+homepage: https://github.com/Voog/epp
 licenses:
 - MIT
 metadata: {}
@@ -136,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: epp
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: EPP (Extensible Provisioning Protocol) for Ruby