reg.api2 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcf919b64250ad7be856188c30ab24b11ef258b4
-  data.tar.gz: 9741bbc8b397d58b26cb733c299804a5ffffd6c8
+  metadata.gz: 2a0e71a8b8e931939edc3f25a46d717d705f16c9
+  data.tar.gz: bb0f339992d12f6380f70f192a653ac888a385e2
 SHA512:
-  metadata.gz: d71dce82ad3170fc6cfd2a9086b91686cc59033a9f1f3b05689f896653f6875c47dfe6251a2c35250208fea1c276808b73e6c8e021915b70f2344d6b3e3cea28
-  data.tar.gz: 477e265b532a2e5d93876bc9b0e1414faf9327d03160fb69d9d05d3371b466d1f44502ae55b2a88ae9c68df1712e4123faf46dc6b6a7fb5f70d50efa80980bf9
+  metadata.gz: d8b82e60de033ebe7faece2f2125cbcc4eccecf14044131a1682913e8e537d83664759470d01443224ff85fcbc66a28a402ca8bfb9eedfe643329195a5baf527
+  data.tar.gz: c3606fa81edd963a8d13254c0f78dc206fd95274b5bd27361e3cf4a9cbfbd128cf462bc048fd51087882e621fa2afbc588b3eb6da69c1919fca64c8f4f71fb5e

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-#  - jruby-19mode
-  - rbx-2.1.1
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+

data/README.md

@@ -85,14 +85,17 @@ Also console reads `~/.regapi2` configuration file if exists, to assign properti
 
 Please follow these links to view documentation on methods of all known API categories:
 
-* [common](http://regru.github.io/reg_api2-ruby/RegApi2/Common.html).
-* [domain](http://regru.github.io/reg_api2-ruby/RegApi2/Domain.html).
-* [user](http://regru.github.io/reg_api2-ruby/RegApi2/User.html).
-* [service](http://regru.github.io/reg_api2-ruby/RegApi2/Service.html).
-* [bill](http://regru.github.io/reg_api2-ruby/RegApi2/Bill.html).
-* [folder](http://regru.github.io/reg_api2-ruby/RegApi2/Folder.html).
-* [zone](http://regru.github.io/reg_api2-ruby/RegApi2/Zone.html).
-* [hosting](http://regru.github.io/reg_api2-ruby/RegApi2/Hosting.html).
+| Category | Description |
+| -------- | ----------- |
+| [common](http://regru.github.io/reg_api2-ruby/RegApi2/Common.html) | Common ops |
+| [domain](http://regru.github.io/reg_api2-ruby/RegApi2/Domain.html) | Domain registration etc. |
+| [user](http://regru.github.io/reg_api2-ruby/RegApi2/User.html) | User creation etc. |
+| [service](http://regru.github.io/reg_api2-ruby/RegApi2/Service.html) | Generic service ops |
+| [bill](http://regru.github.io/reg_api2-ruby/RegApi2/Bill.html) | Billing |
+| [folder](http://regru.github.io/reg_api2-ruby/RegApi2/Folder.html) | Folders for services including domains |
+| [zone](http://regru.github.io/reg_api2-ruby/RegApi2/Zone.html) | Domain zone resource records (DNS) |
+| [hosting](http://regru.github.io/reg_api2-ruby/RegApi2/Hosting.html) | Jelastic hosting ops at now |
+| [shop](http://regru.github.io/reg_api2-ruby/RegApi2/Shop.html) | Domain Shop management functions |
 
 ## Recommendations for effective use of REG.API
 
@@ -177,7 +180,7 @@ Identification by numeric service identifiers is the most reliable and quick met
 | | **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. | 
+| subtype | Service subtype. For example, «pro» for the ISP Manager Pro license. |
 
 ### Service list identification parameters
 
@@ -278,7 +281,7 @@ Error code from REG.API raised by client as exception of {RegApi2::ApiError} cla
 
 ## Documentation
 
-Actual documentation available at https://www.reg.com/support/help/API-version2
+Actual documentation available at https://www.reg.com/support/help/api2
 
 For developers: Ruby client documentation can be accessed as:
 

data/lib/reg_api2/domain.rb

@@ -50,9 +50,18 @@ module RegApi2
 
     # @!method get_deleted(opts = {})
     # Get a list of deleted domains. The function is similar to the [Deleted Domains](https://www.reg.com/domain/new/freeing_domains) page.
+    # Maximum returned elements in list equals to 50000.
     # @param [Hash] opts Options.
     # @note Accessibility: partners
     # @note Support of service lists: no
+    # @example Typical usage
+    #   RegApi2.domain.get_deleted(
+    #       tlds:         'ru',
+    #       deleted_from: '2013-10-01',
+    #       deleted_to:   '2013-11-01',
+    #       min_pr:       2,
+    #       min_cy:       1
+    #   )
     define :get_deleted, field: :domains
 
     # @!method check(opts = {})

data/lib/reg_api2/service.rb

@@ -288,7 +288,10 @@ module RegApi2
     # @!method refill(opts = {})
     # You can use this function to refill balance of you service. Only Jelastic (srv_jelastic) is supported at the moment.
     # @param opts Options.
-    # @option opts [Array] mailtype Email type: `approver_email` — approve ssl certificate order, `certificate_email` — certificate email.
+    # @option opts [Fixnum] service_id Service id to be refilled.
+    # @option opts [Number] amount Amount of the invoice.
+    # @option opts [String] currency Invoice currency (RUR, USD, EUR, UAH).
+    # @option opts [Boolean] 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.
     # @return [Hash(service_id, bill_id etc.)]
     # @note Accessibility: clients
     # @note Support of service lists: no

data/lib/reg_api2/shop.rb

@@ -0,0 +1,69 @@
+# -*- encoding : utf-8 -*-
+
+module RegApi2
+  # REG.API shop category
+  module Shop
+
+    include RegApi2::Builder
+
+    category :shop
+
+    # @!method nop
+    # @param opts Opts
+    # @option opts [String] :dname Domain name.
+    # For testing purposes. Also, with the help of this function you can check accessibility of a lot and get its ID. For this, pass username+password+dname.
+    # @return [String] lot identifier or nil.
+    define :nop
+
+   # @!method add_lot
+    # @param opts Opts
+    # adding lot/lots.
+    # @return [void] Nothing.
+    define :add_lot
+
+   # @!method add_lot
+    # @param opts Opts
+    # Update lot/lots.
+    # @return [void] Nothing.
+    define :update_lot
+
+    # @!method delete_lot
+    # @param opts Opts
+    # @option opts [String] :dname Domain list.
+    # delete lot/lots.
+    # @return [void] Nothing.
+    define :delete_lot, required: { dname: {} }
+
+    # @!method get_info
+    # @param opts Opts
+    # @option opts [String] :dname Domain list.
+    # obtain information on the lot.
+    # @return [Hash] Lots data.
+    define :get_info, required: { dname: {} }
+
+    # @!method get_lot_list
+    # @param opts Opts
+    # @option opts [Boolean] :show_my_lots "Only my items" flag.
+    # @option opts [Fixnum] :pg what page to show, by default - 0.
+    # @option opts [Fixnum] :itemsonpage how many items per page, by default - 25, possible values: 25, 50, 100, 200, 500.
+    # getting a list of lots.
+    # @return [Hash] Lots data.
+    define :get_lot_list
+
+    # @!method get_category_list
+    # @param opts Opts
+    # getting a list of categories.
+    # @return [Array] List of categories.
+    define :get_category_list, field: :category_list
+
+    # @!method get_category_list
+    # @param opts Opts
+    # @option opts [Fixnum] :limit the number of tags, optional, default 10, maximum 50.
+    # getting a list of popular tags.
+    # @return [Array] List of tags.
+    define :get_suggested_tags, field: :tags
+
+    extend self
+  end
+end
+

data/lib/reg_api2/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 module RegApi2
   # Gem version.
-  VERSION = "0.0.12".freeze
+  VERSION = "0.0.14".freeze
 end

data/lib/reg_api2.rb

@@ -19,6 +19,7 @@ require 'reg_api2/bill'
 require 'reg_api2/folder'
 require 'reg_api2/zone'
 require 'reg_api2/hosting'
+require 'reg_api2/shop'
 
 # Provides r/w settings for API connection:
 #
@@ -38,6 +39,7 @@ require 'reg_api2/hosting'
 # * {RegApi2.folder} API category implemented as {RegApi2::Folder} methods.
 # * {RegApi2.zone} API category implemented as {RegApi2::Zone} methods.
 # * {RegApi2.hosting} API category implemented as {RegApi2::Hosting} methods.
+# * {RegApi2.shop} API category implemented as {RegApi2::Shop} methods.
 #
 # Provides dump hooks:
 #
@@ -67,7 +69,7 @@ module RegApi2
   module_function :common
 
   # Shortcut for {RegApi2::Domain} methods.
-  # @return [Module] {RegApi2::Domain} 
+  # @return [Module] {RegApi2::Domain}
   # @api Shortcuts
   def domain; RegApi2::Domain; end
   module_function :domain
@@ -108,6 +110,12 @@ module RegApi2
   def hosting; RegApi2::Hosting; end
   module_function :hosting
 
+  # Shortcut for {RegApi2::Shop} methods.
+  # @return [Module] {RegApi2::Shop}
+  # @api Shortcuts
+  def shop; RegApi2::Shop; end
+  module_function :shop
+
   class << self
     # @!attribute [rw] username
     # @return [String] User name (`test` by default).

data/reg.api2.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "yajl-ruby", "~> 1.0"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec-collection_matchers", "~> 1.0"
   spec.add_development_dependency "faker"
   spec.add_development_dependency "machinist"
   spec.add_development_dependency "yard", "~> 0.8"

data/spec/lib/reg_api2/bill_spec.rb

@@ -6,64 +6,64 @@ describe RegApi2::Bill do
 
   describe :nop do
     it "should raise nothing" do
-      lambda { bill.nop }.should_not raise_error
+      expect { bill.nop }.not_to raise_error
     end
-    
+
     it "should return nil" do
-      bill.nop.should be_nil
+      expect(bill.nop).to be_nil
     end
 
     it "should return bill if specified" do
-      bill.nop(bill_id: 12345).should have(1).bill
+      expect(bill.nop(bill_id: 12345)).to have_exactly(1).bill
     end
 
     it "should return bills if specified" do
-      bill.nop(bills: [ 12345, 12346 ]).should have(2).bills
-    end  
+      expect(bill.nop(bills: [ 12345, 12346 ])).to have_exactly(2).bills
+    end
   end
 
   describe :get_not_payed do
     it "should raise nothing" do
-      lambda { bill.get_not_payed }.should_not raise_error
+      expect { bill.get_not_payed }.not_to raise_error
     end
 
     it "should return something real" do
-      bill.get_not_payed.should have(1).bill
+      expect(bill.get_not_payed).to have_exactly(1).bill
     end
   end
 
   describe :get_for_period do
     it "should raise ContractError without dates" do
-      lambda { bill.get_for_period }.should raise_error RegApi2::ContractError
+      expect { bill.get_for_period }.to raise_error RegApi2::ContractError
     end
 
     it "should return something real" do
-      bill.get_for_period(
+      expect(bill.get_for_period(
         start_date: Date.new(2000, 1, 1),
         end_date: Date.new(2015, 1, 1)
-      ).should have(1).bill
+      )).to have_exactly(1).bill
     end
   end
 
   describe :change_pay_type do
     it "should raise if no currency given" do
-      lambda { bill.change_pay_type(
-        pay_type: :prepay, 
-        bills: [ 123456 ] 
-      ) }.should raise_error RegApi2::ContractError
+      expect { bill.change_pay_type(
+        pay_type: :prepay,
+        bills: [ 123456 ]
+      ) }.to raise_error RegApi2::ContractError
     end
     it "should raise if no pay_type given" do
-      lambda { bill.change_pay_type(
-        currency: :RUR, 
+      expect { bill.change_pay_type(
+        currency: :RUR,
         bills: [ 123456 ]
-      ) }.should raise_error RegApi2::ContractError
+      ) }.to raise_error RegApi2::ContractError
     end
     it "should raise nothing if ok" do
-      bill.change_pay_type(
+      expect(bill.change_pay_type(
         pay_type: :prepay,
         currency: :RUR,
         bills: [ 123456 ]
-      ).should have(1).bill
+      )).to have_exactly(1).bill
     end
   end
 
@@ -72,9 +72,9 @@ describe RegApi2::Bill do
       ans = bill.delete(
         bills: [ { bill_id: 12345 }, { bill_id: 12346 }, { bill_id: 12347 } ]
       )
-      ans.map { |b| b.bill_id }.should == [ 12345, 12346, 12347 ]
-      ans.each { |b| b.result.should == 'success' }
-      ans.each { |b| b.status.should == 'deleted' }
+      expect(ans.map { |b| b.bill_id }).to eq([ 12345, 12346, 12347 ])
+      ans.each { |b| expect(b.result).to eq('success') }
+      ans.each { |b| expect(b.status).to eq('deleted') }
     end
   end
 end

data/spec/lib/reg_api2/common_spec.rb

@@ -5,34 +5,34 @@ describe RegApi2::Common do
 
   describe :nop do
     it "should raise nothing" do
-      lambda { common.nop }.should_not raise_error
+      expect { common.nop }.not_to raise_error
     end
     it "should return login" do
-      common.nop.login.should == RegApi2.username
+      expect(common.nop.login).to eq(RegApi2.username)
     end
   end
 
   describe :reseller_nop do
     it "should raise nothing" do
-      lambda { common.reseller_nop }.should_not raise_error
+      expect { common.reseller_nop }.not_to raise_error
     end
     it "should return login" do
-      common.reseller_nop.login.should == RegApi2.username
+      expect(common.reseller_nop.login).to eq(RegApi2.username)
     end
   end
 
   describe :get_user_id do
     it "should raise nothing" do
-      lambda { common.get_user_id }.should_not raise_error
+      expect { common.get_user_id }.not_to raise_error
     end
     it "should return user id" do
-      common.get_user_id.should be_kind_of(Fixnum)
+      expect(common.get_user_id).to be_kind_of(Fixnum)
     end
   end
 
   describe :get_service_id do
     it "should raise nothing" do
-      lambda { common.get_service_id(service_id: 123456) }.should_not raise_error
+      expect { common.get_service_id(service_id: 123456) }.not_to raise_error
     end
     it "should return user id" do
       common.get_service_id(service_id: 123456) == 123456

data/spec/lib/reg_api2/domain_spec.rb

@@ -5,7 +5,7 @@ describe RegApi2::Domain do
 
   describe :nop do
     it "should raise nothing" do
-      lambda { domain.nop }.should_not raise_error
+      expect { domain.nop }.not_to raise_error
     end
 
     it "should return service id if domain exist"
@@ -19,15 +19,28 @@ describe RegApi2::Domain do
         show_update_data: true, 
         currency: :USD
       )
-      prices.should have_key(:price_group)
-      prices.currency.should == 'USD'
+      expect(prices).to have_key(:price_group)
+      expect(prices.currency).to eq('USD')
     end
   end
 
   describe :get_suggest do
     it "should return suggestions" do
       ans = domain.get_suggest word: 'house', additional_word: 'new', use_hyphen: false, tlds: [ :ru ]
-      ans.should be_kind_of(Array)
+      expect(ans).to be_kind_of(Array)
+    end
+  end
+
+  describe :get_deleted do
+    it "should return deleted domains" do
+      ans = domain.get_deleted(
+        tlds:         'ru',
+        deleted_from: '2013-10-01',
+        deleted_to:   '2013-11-01',
+        min_pr:       2,
+        min_cy:       1
+      )
+      expect(ans).to be_kind_of(Array)
     end
   end
 end

data/spec/lib/reg_api2/entity/entity_base_spec.rb

@@ -8,15 +8,15 @@ describe Testplate do
   let!(:plate) { Testplate.new(a: 4, b: 5) }
 
   it "should be initialized with hash" do
-    plate.a.should == 4
-    plate.b.should == 5
+    expect(plate.a).to eq(4)
+    expect(plate.b).to eq(5)
   end
 
   it "should return the hash" do
-    plate.to_hash.should == { a: 4, b: 5 }
+    expect(plate.to_hash).to eq({ a: 4, b: 5 })
   end
 
   it "should return json" do
-    plate.to_json.should =~ /^{.?"a":4/
+    expect(plate.to_json).to match(/^{.?"a":4/)
   end
 end

data/spec/lib/reg_api2/folder_spec.rb

@@ -8,45 +8,45 @@ describe RegApi2::Folder do
 
   describe :nop do
     it "should raise nothing" do
-      lambda { folder.nop }.should_not raise_error
+      expect { folder.nop }.not_to raise_error
     end
     
     it "should return default folder if no ops set" do
-      folder.nop.should == EXAMPLE_FOLDER_DATA
+      expect(folder.nop).to eq(EXAMPLE_FOLDER_DATA)
     end
 
     it "should return folder data if folder_id specified" do
-      folder.nop(folder_id: 12345).should == EXAMPLE_FOLDER_DATA
+      expect(folder.nop(folder_id: 12345)).to eq(EXAMPLE_FOLDER_DATA)
     end
     
     it "should return folder data if test_folder_name specified" do
-      folder.nop(folder_name: "test_folder_name").should == EXAMPLE_FOLDER_DATA
+      expect(folder.nop(folder_name: "test_folder_name")).to eq(EXAMPLE_FOLDER_DATA)
     end  
   end
 
   describe :create do
     it "should create a folder" do
-      folder.create(folder_name: 'test_folder_name').should be_nil
+      expect(folder.create(folder_name: 'test_folder_name')).to be_nil
     end
   end
 
   describe :remove do
     it "should remove a folder by id" do
-      folder.remove(folder_id: 123456).should be_nil
+      expect(folder.remove(folder_id: 123456)).to be_nil
     end
 
     it "should remove a folder by name" do
-      folder.remove(folder_name: 'test_folder_name').should be_nil
+      expect(folder.remove(folder_name: 'test_folder_name')).to be_nil
     end
   end
 
   describe :rename do
     it "should rename a folder by id" do
-      folder.rename(folder_id: 123456, new_folder_name: 'new_test_folder_name').should have_key(:folder_content)
+      expect(folder.rename(folder_id: 123456, new_folder_name: 'new_test_folder_name')).to have_key(:folder_content)
     end
 
     it "should rename a folder by name" do
-      folder.rename(folder_name: 'test_folder_name', new_folder_name: 'new_test_folder_name').should have_key(:folder_content)
+      expect(folder.rename(folder_name: 'test_folder_name', new_folder_name: 'new_test_folder_name')).to have_key(:folder_content)
     end
   end
 end

data/spec/lib/reg_api2/hosting_spec.rb

@@ -6,19 +6,19 @@ describe RegApi2::Hosting do
 
   describe :nop do
     it "should return nil" do
-      hosting.nop.should be_nil
+      expect(hosting.nop).to be_nil
     end
   end
 
   describe :get_jelastic_refill_url do
     it "should return \"https://test1.ru\"" do
-      hosting.get_jelastic_refill_url.should == "https://test1.ru"
+      expect(hosting.get_jelastic_refill_url).to eq("https://test1.ru")
     end
   end
 
   describe :set_jelastic_refill_url do
     it "should return nil on success" do
-      hosting.set_jelastic_refill_url(url: "http://ya.ru/").should be_nil
+      expect(hosting.set_jelastic_refill_url(url: "http://ya.ru/")).to be_nil
     end
   end
 

data/spec/lib/reg_api2/impl_spec.rb

@@ -12,29 +12,29 @@ describe RegApi2 do
 
     it "should #create_http at first call" do
       allow(RegApi2).to receive(:create_http).once.and_return(45)
-      RegApi2.http.should == 45
+      expect(RegApi2.http).to eq(45)
     end
 
     it "should not #create_http at next call" do
       allow(RegApi2).to receive(:create_http).once.and_return(45)
-      RegApi2.http.should == 45
-      RegApi2.http.should == 45
+      expect(RegApi2.http).to eq(45)
+      expect(RegApi2.http).to eq(45)
     end
   end
 
   describe :create_http do
     it "should create Net::HTTP object" do
       http = RegApi2.create_http
-      http.should be_kind_of(Net::HTTP)
-      http.should be_use_ssl
-      http.verify_mode.should == OpenSSL::SSL::VERIFY_NONE
+      expect(http).to be_kind_of(Net::HTTP)
+      expect(http).to be_use_ssl
+      expect(http.verify_mode).to eq(OpenSSL::SSL::VERIFY_NONE)
     end
 
     it "should use ca_cert_path if exists" do
       allow(RegApi2).to receive(:ca_cert_path).and_return("file")
       http = RegApi2.create_http
-      http.verify_mode.should == OpenSSL::SSL::VERIFY_PEER
-      http.ca_file.should == "file"
+      expect(http.verify_mode).to eq(OpenSSL::SSL::VERIFY_PEER)
+      expect(http.ca_file).to eq("file")
     end
 
     it "should use pem with pem_password" do
@@ -46,8 +46,8 @@ describe RegApi2 do
       allow(OpenSSL::PKey::RSA).to receive(:new).with("pem", "pem_password").and_return(key)
 
       http = RegApi2.create_http
-      http.cert.should == pem
-      http.key.should  == key
+      expect(http.cert).to eq(pem)
+      expect(http.key).to  eq(key)
     end
 
     it "should use pem without pem_password" do
@@ -59,20 +59,20 @@ describe RegApi2 do
       allow(OpenSSL::PKey::RSA).to receive(:new).with("pem").and_return(key)
 
       http = RegApi2.create_http
-      http.cert.should == pem
-      http.key.should_not  be_nil
+      expect(http.cert).to eq(pem)
+      expect(http.key).not_to  be_nil
     end
   end
 
   describe :make_action do
 
     it "should raise ApiError with NO_SUCH_COMMAND code on absent command" do
-      lambda do
+      expect do
         RegApi2.make_action(:bad, :command, {}, {})
-      end.should raise_error RegApi2::ApiError
-      lambda do
+      end.to raise_error RegApi2::ApiError
+      expect do
         RegApi2.make_action(:bad, :command, {}, {})
-      end.should raise_error /NO_SUCH_COMMAND/
+      end.to raise_error /NO_SUCH_COMMAND/
     end
   end
 end

data/spec/lib/reg_api2/request_contract_spec.rb

@@ -10,10 +10,10 @@ describe RegApi2::RequestContract do
 
   describe :initialize do
     it "should assign opts" do
-      contract.opts.should == {
+      expect(contract.opts).to eq({
         required: %w[ a b ],
         optional: %w[ c d ]
-      }
+      })
     end
   end
 

data/spec/lib/reg_api2/result_contract_spec.rb

@@ -5,7 +5,7 @@ describe RegApi2::ResultContract do
 
   describe :initialize do
     it "should assign opts" do
-      contract.opts.should == { a: 1, b: 4 }
+      expect(contract.opts).to eq({ a: 1, b: 4 })
     end
   end
 
@@ -13,18 +13,18 @@ describe RegApi2::ResultContract do
     it "should return handle_answer" do
       expected = 'OOLOLLO'
       expect(contract).to receive(:handle_answer).with({}).and_return(expected) 
-      contract.handle_result({ "answer" => {} }).should == expected
+      expect(contract.handle_result({ "answer" => {} })).to eq(expected)
     end
   end
 
   describe :handle_answer do
     it "should return specified value" do
-      contract.handle_answer("FX").should == "FX"
+      expect(contract.handle_answer("FX")).to eq("FX")
     end
 
     it "should return field value if exists" do
       contract = RegApi2::ResultContract.new(a:1, field: :a)
-      contract.handle_result({ answer: { "a" => "FX" } }).should == "FX"
+      expect(contract.handle_result({ answer: { "a" => "FX" } })).to eq("FX")
     end
   end
 
@@ -36,23 +36,23 @@ describe RegApi2::ResultContract do
         amount: "15",
         text: "2323" 
       })
-      ans.should == {
+      expect(ans).to eq({
         active_domains_cnt: 6,
         success: false,
         amount: 15.0,
         text: "2323"
-      }
+      })
       ans = contract.convert({
         success: "1",
       })
-      ans.should == {
+      expect(ans).to eq({
         success: true,
-      }
+      })
     end
 
     it "should proceed arrays too" do
       ans = contract.convert([ 1, 2, [ 1 ], { amount: "4543" } ])
-      ans.should == [ 1, 2, [ 1 ], { amount: 4543.0} ]
+      expect(ans).to eq([ 1, 2, [ 1 ], { amount: 4543.0} ])
     end
   end
 end