rewritten 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5e8e2e0cac2c6d7a2c2ff86d2be720ab49e6185
-  data.tar.gz: 90aa30fa3b3e23fc6fb8f3670747e9fad38097b6
+  metadata.gz: 176780637c69e65f8bfdddb6da0611fbf870cd18
+  data.tar.gz: 523eddc494f2a72228ccf4486e5b137861fbc051
 SHA512:
-  metadata.gz: 50010ed61dde1c3e54f924e9ec41a2550fb5344167f716de4959b8f92658c65ba562247f75d630c008ae98efe7f223782a82797e435aaa6abb7374c89fb34971
-  data.tar.gz: 07d5fdfbf2ae667d9584569649835d32f5077e138173ef64a41c73612b88185a930b6c63531d1711753784673bc812ce2df9c32853a59ca9a4144f1eb2c1f8aa
+  metadata.gz: b3de980c77f3a47bf75293fbe7c24e000d530321db0465b392a6b37c44c04c326a6765af8981bc48461f0f893b6fdbf0c29b068bbd80b1108f34739a6a504076
+  data.tar.gz: 83649e1157f994f1d1bceaf763bfc89ddab740de1e6c1268d708ec95ba3fdbcbd0ff7d8063327b5e5b42c5e5a8cdae9974f5486726fc5b06609dce7295400e97

data/lib/rewritten/server.rb

@@ -151,14 +151,18 @@ module Rewritten
       @size = 0
       @start = params[:start].to_i
 
-      if params[:f] && params[:f] != ""
+      filter = params[:f]
+
+      if filter && filter != ""
         @translations = []
 
-        keys = Rewritten.redis.keys("*#{params[:f]}*")
+        keys = Rewritten.redis.keys("from:#{filter}") +
+               Rewritten.redis.keys("to:#{filter}") 
+
         keys.each do |key|
           prefix, url = key.split(":") 
           if prefix == "from"
-            to = Rewritten.redis.get("from:#{url}") 
+            to = Rewritten.translate(url)
             @translations << [url, to]
           elsif prefix == "to"
             from = Rewritten.get_current_translation(url) 

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

@@ -7,10 +7,10 @@
   <p>Subdomains are to be prefixed with a colon, e.g. my.subdomain:/some/path</p>
 
   <h3>Flags </h3>
-  <p> Flags can modify above behavior. They are appended at the end of a line like so: /foo/bar [L] </p>
+  <p> Modify the above behavior. Flags are appended at the end of a line with brackets like so: /foo/bar [L] </p>
   <dl>
-    <dt>H</dt>
-    <dd>Stop translating. Keep this line in the browser, don't go to last line.</dd>
+    <dt>[L]</dt>
+    <dd>Stop redirecting here and put this in the browser location.</dd>
   </dl>
 
 </label><br/>

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

@@ -11,7 +11,7 @@ target URL.</p>
 <p><a href="<%= u('/cleanup') %>"> % Cleanup </a></p>
 
 <form method="get">
-  <label>Filter:</label> <input type="text" name="f" value="<%= params[:f] %>"/>
+  <label>Filter (use <b>* ? []</b> as glob-style patterns):</label> <input type="text" name="f" value="<%= params[:f] %>"/>
   <a href="<%= u('/translations') %>"> clear </a>
 </form>
 

data/lib/rewritten/version.rb

@@ -1,4 +1,4 @@
 module Rewritten
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rewritten
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Kai Rubarth
@@ -178,7 +178,6 @@ files:
 - lib/rewritten/server/views/to.erb
 - lib/rewritten/server/views/translations.erb
 - lib/rewritten/version.rb
-- lib/test.ru
 - rewritten.gemspec
 - test/rack/rewritten_url_test.rb
 - test/rewritten_test.rb

data/lib/test.ru

@@ -1,16 +0,0 @@
-require_relative 'rewritten'
-require_relative 'rewritten/server'
-
-map "/" do
-  #use Rack::Rewritten::Record
-  use Rack::Rewritten::Subdomain, "doxter.de", "lvh.me"
-  use Rack::Rewritten::Url
-  use Rack::Rewritten::Html
-  run Rack::Dummy.new
-end
-
-map "/rewritten" do
-  run Rewritten::Server
-end
-
-