magent 0.6.1 → 0.6.2

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/bin/magent-web

@@ -4,6 +4,21 @@ $:.unshift << File.expand_path("../../lib", __FILE__)
 require 'magent'
 require 'magent_web'
 require 'launchy'
+require 'fileutils'
+
+if ARGV[0] == "--install"
+  base_path = File.expand_path("../../", __FILE__)
+
+  if File.exist?("public/javascripts/") && File.exist?("public/stylesheets/")
+    FileUtils.cp_r("#{base_path}/public/javascripts/", "public/")
+    FileUtils.cp_r("#{base_path}/public/stylesheets/", "public/")
+  else
+    raise ArgumentError, "public/javascripts and public/stylesheets do not exist"
+  end
+
+
+  exit 0
+end
 
 Thread.start do
   sleep 2.5

data/lib/magent_web.rb

@@ -12,13 +12,8 @@ require 'net/http'
 require 'uri'
 require 'cgi'
 
-require 'magent_web/mongo_helper'
-require 'magent_web/app'
-
 module MagentWeb
   def self.app
-    MagentWeb.connect
-
     MagentWeb::App
   end
 
@@ -38,5 +33,23 @@ module MagentWeb
       raise ArgumentError, "/etc/magent.yml, ./config/magent.yml or ./magent.yml were not found"
     end
   end
+
+  def self.config_path
+    Dir.home+"/.magent_webrc"
+  end
+
+  def self.config
+    @config ||= YAML.load_file(self.config_path)
+  end
 end
 
+if !File.exist?(MagentWeb.config_path)
+  File.open(MagentWeb.config_path, "w") do |f|
+    f.write YAML.dump("username" => "admin", "password" => "admin", "enable_auth" => true)
+  end
+
+  $stdout.puts "Created #{MagentWeb.config_path} with username=admin password=admin"
+end
+
+require 'magent_web/mongo_helper'
+require 'magent_web/app'

data/lib/magent_web/app.rb

@@ -2,6 +2,17 @@ module MagentWeb
   class App < Sinatra::Base
     include MagentWeb::MongoHelper
 
+    if MagentWeb.config["enable_auth"]
+      use Rack::Auth::Basic, "Restricted Area" do |username, password|
+        [username, password] == [MagentWeb.config["username"], MagentWeb.config["password"]]
+      end
+    end
+
+    def initialize(*args)
+      MagentWeb.connect
+      super(*args)
+    end
+
     helpers do
       include Rack::Utils
       alias_method :h, :escape_html
@@ -59,13 +70,13 @@ module MagentWeb
       doc = @errors_queue.find({:_id => params[:id]}).next_document
       channel.enqueue_error(doc)
 
-      redirect "/queues/#{params[:queue_id]}/failed"
+      redirect "#{queue_path(params[:queue_id])}/failed"
     end
 
     get "/queues/:queue_id/delete/:id" do
       @errors_queue = @database.collection(params[:queue_id]+".errors")
       @errors_queue.remove(:_id => params[:id])
-      redirect "/queues/#{params[:queue_id]}/failed"
+      redirect "#{queue_path(params[:queue_id])}/failed"
     end
 
     private

data/lib/magent_web/mongo_helper.rb

@@ -55,7 +55,11 @@ module MagentWeb
       if v.nil? && quote
         "null"
       elsif v.kind_of?(Hash)
-        JSON.pretty_generate(v)
+        buffer = ""
+        v.each do |k,v|
+          buffer << "#{k.inspect}: #{v.inspect} <br />"
+        end
+        buffer
       elsif v.kind_of?(Array)
         v.map{|e| e.nil? ? "null" : e }.join("<br />")
       elsif v.kind_of?(Time)
@@ -80,5 +84,11 @@ module MagentWeb
     def channel_name_for(queue_id)
       queue_id.to_s.match("magent\.([^\.]+)")[1]
     end
+
+    def queue_path(queue)
+      queue = queue.name if !queue.kind_of?(String)
+
+      "#{ENV["MAGENT_WEB_PATH"]}/queues/#{queue}"
+    end
   end
 end

data/lib/magent_web/views/index.haml

@@ -6,7 +6,7 @@
     %ul(data-role="listview" data-filter="true")
       -@queues.each do |queue|
         %li
-          %a(href="/queues/#{queue.name}")
+          %a(href="#{queue_path(queue)}")
             &=queue.name
           %span{:class=>"ui-li-count"}
             =0

data/lib/magent_web/views/layout.haml

@@ -9,7 +9,7 @@
     %script(src="http://code.jquery.com/jquery-1.5.2.min.js")
     %script(src="/javascripts/jquery.mobile-1.0b1pre.min.js")
 
-    %script(src="/javascripts/application.js")
+    %script(src="/javascripts/magent_web.js")
   %body
     = yield
 

data/lib/magent_web/views/queues/failed.haml

@@ -19,18 +19,18 @@
         %div(data-role="navbar" data-iconpos="bottom")
           %ul
             %li
-              %a(href="/queues/#{@queue.name}/retry/#{document["_id"]}" data-icon="refresh")
+              %a(href="#{queue_path(@queue)}/retry/#{document["_id"]}" data-icon="refresh")
                 Retry
             %li
-              %a(href="/queues/#{@queue.name}/delete/#{document["_id"]}" data-icon="delete" data-theme="e")
+              %a(href="#{queue_path(@queue)}/delete/#{document["_id"]}" data-icon="delete" data-theme="e")
                 Delete
 
 
   %div(data-role="footer")
     -if skip > 0
-      %a(href="/queues/#{@queue.name}/failed?skip=#{params[:skip].to_i-25}")
+      %a(href="#{queue_path(@queue)}/failed?skip=#{params[:skip].to_i-25}")
         Previous
     -if count >= 25
-      %a(href="/queues/#{@queue.name}/failed?skip=#{params[:skip].to_i+25}")
+      %a(href="#{queue_path(@queue)}/failed?skip=#{params[:skip].to_i+25}")
         Next
 

data/lib/magent_web/views/queues/show.haml

@@ -8,10 +8,10 @@
     %div{:"data-role" => "navbar"}
       %ul
         %li
-          %a(href="/queues/#{@queue.name}/failed" data-icon="alert")
+          %a(href="#{queue_path(@queue)}/failed" data-icon="alert")
             Failed
         %li
-          %a(href="/queues/#{@queue.name}/stats" data-icon="grid")
+          %a(href="#{queue_path(@queue)}/stats" data-icon="grid")
             Stats
 
 
@@ -29,8 +29,8 @@
 
   %div(data-role="footer")
     -if skip > 0
-      %a(href="/queues/#{@queue.name}?skip=#{params[:skip].to_i-25}")
+      %a(href="#{queue_path(@queue)}?skip=#{params[:skip].to_i-25}")
         Previous
     -if count >= 25
-      %a(href="/queues/#{@queue.name}?skip=#{params[:skip].to_i+25}")
+      %a(href="#{queue_path(@queue)}?skip=#{params[:skip].to_i+25}")
         Next

data/magent.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{magent}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David A. Cuadrado"]
@@ -63,8 +63,8 @@ Gem::Specification.new do |s|
     "lib/magent_web/views/status.haml",
     "lib/tasks/magent.rake",
     "magent.gemspec",
-    "public/javascripts/application.js",
     "public/javascripts/jquery.mobile-1.0b1pre.min.js",
+    "public/javascripts/magent_web.js",
     "public/stylesheets/highlight.css",
     "public/stylesheets/images/ajax-loader.png",
     "public/stylesheets/images/icon-search-black.png",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -210,8 +210,8 @@ files:
 - lib/magent_web/views/status.haml
 - lib/tasks/magent.rake
 - magent.gemspec
-- public/javascripts/application.js
 - public/javascripts/jquery.mobile-1.0b1pre.min.js
+- public/javascripts/magent_web.js
 - public/stylesheets/highlight.css
 - public/stylesheets/images/ajax-loader.png
 - public/stylesheets/images/icon-search-black.png