rimu 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDA2NzcxYWMzNzEyZmMxZmM1MzBmZWUxN2VjY2MzNzI3NmZmM2I5Nw==
-  data.tar.gz: !binary |-
-    ODY2MmE3N2JkNDE1YjVkZWYxNjg5ZTRkNzc3ODhmNDRlNTg0MDhmMQ==
+SHA1:
+  metadata.gz: a41e8677143f391e930053daa0a4b716ec789150
+  data.tar.gz: 1c359d88df138a4423c619a7c5f84af161d6c958
 SHA512:
-  metadata.gz: !binary |-
-    YWEzNTEzMDBkZDBhYzU1YjNmYzE4ZThlMDQwOTc1ZDJjZjVjODMzZjM2MTgx
-    NzJlMTIwMWU4OWUwZjgxZmYyYzU3NTUyZDFjMTNhMmM4ZGRiZTU1YWRjYTk4
-    OTU2NzkzZDgwM2YxMjYzODU2YThkZjdhNDExZmRjMDhhMjg2YTc=
-  data.tar.gz: !binary |-
-    YTA3OWI1Yjk1NDVmMzE5NjBlZjQyNmI3NWFhNmJhYTUyYmZjY2IzNDdkZDgx
-    Njc4NzQzNDhkNmU4M2ZhMDc2NDg5OWIyZTA0NDMxZTIwYTkxOGY0NzhjYjVi
-    ZWY1MGUyNjE3ZTMxMGNhYTkxMjdhYWIyNjExNTA5ZDdkZjBmZmI=
+  metadata.gz: d2918c424fc5d58a297eb1d3282316287601b95f1ce101578c84a7ece6315233a7b4b4f17b563308010cf097497f616de5574644f22b13cc28c8cdcac37650a5
+  data.tar.gz: 1e0221a0bc3bdb6e50739c29a31938720f06abd9a356c929542cbec8c76c86f71a6171d6a79326e5c1ef352b5fc4671143a3eebef029170ccd30868f2001c112

data/.travis.yml

@@ -5,7 +5,6 @@ rvm:
      - "2.1.4"
      - "2.2.1"
 script: bundle exec rspec spec
-before_install: gem install bundler -v 1.10.6
 addons:
     code_climate:
         repo_token: 98eb635c4bb4c62c56e531c05c69d911616f3fa319cf79a86ef7b6b783f42fa9

data/Gemfile

@@ -1,7 +1,10 @@
 source 'https://rubygems.org'
 
+group :test do
+    gem 'simplecov', :require => false
+    gem 'codecov', :require => false
+    gem 'codeclimate-test-reporter', :require => false
+end
+
 # Specify your gem's dependencies in rimu.gemspec
 gemspec
-gem 'simplecov', :require => false, :group => :test
-gem 'codecov', :require => false, :group => :test
-gem 'codeclimate-test-reporter', :require => false, :group => :test

data/lib/rimu.rb

@@ -38,35 +38,11 @@ class Rimu
         }
     end
 
-    def post(path, data)
-        logger.info "POST #{api_url}#{path} body:#{data.inspect}" if logger
-        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}
-        HTTParty.get(api_url + path, options).parsed_response
-    end
-
-    def delete(path)
-        logger.info "DELETE #{api_url}#{path}" if logger
-        options = {headers: set_headers}
-        HTTParty.delete(api_url + path, options).parsed_response
-    end
-
     def error?(response)
         if response.nil?
             return true
         else
-            if response.is_a?(Hash)
+            if response.is_a?(Hash) && ! response.empty?
                 ! response.empty? and response[response.keys[0]] and \
                 response[response.keys[0]].has_key?("response_type") and \
                 response[response.keys[0]]["response_type"] == "ERROR"
@@ -78,7 +54,11 @@ class Rimu
 
     def error_message(response)
         if response.nil? || ! response.is_a?(Hash) || (response.is_a?(Hash) && response.empty?)
+          if response.empty?
+            "  - Error: Response was empty"
+          else
             "  - Error: Unknown error occured"
+          end
         else
             if response[response.keys[0]].has_key?("human_readable_message")
                 error = response[response.keys[0]]["human_readable_message"]
@@ -108,16 +88,18 @@ class Rimu
     end
 
     def send_request(path, field, method="GET", data=nil)
-        if method == "POST"
-            response = post(path, data)
-        elsif method == "PUT"
-            response = put(path, data)
-        elsif method == "DELETE"
-            response = delete(path)
+        logger.info "#{method} #{api_url}#{path} body:#{data.inspect}" if logger
+        if data
+          options = {headers: set_headers, body: data.to_json, read_timeout: read_timeout} if data
         else
-            response = get(path)
+          options = {headers: set_headers}
         end
-        raise "Errors completing request [#{path}] @ [#{api_url}] with data [#{data.inspect}]:\n#{error_message(response)}" if error?(response)
+        begin
+          response = HTTParty.send(method.downcase.to_sym, path, options).parsed_response
+        rescue StandardError => e
+          raise RimuRequestError, "Errors completing request #{method} #{api_url}#{path} with data [#{data.inspect}]:\n#{e}"
+        end
+        raise RimuResponseError, "Errors completing request #{method} #{api_url}#{path} with data [#{data.inspect}]:\n#{error_message(response)}" if error?(response)
         logger.info "Response: => #{response}" if logger
         format_response(response, field)
     end
@@ -130,10 +112,6 @@ class Rimu
         send_request("/r/billing-methods", "billing_methods")
     end
 
-    # def pricing_plans
-    #     send_request("/r/pricing-plans", "pricing_plan_infos")
-    # end
-
     def prep_data(default_params, params)
         params.keep_if {|k,_| default_params.keys.include? k }
         new_params = default_params.merge(params)
@@ -156,6 +134,7 @@ class Rimu
                     :api_key => api_key,
                     :api_url => api_url,
                     :logger => logger,
+                    :read_timeout => read_timeout,
                 )
                 instance_variable_set("@#{namespace}", subclass)
                 subclass
@@ -164,5 +143,14 @@ class Rimu
     end
 
     has_namespace :orders, :servers
+
+    class RimuArgumentError < ArgumentError
+    end
+
+    class RimuRequestError < ArgumentError
+    end
+
+    class RimuResponseError < ArgumentError
+    end
 end
 Dir[File.expand_path(File.dirname(__FILE__) + '/rimu/*.rb')].each {|f| require f }

data/rimu.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "rimu"
-  spec.version       = "0.0.3"
+  spec.version       = "0.0.4"
   spec.authors       = ["Andrew Colin Kissa"]
   spec.email         = ["andrew@topdog.za.net"]
   spec.license       = "MPL-2.0"
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9.3'
   spec.extra_rdoc_files = ['README.md']
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-core"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rimu
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Andrew Colin Kissa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -42,42 +42,42 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -153,17 +153,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the Rimuhosting REST API