rewritten 0.0.4 → 0.1.0

data/HISTORY.rdoc

@@ -0,0 +1,12 @@
+
+== 0.1.0
+
+* added filter function in web gui
+* improved pagination
+
+== 0.0.4
+
+* fixed bug with unescaped keys in web gui
+
+
+

data/Rakefile

@@ -20,6 +20,7 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.title    = 'SpeakingUrl'
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('HISTORY.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 

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

@@ -6,7 +6,7 @@
 <div style="float: left; margin-top: 10px">
 <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 />
+  <label>To (what your app sees) </label><br/>   <textarea name="to" cols="80" rows="5" value="<%= params[:to] %>"></textarea> <br />
   <input type="submit" value="Create" />
   <a href='<%= u("/translations") %>'>Cancel</a>  
 </form>

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

@@ -1,10 +1,12 @@
 <%if  start - Rewritten.per_page >= 0 || start + Rewritten.per_page < size%>
 <p class='pagination'>
   <% if start - Rewritten.per_page >= 0 %>
-    <a href="<%= current_page %>?start=<%= start - Rewritten.per_page %>" class='less'>&laquo; less</a>
+    <!-- <a href="<%= current_page %>?start=<%= start - Rewritten.per_page %>" class='less'>&laquo; less</a> -->
+    <a href="<%= current_page %>?<%= build_query(params.merge({'start' => (start - Rewritten.per_page).to_s})) %>" class='less'>&laquo; less</a>
   <% end %>
   <% if start + Rewritten.per_page <= size %>
-    <a href="<%= current_page %>?start=<%= start + Rewritten.per_page %>" class='more'>more &raquo;</a>
+    <!-- <a href="<%= current_page %>?start=<%= start + Rewritten.per_page %>" class='more'>more &raquo;</a> -->
+    <a href="<%= current_page %>?<%= build_query(params.merge('start' => start + Rewritten.per_page)) %>" class='more'>more &raquo;</a>
   <% end %>
 </p>
 <%end%>

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

@@ -1,35 +1,6 @@
 
 <%# @subtabs = resque.queues unless partial? || params[:id].nil? %>
 
-<% if false and 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 + 1 %> 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'>Translations</h1>
 
   <p class='intro'>The list below contains all the registered translations from an 
@@ -38,7 +9,18 @@
 
   <a href="<%= u('/new') %>"> + New Translation </a>
 
-  <p class='sub'>Showing <%= (start = params[:start].to_i)+1 %> to <%= start + Rewritten.per_page %> of <b><%=size = Rewritten.size('froms')%></b> translations. </p>
+
+  <form method="get">
+    <label>Filter:</label> <input type="text" name="f" value="<%= params[:f] %>"/>
+    <a href="<%= u('/translations') %>"> clear </a>
+  </form>
+
+  <p class='sub'>
+  Showing <%= @start + 1%> to <%= [@size, @start + Rewritten.per_page].min %> of <b><%= @size %></b> translations
+  <% if params[:f] && params[:f] != '' %>
+    matching: <%= params[:f] %>.
+  <% else %>.<% end %>
+  </p>
 
   <table class=''>
     <tr>
@@ -46,16 +28,15 @@
       <th>to URL (Your App)</th>
     </tr>
 
-    <% for mapping in Rewritten.list_range("froms", params[:start].to_i, Rewritten.per_page) %>
+    <% for from,to in @translations %>
       <tr>
-        <td class=''><a href="<%= mapping %>" target="new"><%= mapping %></td>
-        <td class=''><a href="<%= u("/to?to=#{escape(to=Rewritten.redis.get("from:#{mapping}"))}") %>"><%= to %></td>
+        <td class=''><a href="<%= from %>" target="new"><%= from %></td>
+        <td class=''><a href="<%= u("/to?to=#{escape(to)}") %>"><%= to %></td>
         </tr>
       <% end %>
 
     </table>
 
-  <% end %>
 
-  <%= partial :next_more, :start => start, :size => size %>
+  <%= partial :next_more, :start => @start, :size => @size %>
 

data/lib/rewritten/server.rb

@@ -143,6 +143,32 @@ module Rewritten
     end
 
     get "/translations" do
+      @size = 0
+      @start = params[:start].to_i
+
+      if params[:f] && params[:f] != ""
+        @translations = []
+        keys = Rewritten.redis.keys("*#{params[:f]}*")
+        keys.each do |key|
+          prefix, url = key.split(":") 
+          if prefix == "from"
+            to = Rewritten.redis.get("from:#{url}") 
+            @translations << [url, to]
+          elsif prefix == "to"
+            from = Rewritten.get_current_translation(url) 
+            @translations << [from, url]
+          end
+        end
+        @size = @translations.size
+        @translations = @translations[params[:start].to_i..params[:start].to_i+Rewritten.per_page-1]
+
+      else
+        @size = Rewritten.size("froms") 
+        froms = Rewritten.list_range("froms", @start, Rewritten.per_page) 
+        @translations = froms.map{|f| [f, Rewritten.redis.get("from:#{f}")]}
+      end
+
+
       show 'translations'
     end
 

data/lib/rewritten/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rewritten
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 4
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Kai Rubarth
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-10 00:00:00 +02:00
-default_executable: 
+date: 2011-09-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis-namespace
@@ -93,6 +92,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- HISTORY.rdoc
 - README.rdoc
 - Rakefile
 - bin/rewritten-web.rb
@@ -130,7 +130,6 @@ files:
 - lib/test.ru
 - rewritten.gemspec
 - test/test_rewritten.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -160,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rewritten
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A redis-based URL rewriting engine