rimu 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODY3ZWYzM2U4MTA2ZjcxMDM2MWEwYTMzYWEzZjgzOTYxZjg4Mjg2MQ==
+    ZDA2NzcxYWMzNzEyZmMxZmM1MzBmZWUxN2VjY2MzNzI3NmZmM2I5Nw==
   data.tar.gz: !binary |-
-    NTk0MTNkMDRkYjU2NDgxODlmZmQ4YWFjOGY3N2FjYjY4MjA2ZWQwMQ==
+    ODY2MmE3N2JkNDE1YjVkZWYxNjg5ZTRkNzc3ODhmNDRlNTg0MDhmMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZmQ3OTVlNzRiMTM2NTgwZDIyMmFmYTJhY2VhZDFiODg1NGQ0OWMwOGI4MzQ5
-    ODlkZWViNDFkMzRjMTdlOWNlMTQyNDk5M2MxZGRkZjlmMjliYWQ5NDI2NTgx
-    ZTlhZGJiNWY5Y2JiNjhmYTIxODI2MzVkYjViM2I2YTJhMzZiYmM=
+    YWEzNTEzMDBkZDBhYzU1YjNmYzE4ZThlMDQwOTc1ZDJjZjVjODMzZjM2MTgx
+    NzJlMTIwMWU4OWUwZjgxZmYyYzU3NTUyZDFjMTNhMmM4ZGRiZTU1YWRjYTk4
+    OTU2NzkzZDgwM2YxMjYzODU2YThkZjdhNDExZmRjMDhhMjg2YTc=
   data.tar.gz: !binary |-
-    MWVmNTQwZjZkM2I3YjFiMGU4OTNkMTFmOGYxYWJjMWM4ZDVlYmU4MzNjODQ3
-    NmExNjc1NThmNTQ2OTBiYTU1OGEwOGRkZTdmNTYwYzQwMDg0YjE1OGNjMGM3
-    ZGVkMzgzMjQ3MjY0MDNiYjJiOTQ0ZDIxODY4ZDdiNzkyOGQ0YTY=
+    YTA3OWI1Yjk1NDVmMzE5NjBlZjQyNmI3NWFhNmJhYTUyYmZjY2IzNDdkZDgx
+    Njc4NzQzNDhkNmU4M2ZhMDc2NDg5OWIyZTA0NDMxZTIwYTkxOGY0NzhjYjVi
+    ZWY1MGUyNjE3ZTMxMGNhYTkxMjdhYWIyNjExNTA5ZDdkZjBmZmI=

data/.rubocop.yml

@@ -475,7 +475,6 @@ Style/ParallelAssignment:
                   matches on both sides of the assignment.
                   This also provides performance benefits
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parallel-assignment'
-  Reference: 'https://github.com/JuanitoFatas/fast-ruby#parallel-assignment-vs-sequential-assignment-code'
   Enabled: false
 
 Style/ParenthesesAroundCondition:

data/lib/rimu/servers.rb

@@ -56,7 +56,7 @@ class Rimu::Servers < Rimu
 
     def info(oid)
         raise ArgumentError, "oid should be an Integer" unless oid.is_a?(Integer)
-        send_request("/r/orders/order-#{oid}-dn/vps", "about_order")
+        send_request("/r/orders/order-#{oid}-dn", "about_order")
     end
 
     def cancel(oid)

data/lib/rimu.rb

@@ -13,6 +13,8 @@ class Rimu
         else
             raise ArgumentError, "The :api_key is required."
         end
+        @read_timeout = args[:read_timeout] if args[:read_timeout]
+        raise ArgumentError, "The :read_timeout must be an Integer." if ! @read_timeout.nil? && ! @read_timeout.is_a?(Integer)
     end
 
     def api_url
@@ -23,21 +25,31 @@ class Rimu
         @api_key
     end
 
+    def read_timeout
+        @read_timeout || 3600
+    end
+
     def set_headers
         {
             'Content-Type' =>'application/json',
             'Accept' =>'application/json',
             'User-Agent' => 'RimuAPI-Ruby',
-            'Authorization' => 'rimuhosting apikey=#{api_key}',
+            'Authorization' => "rimuhosting apikey=#{api_key}",
         }
     end
 
     def post(path, data)
         logger.info "POST #{api_url}#{path} body:#{data.inspect}" if logger
-        options = {headers: set_headers, body: data}
+        options = {headers: set_headers, body: data.to_json}
         HTTParty.post(api_url + path, options).parsed_response
     end
 
+    def put(path, data)
+        logger.info "PUT #{api_url}#{path} body:#{data.inspect}" if logger
+        options = {headers: set_headers, body: data.to_json, read_timeout: read_timeout}
+        HTTParty.put(api_url + path, options).parsed_response
+    end
+
     def get(path)
         logger.info "GET #{api_url}#{path}" if logger
         options = {headers: set_headers}
@@ -51,13 +63,30 @@ class Rimu
     end
 
     def error?(response)
-        response and response["jaxrs_response"] and \
-        response["jaxrs_response"]["response_type"] and \
-        response["jaxrs_response"]["response_type"] == "ERROR"
+        if response.nil?
+            return true
+        else
+            if response.is_a?(Hash)
+                ! response.empty? and response[response.keys[0]] and \
+                response[response.keys[0]].has_key?("response_type") and \
+                response[response.keys[0]]["response_type"] == "ERROR"
+            else
+                return true
+            end
+        end
     end
 
     def error_message(response)
-        "  - Error: #{response["jaxrs_response"]["human_readable_message"]}"
+        if response.nil? || ! response.is_a?(Hash) || (response.is_a?(Hash) && response.empty?)
+            "  - Error: Unknown error occured"
+        else
+            if response[response.keys[0]].has_key?("human_readable_message")
+                error = response[response.keys[0]]["human_readable_message"]
+                "  - Error: #{error}"
+            else
+                "  - Error: Unknown error occured"
+            end
+        end
     end
 
     def format_response(response, field)
@@ -89,6 +118,7 @@ class Rimu
             response = get(path)
         end
         raise "Errors completing request [#{path}] @ [#{api_url}] with data [#{data.inspect}]:\n#{error_message(response)}" if error?(response)
+        logger.info "Response: => #{response}" if logger
         format_response(response, field)
     end
 
@@ -122,7 +152,11 @@ class Rimu
             define_method(namespace.to_sym) do ||
                 lookup = instance_variable_get("@#{namespace}")
                 return lookup if lookup
-                subclass = self.class.const_get(namespace.to_s.capitalize).new(:api_key => api_key, :api_url => api_url)
+                subclass = self.class.const_get(namespace.to_s.capitalize).new(
+                    :api_key => api_key,
+                    :api_url => api_url,
+                    :logger => logger,
+                )
                 instance_variable_set("@#{namespace}", subclass)
                 subclass
             end

data/rimu.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "rimu"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["Andrew Colin Kissa"]
   spec.email         = ["andrew@topdog.za.net"]
   spec.license       = "MPL-2.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rimu
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Andrew Colin Kissa