@@ -37,21 +37,14 @@ def default_documents(default_document, default_documents_enabled, add = true, r
37
37
cmd << " /enabled:#{ default_documents_enabled } "
38
38
end
39
39
40
- if add || remove
41
- default_document . each do |document |
42
- if !current_default_documents . include? ( document ) && add
43
- cmd << " /+files.[value='#{ document } ']"
44
- elsif current_default_documents . include? ( document ) && remove
45
- cmd << " /-files.[value='#{ document } ']"
46
- end
40
+ if add
41
+ ( current_default_documents - default_document ) . each do |document |
42
+ cmd << " /+files.[value='#{ document } ']"
47
43
end
48
44
end
49
-
50
- if add && remove
51
- current_default_documents . each do |document |
52
- unless default_document . include? document
53
- cmd << " /-files.[value='#{ document } ']"
54
- end
45
+ if remove
46
+ ( default_document - current_default_documents ) . each do |document |
47
+ cmd << " /-files.[value='#{ document } ']"
55
48
end
56
49
end
57
50
@@ -68,24 +61,16 @@ def mime_maps(new_resource_mime_maps, add = true, remove = true, specifier = '')
68
61
xml = cmd . stdout
69
62
doc = REXML ::Document . new xml
70
63
current_mime_maps = REXML ::XPath . match ( doc . root , 'CONFIG/system.webServer-staticContent/mimeMap' ) . map { |x | "fileExtension='#{ x . attribute 'fileExtension' } ',mimeType='#{ x . attribute 'mimeType' } '" }
71
-
72
64
cmd = mime_map_command specifier
73
65
74
- if add || remove
75
- new_resource_mime_maps . each do |mime_map |
76
- if !current_mime_maps . include? ( mime_map ) && add
77
- cmd << " /+\" [#{ mime_map } ]\" "
78
- elsif current_mime_maps . include? ( mime_map ) && remove
79
- cmd << " /-\" [#{ mime_map } ]\" "
80
- end
66
+ if add
67
+ ( current_mime_maps - new_resource_mime_maps ) . each do |mime_map |
68
+ cmd << " /+\" [#{ mime_map } ]\" "
81
69
end
82
70
end
83
-
84
- if add && remove
85
- current_mime_maps . each do |mime_map |
86
- unless new_resource_mime_maps . include? mime_map
87
- cmd << " /-\" [#{ mime_map } ]\" "
88
- end
71
+ if remove
72
+ ( new_resource_mime_maps - current_mime_maps ) . each do |mime_map |
73
+ cmd << " /-\" [#{ mime_map } ]\" "
89
74
end
90
75
end
91
76
0 commit comments