lib/owasp_zap/spider.rb in owasp_zap-0.0.8 vs lib/owasp_zap/spider.rb in owasp_zap-0.0.9

@@ -8,20 +8,28 @@
             @target = params[:target]
         end
 
         def start
             #http://localhost:8080/JSON/spider/action/scan/?zapapiformat=JSON&url=
-            url = Addressable::URI.parse "#{@base}/spider/action/scan/"
+            url = Addressable::URI.parse "#{@base}/JSON/spider/action/scan/"
             url.query_values = {:zapapiformat=>"JSON",:url=>@target}
             RestClient::get url.normalize.to_str
         end
 
         def stop
-            RestClient::get "#{@base}/spider/action/stop/?zapapiformat=JSON"
+            RestClient::get "#{@base}/JSON/spider/action/stop/?zapapiformat=JSON"
         end
 
         def status
-            RestClient::get "#{@base}/spider/view/status/?zapapiformat=JSON"
-        end
+            ret = JSON.parse(RestClient::get("#{@base}/JSON/spider/view/status/?zapapiformat=JSON"))
+            if ret.has_key? "status"
+                ret["status"].to_i
+            else
+                100 # it means no running
+            end
+       end
 
+       def running?
+            self.status != 100
+       end
     end
 end