reg.api2 0.0.1 → 0.0.2

data/.yard_redcarpet_ext

@@ -0,0 +1 @@
+tables

data/.yardopts

@@ -2,6 +2,7 @@
 --markup-provider redcarpet
 --charset utf-8
 --readme README.md
+--plugin redcarpet-ext
 -
 README.md
 LICENSE

data/README.md

@@ -6,6 +6,8 @@
 
 REG.API v2 Implementation.
 
+We want to note that Ruby client uses recommended way to access API: POST requests with JSON input/output in utf-8 encoding over HTTPS protocol.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -27,8 +29,12 @@ Or install it yourself as:
 ```ruby
 require "reg_api2"
 
+RegApi2.username = 'test'
+RegApi2.password = 'test'
+RegApi2.lang     = 'ru'
+
 RegApi2.service.nop(services: [
-  { dname:"test.ru" },
+  { dname: "test.ru" },
   { dname: "test.su", servtype: "srv_hosting_ispmgr" },
   { service_id: 111111 },
   { service_id: "22bug22" },
@@ -36,21 +42,127 @@ RegApi2.service.nop(services: [
 ])
 ```
 
+Other examples available as examples of concrete method calls.
+
+### Console
+
+This gem also provides `regapi2console` utility that allows You
+to query REG.API interactively using `irb` shell.
+
+```
+$ regapi2console
+Your default username: "test", and You can change it with "~/.regapi2".
+1.9.3-p194 :001 > folder.nop
+ => {"name"=>"test_folder_name", "id"=>"-1"}
+1.9.3-p194 :002 >
+```
+
+## Recommendations for effective use of REG.API
+This section provides information that will help you to make you work with REG.API more productive and convenient.
+
+One of the most frequent problems our partners face when working with REG.API is exceeding the maximum request limit (1,200 requests per hour).
+
+The analysis of such situations showed that in most cases such problems are the results of improper use or misuse of REG.API due to bugs or design faults in the software used by partners.
+
+The recommendations below will, on the one hand, allow you to preclude situations with excessive requests to REG.API leading to temporary blocking of user accounts, and, on the other hand, to reduce the load on RegRuSRS.
+
+1. We recommend you to send WHOIS requests (for the display of WHOIS data on your sites) not to REG.API, but directly to the WHOIS servers of the corresponding domain zones.
+
+  The advantages of this approach are as follows:
+  * The responses to WHOIS requests will arriver faster.
+  * You will get data directly from its source without mediation.
+  * The overall number of requests will decrease, thus the likelihood of blocking of your account due to excessive requests to REG.API decreases as well.
+
+  We can offer you ready-to-use software solutions that will allow you to optimize your procedures of getting WHOIS data.
+
+2. We recommend you to use REG.API for placing orders or changing data rather than for obtaining data. The software employed by some of our partners either do not locally store domain-related data or store incomplete data. As a result this data is dynamically downloaded from our system with the help of such functions domain_list, service/get_info, domain/get_contacts, domain/get_nss, etc.
+  We advise you to store all domain- and service-related locally and address to REG.API only when you want to change some data in the registry. This will ensure fast and reliable operation of your applications and minimize your dependency on the availability of our system.
+
+3. All data change requests should be performed asynchronously.
+
+  Some applications perform domain/service registration operations, as well as data change operations right at the moment of processing HTTP requests from clients. But if the execution of an API request fails for some reason (connection loss, exceeding of request limit, parallel request blocking), this request will get lost and the client will receive an error message.
+
+  This mode of interaction is very unreliable and inconvenient for your customers.
+
+  We recommend you to perform all service ordering/data changing requests asynchronously using the queue mechanism. In such a case:
+  * You will exclude the possibility of API request blockings (because only one API request is performed at a time).
+  * In case of connection failures the request can be repeated until it is executed (this significantly increases the system reliability).
+  * In case of request processing errors (if REG.RU returned an error code), you can fix the problem and repeat the request, while the customer will not get any error messages. You can solve the major part of your customers’ problems on your own without their participation.
+
+4. It is a good practice to keep logs of all API request and responses. If a problem arises, logs will help you or our support engineers to efficiently locate and solve it.
+
+We hope that this information will be useful for you and that it will help you to optimize your work with REG.API.
+
+## REG.API 2.0 overview
+
+### Service identification parameters
+This group of parameters serves for identification of specific pre-ordered services.
+
+Services can be identified by:
+
+* service ID (both domains and services),
+* domain name (domains only),
+* domain name and service type (services only),
+* ID of a parent service, service type or subtype (services only).
+
+Identification by numeric service identifiers is the most reliable and quick method. For this reason, we recommend that you save and store domain/service IDs on your side and use them for service identification.
+
+| Parameter   | Description                     |
+| ----------- | ------------------------------- |
+| | **Identification by service ID (recommended)** |
+| service_id  | Numeric service identifier. |
+| | **Identification by service ID passed by the user** |
+| user_servid | Alphanumeric service identifier. To use such an identifier, you should define it during domain/service creation. To learn the pre-defined identifier, use the `RegApi2.service.get_info` function.|
+| | **Domain identification by name** |
+| domain_name | Domain name. Russian domain names should be passed in the punycode or national encoding. |
+| | **Service identification by domain name and type of service (except for VPS)** |
+| domain_name | Name of the domain the service is associated with. Russian domain names should be passed in the punycode or national encoding. |
+| servtype | Service type. For example, «srv_hosting_ispmgr» for hosting or «srv_webfwd» for the web-forwarding service. |
+| | **Service identification by parent service ID, service type or subtype** |
+| uplink_service_id | ID of the parent service with which the required service is associated. |
+| servtype | Service type. For example, «srv_hosting_ispmgr» for hosting or «srv_webfwd» for the web-forwarding service. |
+| subtype | Service subtype. For example, «pro» for the ISP Manager Pro license. | 
+
+### Service list identification parameters
+
+| Parameter   | Description                     |
+| ----------- | ------------------------------- |
+| domains | A list where each element includes a domain name or its service_ID in compliance with common service identification parameters. You can specify not more than 1000 services in one request. |
+| services | A list where each element includes a domain name + service type or service_ID in compliance common service identification parameters. |
+
+### Folder identification parameters
+
+| Parameter   | Description                     |
+| ----------- | ------------------------------- |
+| folder_id | Numeric folder identifier (recommended). |
+| folder_name | Folder name. |
+
+### Common payment options
+
+This section describes the parameters common for the functions dealing with service ordering or renewal of services, i.e. the functions that involve payments.
+
+| Parameter   | Description                     |
+| ----------- | ------------------------------- |
+| point_of_sale | An arbitrary string that identifies a system/web site used by the customer for placing an order for a domain. Optional field. Example: «regpanel.ru». |
+| pay_type | Payment option. Currently available payment options: (WM, bank, pbank, prepay, yamoney, rapida, robox, paymer, cash, chronopay). Default value: prepay. Please note that automatic payments can be done only if the selected payment method is «prepay» and you have enough funds in your account. Otherwise, your order will be marked as unpaid and you will have to arrange the payment manually from your profile page. |
+| ok_if_no_money | Enable to create bill when not enough funds to complete the operation. In this case requested operation is stored in the system, however it will be processed after submitting "change payment method" request via web interface. Return error if this flag not set and not enough funds to complete the operation. |
+
 ## Documentation
 
-Simply do
+Actual documentation available at https://www.reg.com/support/help/API-version2
+
+For developers: Ruby client documentation can be accessed as:
 
 ```bash
 bundle exec rake yard
 open doc/index.html
 ```
 
-Also documentation available at https://www.reg.com/support/help/API-version2
-
 ## Contributing
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+3. Add your tests and run `rake`.
+4. Commit your changes (`git commit -am 'Add some feature'`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create new Pull Request

data/Rakefile

@@ -1,9 +1,12 @@
-require 'rubygems'
 require 'rake'
 require "bundler/gem_tasks"
 
 APP_ROOT = File.dirname(__FILE__).freeze
 
+lib = File.expand_path('lib', APP_ROOT)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'reg_api2/version'
+
 begin
   require 'rspec/core/rake_task'
 
@@ -24,7 +27,8 @@ begin
   require 'yard'
 
   YARD::Rake::YardocTask.new do |yard|
-    version = File.exists?('VERSION') ? IO.read('VERSION') : ""
+
+    version = RegApi2::VERSION
     yard.options << "--title='reg.api2 #{version}'"
   end
 rescue LoadError

data/bin/regapi2console

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+begin
+  require 'reg_api2/console'
+rescue LoadError # local run
+  APP_ROOT = File.expand_path('..', File.dirname(__FILE__)).freeze
+  lib = File.expand_path('lib', APP_ROOT)
+  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+  require 'reg_api2/console'
+end

data/lib/reg_api2/bill.rb

@@ -0,0 +1,76 @@
+# -*- encoding : utf-8 -*-
+module RegApi2
+  # REG.API bill category
+  module Bill
+
+    include RegApi2::Builder
+
+    category :bill
+
+    # @!method nop(opts = {})
+    # @param [Hash] opts
+    # @option opts [String] :bill_id Invoice number in case of a single-invoice request.
+    # @option opts [Array] :bills A list if invoice numbers.
+    # For testing purposes.
+    # @return [NilClass or Hash(bills)] nil or bills.
+    # @note Support of invoice lists: yes
+    # @example Get single bill
+    #    RegApi2.bill.nop bill_id: 12345
+    # @example Get bills
+    #    RegApi2.bill.nop bills: ["12345","12346"]
+    define :nop
+
+    # @!method get_not_payed(opts = {})
+    # Use this function to obtain a list of unpaid invoices.
+    # @param [Hash] opts
+    # @option opts [Fixnum] :limit Defines the number of invoices to be included in the output at a time. Default value: 100. Maximum value: 1024.
+    # @option opts [Fixnum] :offset The offset from the starting point, if the number of invoices exceeds the defined limit.
+    # @return [Hash(bills)] Bills.
+    # @note Accessibility: clients
+    # @note Support of invoice lists: yes
+    define :get_not_payed
+
+    # @!method get_for_period(opts = {})
+    # Use this function to obtain a list of invoices for the defined period.
+    # @param [Hash] opts
+    # @option opts [String, Date] :start_date Starting date of the requested period in the ISO format. Mandatory field.
+    # @option opts [String, Date] :end_date End date of the requested period in the ISO format. Mandatory field.
+    # @option opts [String] :pay_type Payment method. For information about available alternatives refer to the description of response fields.
+    # @option opts [Fixnum] :limit Defines the number of invoices to be included in the output at a time. Default value: 100. Maximum value: 1024.
+    # @option opts [Fixnum] :offset The offset from the starting point, if the number of invoices exceeds the defined limit.
+    # @option opts [Boolean] :all Show inactive invoices, i.e. invoices for outdated services and invoices cancelled due to impossibility of order execution.
+    # @return [Hash(bills)] Bills.
+    # @note Accessibility: partners
+    # @note Support of invoice lists: yes
+    define :get_for_period, required: { start_date: { iso_date: true }, end_date: { iso_date: true } }
+
+    # @!method change_pay_type(opts = {})
+    # You can use this function to change payment methods. Some of the methods allow issue of invoices in the defined payment systems, advance payments are made immediately.
+    # @note Accessibility: clients
+    # @param [Hash] opts
+    # @option opts [Fixnum] :bill_id Invoice ID (in case of single invoice request).
+    # @option opts [Array(Fixnum)] :bills A list of invoice IDs.
+    # @option opts [String] :pay_type New payment type. Mandatory field. Valid values: prepay — advance payment (to be made immediately); WM — WebMoney. With the WMID defined, the invoices are issued to the customer’s WM account; yamoney, ymbill — Yandex.Dengi. To issue an invoice, define ymbill and in advance allow the receipt of invoices from REG.; bank — bank transfer
+    # @option opts [String] :currency Currency. Mandatory field. «Yandex.Dengi» allows RUR only, «bank» and «prepay» – RUR and USD, «WebMoney» also allows EUR and UAH.
+    # @option opts [Fixnum] :wmid WebMoney ID
+    # @note Support of invoice lists: yes
+    # @return [Hash(bills)] Bills.
+    # @example Example of request
+    #    bill.change_pay_type(currency: :RUR, pay_type: :prepay, bills: [ 123456 ])
+    define :change_pay_type, required: %w[ currency pay_type ]
+
+    # @!method delete(opts = {})
+    # Deletion of unpaid invoices.
+    # @note Accessibility: clients
+    # @note Support of invoice lists: yes
+    # @param [Hash] opts
+    # @option opts [Fixnum] :bill_id Invoice ID (in case of single invoice request).
+    # @option opts [Array(Fixnum)] :bills A list of invoice IDs.
+    # @return [Hash(bills)] Bills.
+    # @example Delete three bills.
+    #    bill.delete(bills: [ { bill_id: 12345 }, { bill_id: 12346 }, { bill_id: 12347 } ])    
+    define :delete
+
+    extend self
+  end
+end

data/lib/reg_api2/common.rb

@@ -1,7 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-require 'reg_api2/result_contract/single_field'
-
 module RegApi2
 
   # REG.API common category
@@ -31,14 +29,14 @@ module RegApi2
     # @param None
     # For testing purposes (returns the identifier of the user logged into the system).
     # @return [String] user_id
-    define :get_user_id, result: :single_field, field: 'user_id'
+    define :get_user_id, field: :user_id
 
     # @!method get_service_id(opts = {})
     # @param [Hash] opts The options.
     # @option opts [FixNum] :service_id Service identifier.
     # Gets service/domain identifier
     # @return [String] service_id
-    define :get_service_id, result: :single_field, field: 'service_id'
+    define :get_service_id, field: :service_id
 
     extend self
   end

data/lib/reg_api2/console.rb

@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+module RegApi2
+  # Runs Interactive Ruby Shell
+  class Console
+    # Gem root.
+    GEM_ROOT = File.expand_path("../..", File.dirname(__FILE__)).freeze
+
+    # Runs irb with our console helpers.
+    def self.run!
+      Kernel.exec("irb --readline -I #{File.join(GEM_ROOT, 'lib')} -r reg_api2/console_helpers")
+    end
+  end
+end
+
+RegApi2::Console.run!

data/lib/reg_api2/console_helpers.rb

@@ -0,0 +1,24 @@
+# -*- encoding : utf-8 -*-
+require 'reg_api2'
+
+include RegApi2
+
+# Try to load defaults from ~/.regapi2
+def try_lo_load_defaults
+  filename = "#{ENV['HOME']}/.regapi2"
+  username = 'test'
+  password = 'test'
+
+  if File.readable?(filename)
+    IO.read(filename).split("\n").each do |line|
+      username = $1  if line.strip =~ /^\s*username\s*\=(.+)\s*$/;
+      password = $1  if line.strip =~ /^\s*password\s*\=(.+)\s*$/;
+    end
+  end
+
+  RegApi2.username = username
+  RegApi2.password = password
+  puts "Your default username: \"#{username}\", and You can change it with \"#{filename}\"."
+end
+
+try_lo_load_defaults

data/lib/reg_api2/domain.rb

@@ -0,0 +1,96 @@
+# -*- encoding : utf-8 -*-
+module RegApi2
+  # REG.API domain category
+  module Domain
+
+    include RegApi2::Builder
+
+    category :domain
+
+    # @!method nop(opts = {})
+    # @param [Hash] opts
+    # @option opts [String] :dname Domain name to check.
+    # For testing purposes. Also, with the help of this function you can check accessibility of a domain and get its ID. For this, pass username+password+dname.
+    # @return [NilClass or String] nil or Domain identifier, available only when the domain name is passed in the field domain_name/dname.
+    define :nop
+
+    # @!method get_prices(opts = {})
+    # @param [Hash] opts
+    # @option opts [Fixnum] :show_renew_data With this flag enabled the System will return the price of registration renewal (1/0). Optional field.
+    # @option opts [Fixnum] :show_update_data Флаг возврата цен для обновления домена (1/0). Необязательное поле.
+    # @option opts [String] :currency Identifier of the currency in which the prices will be quoted: RUR (default), UAH, USD, EUR. Optional field.
+    # Get domain registration/renewal prices in all zones available.
+    # @return [Hash(currency, price_group, prices)] Prices sorted by domain zones. The prices are quoted for the period of 1 year. For some of the zones the minimum registration period exceeds 1 year. If a zone allows Cyrillic domains and the price for them differ from the price for domains in Latin characters, for such a zone the system will return an additional record with the prefix '__idn.'.
+    # @note Accessibility: everyone
+    # @note Support of service lists: no
+    define :get_prices
+
+    # @!method get_suggest(opts = {})
+    define :get_suggest
+
+    # @!method get_premium(opts = {})
+    define :get_premium
+
+    # @!method check(opts = {})
+    define :check
+
+    # @!method create(opts = {})
+    define :create
+
+    # @!method transfer(opts = {})
+    define :transfer
+
+    # @!method get_rereg_data(opts = {})
+    define :get_rereg_data
+
+    # @!method set_rereg_bids(opts = {})
+    define :set_rereg_bids
+
+    # @!method get_user_rereg_bids(opts = {})
+    define :get_user_rereg_bids
+
+    # @!method get_docs_upload_uri(opts = {})
+    define :get_docs_upload_uri
+
+    # @!method update_contacts(opts = {})
+    define :update_contacts
+
+    # @!method update_private_person_flag(opts = {})
+    define :update_private_person_flag
+
+    # @!method register_ns(opts = {})
+    define :register_ns
+
+    # @!method delete_ns(opts = {})
+    define :delete_ns
+
+    # @!method get_nss(opts = {})
+    define :get_nss
+
+    # @!method update_nss(opts = {})
+    define :update_nss
+
+    # @!method delegate(opts = {})
+    define :delegate
+
+    # @!method undelegate(opts = {})
+    define :undelegate
+
+    # @!method transfer_to_another_account(opts = {})
+    define :transfer_to_another_account
+
+    # @!method look_at_entering_list(opts = {})
+    define :look_at_entering_list
+
+    # @!method accept_or_refuse_entering_list(opts = {})
+    define :accept_or_refuse_entering_list
+
+    # @!method cancel_transfer(opts = {})
+    define :cancel_transfer
+
+    # @!method request_to_transfer(opts = {})
+    define :request_to_transfer
+
+    extend self
+  end
+end

data/lib/reg_api2/folder.rb

@@ -0,0 +1,87 @@
+# -*- encoding : utf-8 -*-
+module RegApi2
+  # REG.API folder category
+  module Folder
+
+    include RegApi2::Builder
+
+    category :folder
+
+    # @!method nop(opts = {})
+    # @param [Hash] opts
+    # @option opts [String] :folder_name Folder name to check.
+    # @option opts [String] :folder_id Folder id to check.
+    # You can use this test function to check the availability of folders.
+    # @return [Hash(id, name)] Folder data.
+    # @note Support of service lists: no
+    # @example Initialization with ID
+    #    RegApi2.folder.nop folder_id: 123456
+    # @example Initialization with name
+    #    RegApi2.folder.nop folder_name: "test_folder_name"
+    define :nop
+
+    # @!method create(opts = {})
+    # Creates a folder.
+    # @param [Hash] opts
+    # @option opts [String] :folder_name The name of the new folder.
+    # @return [nil] nil.
+    # @note Support of service lists: no
+    # @example Creation of folder
+    #    RegApi2.folder.create folder_name: 'test_folder_name'
+    define :create, required: %w[ folder_name ]
+
+    # @!method remove(opts = {})
+    # Removes a folder.
+    # @param [Hash] opts
+    # @option opts [Fixnum] :folder_id Id of folder to remove.
+    # @option opts [String] :folder_name The name of folder to remove.
+    # @return [nil] nil.
+    # @note Support of service lists: no
+    # @example Removing of folder by id
+    #    RegApi2.folder.remove folder_id: 123456
+    # @example Removing of folder by name
+    #    RegApi2.folder.remove folder_name: 'test_folder_name'
+    define :remove
+
+    # @!method rename(opts = {})
+    # Renames a folder.
+    # @param [Hash] opts
+    # @option opts [Fixnum] :folder_id Id of folder to rename.
+    # @option opts [String] :folder_name The name of folder to rename.
+    # @option opts [String] :new_folder_name Defines the new name of folder.
+    # @return [Hash(folder_content)] Folder content.
+    # @note Support of service lists: no
+    # @example Renaming of folder by id
+    #    RegApi2.folder.rename folder_id: 123456, new_folder_name: 'new_test_folder_name'
+    # @example Renaming of folder by name
+    #    RegApi2.folder.rename folder_name: 'test_folder_name', new_folder_name: 'new_test_folder_name'
+    define :rename, required: %w[ new_folder_name ]
+
+    # @!method get_services(opts = {})
+    # Use this function to obtain the list of services available in the folder.
+    # @param [Hash] opts
+    define :get_services
+
+    # @!method add_services(opts = {})
+    # Use this function to add services to folders.
+    # @param [Hash] opts
+    define :add_services
+
+    # @!method remove_services(opts = {})
+    # Use this function to delete services from folders.
+    # @param [Hash] opts
+    define :remove_services
+
+    # @!method replace_services(opts = {})
+    # This function allows replacement of services already available in a folder with other services (deletes the service available in the folder and adds the services defined by the domain_name or service_id parameter).
+    # @param [Hash] opts
+    define :replace_services
+
+    # @!method move_services(opts = {})
+    # Use this function to move service between folders.
+    # @param [Hash] opts
+    define :move_services
+
+    extend self
+  end
+end

data/lib/reg_api2/impl.rb

@@ -3,15 +3,23 @@ require 'net/http'
 require 'net/https'
 require 'yajl'
 
-require 'reg_api2/util'
-
 module RegApi2
   # Networking Error
   class NetError < Exception
   end
+
   # API Contract Error
   class ContractError < Exception
+    # @!attribute [r] fields
+    # Wrong fields.
+    attr_reader :fields
+
+    def initialize message, fields = []
+      super message
+      @fields = fields
+    end
   end
+
   # API Error
   class ApiError < Exception
     # @!attribute [r] description
@@ -46,10 +54,6 @@ module RegApi2
     DEFAULT_IO_ENCODING = 'utf-8'
     # Default lang.
     DEFAULT_LANG = 'en'
-    # Default API contract for requests
-    DEFAULT_REQUEST_CONTRACT = RegApi2::RequestContract::Default
-    # Default API contract for results
-    DEFAULT_RESULT_CONTRACT = RegApi2::ResultContract::Default
 
     # REG.API base URI
     API_URI = URI.parse("https://api.reg.ru/api/regru2")
@@ -70,41 +74,16 @@ module RegApi2
     # Placeholder to inspect sent form
     # @param [String] path
     # @param [Hash] form
-    # @return Doesn't matter
+    # @return void
     def form_to_be_sent(path, form)
     end
 
     # Placeholder to inspect got response.
     # @param [Net::HTTPResponse] response
-    # @return Doesn't matter
+    # @return void
     def got_response(response)
     end
 
-    # Gets {Class} by its name.
-    # @param [Class] ancestor
-    # @param [NilClass, Class, String] name
-    # @param [Class] default_value
-    # @return [Class] {RegApi2::RequestContract}
-    def get_contract ancestor, name, default_value
-      return default_value  unless name
-      return name  if name.kind_of?(Class)
-      ancestor.const_get(RegApi2::Util.constantize name)
-    end
-
-    # Gets {RegApi2::RequestContract} by its name.
-    # @param [NilClass, Class, String] name
-    # @return [Class] {RegApi2::RequestContract}
-    def get_request_contract_by_name name
-      get_contract(RegApi2::RequestContract, name, DEFAULT_REQUEST_CONTRACT)
-    end
-
-    # Gets {RegApi2::ResultContract} by its name.
-    # @param [NilClass, Class, String] name
-    # @return [Class] {RegApi2::ResultContract}
-    def get_result_contract_by_name name
-      get_contract(RegApi2::ResultContract, name, DEFAULT_RESULT_CONTRACT)
-    end
-
     # Gets form data for POST request
     # @param [Hash] defopts
     # @param [Hash] opts
@@ -114,7 +93,8 @@ module RegApi2
       # HACK: REG.API doesn't know about utf-8.
       io_encoding = 'utf8'  if !io_encoding || io_encoding == DEFAULT_IO_ENCODING
       opts = opts.to_hash  if opts.respond_to?(:to_hash)
-      get_request_contract_by_name(defopts[:request]).new(defopts).validate(opts)
+      opts = RegApi2::RequestContract.new(defopts).validate(opts)
+
       form = {
         'username' => username,
         'password' => password,
@@ -125,6 +105,7 @@ module RegApi2
         'show_input_params' => 0,
         'input_data' => Yajl::Encoder.encode(opts)
       }
+
       form
     end
 
@@ -145,7 +126,8 @@ module RegApi2
         json['error_params']
       )  if json['result'] == 'error'
 
-      get_result_contract_by_name(defopts[:result]).new(defopts).handle_result(json)
+      res_contract = RegApi2::ResultContract.new(defopts)
+      res_contract.handle_result(json)
     end
 
     # Do actual call to REG.API using POST/JSON convention.
@@ -171,5 +153,5 @@ module RegApi2
       handle_response(defopts, res)
     end
 
-    end
   end
+end