lumberg 2.0.0.pre4 → 2.0.0.pre5

data/lib/lumberg/cpanel/zone_edit.rb

@@ -6,7 +6,7 @@ module Lumberg
       #
       # Returns Hash API Response
       def list
-        perform_request({ :api_function => 'fetchzones' })
+        perform_request({ api_function: 'fetchzones' })
       end
 
       # Public: Add an A, CNAME, or TXT record to a zone file, specified by
@@ -30,7 +30,7 @@ module Lumberg
       # Returns Hash API response.
       def create(options = {})
         options[:txtdata] = options.delete(:txt)
-        perform_request({ :api_function => 'add_zone_record' }.merge(options))
+        perform_request({ api_function: 'add_zone_record' }.merge(options))
       end
 
       # Public: Show dns zone for a domain
@@ -51,7 +51,7 @@ module Lumberg
       # Returns Hash API response.
       def show(options = {})
         options[:customonly] = options.delete(:get_custom_entries)
-        perform_request({ :api_function => 'fetchzone' }.merge(options))
+        perform_request({ api_function: 'fetchzone' }.merge(options))
       end
 
       # Public: Revert a zone file to its original state.
@@ -62,7 +62,7 @@ module Lumberg
       #
       # Returns Hash API response
       def reset(options = {})
-        perform_request({ :api_function => 'resetzone' })
+        perform_request({ api_function: 'resetzone' })
       end
 
       # Public: Edit an A, CNAME, or TXT record in a zone file, specified by
@@ -89,7 +89,7 @@ module Lumberg
       def edit(options = {})
         options[:Line]    = options.delete(:line)
         options[:txtdata] = options.delete(:txt)
-        perform_request({ :api_function => 'edit_zone_record' }.merge(options))
+        perform_request({ api_function: 'edit_zone_record' }.merge(options))
       end
 
       # Public: Remove lines from a DNS zone file. You may only remove A, TXT,
@@ -103,7 +103,7 @@ module Lumberg
       #
       # Returns Hash API response.
       def remove(options = {})
-        perform_request({ :api_function => 'remove_zone_record' }.merge(options))
+        perform_request({ api_function: 'remove_zone_record' }.merge(options))
       end
 
       # Public: Retrieve a list of domains, created within cPanel, associated
@@ -116,7 +116,7 @@ module Lumberg
       #
       # Returns Hash API response.
       def show_domains(options = {})
-        perform_request({ :api_function => 'fetch_cpanel_generated_domains' })
+        perform_request({ api_function: 'fetch_cpanel_generated_domains' })
       end
 
       # Public: Retrieve a list of zone modifications for a specific domain.
@@ -126,7 +126,7 @@ module Lumberg
       #
       # Returns Hash API response.
       def modifications_for(options = {})
-        perform_request({ :api_function => 'fetchzone_records' }.merge(options))
+        perform_request({ api_function: 'fetchzone_records' }.merge(options))
       end
     end
   end

data/lib/lumberg/format_whm.rb

@@ -1,6 +1,6 @@
 module Lumberg
   class FormatWhm < Faraday::Response::Middleware
-    
+
     def initialize(env, *args, &block)
       @type = args[0]
       @key = args[1]
@@ -13,11 +13,11 @@ module Lumberg
     end
 
     def response_values(env)
-      {:status => env[:status], :headers => env[:response_headers], :body => env[:body]}
+      {status: env[:status], headers: env[:response_headers], body: env[:body]}
     end
-    
+
   private
-    
+
     def format_response(response)
       success, message, params = false, nil, {}
 
@@ -33,13 +33,13 @@ module Lumberg
         when :unknown
           message = "Unknown error occurred #{response.inspect}"
       end
-      
+
       params = Whm::symbolize_keys(params)
       params = Whm::to_bool(params, @boolean_params)
 
-      {:success => success, :message => message, :params => params}
+      {success: success, message: message, params: params}
     end
-    
+
     def response_type(response)
       if !response.respond_to?(:has_key?)
         :unknown

data/lib/lumberg/version.rb

@@ -1,3 +1,3 @@
 module Lumberg
-  VERSION = '2.0.0.pre4'
+  VERSION = '2.0.0.pre5'
 end

data/lib/lumberg/whm/account.rb

@@ -42,7 +42,7 @@ module Lumberg
       def change_password(options = {})
         options[:user] = options.delete(:username)
         options[:pass] = options.delete(:password)
-        server.perform_request('passwd', options.merge(:response_key => 'passwd'))
+        server.perform_request('passwd', options.merge(response_key: 'passwd'))
       end
 
       # Displays pertinent information about a specific account
@@ -159,7 +159,7 @@ module Lumberg
       # ==== Required
       #  * <tt>:domain</tt> - PENDING
       def domain_user_data(options = {})
-        server.perform_request('domainuserdata', options.merge(:response_key => 'userdata')) do |s|
+        server.perform_request('domainuserdata', options.merge(response_key: 'userdata')) do |s|
           s.boolean_params = :hascgi
         end
       end
@@ -196,7 +196,7 @@ module Lumberg
       #  * <tt>:username</tt> - PENDING
       def privs(options ={})
         verify_user(options[:username]) do
-          resp = server.perform_request('myprivs', options.merge(:response_key => 'privs')) do |s|
+          resp = server.perform_request('myprivs', options.merge(response_key: 'privs')) do |s|
             s.boolean_params = :all
           end
           # if you get this far, it's successful
@@ -226,7 +226,7 @@ module Lumberg
       #  * <tt>:subs</tt> - PENDING
       def restore_account(options = {})
         options[:user] = options.delete(:username) if options[:username]
-        server.perform_request('restoreaccount', options.merge(:response_key => 'metadata'))
+        server.perform_request('restoreaccount', options.merge(response_key: 'metadata'))
       end
 
       protected
@@ -239,7 +239,7 @@ module Lumberg
       #      change_password()
       #   end
       def verify_user(username, &block)
-        exists = summary(:username => username)
+        exists = summary(username: username)
         if exists[:success]
           yield
         else

data/lib/lumberg/whm/cert.rb

@@ -69,7 +69,7 @@ module Lumberg
       #  * <tt>none</tt> - PENDING
       def listcrts(options = {})
         server.force_response_type = :ssl
-        result = server.perform_request('listcrts', options.merge(:response_key => 'crt'))
+        result = server.perform_request('listcrts', options.merge(response_key: 'crt'))
       end
     end
   end

data/lib/lumberg/whm/dns.rb

@@ -37,7 +37,7 @@ module Lumberg
 
       # Generates a list of all domains and corresponding DNS zones associated with your server
       def list_zones(options = {})
-        server.perform_request('listzones', options.merge(:response_key => 'zone'))
+        server.perform_request('listzones', options.merge(response_key: 'zone'))
       end
 
       # Return zone records for a domain.
@@ -66,7 +66,7 @@ module Lumberg
       #  * <tt>:domain</tt> - PENDING
       #  * <tt>:"api.version".to_sym</tt> - PENDING
       def resolve_domain(options = {})
-        server.perform_request('resolvedomainname', options.merge(:response_key => 'data'))
+        server.perform_request('resolvedomainname', options.merge(response_key: 'data'))
       end
 
       # Allows you to edit a DNS zone record on the server.
@@ -104,7 +104,7 @@ module Lumberg
       # ==== Required
       #  * <tt>:nameserver</tt> - PENDING
       def lookup_nameserver_ip(options = {})
-        server.perform_request('lookupnsip', options.merge(:response_key => 'ip'))
+        server.perform_request('lookupnsip', options.merge(response_key: 'ip'))
       end
 
       # Allows you to remove a DNS zone record from the server.
@@ -141,7 +141,7 @@ module Lumberg
       #  * <tt>:preference</tt>    - PENDING
       #  * <tt>:alwaysaccept</tt>  - PENDING
       def change_mx(options = {})
-        server.perform_request('changemx', options.merge(:response_key => 'data'))
+        server.perform_request('changemx', options.merge(response_key: 'data'))
       end
 
       # This function will add an MX record to a  specified domain
@@ -152,7 +152,7 @@ module Lumberg
       #  * <tt>:preference</tt>    - PENDING
       #  * <tt>:alwaysaccept</tt>  - PENDING
       def add_mx(options = {})
-        server.perform_request('addmx', options.merge(:response_key => 'data'))
+        server.perform_request('addmx', options.merge(response_key: 'data'))
       end
 
       # This function will list a specified domain's MX records
@@ -163,7 +163,7 @@ module Lumberg
       #  * <tt>:domain</tt> - PENDING
       #  * <tt>:"api.version".to_sym</tt> - PENDING
       def list_mxs(options = {})
-        server.perform_request('listmxs', options.merge(:response_key => 'data'))
+        server.perform_request('listmxs', options.merge(response_key: 'data'))
       end
 
       # This function will add an MX record

data/lib/lumberg/whm/reseller.rb

@@ -15,9 +15,9 @@ module Lumberg
       # Lists the usernames of all resellers on the server
       def list
         # This method is funky. That is all
-        result = server.perform_request('listresellers', :response_key => 'reseller')
+        result = server.perform_request('listresellers', response_key: 'reseller')
         result[:success] = true
-        result[:params]  = {:resellers => result.delete(:params)}
+        result[:params]  = {resellers: result.delete(:params)}
         result
       end
 
@@ -115,7 +115,7 @@ module Lumberg
       #  * <tt>:username</tt> - PENDING
       def account_counts(options = {})
         options[:user] = options.delete(:username)
-        server.perform_request('acctcounts', options.merge(:response_key => 'reseller'))
+        server.perform_request('acctcounts', options.merge(response_key: 'reseller'))
       end
 
       # Defines a reseller's nameservers. Additionally, you may use it to reset a reseller's nameservers to the default settings
@@ -140,7 +140,7 @@ module Lumberg
 
       # Lists the saved reseller ACL lists on the server
       def list_acls
-        server.perform_request('listacls', {:response_key => 'acls'})
+        server.perform_request('listacls', {response_key: 'acls'})
       end
 
       # Creates a new reseller ACL list
@@ -148,7 +148,7 @@ module Lumberg
       # ==== Required
       #  * <tt>:acllist</tt> - PENDING
       def save_acl_list(options = {})
-        server.perform_request('saveacllist', options.merge(:response_key => 'results'))
+        server.perform_request('saveacllist', options.merge(response_key: 'results'))
       end
 
       # Sets the ACL for a reseller, or modifies specific ACL items for a reseller

data/lib/lumberg/whm/server.rb

@@ -1,4 +1,4 @@
-Faraday.register_middleware :response, :format_whm => Lumberg::FormatWhm
+Faraday.register_middleware :response, format_whm: Lumberg::FormatWhm
 
 module Lumberg
   module Whm
@@ -15,7 +15,7 @@ module Lumberg
       # Enable Basic Authentication with API - default false
       attr_accessor :basic_auth
 
-      # API username - :default => root
+      # API username - default: root
       attr_accessor :user
 
       # WHM parsed response
@@ -77,11 +77,11 @@ module Lumberg
       end
 
       def get_hostname
-        perform_request('gethostname', {:response_key => 'hostname'})
+        perform_request('gethostname', {response_key: 'hostname'})
       end
 
       def version
-        perform_request('version', {:response_key => 'version'})
+        perform_request('version', {response_key: 'version'})
       end
 
       def load_average
@@ -92,25 +92,25 @@ module Lumberg
       end
 
       def system_load_average(options = {})
-        perform_request('systemloadavg', options.merge(:response_key => 'data'))
+        perform_request('systemloadavg', options.merge(response_key: 'data'))
       end
 
       def languages
-        perform_request('getlanglist', {:response_key => 'lang'})
+        perform_request('getlanglist', {response_key: 'lang'})
       end
 
       def themes
-        perform_request('getlanglist', {:response_key => 'themes'})
+        perform_request('getlanglist', {response_key: 'themes'})
       end
 
       def list_ips
-        perform_request('listips', {:response_key => 'result'})
+        perform_request('listips', {response_key: 'result'})
       end
 
       def get_tweaksetting(options = {})
         request = perform_request('get_tweaksetting',
           options.merge(
-            :response_key  => 'data',
+            response_key:     'data',
             :'api.version' => 1
           )
         )
@@ -122,7 +122,7 @@ module Lumberg
       def set_tweaksetting(options = {})
         request = perform_request('set_tweaksetting',
           options.merge(
-            :response_key  => 'metadata',
+            response_key:     'metadata',
             :'api.version' => 1
           )
         )
@@ -132,57 +132,57 @@ module Lumberg
       end
 
       def add_ip(options = {})
-        perform_request('addip', options.merge(:response_key => 'addip'))
+        perform_request('addip', options.merge(response_key: 'addip'))
       end
 
       def delete_ip(options = {})
-        perform_request('delip', options.merge(:response_key => 'delip'))
+        perform_request('delip', options.merge(response_key: 'delip'))
       end
 
       def set_hostname(options = {})
-        perform_request('sethostname', options.merge(:response_key => 'sethostname'))
+        perform_request('sethostname', options.merge(response_key: 'sethostname'))
       end
 
       def set_resolvers(options = {})
-        perform_request('setresolvers', options.merge(:response_key => 'setresolvers'))
+        perform_request('setresolvers', options.merge(response_key: 'setresolvers'))
       end
 
       def show_bandwidth(options = {})
-        perform_request('showbw', options.merge(:response_key => 'bandwidth'))
+        perform_request('showbw', options.merge(response_key: 'bandwidth'))
       end
 
       def set_nv_var(options = {})
-        perform_request('nvset', options.merge(:response_key => 'nvset'))
+        perform_request('nvset', options.merge(response_key: 'nvset'))
       end
 
       def get_nv_var(options = {})
-        perform_request('nvget', options.merge(:response_key => 'nvget'))
+        perform_request('nvget', options.merge(response_key: 'nvget'))
       end
 
       def reboot
-        perform_request('reboot', {:response_key => "reboot"})
+        perform_request('reboot', {response_key: "reboot"})
       end
 
       def account
-        @account ||= Account.new(:server => self)
+        @account ||= Account.new(server: self)
       end
 
       def dns
-        @dns ||= Dns.new(:server => self)
+        @dns ||= Dns.new(server: self)
       end
 
       def reseller
-        @reseller ||= Reseller.new(:server => self)
+        @reseller ||= Reseller.new(server: self)
       end
 
       def cert
-        @cert ||= Cert.new(:server => self)
+        @cert ||= Cert.new(server: self)
       end
 
     private
 
       def do_request(uri, function, params)
-        @response = Faraday.new(:url => uri, :ssl => ssl_options) do |c|
+        @response = Faraday.new(url: uri, ssl: ssl_options) do |c|
           if basic_auth
             c.basic_auth @user, @hash
           else
@@ -217,12 +217,12 @@ module Lumberg
       def ssl_options
         if @ssl_verify
           {
-            :verify_mode => OpenSSL::SSL::VERIFY_PEER,
-            :ca_file     => File.join(Lumberg::base_path, "cacert.pem")
+            verify_mode: OpenSSL::SSL::VERIFY_PEER,
+            ca_file:     File.join(Lumberg::base_path, "cacert.pem")
           }
         else
           {
-            :verify_mode => OpenSSL::SSL::VERIFY_NONE
+            verify_mode: OpenSSL::SSL::VERIFY_NONE
           }
         end
       end

data/spec/cpanel/addon_domain_spec.rb

@@ -3,13 +3,13 @@ require "spec_helper"
 module Lumberg
   describe Cpanel::AddonDomain do
     before(:each) do
-      @login    = { :host => @whm_host, :hash => @whm_hash }
+      @login    = { host: @whm_host, hash: @whm_hash }
       @server   = Whm::Server.new(@login.dup)
 
       @api_username = "lumberg"
       @addond = Cpanel::AddonDomain.new(
-        :server       => @server.dup,
-        :api_username => @api_username
+        server:       @server.dup,
+        api_username: @api_username
       )
     end
 
@@ -19,14 +19,14 @@ module Lumberg
       it "removes an addon domain" do
         # Create the addon domain to be removed
         @addond.add(
-          :dir       => "public_html/test-addon.com/",
-          :newdomain => "test-addon.com",
-          :subdomain => "testadd"
+          dir:       "public_html/test-addon.com/",
+          newdomain: "test-addon.com",
+          subdomain: "testadd"
         )
 
         result = @addond.remove(
-          :domain    => "test-addon.com",
-          :subdomain => "testadd_lumberg-test.com"
+          domain:    "test-addon.com",
+          subdomain: "testadd_lumberg-test.com"
         )
 
         result[:params][:data][0][:result].should == 1
@@ -39,16 +39,16 @@ module Lumberg
 
       it "adds an addon domain" do
         result = @addond.add(
-          :dir       => "public_html/test-magic.com/",
-          :newdomain => "test-magic.com",
-          :subdomain => "tmagic"
+          dir:       "public_html/test-magic.com/",
+          newdomain: "test-magic.com",
+          subdomain: "tmagic"
         )
         result[:params][:data][0][:result].should == 1
 
         # Remove the addon domain
         result = @addond.remove(
-          :domain    => "test-magic.com",
-          :subdomain => "tmagic_lumberg-test.com"
+          domain:    "test-magic.com",
+          subdomain: "tmagic_lumberg-test.com"
         )
       end
     end