Merge pull request #5 from /issues/4

Fixing purge files by array to return a hash of status results...

Author: jmervine

BENCHMARKS.md

@@ -10,11 +10,11 @@ Running benchmarks as follows in order:
  maxcdn.purge('ZONEID', [ 'FILE1','FILE2' ])
 
        user     system      total        real
-get   :  0.050000   0.070000   0.120000 (  1.026412)
-get   :  0.010000   0.000000   0.010000 (  0.636914)
-post  :  0.020000   0.010000   0.030000 ( 11.083888)
-put   :  0.010000   0.000000   0.010000 (  1.240014)
-delete:  0.020000   0.000000   0.020000 (  6.846295)
-purge :  0.010000   0.010000   0.020000 ( 11.578944)
-purge :  0.020000   0.000000   0.020000 (  0.956149)
-purge :  0.030000   0.000000   0.030000 (  1.870104)
+get   :  0.060000   0.060000   0.120000 (  1.014527)
+get   :  0.010000   0.000000   0.010000 (  0.613805)
+post  :  0.020000   0.000000   0.020000 ( 19.011447)
+put   :  0.020000   0.000000   0.020000 (  0.670025)
+delete:  0.010000   0.000000   0.010000 (  1.076173)
+purge :  0.020000   0.000000   0.020000 ( 11.109962)
+purge :  0.010000   0.010000   0.020000 (  0.813984)
+purge :  0.030000   0.000000   0.030000 (  6.704786)

README.md

@@ -98,6 +98,10 @@ bundle exec ruby ./test/integration.rb # requires host's IP be whitelisted
 
 # Change Log
 
+##### 0.1.5
+
+* Issue #4: Fixing purge files by array to return a hash of status results.
+
 ##### 0.1.4
 
 * Fixing bug where purging files purges entire zone.

lib/maxcdn.rb

@@ -123,13 +123,16 @@ def purge zone_id, file_or_files=nil, options={}
       end
 
       if file_or_files.is_a?(Array)
-        return file_or_files.map do |file|
-          self.delete("/zones/pull.json/#{zone_id}/cache", { "files" => file }, options)
+        result = {}
+        file_or_files.each do |file|
+          result[file] = self.delete("/zones/pull.json/#{zone_id}/cache", { "files" => file }, options)
         end
+        return result
       end
 
-      if file_or_files.is_a?(Hash) and (file_or_files.has_key(:files) or file_or_files.has_key("files"))
-          return self.delete("/zones/pull.json/#{zone_id}/cache", { "files" => file_or_files }, options)
+      if file_or_files.is_a?(Hash)
+        return self.purge(zone_id, file_or_files[:files]) if file_or_files.has_key?("files")
+        return self.purge(zone_id, file_or_files[:files]) if file_or_files.has_key?(:files)
       end
 
       raise MaxCDN::APIException.new("Invalid file_or_files argument for delete method.")

lib/maxcdn/version.rb

@@ -1,3 +1,3 @@
 module MaxCDN
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

test/ext_hash_test.rb

@@ -57,7 +57,7 @@ def test_purge
     assert_equal 200, @max.purge(zone, popularfiles[0]["uri"])["code"], "purge file"
 
     files = [popularfiles[0]["uri"], popularfiles[1]["uri"]]
-    assert_equal [{"code"=>200},{"code"=>200}], @max.purge(zone, files), "purge files"
+    expected = {files[0]=>{"code"=>200},files[1]=>{"code"=>200}}
+    assert_equal expected, @max.purge(zone, files), "purge files"
   end
 end
-

test/integration.rb

@@ -138,7 +138,11 @@ def test_purge_file
   end
 
   def test_purge_files
-    assert_equal([{ "foo" => "bar" },{ "foo" => "bar" }], @max.purge(12345, [ "foo.txt", "bar.txt" ]))
+    assert_equal({"foo.txt"=>{"foo"=>"bar"}, "bar.txt"=>{"foo"=>"bar"}}, @max.purge(12345, [ "foo.txt", "bar.txt" ]))
+  end
+
+  def test_purge_files
+    assert_equal({"foo.txt"=>{"foo"=>"bar"}, "bar.txt"=>{"foo"=>"bar"}}, @max.purge(12345, { :files => [ "foo.txt", "bar.txt" ]}))
   end
 end