cps-client 0.0.3 → 0.0.4

data/.gitignore

@@ -2,3 +2,5 @@ pkg/*
 *.gem
 .bundle
 doc
+.rvmrc
+test-*

data/Gemfile.lock

@@ -1,13 +1,15 @@
 PATH
   remote: .
   specs:
-    cps-client (0.1.0)
+    cps-client (0.0.5)
       always_verify_ssl_certificates (>= 0.2.0)
+      punycode4r (>= 0.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     always_verify_ssl_certificates (0.2.0)
+    punycode4r (0.2.0)
 
 PLATFORMS
   ruby
@@ -15,3 +17,4 @@ PLATFORMS
 DEPENDENCIES
   always_verify_ssl_certificates (>= 0.2.0)
   cps-client!
+  punycode4r (>= 0.2.0)

data/LICENSE

@@ -0,0 +1,21 @@
+== MIT License
+
+Copyright (c) 2008, Swank Innovations, LLC.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/cps-client.gemspec

@@ -2,6 +2,10 @@
 $:.push File.expand_path("../lib", __FILE__)
 require "cps-client/version"
 
+# to publish the gem to rubygems.org run:
+# rake install
+# rake release
+
 Gem::Specification.new do |s|
   s.name        = "cps-client"
   s.version     = CPS::VERSION
@@ -13,6 +17,8 @@ Gem::Specification.new do |s|
   s.description = %q{ruby api for the arp-client of cps-datensysteme.de}
 
   s.add_dependency('always_verify_ssl_certificates', '>= 0.2.0')
+  s.add_dependency('punycode4r', '>= 0.2.0')
+  s.add_dependency('domainatrix', '>= 0.0.7')
 
   s.rubyforge_project = "cps-client"
   

data/lib/core_ext.rb

@@ -1,19 +1,34 @@
 require 'iconv'
+require 'punycode'
+require 'domainatrix'
 
 class String
   
   CONVERTION_TABLE = {
     'Ç'       => 'C',
     'ç'       => 'c',
-    '[ûúù]'   => 'u',
-    '[éêëè]'  => 'e',
-    '[âàåá]'  => 'a',
-    '[ïîìí]'  => 'i',
-    '[Å]'     => 'A',
+    'û'       => 'u',
+    'ú'       => 'u',
+    'ù'       => 'u',
+    'é'       => 'e',
+    'ê'       => 'e',
+    'ë'       => 'e',
+    'è'       => 'e',
+    'â'       => 'a',
+    'à'       => 'a',
+    'å'       => 'a',
+    'á'       => 'a',
+    'ï'       => 'i',
+    'î'       => 'i',
+    'ì'       => 'i',
+    'í'       => 'i',
+    'Å'       => 'A',
     'É'       => 'E',
     'æ'       => 'ae',
     'Æ'       => 'Ae',
-    '[ôòó]'   => 'o',
+    'ô'       => 'o',
+    'ò'       => 'o',
+    'ó'       => 'o',
     'Ä'       => 'Ae',
     'Ö'       => 'Oe',
     'Ü'       => 'Ue',
@@ -36,20 +51,41 @@ class String
     return s
   end
   
-  def convert_to_iso_8859_1
+  def to_punycode
+    result = self
+    if self.match(/@/)
+      name   = self.split('@')[0]
+      url    = Domainatrix.parse("http://"+self.split('@')[1]) # Domainatrix needs a protocol...
+      result = "#{name}@#{url.domain.domain_to_punycode}.#{url.public_suffix}"
+    elsif self.match(/./)
+      url    = Domainatrix.parse("http://"+self)
+      result = "#{url.domain.domain_to_punycode}.#{url.public_suffix}"
+    end
+    return result
+  end
+  
+  def to_iso_8859_1
     begin
       i = Iconv.new('ISO-8859-1', 'UTF-8') # Iconv.new(to, from)
-      f = i.iconv(self.i18n_safe)
-      i.close
-      return f
+      i.iconv(self.i18n_safe)
     rescue
-      i.close
       self
+    ensure
+      i.close
     end
   end
-
+  
   def blank?
     self.nil? || self == ""
   end
-
+  
+  def domain_to_punycode
+    p = Punycode.encode(self)
+    unless p.match(/-$/)
+      "xn--#{p}"
+    else
+      p.sub(/-$/, "")
+    end
+  end
+  
 end

data/lib/cps-client/contact.rb

@@ -7,17 +7,17 @@ module CPS
     
     def initialize(options = {})
       @object       = options[:object].upcase
-      @firstname    = options[:firstname]
-      @lastname     = options[:lastname]
-      @orgname      = options[:orgname].nil? || options[:orgname] == "" ? "-" : options[:orgname]
-      @street       = options[:street]
-      @postal       = options[:postal]
-      @city         = options[:city]
-      @state        = options[:state]
-      @iso_country  = options[:iso_country]
-      @phone        = options[:phone]
-      @fax          = options[:fax]
-      @email        = options[:email]
+      @firstname    = options[:firstname].to_iso_8859_1
+      @lastname     = options[:lastname].to_iso_8859_1
+      @orgname      = options[:orgname].nil? || options[:orgname] == "" ? "-" : options[:orgname].to_iso_8859_1
+      @street       = options[:street].to_iso_8859_1
+      @postal       = options[:postal].to_iso_8859_1
+      @city         = options[:city].to_iso_8859_1
+      @state        = options[:state].to_iso_8859_1
+      @iso_country  = options[:iso_country].to_iso_8859_1
+      @phone        = options[:phone].to_iso_8859_1
+      @fax          = options[:fax].to_iso_8859_1
+      @email        = options[:email].to_punycode
       @privacy_rule = options[:privacy_rule] || ""
       @contact_type = @orgname == '-' ? "person" : "organisation"
     end

data/lib/cps-client/domain.rb

@@ -4,7 +4,7 @@ module CPS
     attr_reader :domain
     
     def initialize(options = {})
-      @domain = options[:domain]
+      @domain = options[:domain].downcase.to_punycode
       @adminc = options[:adminc]
       @techc  = options[:techc]
       @billc  = options[:billc]

data/lib/cps-client/version.rb

@@ -7,7 +7,7 @@ module CPS
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 3
+    PATCH = 4
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

data/lib/erb/base.erb

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <request>
   <auth>
-    <cid><%= @cid.convert_to_iso_8859_1 %></cid>
-    <user><%= @uid.convert_to_iso_8859_1 %></user>
-    <pwd><%= @pwd.convert_to_iso_8859_1 %></pwd>
+    <cid><%= @cid.to_iso_8859_1 %></cid>
+    <user><%= @uid.to_iso_8859_1 %></user>
+    <pwd><%= @pwd.to_iso_8859_1 %></pwd>
   </auth>
   <transaction>
     <%= @xml %>

data/lib/erb/contact_create.erb

@@ -1,19 +1,19 @@
 <group>contact</group>
 <action>create</action>
 <attribute>contact</attribute>
-<object><%= @object.convert_to_iso_8859_1 %></object>
+<object><%= @object %></object>
 <values>
-  <firstname><%= @firstname.convert_to_iso_8859_1 %></firstname>
-  <lastname><%= @lastname.convert_to_iso_8859_1 %></lastname>
-  <orgname><%= @orgname.convert_to_iso_8859_1 %></orgname>
-  <street><%= @street.convert_to_iso_8859_1 %></street>
-  <postal><%= @postal.convert_to_iso_8859_1 %></postal>
-  <city><%= @city.convert_to_iso_8859_1 %></city>
-  <state><%= @state.convert_to_iso_8859_1 %></state>
-  <iso_country><%= @iso_country.convert_to_iso_8859_1 %></iso_country>
-  <phone><%= @phone.convert_to_iso_8859_1 %></phone>
-  <fax><%= @fax.convert_to_iso_8859_1 %></fax>
-  <email><%= @email.convert_to_iso_8859_1 %></email>
-  <privacy_rule><%= @privacy_rule.convert_to_iso_8859_1 %></privacy_rule>
-  <contact_type><%= @contact_type.convert_to_iso_8859_1 %></contact_type>
+  <firstname><%= @firstname %></firstname>
+  <lastname><%= @lastname %></lastname>
+  <orgname><%= @orgname %></orgname>
+  <street><%= @street %></street>
+  <postal><%= @postal %></postal>
+  <city><%= @city %></city>
+  <state><%= @state %></state>
+  <iso_country><%= @iso_country %></iso_country>
+  <phone><%= @phone %></phone>
+  <fax><%= @fax %></fax>
+  <email><%= @email %></email>
+  <privacy_rule><%= @privacy_rule %></privacy_rule>
+  <contact_type><%= @contact_type %></contact_type>
 </values>

data/lib/erb/contact_delete.erb

@@ -1,4 +1,4 @@
 <group>contact</group>
 <action>delete</action>
 <attribute>contact</attribute>
-<object><%= @object.convert_to_iso_8859_1 %></object>
+<object><%= @object %></object>

data/lib/erb/contact_domain.erb

@@ -1,13 +1,13 @@
-<firstname><%= @firstname.convert_to_iso_8859_1 %></firstname>
-<lastname><%= @lastname.convert_to_iso_8859_1 %></lastname>
-<orgname><%= @orgname.convert_to_iso_8859_1 %></orgname>
-<street><%= @street.convert_to_iso_8859_1 %></street>
-<postal><%= @postal.convert_to_iso_8859_1 %></postal>
-<city><%= @city.convert_to_iso_8859_1 %></city>
-<state><%= @state.convert_to_iso_8859_1 %></state>
-<iso_country><%= @iso_country.convert_to_iso_8859_1 %></iso_country>
-<phone><%= @phone.convert_to_iso_8859_1 %></phone>
-<fax><%= @fax.convert_to_iso_8859_1 %></fax>
-<email><%= @email.convert_to_iso_8859_1 %></email>
-<privacy_rule><%= @privacy_rule.convert_to_iso_8859_1 %></privacy_rule>
-<contact_type><%= @contact_type.convert_to_iso_8859_1 %></contact_type>
+<firstname><%= @firstname %></firstname>
+<lastname><%= @lastname %></lastname>
+<orgname><%= @orgname %></orgname>
+<street><%= @street %></street>
+<postal><%= @postal %></postal>
+<city><%= @city %></city>
+<state><%= @state %></state>
+<iso_country><%= @iso_country %></iso_country>
+<phone><%= @phone %></phone>
+<fax><%= @fax %></fax>
+<email><%= @email %></email>
+<privacy_rule><%= @privacy_rule %></privacy_rule>
+<contact_type><%= @contact_type %></contact_type>

data/lib/erb/contact_info.erb

@@ -1,4 +1,4 @@
 <group>contact</group>
 <action>info</action>
 <attribute>contact</attribute>
-<object><%= @object.convert_to_iso_8859_1 %></object>
+<object><%= @object %></object>

data/lib/erb/domain_create.erb

@@ -1,16 +1,16 @@
 <group>domain</group>
 <action>create</action>
 <attribute>domain</attribute>
-<object><%= @domain.convert_to_iso_8859_1 %></object>
+<object><%= @domain %></object>
 <values>
-  <adminc><%= @adminc.convert_to_iso_8859_1 %></adminc>
-  <techc><%= @techc.convert_to_iso_8859_1 %></techc>
-  <billc><%= @billc.convert_to_iso_8859_1 %></billc>
-  <ownerc><%= @ownerc.convert_to_iso_8859_1 %></ownerc>
+  <adminc><%= @adminc %></adminc>
+  <techc><%= @techc %></techc>
+  <billc><%= @billc %></billc>
+  <ownerc><%= @ownerc %></ownerc>
   <dns>
-    <hostname><%= @ns1.convert_to_iso_8859_1 %></hostname>
+    <hostname><%= @ns1 %></hostname>
   </dns>
   <dns>
-    <hostname><%= @ns2.convert_to_iso_8859_1 %></hostname>
+    <hostname><%= @ns2 %></hostname>
   </dns>
 </values>

data/lib/erb/domain_delete.erb

@@ -1,4 +1,4 @@
 <group>domain</group>
 <action>delete</action>
 <attribute>domain</attribute>
-<object><%= @domain.convert_to_iso_8859_1 %></object>
+<object><%= @domain %></object>

data/lib/erb/domain_info.erb

@@ -1,4 +1,4 @@
 <group>domain</group>
 <action>info</action>
 <attribute>domain</attribute>
-<object><%= @domain.convert_to_iso_8859_1 %></object>
+<object><%= @domain %></object>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cps-client
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - jfqd
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 +01:00
+date: 2011-04-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,38 @@ dependencies:
         version: 0.2.0
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: punycode4r
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: domainatrix
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 0
+        - 7
+        version: 0.0.7
+  type: :runtime
+  version_requirements: *id003
 description: ruby api for the arp-client of cps-datensysteme.de
 email: 
 - jfqd@blun.org
@@ -47,6 +79,7 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - Rakefile
 - Readme.textile
 - cps-client.gemspec
@@ -98,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cps-client
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: ruby api for the arp-client of cps-datensysteme.de