rewritten 0.0.3 → 0.0.4

data/lib/rewritten/server/views/delete.erb

@@ -1,14 +1,19 @@
-<div style="float:left">
+<div style="">
   <% if @from && @to %>  
-    <h2><%= @from %> -> <%= @to %> </h2>
+
+    <h2 style="width: 90%; overflow: scroll"><%= @from %> -> <%= @to %> </h2>
+
+    <div style="float :left">
+
     <p>Are you sure you want to delete above translation?</p>
     <form action='<%= u("/delete")%>' method="post" style="margin-top: 10px ">  
       <input type="hidden" name="_method" value="delete">  
       <input type="hidden" name="from" value="<%= @from %>">  
-      <input type="hidden" name="to" value="<%= @to %>">  
+      <input type="hidden" name="to" value="<%= @to %>">
       <input type="submit" value="Yes, Delete It!">  
-      <a href='<%= u("/to?to=#{@to}") %>'>Cancel</a>  
+      <a href='<%= u("/to?to=#{escape(@to)}") %>'>Cancel</a>  
     </form>  
+  </div>
   <% else %>  
     <p>Translation not found.</p>  
   <% end %>

data/lib/rewritten/server/views/new.erb

@@ -1,13 +1,14 @@
 
 
-<h1>Create New Mapping</h1>
+<h1>New Translation</h1>
 
 
 <div style="float: left; margin-top: 10px">
-<form method="POST" action="<%= u "/translations" %>">
-  <label>From:</label><br/>  <input type="text" name="from" /> <br />
-  <label>To:</label><br/>   <input type="text" name="to" value="<%= params[:to] %>" /> <br />
+<form method="POST" action="<%= u "/translations" %>" >
+  <label>From (what the user sees) </label><br/>  <input type="text" name="from" size="80"/> <br />
+  <label>To (what your app sees) </label><br/>   <input type="text" name="to" size="80" value="<%= params[:to] %>" /> <br />
   <input type="submit" value="Create" />
+  <a href='<%= u("/translations") %>'>Cancel</a>  
 </form>
 </div>
 

data/lib/rewritten/server/views/to.erb

@@ -1,7 +1,7 @@
 
 <h1 class='wi'><%= params[:to] %> (App URL)</h1>
 
-<a href="<%= u(%|/new?to=#{params[:to]}|) %>"> + add another translation </a>
+<a href="<%= u(%|/new?to=#{Rack::Utils.escape(params[:to])}|) %>"> + add another translation </a>
 
 <table class='queues'>
   <tr>
@@ -12,7 +12,7 @@
   <% for translation in Rewritten.list_range("to:#{params[:to]}", 0, 100) %>
     <tr>
       <td class=''><a href="<%= translation %>" target="new"><%= translation %></td>
-      <td class=''><a href="<%= u("/delete?from=#{translation}&to=#{params[:to]}") %>">Delete</a></td>
+      <td class=''><a href="<%= u("/delete?from=#{translation}&to=#{escape(params[:to])}") %>">Delete</a></td>
     </tr>
   <% end %>
 

data/lib/rewritten/server/views/translations.erb

@@ -49,7 +49,7 @@
     <% for mapping in Rewritten.list_range("froms", params[:start].to_i, Rewritten.per_page) %>
       <tr>
         <td class=''><a href="<%= mapping %>" target="new"><%= mapping %></td>
-        <td class=''><a href="<%= u("/to?to=#{to=Rewritten.redis.get("from:#{mapping}")}") %>"><%= to %></td>
+        <td class=''><a href="<%= u("/to?to=#{escape(to=Rewritten.redis.get("from:#{mapping}"))}") %>"><%= to %></td>
         </tr>
       <% end %>
 

data/lib/rewritten/server.rb

@@ -178,7 +178,7 @@ module Rewritten
       Rewritten.remove_translation(from, to)
 
       if Rewritten.num_translations(to) > 0
-        redirect u("/to?to=#{to}")
+        redirect u("/to?to=#{escape(to)}")
       else
         redirect u("/")
       end

data/lib/rewritten/version.rb

@@ -1,3 +1,3 @@
 module Rewritten
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rewritten
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Kai Rubarth
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 Z
+date: 2011-09-10 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis-namespace
@@ -117,24 +118,19 @@ files:
 - lib/rewritten/server/views/clear_hits.erb
 - lib/rewritten/server/views/delete.erb
 - lib/rewritten/server/views/error.erb
-- lib/rewritten/server/views/failed.erb
 - lib/rewritten/server/views/hits.erb
-- lib/rewritten/server/views/key_sets.erb
-- lib/rewritten/server/views/key_string.erb
 - lib/rewritten/server/views/layout.erb
 - lib/rewritten/server/views/new.erb
 - lib/rewritten/server/views/next_more.erb
 - lib/rewritten/server/views/overview.erb
-- lib/rewritten/server/views/queues.erb
 - lib/rewritten/server/views/stats.erb
 - lib/rewritten/server/views/to.erb
 - lib/rewritten/server/views/translations.erb
-- lib/rewritten/server/views/workers.erb
-- lib/rewritten/server/views/working.erb
 - lib/rewritten/version.rb
 - lib/test.ru
 - rewritten.gemspec
 - test/test_rewritten.rb
+has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -164,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rewritten
-rubygems_version: 1.8.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A redis-based URL rewriting engine

data/lib/rewritten/server/views/failed.erb

@@ -1,64 +0,0 @@
-<%start = params[:start].to_i %>
-<%failed = Resque::Failure.all(start, 20)%>
-<% index = 0 %>
-<% date_format = "%Y/%m/%d %T %z" %>
-
-<h1>Failed Jobs</h1>
-<%unless failed.empty?%>
-<form method="POST" action="<%=u 'failed/clear'%>" class='clear-failed'>
-  <input type='submit' name='' value='Clear Failed Jobs' />
-</form>
-<%end%>
-
-<p class='sub'>Showing <%=start%> to <%= start + 20 %> of <b><%= size = Resque::Failure.count %></b> jobs</p>
-
-<ul class='failed'>
-  <%for job in failed%>
-    <% index += 1 %>
-    <li>
-      <dl>
-        <% if job.nil? %>
-        <dt>Error</dt>
-        <dd>Job <%= index%> could not be parsed; perhaps it contains invalid JSON?</dd>
-        <% else %>
-        <dt>Worker</dt>
-        <dd>
-          <a href="<%= u(:workers, job['worker']) %>"><%= job['worker'].split(':')[0...2].join(':') %></a> on <b class='queue-tag'><%= job['queue'] %></b > at <b><span class="time"><%= Time.parse(job['failed_at']).strftime(date_format) %></span></b>
-          <% if job['retried_at'] %>
-            <div class='retried'>
-              Retried <b><span class="time"><%= Time.parse(job['retried_at']).strftime(date_format) %></span></b>
-              <a href="<%= u "failed/remove/#{start + index - 1}" %>" class="remove" rel="remove">Remove</a>
-            </div>
-          <% else %>
-            <div class='controls'>
-              <a href="<%= u "failed/requeue/#{start + index - 1}" %>" rel="retry">Retry</a>
-              or
-              <a href="<%= u "failed/remove/#{start + index - 1}" %>" rel="remove">Remove</a>
-            </div>
-          <% end %>
-        </dd>
-        <dt>Class</dt>
-        <dd><code><%= job['payload'] ? job['payload']['class'] : 'nil' %></code></dd>
-        <dt>Arguments</dt>
-        <dd><pre><%=h job['payload'] ? show_args(job['payload']['args']) : 'nil' %></pre></dd>
-        <dt>Exception</dt>
-        <dd><code><%= job['exception'] %></code></dd>
-        <dt>Error</dt>
-        <dd class='error'>
-          <% if job['backtrace'] %>
-            <a href="#" class="backtrace"><%= h(job['error']) %></a>
-            <pre style='display:none'><%=h job['backtrace'].join("\n") %></pre>
-          <% else %>
-            <%=h job['error'] %>
-          <% end %>
-        </dd>
-        <% end %>
-      </dl>
-      <div class='r'>
-      </div>
-    </li>
-  <%end%>
-</ul>
-
-<%= partial :next_more, :start => start, :size => size %>
-

data/lib/rewritten/server/views/key_sets.erb

@@ -1,19 +0,0 @@
-<% if key = params[:key] %>
-
-  <p class='sub'>
-    Showing <%= start = params[:start].to_i %> to <%= start + 20 %> of <b><%=size = redis_get_size(key) %></b>
-  </p>
-
-  <h1>Key "<%= key %>" is a <%= resque.redis.type key %></h1>
-  <table>
-    <% for row in redis_get_value_as_array(key, start) %>
-    <tr>
-      <td>
-        <%= row %>
-      </td>
-    </tr>
-    <% end %>
-  </table>
-
-<%= partial :next_more, :start => start, :size => size %>
-<% end %>

data/lib/rewritten/server/views/key_string.erb

@@ -1,11 +0,0 @@
-<% if key = params[:key] %>
-  <h1>Key "<%= key %>" is a <%= resque.redis.type key %></h1>
-  <h2>size: <%= redis_get_size(key) %></h2>
-  <table>
-    <tr>
-      <td>
-        <%= redis_get_value_as_array(key) %>
-      </td>
-    </tr>
-  </table>
-<% end %>

data/lib/rewritten/server/views/queues.erb

@@ -1,49 +0,0 @@
-<%# @subtabs = resque.queues unless partial? || params[:id].nil? %>
-
-<% if queue = params[:id] %>
-
-  <h1>Pending jobs on <span class='hl'><%= queue %></span></h1>
-  <form method="POST" action="<%=u "/queues/#{queue}/remove" %>" class='remove-queue'>
-    <input type='submit' name='' value='Remove Queue' onclick='return confirm("Are you absolutely sure? This cannot be undone.");' />
-  </form>
-  <p class='sub'>Showing <%= start = params[:start].to_i %> to <%= start + 20 %> of <b><%=size = rewritten.size(queue)%></b> jobs</p>
-  <table class='jobs'>
-    <tr>
-      <th>Class</th>
-      <th>Args</th>
-    </tr>
-    <% for job in (jobs = rewritten.peek(queue, start, 20)) %>
-    <tr>
-      <td class='class'><%= job['class'] %></td>
-      <td class='args'><%=h job['args'].inspect %></td>
-    </tr>
-    <% end %>
-    <% if jobs.empty? %>
-    <tr>
-      <td class='no-data' colspan='2'>There are no pending jobs in this queue</td>
-    </tr>
-    <% end %>
-  </table>
-  <%= partial :next_more, :start => start, :size => size %>
-<% else %>
-
-  <h1 class='wi'>Queues</h1>
-  <p class='intro'>The list below contains all the registered queues with the number of jobs currently in the queue. Select a queue from above to view all jobs currently pending on the queue.</p>
-  <table class='queues'>
-    <tr>
-      <th>Name</th>
-      <th>Jobs</th>
-    </tr>
-    <% for queue in rewritten.queues.sort_by { |q| q.to_s } %>
-    <tr>
-      <td class='queue'><a class="queue" href="<%= u "queues/#{queue}" %>"><%= queue %></a></td>
-      <td class='size'><%= rewritten.size queue %></td>
-    </tr>
-    <% end %>
-    <tr class="<%= Rewritten::Failure.count.zero? ? "failed" : "failure" %>">
-      <td class='queue failed'><a class="queue" href="<%= u :failed %>">failed</a></td>
-      <td class='size'><%= Rewritten::Failure.count %></td>
-    </tr>
-  </table>
-
-<% end %>

data/lib/rewritten/server/views/workers.erb

@@ -1,109 +0,0 @@
-<% @subtabs = worker_hosts.keys.sort unless worker_hosts.size == 1 %>
-
-<% if params[:id] && worker = Resque::Worker.find(params[:id]) %>
-
-  <h1>Worker <%= worker %></h1>
-  <table class='workers'>
-    <tr>
-      <th>&nbsp;</th>
-      <th>Host</th>
-      <th>Pid</th>
-      <th>Started</th>
-      <th>Queues</th>
-      <th>Processed</th>
-      <th>Failed</th>
-      <th>Processing</th>
-    </tr>
-    <tr>
-      <td class='icon'><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
-
-      <% host, pid, queues = worker.to_s.split(':') %>
-      <td><%= host %></td>
-      <td><%= pid %></td>
-      <td><span class="time"><%= worker.started %></span></td>
-      <td class='queues'><%= queues.split(',').map { |q| '<a class="queue-tag" href="' + u("/queues/#{q}") + '">' + q + '</a>'}.join('') %></td>
-      <td><%= worker.processed %></td>
-      <td><%= worker.failed %></td>
-      <td class='process'>
-        <% data = worker.processing || {} %>
-        <% if data['queue'] %>
-          <code><%= data['payload']['class'] %></code>
-          <small><a class="queue time" href="<%=u "/working/#{worker}" %>"><%= data['run_at'] %></a></small>
-        <% else %>
-          <span class='waiting'>Waiting for a job...</span>
-        <% end %>
-      </td>
-    </tr>
-  </table>
-
-<% elsif params[:id] && !worker_hosts.keys.include?(params[:id]) && params[:id] != 'all' %>
-
-<h1>Worker doesn't exist</h1>
-
-<% elsif worker_hosts.size == 1 || params[:id] %>
-
-  <% if worker_hosts.size == 1 || params[:id] == 'all' %>
-    <% workers = Resque.workers %>
-  <% else %>
-    <% workers = worker_hosts[params[:id]].map { |id| Resque::Worker.find(id) } %>
-  <% end %>
-
-  <h1 class='wi'><%= workers.size %> Workers</h1>
-  <p class='intro'>The workers listed below are all registered as active on your system.</p>
-  <table class='workers'>
-    <tr>
-      <th>&nbsp;</th>
-      <th>Where</th>
-      <th>Queues</th>
-      <th>Processing</th>
-    </tr>
-    <% for worker in (workers = workers.sort_by { |w| w.to_s }) %>
-    <tr class="<%=state = worker.state%>">
-      <td class='icon'><img src="<%=u state %>.png" alt="<%= state %>" title="<%= state %>"></td>
-
-      <% host, pid, queues = worker.to_s.split(':') %>
-      <td class='where'><a href="<%=u "workers/#{worker}"%>"><%= host %>:<%= pid %></a></td>
-      <td class='queues'><%= queues.split(',').map { |q| '<a class="queue-tag" href="' + u("/queues/#{q}") + '">' + q + '</a>'}.join('') %></td>
-
-      <td class='process'>
-        <% data = worker.processing || {} %>
-        <% if data['queue'] %>
-          <code><%= data['payload']['class'] %></code>
-          <small><a class="queue time" href="<%=u "/working/#{worker}" %>"><%= data['run_at'] %></a></small>
-        <% else %>
-          <span class='waiting'>Waiting for a job...</span>
-        <% end %>
-      </td>
-    </tr>
-    <% end %>
-    <% if workers.empty? %>
-    <tr>
-      <td colspan='4' class='no-data'>There are no registered workers</td>
-    </tr>
-    <% end %>
-  </table>
-  <%=poll%>
-
-<% else %>
-  <% @subtabs = [] %>
-  <h1 class='wi'>Workers</h1>
-  <p class='intro'>The hostnames below all have registered workers. Select a hostname to view its workers, or "all" to see all workers.</p>
-  <table class='queues'>
-    <tr>
-      <th>Hostname</th>
-      <th>Workers</th>
-    </tr>
-    <% for hostname, workers in worker_hosts.sort_by { |h,w| h } %>
-    <tr>
-      <td class='queue'><a class="queue" href="<%= u "workers/#{hostname}" %>"><%= hostname %></a></td>
-      <td class='size'><%= workers.size %></td>
-    </tr>
-    <% end %>
-    <tr class="failed">
-      <td class='queue failed'><a class="queue" href="<%= u "workers/all" %>">all workers</a></td>
-      <td class='size'><%= Resque.workers.size %></td>
-    </tr>
-  </table>
-
-
-<% end %>

data/lib/rewritten/server/views/working.erb

@@ -1,72 +0,0 @@
-<% if params[:id] && (worker = Resque::Worker.find(params[:id])) && worker.job %>
-  <h1><%= worker %>'s job</h1>
-
-  <table>
-    <tr>
-      <th>&nbsp;</th>
-      <th>Where</th>
-      <th>Queue</th>
-      <th>Started</th>
-      <th>Class</th>
-      <th>Args</th>
-    </tr>
-      <tr>
-        <td><img src="<%=u 'working.png' %>" alt="working" title="working"></td>
-        <% host, pid, _ = worker.to_s.split(':') %>
-        <td><a href="<%=u "/workers/#{worker}" %>"><%= host %>:<%= pid %></a></td>
-        <% data = worker.job %>
-        <% queue = data['queue'] %>
-        <td><a class="queue" href="<%=u "/queues/#{queue}" %>"><%= queue %></a></td>
-        <td><span class="time"><%= data['run_at'] %></span></td>
-        <td>
-          <code><%= data['payload']['class'] %></code>
-        </td>
-        <td><%=h data['payload']['args'].inspect %></td>
-      </tr>
-  </table>
-
-<% else %>
-
-  <%
-    workers = resque.working
-    jobs = workers.collect {|w| w.job }
-    worker_jobs = workers.zip(jobs)
-    worker_jobs = worker_jobs.reject { |w, j| w.idle? }
-  %>
-
-  <h1 class='wi'><%= worker_jobs.size %> of <%= resque.workers.size %> Workers Working</h1>
-  <p class='intro'>The list below contains all workers which are currently running a job.</p>
-  <table class='workers'>
-    <tr>
-      <th>&nbsp;</th>
-      <th>Where</th>
-      <th>Queue</th>
-      <th>Processing</th>
-    </tr>
-    <% if worker_jobs.empty? %>
-    <tr>
-      <td colspan="4" class='no-data'>Nothing is happening right now...</td>
-    </tr>
-    <% end %>
-
-    <% worker_jobs.sort_by {|w, j| j['run_at'] ? j['run_at'] : '' }.each do |worker, job| %>
-      <tr>
-        <td class='icon'><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
-        <% host, pid, queues = worker.to_s.split(':') %>
-        <td class='where'><a href="<%=u "/workers/#{worker}" %>"><%= host %>:<%= pid %></a></td>
-        <td class='queues queue'>
-          <a class="queue-tag" href="<%=u "/queues/#{job['queue']}" %>"><%= job['queue'] %></a>
-        </td>
-        <td class='process'>
-          <% if job['queue'] %>
-            <code><%= job['payload']['class'] %></code>
-            <small><a class="queue time" href="<%=u "/working/#{worker}" %>"><%= job['run_at'] %></a></small>
-          <% else %>
-            <span class='waiting'>Waiting for a job...</span>
-          <% end %>
-        </td>
-      </tr>
-    <% end %>
-  </table>
-
-<% end %>