opensrs-ruby 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9db624959631865e046c75c2b1ce1ddf206660653b52c23d4ed1b3e16e2df99a
-  data.tar.gz: 94305661d8151fc552a51a47c848ccf23dda4521d7b16537c5119852bb6a989e
+  metadata.gz: ca301070c7f153b8a30427eb06c1c054eb2426e686b5bd5a8756e68aeebc3962
+  data.tar.gz: 2fde40733b76b76897cfd919abadcc71c7ebf07455d89c20a89d58fd2e341c82
 SHA512:
-  metadata.gz: c44c80fd62678fe427a04f62787a14211885db290b052e0e4b52dcf8bea55c323994188bb97c8da47aa5e7dbc98140d90a29ca60aeb76a19ec9137581fd3cf90
-  data.tar.gz: 209b945d9cf72e39b1d3d7ed88b56cc8aa4585e78506c1edbccdc5de11e74caddedf95c84c0b301431b0574c13a119736ce45776cf8aa956e4269686b6cd948f
+  metadata.gz: e1339e6aa4c6aa43ea153f127a175eceb8c9c494a66bbe0c7dd73f978c7c6b2f81ed8c24174b67822f87dc1c46fd013fe76ccf82e5e21ae322aaf8ec72a33e5e
+  data.tar.gz: 94b80af468d1024563399d4ddd7e1b8d186170bbcdbf8ccaa859d0f8ce3a89698ccb6157b002e2747c711ef292319a18782b5b0c41c298b2ed4ac262a7eaa15d

data/lib/opensrs/domain.rb

@@ -9,8 +9,8 @@ module OpenSRS
     attr_reader :name, :expires_at, :created_at, :updated_at, :nameservers, :contacts
 
     def initialize(name:, client: nil, expires_at: nil, created_at: nil,
-                   updated_at: nil, auto_renew: false, locked: false,
-                   whois_private: false, nameservers: [], contacts: {})
+                   updated_at: nil, auto_renew: false, locked: nil,
+                   whois_private: nil, nameservers: [], contacts: {})
       @name = name
       @client = client || OpenSRS.default_client
       @expires_at = expires_at
@@ -24,8 +24,26 @@ module OpenSRS
     end
 
     def auto_renew? = @auto_renew
-    def locked? = @locked
-    def whois_private? = @whois_private
+
+    def locked?
+      if @locked.nil?
+        result = @client.call(action: "GET", object: "DOMAIN",
+          attributes: { "type" => "status", "domain_name" => @name },
+          extra: { "domain" => @name })
+        @locked = result.dig("attributes", "lock_state").to_s == "1"
+      end
+      @locked
+    end
+
+    def whois_private?
+      if @whois_private.nil?
+        result = @client.call(action: "GET", object: "DOMAIN",
+          attributes: { "type" => "whois_privacy_state" },
+          extra: { "domain" => @name })
+        @whois_private = result.dig("attributes", "state") == "enabled"
+      end
+      @whois_private
+    end
 
     class << self
       def available?(domain_name, client: OpenSRS.default_client)
@@ -108,19 +126,15 @@ module OpenSRS
       end
 
       def register!(domain_name, period: 1, contacts:, nameservers:, client: OpenSRS.default_client)
-        contact_set = {}
-        contacts.each do |role, data|
-          c = data.is_a?(Contact) ? data : Contact.new(**data)
-          contact_set[role.to_s] = c.to_api_hash
-        end
-        %w[admin billing].each { |r| contact_set[r] ||= contact_set["owner"] }
+        contact_set = build_contact_set(contacts)
 
         ns_list = nameservers.each_with_index.map do |ns, i|
           { "name" => ns, "sortorder" => (i + 1).to_s }
         end
 
         reg_user = domain_name.gsub(/[^a-z0-9]/i, "")[0, 20]
-        reg_pass = Digest::MD5.hexdigest(domain_name + Time.now.to_s)[0, 20]
+        reg_user = "user#{reg_user}" if reg_user.length < 3
+        reg_pass = "Rg!" + Digest::MD5.hexdigest(domain_name + Time.now.to_s)[0, 17]
 
         client.call(action: "SW_REGISTER", object: "DOMAIN", attributes: {
           "domain" => domain_name,
@@ -132,6 +146,7 @@ module OpenSRS
           "custom_nameservers" => "1",
           "custom_tech_contact" => "0",
           "auto_renew" => "0",
+          "f_lock_domain" => "1",
           "f_whois_privacy" => "1",
           "contact_set" => contact_set,
           "nameserver_list" => ns_list,
@@ -141,15 +156,11 @@ module OpenSRS
       end
 
       def transfer!(domain_name, auth_code:, contacts:, nameservers: [], client: OpenSRS.default_client)
-        contact_set = {}
-        contacts.each do |role, data|
-          c = data.is_a?(Contact) ? data : Contact.new(**data)
-          contact_set[role.to_s] = c.to_api_hash
-        end
-        %w[admin billing].each { |r| contact_set[r] ||= contact_set["owner"] }
+        contact_set = build_contact_set(contacts)
 
         reg_user = domain_name.gsub(/[^a-z0-9]/i, "")[0, 20]
-        reg_pass = Digest::MD5.hexdigest(domain_name + Time.now.to_s)[0, 20]
+        reg_user = "user#{reg_user}" if reg_user.length < 3
+        reg_pass = "Rg!" + Digest::MD5.hexdigest(domain_name + Time.now.to_s)[0, 17]
 
         attrs = {
           "domain" => domain_name,
@@ -177,6 +188,22 @@ module OpenSRS
 
       private
 
+      def build_contact_set(contacts)
+        contact_set = {}
+        if contacts.is_a?(Contact)
+          contact_set["owner"] = contacts.to_api_hash
+        elsif contacts.is_a?(Hash) && contacts.values.first.is_a?(Contact)
+          contacts.each { |role, c| contact_set[role.to_s] = c.to_api_hash }
+        elsif contacts.is_a?(Hash)
+          contacts.each do |role, data|
+            c = data.is_a?(Hash) ? Contact.new(**data.transform_keys(&:to_sym).slice(*Contact.members)) : data
+            contact_set[role.to_s] = c.is_a?(Contact) ? c.to_api_hash : c
+          end
+        end
+        %w[admin billing tech].each { |r| contact_set[r] ||= contact_set["owner"] }
+        contact_set
+      end
+
       def from_api(domain_name, attrs, client:)
         nameservers = (attrs["nameserver_list"] || []).sort_by { |ns|
           ns["sortorder"].to_i
@@ -194,8 +221,8 @@ module OpenSRS
           created_at: parse_time(attrs["registry_createdate"]),
           updated_at: parse_time(attrs["registry_updatedate"]),
           auto_renew: attrs["auto_renew"].to_s == "1",
-          locked: attrs["f_lock_domain"].to_s == "1",
-          whois_private: attrs["whois_privacy_state"] == "enabled",
+          locked: nil,
+          whois_private: nil,
           nameservers: nameservers,
           contacts: contacts
         )
@@ -221,12 +248,14 @@ module OpenSRS
     end
 
     def lock!
-      modify_setting("f_lock_domain", "1")
+      @client.call(action: "MODIFY", object: "DOMAIN",
+        attributes: { "domain" => @name, "data" => "status", "affect_domains" => "0", "lock_state" => "1" })
       @locked = true
     end
 
     def unlock!
-      modify_setting("f_lock_domain", "0")
+      @client.call(action: "MODIFY", object: "DOMAIN",
+        attributes: { "domain" => @name, "data" => "status", "affect_domains" => "0", "lock_state" => "0" })
       @locked = false
     end
 
@@ -262,12 +291,5 @@ module OpenSRS
       @auto_renew = enabled
     end
 
-    private
-
-    def modify_setting(key, value)
-      @client.call(action: "MODIFY", object: "DOMAIN",
-        attributes: { "affect_domains" => "0", "data" => "status", key => value },
-        extra: { "domain" => @name })
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opensrs-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - usiegj00