reg.api2 0.0.11 → 0.0.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fcf919b64250ad7be856188c30ab24b11ef258b4
+  data.tar.gz: 9741bbc8b397d58b26cb733c299804a5ffffd6c8
+SHA512:
+  metadata.gz: d71dce82ad3170fc6cfd2a9086b91686cc59033a9f1f3b05689f896653f6875c47dfe6251a2c35250208fea1c276808b73e6c8e021915b70f2344d6b3e3cea28
+  data.tar.gz: 477e265b532a2e5d93876bc9b0e1414faf9327d03160fb69d9d05d3371b466d1f44502ae55b2a88ae9c68df1712e4123faf46dc6b6a7fb5f70d50efa80980bf9

data/.travis.yml

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

data/CHANGES.md

@@ -1,5 +1,10 @@
 # Changes
 
+## Version 0.0.12
+
+* `service.refill` method.
+* rr mocks was replaced with rspec ones.
+
 ## Version 0.0.11
 
 * New API category: `hosting`.

data/README.md

@@ -45,7 +45,7 @@ RegApi2.service.nop(services: [
 ])
 ```
 
-or with including of {RegApi2} module:
+or with including of [RegApi2](http://regru.github.io/reg_api2-ruby/RegApi2.html) module:
 
 ```ruby
 require "reg_api2"
@@ -81,6 +81,19 @@ before any operations over REG.API through {RegApi2} properties.
 
 Also console reads `~/.regapi2` configuration file if exists, to assign properties from. It knows about these properties in configuration file: `username`, `password`, `lang`, `pem`, `pem_password` and `ca_cert_path`. Properties should be written in `key=value` format separated by newline.
 
+## API categories map
+
+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).
+
 ## 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.

data/lib/reg_api2/folder.rb

@@ -24,7 +24,7 @@ module RegApi2
     # Creates a folder.
     # @param [Hash] opts
     # @option opts [String] :folder_name The name of the new folder.
-    # @return [nil] nil.
+    # @return [void] Nothing.
     # @note Support of service lists: no
     # @example Creation of folder
     #    RegApi2.folder.create folder_name: 'test_folder_name'
@@ -35,7 +35,7 @@ module RegApi2
     # @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.
+    # @return [void] Nothing.
     # @note Support of service lists: no
     # @example Removing of folder by id
     #    RegApi2.folder.remove folder_id: 123456

data/lib/reg_api2/hosting.rb

@@ -10,7 +10,7 @@ module RegApi2
     # @!method nop(opts = {})
     # @param [Hash] opts
     # This function serves for testing purposes.
-    # @return [Hash(domains)] A list of domains. Domains that allow DNS zone management will have the “success” value in the “result” field, otherwise the “result” field will feature an error code explaining the error reason.
+    # @return [void] Nothing.
     # @note Accessibility: everyone
     # @example Test
     #    RegApi2.hosting.nop
@@ -27,8 +27,9 @@ module RegApi2
 
     # @!method set_jelastic_refill_url(opts = {})
     # @param [Hash] opts
-    # @option opts [String] :url Jelastic refill URL.
+    # @option opts [String] :url Jelastic refill URL.  You can use the keywords `<service_id>` and `<email>`, which will be replaced with the identifier of service for balance refill, and the email address used for the Jelastic account registration.
     # Sets Jelastic refill URL for current reseller.
+    # @return [void] Nothing.
     # @note Accessibility: partners
     # @example Typical usage
     #    RegApi2.set_jelastic_refill_url url: 'http://mysite.com?service_id=<service_id>&email=<email>'

data/lib/reg_api2/service.rb

@@ -113,7 +113,7 @@ module RegApi2
     #   | srv_dedicated | dedicated server |
     #   | srv_kvm | KVM access |
     #
-    # @return [NilClass] nil
+    # @return [void] Nothing.
     # @note Accessibility: clients
     # @note Support of service lists: no
     # @example Removing of `srv_hosting_ispmgr` service.
@@ -225,7 +225,7 @@ module RegApi2
     # @!method set_autorenew_flag(opts = {})
     # Enables or disables automatic service renewal.
     # @param opts Options.
-     # @return [NilClass] nil
+    # @return [void] Nothing.
     # @note Accessibility: clients
     # @note Support of service lists: no
     define :set_autorenew_flag
@@ -233,7 +233,7 @@ module RegApi2
     # @!method suspend(opts = {})
     # Use this function to suspend services (for domains – suspend delegation).
     # @param opts Options.
-    # @return [NilClass] nil
+    # @return [void] Nothing.
     # @note Accessibility: clients
     # @note Support of service lists: no
     define :suspend
@@ -241,7 +241,7 @@ module RegApi2
     # @!method resume(opts = {})
     # Use this function to resume services (for domains – resume domain delegation).
     # @param opts Options.
-    # @return [NilClass] nil
+    # @return [void] Nothing.
     # @note Accessibility: clients
     # @note Support of service lists: no
     define :resume
@@ -285,6 +285,17 @@ module RegApi2
     #    RegApi2.service.resend_mail servtype: :srv_ssl_certificate
     define :resend_mail
 
+    # @!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.
+    # @return [Hash(service_id, bill_id etc.)]
+    # @note Accessibility: clients
+    # @note Support of service lists: no
+    # @example Refill by service id.
+    #    RegApi2.service.refill service_id: 123456, amount: 10, currency: 'UAH'
+    define :refill
+
     extend self
   end
 end

data/lib/reg_api2/user.rb

@@ -13,7 +13,7 @@ module RegApi2
     # @!method nop
     # @param None
     # Accessibility testing.
-    # @return [NilClass] nil
+    # @return [void] Nothing.
     define :nop
 
     # @!method create(opts = {})

data/lib/reg_api2/version.rb

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

data/reg.api2.gemspec

@@ -22,9 +22,7 @@ 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-core"
-  spec.add_development_dependency "rspec-expectations"
-  spec.add_development_dependency "rr"
+  spec.add_development_dependency "rspec", "~> 2.14"
   spec.add_development_dependency "faker"
   spec.add_development_dependency "machinist"
   spec.add_development_dependency "yard", "~> 0.8"

data/spec/lib/reg_api2/hosting_spec.rb

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

data/spec/lib/reg_api2/impl_spec.rb

@@ -11,12 +11,12 @@ describe RegApi2 do
     end
 
     it "should #create_http at first call" do
-      mock(RegApi2).create_http { 45 }.times(1)
+      allow(RegApi2).to receive(:create_http).once.and_return(45)
       RegApi2.http.should == 45
     end
 
     it "should not #create_http at next call" do
-      mock(RegApi2).create_http { 45 }.times(1)
+      allow(RegApi2).to receive(:create_http).once.and_return(45)
       RegApi2.http.should == 45
       RegApi2.http.should == 45
     end
@@ -31,23 +31,19 @@ describe RegApi2 do
     end
 
     it "should use ca_cert_path if exists" do
-      any_instance_of(Net::HTTP) do |instance|
-        proxy(instance).verify_mode=(OpenSSL::SSL::VERIFY_PEER)
-        proxy(instance).ca_file=("file")
-      end
-      mock(RegApi2).ca_cert_path { "file" }.any_times
+      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"
     end
 
     it "should use pem with pem_password" do
-      mock(RegApi2).pem { "pem" }.any_times
-      mock(RegApi2).pem_password { "pem_password" }.any_times
+      allow(RegApi2).to receive(:pem).and_return("pem")
+      allow(RegApi2).to receive(:pem_password).and_return("pem_password")
       pem = Object.new
       key = Object.new
-      mock(OpenSSL::X509::Certificate).new("pem") { pem }
-      mock(OpenSSL::PKey::RSA).new("pem", "pem_password") { key }
+      allow(OpenSSL::X509::Certificate).to receive(:new).with("pem").and_return(pem)
+      allow(OpenSSL::PKey::RSA).to receive(:new).with("pem", "pem_password").and_return(key)
 
       http = RegApi2.create_http
       http.cert.should == pem
@@ -55,12 +51,12 @@ describe RegApi2 do
     end
 
     it "should use pem without pem_password" do
-      mock(RegApi2).pem { "pem" }.any_times
-      mock(RegApi2).pem_password { nil }.any_times
+      allow(RegApi2).to receive(:pem).and_return("pem")
+      allow(RegApi2).to receive(:pem_password).and_return(nil)
       pem = Object.new
       key = Object.new
-      mock(OpenSSL::X509::Certificate).new("pem") { pem }
-      mock(OpenSSL::PKey::RSA).new("pem") { key }
+      allow(OpenSSL::X509::Certificate).to receive(:new).with("pem").and_return(pem)
+      allow(OpenSSL::PKey::RSA).to receive(:new).with("pem").and_return(key)
 
       http = RegApi2.create_http
       http.cert.should == pem

data/spec/lib/reg_api2/result_contract_spec.rb

@@ -12,7 +12,7 @@ describe RegApi2::ResultContract do
   describe :handle_result do
     it "should return handle_answer" do
       expected = 'OOLOLLO'
-      mock(contract).handle_answer({}) { expected } 
+      expect(contract).to receive(:handle_answer).with({}).and_return(expected) 
       contract.handle_result({ "answer" => {} }).should == expected
     end
   end

data/spec/lib/reg_api2/service_spec.rb

@@ -57,7 +57,7 @@ describe RegApi2::Service do
 
   describe :get_dedicated_server_list do
     it "should get list of dedicated servers" do
-      ans = RegApi2.service.get_dedicated_server_list
+      ans = service.get_dedicated_server_list
       ans.should be_kind_of Array
       ans.map(&:server_id).each { |id| id.should be_kind_of Fixnum }
     end
@@ -65,9 +65,19 @@ describe RegApi2::Service do
 
   describe :get_bills do
     it "should get list of services and bills" do
-      ans = RegApi2.service.get_bills dname: "qqq.ru"
+      ans = service.get_bills dname: "qqq.ru"
       ans.services.should be_kind_of Array
       ans.bills.should be_nil
     end
   end
+
+  describe :refill do
+    it "should refill by service id" do
+      ans = service.refill service_id: 123456, amount: 10, currency: 'UAH'
+      ans.pay_notes.should include("success")
+      ans.pay_type.should == "prepay"
+      ans.service_id.should == 123456
+      ans.payment.should > 0
+    end
+  end
 end

data/spec/lib/reg_api2/sym_hash_spec.rb

@@ -47,7 +47,7 @@ describe RegApi2::SymHash do
 
   describe :include? do
     it "should be has_key?" do
-      mock(hash).has_key?("what") { true }
+      allow(hash).to receive(:has_key?).with("what").and_return(true)
       hash.include?("what").should be_true
     end
   end

data/spec/spec_helper.rb

@@ -26,7 +26,6 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
-  config.mock_with :rr
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: reg.api2
 version: !ruby/object:Gem::Version
-  version: 0.0.11
-  prerelease: 
+  version: 0.0.12
 platform: ruby
 authors:
 - Akzhan Abdulin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,103 +41,62 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-core
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: machinist
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard-redcarpet-ext
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -182,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -247,33 +196,26 @@ files:
 homepage: https://regru.github.com/reg_api2-ruby
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -789251017170447539
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -789251017170447539
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: REG.API v2 Implementation
 test_files:
 - spec/blueprints/user.rb