lib/mutx/routes.rb in mutx-0.1.23 vs lib/mutx/routes.rb in mutx-0.1.24

@@ -160,13 +160,19 @@
 
 
 
     on get do
 
+      on "pull" do
+        #Check for updates on the branch and make a pull if its outdated
+        Mutx::Support::Git.pull unless Mutx::Support::Git.up_to_date?
+        res.redirect "/tasks"
+      end
+
       on "logout" do
         if env["SERVER_NAME"].eql? "localhost"
-          a = env["HTTP_REFERER"]
+          a = env["HTTP_REFERER"] || env["REQUEST_URI"]
           logout = a.match(/\D{4,5}:\/\//).to_s+"user:pass@"+env["SERVER_NAME"].to_s+":"+env["SERVER_PORT"].to_s
           res.redirect "#{logout}/tasks"
         else
           res.redirect "http://[e-mail]/tasks"
         end
@@ -373,15 +379,35 @@
         res.write template.call(section:"Task Message", args:args)
       end
 
 
       on "tasks/:task_name" do |task_name|
-        query_string = Mutx::Support::QueryString.new req
-        task_name.gsub!("%20"," ")
-        args = {query_string:query_string, task_name:task_name}
-        template = Mote.parse(File.read("#{Mutx::View.path}/body.mote"),self, [:section, :args])
-        res.write template.call(section:"Tasks", args:args)
+        task = Mutx::Tasks::Task.get_task_with task_name.gsub(/%20/, " ")
+        if task.blocked.eql? "on"
+          response = basic_auth(env) do |user, pass|
+           user == "mutx" && pass == "mutxAdmin"
+          end
+          if response
+            query_string = Mutx::Support::QueryString.new req
+            task_name.gsub!("%20"," ")
+            args = {query_string:query_string, task_name:task_name}
+            template = Mote.parse(File.read("#{Mutx::View.path}/body.mote"),self, [:section, :args])
+            res.write template.call(section:"Tasks", args:args)
+          else
+           on default do
+             res.status = 401
+             res.headers["WWW-Authenticate"] = 'Basic realm="MyApp"'
+             res.write "Access Denied, Mutx don't let you run this execution without authorization"
+           end
+          end
+        else
+          query_string = Mutx::Support::QueryString.new req
+          task_name.gsub!("%20"," ")
+          args = {query_string:query_string, task_name:task_name}
+          template = Mote.parse(File.read("#{Mutx::View.path}/body.mote"),self, [:section, :args])
+          res.write template.call(section:"Tasks", args:args)
+        end
       end
 
       on "tasks" do
         query_string = Mutx::Support::QueryString.new req
         args = {query_string:query_string}
@@ -414,16 +440,37 @@
         template = Mote.parse(File.read("#{Mutx::View.path}/body.mote"),self, [:section, :args])
         res.write template.call(section:"Test Message", args:args)
       end
 
       on "tests/:task_name" do |task_name|
-        query_string = Mutx::Support::QueryString.new req
-        Mutx::Support::Log.debug "task_name => #{task_name}"
-        task_name.gsub!("%20"," ")
-        args = {query_string:query_string, task_name:task_name}
-        template = Mote.parse(File.read("#{Mutx::View.path}/body.mote"),self, [:section, :args])
-        res.write template.call(section:"Tests", args:args)
+        task = Mutx::Tasks::Task.get_task_with task_name.gsub(/%20/, " ")
+        if task.blocked.eql? "on"
+          response = basic_auth(env) do |user, pass|
+           user == "mutx" && pass == "mutxAdmin"
+          end
+          if response
+            query_string = Mutx::Support::QueryString.new req
+            Mutx::Support::Log.debug "task_name => #{task_name}"
+            task_name.gsub!("%20"," ")
+            args = {query_string:query_string, task_name:task_name}
+            template = Mote.parse(File.read("#{Mutx::View.path}/body.mote"),self, [:section, :args])
+            res.write template.call(section:"Tests", args:args)
+          else
+           on default do
+             res.status = 401
+             res.headers["WWW-Authenticate"] = 'Basic realm="MyApp"'
+             res.write "Access Denied, Mutx don't let you run this execution without authorization"
+           end
+          end
+        else
+          query_string = Mutx::Support::QueryString.new req
+          Mutx::Support::Log.debug "task_name => #{task_name}"
+          task_name.gsub!("%20"," ")
+          args = {query_string:query_string, task_name:task_name}
+          template = Mote.parse(File.read("#{Mutx::View.path}/body.mote"),self, [:section, :args])
+          res.write template.call(section:"Tests", args:args)
+        end
       end
 
       on "tests" do
         query_string = Mutx::Support::QueryString.new req
         args = {query_string:query_string}
@@ -662,16 +709,10 @@
       end
 
       on "favicon" do
         res.write ""
       end
-
-      on "pull" do
-        #When go to pull, check for updates on the branch and make a pull if its outdated
-        Mutx::Support::Git.pull unless Mutx::Support::Git.up_to_date?
-        res.redirect "/tasks"
-      end
      
       on root do
         res.redirect "/tasks"
       end
 
@@ -683,6 +724,6 @@
     Mutx::Support::Log.error "Cuba: #{e} #{e.backtrace}" if Mutx::Support::Log
     args= {query_string:Mutx::Support::QueryString.new(req), exception:e}
     template = Mote.parse(File.read("#{Mutx::View.path}/error_handler.mote"),self, [:args])
     res.write template.call(args:args)
   end
-end
\ No newline at end of file
+end