upyun-purge 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3889962b85d048baf65e383bce42fc20c693b8ba
-  data.tar.gz: d9aaf2be06663b72268984310f862d3ec6d12bb3
+  metadata.gz: cafaea0663b2c8c1a4c869bcdf436844e8957cf3
+  data.tar.gz: 004bf545cbf8f0457bf6b9e4b86f3b9cfd5d6f4b
 SHA512:
-  metadata.gz: 32bf305b63de12f39029b768364592808ea59d033f42d4896d1943e7b1086a23545475a0b95175f560093890fbd1ddb078f868e016540b0c11c32942c2f05ced
-  data.tar.gz: f6637a8949e5e2b29afc40f87d9e0cc79d6226bb829d2966875ed3ad891582864c25e90704d0383482802200afa953a8a546c83d2bb3ac11b40980f8f7324db3
+  metadata.gz: 484555511bcb7cadcce8855bce5481542bb2fd6fda7411a5463ebd83022b8cc392c4da1be6909a1597f5919b7aaf1a18101e2e86b83a66ba750a7806494bef7f
+  data.tar.gz: c62a8427a87e2a17a4de689f66456874834b134b5fcc3523017c28622395b1882e7e3ce927a0f0bf262a79f820f308d8039f49d0f5fb52439f282a3c60a0eefe

data/lib/upyun/purge/client.rb

@@ -4,6 +4,14 @@ module Upyun
 
       attr_accessor :urls
 
+      attr_accessor :bucket_name, :operator_name, :operator_password
+
+      def initialize( option={} )
+        @bucket_name = option[:bucket_name] || Upyun::Purge.bucket_name
+        @operator_name = option[:operator_name] || Upyun::Purge.operator_name
+        @operator_password = option[:operator_password] || Upyun::Purge.operator_password
+      end
+
       def purge( urls = nil)
         @urls = urls.is_a?(Array) ? urls : [urls]
         @urls = @urls.compact
@@ -17,9 +25,9 @@ module Upyun
         response = http.request(request)
         case response
         when Net::HTTPSuccess
-          return response.body
+          return JSON.parse(response.body)
         else
-          raise Exception.new "Request uri:#{uri.request_uri} \nResponse code: #{response.code} \nMessage: #{response.body}"
+          raise Exception.new "\n\tRequest uri:#{uri.request_uri} \n\tResponse code: #{response.code} \n\tMessage: #{response.body}"
         end
 
       end
@@ -30,13 +38,13 @@ module Upyun
       def make_signature
         _urls = @urls.join("\n")
         datetime = Time.now
-        second_str = [_urls,Upyun::Purge.bucket_name, datetime, md5(Upyun::Purge.operator_password)].join("&")
+        second_str = [_urls,@bucket_name, datetime, md5(@operator_password)].join("&")
         sign = md5(second_str)
         sign
       end
 
       def auth_header
-        "UpYun #{Upyun::Purge.bucket_name}:#{Upyun::Purge.operator_name}:#{make_signature}"
+        "UpYun #{@bucket_name}:#{@operator_name}:#{make_signature}"
       end
 
       def md5( str )

data/lib/upyun/purge/version.rb

@@ -1,5 +1,5 @@
 module Upyun
   module Purge
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/upyun/purge.rb

@@ -1,6 +1,7 @@
 require "upyun/purge/version"
 require "upyun/purge/base_extend"
 require "upyun/purge/client"
+require "json"
 
 module Upyun
   module Purge
@@ -30,10 +31,7 @@ module Upyun
 
 
     def self.new( hash = {} )
-      @@bucket_name ||= hash[:bucket_name]
-      @@operator_name ||= hash[:operator_name]
-      @@operator_password ||= hash[:operator_password]
-      Client.new
+      Client.new( hash )
     end
 
   end

data/test/purge_test.rb

@@ -7,17 +7,24 @@ class PurgeTest < Minitest::Test
 
   def test_purge
     result = @upyun.purge("http://xx.xxxx.com/xxx.jpg")
+    assert_equal true, result.key?("invalid_domain_of_url")
   end
 
 
   def test_purge_mult
     result = @upyun.purge(["http://xx.xxxx.com/xxx.jpg","http://bb.bbb.com/bbb.jpg"])
-
+    assert_equal true, result.key?("invalid_domain_of_url")
   end
 
-
   def test_md5
     assert_equal("5f4dcc3b5aa765d61d8327deb882cf99", @upyun.md5("password"))
   end
 
+
+  def test_call_method
+    upyun = Upyun::Purge.new(bucket_name: Upyun::Purge.bucket_name ,operator_name: Upyun::Purge.operator_name ,operator_password: Upyun::Purge.operator_password )
+    result = upyun.purge("http://docs.upyun.com/css/bootstrap.min.css")
+    assert_equal true, result.key?("invalid_domain_of_url")
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upyun-purge
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Lester Zhao