kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Fix some null checks.

Browse source
This commit is contained in:
Rupak Ganguly 2012-11-08 16:41:18 -05:00
parent 41805cfdca
commit 4538803ab9
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/fog/hp/models/storage/directory.rb
View file

@ -19,11 +19,11 @@ module Fog
end end
def read_acl def read_acl
@read_acl @read_acl || []
end end
def write_acl def write_acl
@write_acl @write_acl || []
end end
def can_read?(user) def can_read?(user)
@ -61,10 +61,12 @@ module Fog
end end
r_acl, w_acl = connection.perm_to_acl(perm, user_list) r_acl, w_acl = connection.perm_to_acl(perm, user_list)
unless r_acl.nil? || r_acl.empty? unless r_acl.nil? || r_acl.empty?
@read_acl = [] if @read_acl.nil?
@read_acl = @read_acl + r_acl @read_acl = @read_acl + r_acl
@read_acl.uniq! @read_acl.uniq!
end end
unless w_acl.nil? || w_acl.empty? unless w_acl.nil? || w_acl.empty?
@write_acl = [] if @write_acl.nil?
@write_acl = @write_acl + w_acl @write_acl = @write_acl + w_acl
@write_acl.uniq! @write_acl.uniq!
end end
@ -79,11 +81,13 @@ module Fog
user_list = users user_list = users
end end
r_acl, w_acl = connection.perm_to_acl(perm, user_list) r_acl, w_acl = connection.perm_to_acl(perm, user_list)
unless (r_acl.nil? || r_acl.empty?) && (@read_acl.nil? || @read_acl.empty?) unless r_acl.nil? || r_acl.empty?
@read_acl = [] if @read_acl.nil?
@read_acl = @read_acl - r_acl @read_acl = @read_acl - r_acl
@read_acl.uniq! @read_acl.uniq!
end end
unless (w_acl.nil? || w_acl.empty?) && (@write_acl.nil? || @write_acl.empty?) unless w_acl.nil? || w_acl.empty?
@write_acl = [] if @write_acl.nil?
@write_acl = @write_acl - w_acl @write_acl = @write_acl - w_acl
@write_acl.uniq! @write_acl.uniq!
end end
@ -125,9 +129,8 @@ module Fog
end end
def public? def public?
if @read_acl.empty? @read_acl = [] if @read_acl.nil?
false if @read_acl.include?(".r:*")
elsif @read_acl.include?(".r:*")
true true
else else
false false