Skip to content

support Ruby 2.0 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
codearrangertoo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

support Ruby 2.0 #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions lib/unifi/api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def get_alerts
end

def get_alerts_unarchived
params ={'json': {'_sort': '-time', 'archived': false}}
params ={'json' => {'_sort' => '-time', 'archived' => false}}
read "#{api_url}list/alarm", params
end

Expand All @@ -49,9 +49,9 @@ def get_statistics_last_24h

def get_statistics_24h(endtime)
params = {
'attrs': ["wlan_bytes", "wlan-num_sta", "time"],
'start': "#{(endtime - 1.day).to_i * 1000}",
'end': "#{(endtime - 1.hour).to_i * 1000}"
'attrs' => ["wlan_bytes", "wlan-num_sta", "time"],
'start' => "#{(endtime - 1.day).to_i * 1000}",
'end' => "#{(endtime - 1.hour).to_i * 1000}"
}
return read "#{api_url}stat/report/hourly.site", params, :post
end
Expand All @@ -61,7 +61,7 @@ def get_events
end

def get_aps
params = {'_depth': 2, 'test': 0}
params = {'_depth' => 2, 'test' => 0}
read "#{api_url}stat/device", params
end

Expand Down Expand Up @@ -109,12 +109,12 @@ def restart_ap_name(name=nil)
end

def archive_all_alerts
params = {'cmd': 'archive-all-alarms'}
params = {'cmd' => 'archive-all-alarms'}
read "#{api_url}cmd/evtmgr", params, :post
end

def create_backup
params = {'cmd': 'backup'}
params = {'cmd' => 'backup'}
result = read "#{api_url}cmd/system", params, :post
result[0]['url']
end
Expand All @@ -130,7 +130,7 @@ def get_backup(target_file='unifi-backup.unf')

def authorize_guest(guest_mac, minutes, up_bandwidth=nil, down_bandwidth=nil, byte_quota=nil, ap_mac=nil)
cmd = 'authorize-guest'
params = {'mac': guest_mac, 'minutes': minutes}
params = {'mac' => guest_mac, 'minutes' => minutes}

if up_bandwidth
params['up'] = up_bandwidth
Expand All @@ -150,18 +150,18 @@ def authorize_guest(guest_mac, minutes, up_bandwidth=nil, down_bandwidth=nil, by

def unauthorize_guest(guest_mac)
cmd = 'unauthorize-guest'
params = {'mac': guest_mac}
params = {'mac' => guest_mac}
run_command(cmd, params)
end

def login
params = {'username': @username, 'password': @password}
params = {'username' => @username, 'password' => @password}
params['login'] = 'login' unless version == 'v4'

options = {
verify: false,
body: params.to_json,
headers: {'Content-Type': 'application/json','Accept': 'application/json'}
:verify => false,
:body => params.to_json,
:headers => {'Content-Type' => 'application/json','Accept' => 'application/json'}
}

res = HTTParty.post(login_url, options)
Expand All @@ -177,12 +177,12 @@ def logout

def read(url, params=nil, method=:get)
options = {
verify: false,
body: params.to_json,
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json',
'Cookie': @cookies || ''
:verify => false,
:body => params.to_json,
:headers => {
'Content-Type' => 'application/json',
'Accept' => 'application/json',
'Cookie' => @cookies || ''
}
}

Expand Down Expand Up @@ -210,7 +210,7 @@ def run_command(command, params={}, mgr='stamgr')
end

def mac_cmd(target_mac, command, mgr='stamgr')
params = {'mac': target_mac}
params = {'mac' => target_mac}
run_command(command, params, mgr)
end

Expand Down