rewritten 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b219a3b39bc494eb23d7768fd6de8fbab2b7933
-  data.tar.gz: 2f1ee10125acebf0d1b007e1d65a7f2b6648c6c7
+  metadata.gz: f5e8e2e0cac2c6d7a2c2ff86d2be720ab49e6185
+  data.tar.gz: 90aa30fa3b3e23fc6fb8f3670747e9fad38097b6
 SHA512:
-  metadata.gz: e15bbb18a1f5bf571c0846049ca57daba0ffd1665f7ee5d4035decbbb16389921abf28a9b6be4c9b03e6959a7e1bf9def345dce6f9402a00db00ffe057b3b8fb
-  data.tar.gz: 5e4bee52c3efef72088ca7ebd0326c7168cc17848b8c62bf2a4d4753363bbf0d0df28d4b9dc9e2b156e8d7cc966b0e058c9518f9ffbc05d5ab287bd524d25be7
+  metadata.gz: 50010ed61dde1c3e54f924e9ec41a2550fb5344167f716de4959b8f92658c65ba562247f75d630c008ae98efe7f223782a82797e435aaa6abb7374c89fb34971
+  data.tar.gz: 07d5fdfbf2ae667d9584569649835d32f5077e138173ef64a41c73612b88185a930b6c63531d1711753784673bc812ce2df9c32853a59ca9a4144f1eb2c1f8aa

data/HISTORY.rdoc

@@ -1,3 +1,7 @@
+== 0.8.0
+
+  * introduce the [H] flag to stop translating
+
 == 0.7.0
 
   * use sorted sets for the targets instead of lists

data/bin/rewritten-dump.rb

@@ -39,7 +39,7 @@ file = options[:out] == "-" ? STDOUT : File.open(options[:out], "w")
 
 file.puts "#from;to"
 Rewritten.all_tos.each do |to|
-  file.puts Rewritten.get_all_translations(to).map{|from| "#{from};#{to}"}.join("\n")
+  file.puts Rewritten.get_all_translations(to).map{|from| "#{Rewritten.full_line(from)};#{to}"}.join("\n")
 end
 
 

data/bin/rewritten-import.rb

@@ -46,7 +46,7 @@ File.open(options[:file]).each do |line|
   next if line =~ /^#/
   from,to = line.split(";")
   puts "adding #{from} -> #{to}" if options[:verbose]
-  Rewritten.add_translation(from,to)
+  Rewritten.add_translation(from,to.chomp)
 end
 
 

data/lib/rack/html.rb

@@ -20,7 +20,7 @@ module Rack
             links = line.scan(/href="([^"]+)"/).flatten.uniq
             res = line
             links.each do |link|
-              t = get_translation(link)
+              t = ::Rewritten.get_current_translation(link)
               res.gsub!(/href="#{link}"/, %Q|href="#{t}"|) if t
             end
             new_response << res
@@ -32,12 +32,6 @@ module Rack
         [status, headers, new_response]
       end
 
-      private
-
-      def get_translation(url)
-        ::Rewritten.list_range("to:#{url}", -1, 1)
-      end
-
     end
 
   end

data/lib/rack/url.rb

@@ -27,7 +27,7 @@ module Rack
           current_path = ::Rewritten.get_current_translation(to)
           current_path = current_path.split(":").last
 
-          if current_path == req.path_info
+          if current_path == req.path_info or ::Rewritten.has_flag?(path, 'L')
             # if this is the current path, rewrite path and parameters
             tpath, tparams = split_to_path_params(to)
             req.path_info = tpath

data/lib/rewritten.rb

@@ -126,12 +126,16 @@ module Rewritten
   # translations 
   #
 
-  def add_translation(from, to)
-    redis.set("from:#{from}", to)
-    redis.sadd(:froms, from) 
-    redis.sadd(:tos, to) 
+  def add_translation(line, to)
+    from, flags = line.split(/\s+/)
 
+    flags = flags.scan(/\[(\w+)\]/).first if flags
 
+    redis.hset("from:#{from}", :to, to)
+    redis.hset("from:#{from}", :flags, flags) if flags
+
+    redis.sadd(:froms, from) 
+    redis.sadd(:tos, to) 
     score = redis.zcard("to:#{to}") || 0
     redis.zadd("to:#{to}", score, from)  
   end
@@ -174,8 +178,8 @@ module Rewritten
     Array(Rewritten.redis.smembers(:tos))
   end
 
-  def all_translations
-    Hash[all_tos.map {|to| [to, Rewritten.get_all_translations(to)]}]
+  def translate(from)
+    redis.hget("from:#{from}", :to)
   end
 
   def get_all_translations(to)
@@ -188,6 +192,26 @@ module Rewritten
     return path
   end
 
+  def get_flag_string(from)
+    Rewritten.redis.hget("from:#{from}", :flags)||""
+  end
+
+  def has_flag?(from, c)
+    return false unless Rewritten.redis.exists("from:#{from}")
+    get_flag_string(from).index(c) != nil
+  end
+
+  def full_line(from)
+    flags = get_flag_string(from)
+
+    if flags == ""
+      from
+    else
+      "#{from} [#{flags}]" 
+    end
+
+  end
+
   def exist_translation_for?(path)
     get_current_translation(path) != path
   end
@@ -202,7 +226,7 @@ module Rewritten
   end
 
   def includes?(path)
-    Rewritten.redis.get("from:#{path}")
+    Rewritten.redis.hget("from:#{path}", :to)
   end
 
   # return the number of froms

data/lib/rewritten/server.rb

@@ -172,7 +172,7 @@ module Rewritten
       else
         @size = Rewritten.num_froms
         froms = Rewritten.all_froms[@start, @start+Rewritten.per_page-1]
-        @translations = froms.map{|f| [f, Rewritten.redis.get("from:#{f}")]}
+        @translations = froms.map{|f| [f, Rewritten.translate(f)]}
       end
 
 
@@ -186,7 +186,7 @@ module Rewritten
 
     get "/edit" do
       @old_to = @to = params[:to]
-      @translations = Rewritten.get_all_translations(@to)
+      @translations = Rewritten.get_all_translations(@to).map{|t| Rewritten.full_line(t)}
       show "edit"
     end
 
@@ -223,8 +223,7 @@ module Rewritten
     end
 
     get "/to" do
-      #translations = Rewritten.list_range(params[:to], 0, -1) 
-      translations = Rewritten.z_range(params[:to], 0, -1) 
+      @translations = Rewritten.get_all_translations(params[:to])
       show "to" 
     end
 

data/lib/rewritten/server/public/style.css

@@ -21,6 +21,24 @@ body { padding:0; margin:0; }
 #main span.hl { background:#efefef; padding:2px;}
 #main h1 { margin:10px 0; font-size:190%; font-weight:bold; color:#ce1212;}
 #main h2 { margin:10px 0; font-size:130%;}
+#main h3 { margin:10px 0; font-size:120%;}
+
+#main dl{ }
+#main dl dt {
+  float: left;
+  font-weight: bold;
+  margin-right: 10px;
+  padding:5px;
+  width: 15px;
+
+}
+
+#main dl dd{
+  margin: 2px 0;
+  padding: 5px 0;
+}
+
+
 #main table { width:100%; margin:10px 0;}
 #main table tr td, #main table tr th { border:1px solid #ccc; padding:6px;}
 #main table tr th { background:#efefef; color:#888; font-size:80%; font-weight:bold;}
@@ -82,4 +100,4 @@ body { padding:0; margin:0; }
 
 #main form {float:right; margin-top:-10px;}
 
-#main .time a.toggle_format {text-decoration:none;}
+#main .time a.toggle_format {text-decoration:none;}

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

@@ -5,12 +5,20 @@
   <h2>Translations (What's seen in the browser's location bar)</h2>
   <p>Last line being the final location in the browser</p>
   <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>
+  <dl>
+    <dt>H</dt>
+    <dd>Stop translating. Keep this line in the browser, don't go to last line.</dd>
+  </dl>
+
 </label><br/>
 
 <textarea name="translations" cols="80" rows="10"><%= @translations.join("\n") %></textarea> <br />
 
 <p>
-<label><h2>Resource (What your app sees)</h2></label><br/>
+<label><h2>Resource (What your app sees)</h2></label><br/>
 <textarea name="to" cols="80" rows="2"><%= @to %></textarea>
 </p>
 

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

@@ -17,9 +17,9 @@
     <th>Action</th>
   </tr>
 
-  <% for translation in Rewritten.z_range("to:#{params[:to]}", 0, 100) %>
+  <% for translation in @translations %>
     <tr>
-      <td class=''><a href="<%= translation %>" target="new"><%= translation %></td>
+      <td class=''><a href="<%= translation %>" target="new"><%= Rewritten.full_line(translation) %></td>
         <td class=''>
           <a href="<%= u(%|/edit?to=#{escape(params[:to])}|) %>"> add </a>| 
           <a href="<%= u(%|/edit?to=#{escape(params[:to])}|) %>"> edit </a>|

data/lib/rewritten/version.rb

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

data/test/rack/rewritten_url_test.rb

@@ -11,6 +11,10 @@ describe Rack::Rewritten::Url do
       'rack.input' => '',
       'rack.url_scheme' => 'http'}.merge(overrides)
   end
+  
+  def request_url(url)
+    call_args.merge('REQUEST_URI' => url, 'PATH_INFO' => url )
+  end
 
   before {
     Rewritten.add_translation '/foo/bar', '/products/1'
@@ -78,6 +82,37 @@ describe Rack::Rewritten::Url do
 
     end
 
+    describe "flag behavior" do
+
+      before {
+        Rewritten.add_translation('/with/flags [L]', '/adwords/target')
+        Rewritten.add_translation('/with/flags2 [L]', '/adwords/target')
+        Rewritten.add_translation('/no/flags', '/adwords/target')
+        Rewritten.add_translation('/final/line', '/adwords/target')
+      }
+
+      it "must stay on [L] flagged froms" do
+        @app.expect :call, [200, {'Content-Type' => 'text/plain'},[""]], [Hash]
+        @app.expect :call, [200, {'Content-Type' => 'text/plain'},[""]], [Hash]
+
+        ret = @rack.call( request_url('/with/flags'))
+        ret[0].must_equal 200
+
+        ret = @rack.call( request_url('/with/flags2'))
+        ret[0].must_equal 200
+
+        @app.verify
+      end
+
+      it "must redirect for other entries" do
+        ret = @rack.call( request_url('/no/flags') )
+        @app.verify
+        ret[0].must_equal 301
+        ret[1]['Location'].must_equal "http://www.example.org/final/line"
+      end
+
+    end
+
 
   end
 

data/test/rewritten_test.rb

@@ -6,15 +6,53 @@ describe Rewritten do
     Rewritten.add_translation('/from', '/to')
     Rewritten.add_translation('/from2', '/to')
     Rewritten.add_translation('/from3', '/to2')
+
+    #with flags
+    Rewritten.add_translation('/with/flags  [L12]', '/to3')
   }
 
-  it "must give all tos" do
-    Rewritten.all_tos.sort.must_equal ["/to", "/to2"] 
+  describe "basic interface" do
+
+    it "must translate froms" do
+      Rewritten.translate('/from').must_equal '/to'
+      Rewritten.translate('/from2').must_equal '/to'
+      Rewritten.translate('/from3').must_equal '/to2'
+      Rewritten.translate('/with/flags').must_equal '/to3'
+    end
+
+    it "must give current_translation" do
+      Rewritten.get_current_translation('/to').must_equal '/from2'
+      Rewritten.get_current_translation('/to2').must_equal '/from3'
+      Rewritten.get_current_translation('/to3').must_equal '/with/flags'
+      Rewritten.get_current_translation('/n/a').must_equal '/n/a'
+    end
+
+    it "must return the  complete line with flags" do
+      Rewritten.full_line('/from').must_equal '/from'
+      Rewritten.full_line('/with/flags').must_equal '/with/flags [L12]'
+    end
+
+    it "must give all tos" do
+      Rewritten.all_tos.sort.must_equal ["/to", "/to2", "/to3"] 
+    end
+
   end
 
-  it "must return all translations" do
-    expected = { "/to" => ['/from', '/from2'], "/to2" => ['/from3']}
-    Rewritten.all_translations.must_equal expected
+
+  describe "flag management" do
+
+    it "must return a flag string" do
+      Rewritten.get_flag_string('/with/flags').must_equal "L12"
+      Rewritten.get_flag_string('/n/a').must_equal ""
+    end
+
+    it "must query flags" do
+      Rewritten.has_flag?('/with/flags', 'X').must_equal false
+      Rewritten.has_flag?('/with/flags', 'L').must_equal true
+      Rewritten.has_flag?('/with/flags', '1').must_equal true
+      Rewritten.has_flag?('/with/flags', '2').must_equal true
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rewritten
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Kai Rubarth