rewritten 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c3f8baf622f9b4ce4351475c13fc1dc0eb73d86
-  data.tar.gz: 0afcf0f5c164bbae531c82692702305818cee956
+  metadata.gz: 7457fe2750b09f702f64e2255515fcb1b7d681f1
+  data.tar.gz: a7653f8eb5b983e220f4332d6395d0f17fec6e4a
 SHA512:
-  metadata.gz: efb7ccf5dfa9d2b060c97960a677da421651dcc7ed6ba91f12d8373754d7bd6e4c682e8234106ea3ac4fd91af0dbab92bc950e7d44de08b8067d4afb2440d2a6
-  data.tar.gz: 0380009037fce092fabab01e3fbf902521513fe52470f8f0158313ba4c4c118c57eb88735db61d6b35c5e3fbe7d6b46ec5fc203bbc383be3ffaf0c50e44a0202
+  metadata.gz: e0f1fb6a8ee92c5517963ec40e34d7ac286312ae4382049c9b10209e3402b6a858d7d9346abd06fc0925ad3124c9a7c6f5523f0ddaf9e603d3d9215c66b5020e
+  data.tar.gz: 23194964b145fe819f7aa68a6bc327661f932483a5046d16d9868604c350be7fc829cf2c6c82aaa0e77dc953f05e57fa0ef8d403fb96b98af7afb3b200ec9351

data/HISTORY.rdoc

@@ -1,3 +1,12 @@
+== 0.5.0
+
+  * dump and import scripts in bin/
+
+== 0.4.0
+
+  * keep query parameters when doing 301 redirects
+  * test suite
+
 == 0.3.3
 
   * Possibly fixing new relic compatiblity: Only process successful responses in Rewritten::HTML

data/bin/rewritten-dump.rb

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+require 'optparse'
+require 'rewritten'
+
+options = {
+  :out => 'rewritten.csv',
+  :verbose => false
+}
+
+op = OptionParser.new do |opts|
+  opts.banner = "Usage: rewriten-dump.rb [options]"
+
+  opts.on("-v", "--verbose", "be more verbose") do
+    options[:verbose] = true
+  end
+
+  opts.on("-o", "--out FILE", 'output file or "-" for stdout') do |o|
+    options[:out] = o
+  end
+
+  opts.on("-u", "--uri URI", 'uri to the redis db') do |uri|
+    options[:uri] = uri
+  end
+
+  opts.on("-h", "--help", 'print help') do
+    puts opts
+    exit 0
+  end
+
+end
+op.parse!
+
+Rewritten.redis = options[:uri] if options[:uri] 
+
+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")
+end
+
+

data/bin/rewritten-import.rb

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+require 'optparse'
+require 'rewritten'
+require 'multi_json'
+
+options = {
+  :drop => false
+}
+
+op = OptionParser.new do |opts|
+  opts.banner = "Usage: rewriten-dump.rb [options]"
+
+  opts.on("-v", "--verbose", "be more verbose") do |v|
+    options[:verbose] = v
+  end
+
+  opts.on("-f", "--file FILE", 'input file') do |o|
+    options[:file] = o
+  end
+
+  opts.on("-u", "--uri URI", 'uri to the redis db') do |uri|
+    options[:uri] = uri
+  end
+
+  opts.on("-d", "--drop", 'drop translations first') do
+    options[:drop] = true
+  end
+
+end
+
+op.parse!
+
+unless options[:file]
+  puts op
+  exit
+end
+
+Rewritten.redis = options[:uri] if options[:uri] 
+
+Rewritten.clear_translations if options[:drop]
+
+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)
+end
+
+

data/lib/rewritten/version.rb

@@ -1,4 +1,4 @@
 module Rewritten
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end
 

data/lib/rewritten.rb

@@ -6,6 +6,7 @@ require 'rack/url'
 require 'rack/record'
 require 'rack/html'
 require 'rack/subdomain'
+require 'pry'
 
 module Rewritten
   include Helpers
@@ -160,8 +161,33 @@ module Rewritten
     end
   end
 
+  def clear_translations
+    if Rewritten.redis == :test
+      @static_translations = {}    
+    else
+      Rewritten.redis.del(*Rewritten.redis.keys) unless Rewritten.redis.keys.empty?
+    end
+  end
+
+  def all_tos
+    tos = []
+    if Rewritten.redis == :test
+      tos = @static_translations.values.uniq
+    else
+      tos = Rewritten.redis.lrange("tos",0,-1).uniq
+    end
+  end
+
+  def all_translations
+    Hash[all_tos.map {|to| [to, Rewritten.get_all_translations(to)]}]
+  end
+
   def get_all_translations(to)
-    Rewritten.redis.lrange("to:#{to}", 0, -1)
+    if Rewritten.redis == :test
+      @static_translations.to_a.select{|k,v| v == to}.map{|k,v| k} 
+    else
+      Rewritten.redis.lrange("to:#{to}", 0, -1)
+    end
   end
 
   def get_current_translation(path)

data/test/rewritten_test.rb

@@ -0,0 +1,25 @@
+require 'rewritten'
+require 'minitest/autorun'
+
+describe Rewritten do
+
+  before{
+    Rewritten.redis = :test
+    Rewritten.clear_translations
+    Rewritten.add_translation('/from', '/to')
+    Rewritten.add_translation('/from2', '/to')
+    Rewritten.add_translation('/from3', '/to2')
+  }
+
+  it "must give all tos" do
+    Rewritten.all_tos.must_equal ["/to", "/to2"] 
+  end
+
+  it "must return all translations" do
+    expected = { "/to" => ['/from', '/from2'], "/to2" => ['/from3']}
+    Rewritten.all_translations.must_equal expected
+  end
+
+end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rewritten
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Kai Rubarth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace
@@ -128,6 +128,8 @@ description: |2
 email:
 - kai@doxter.de
 executables:
+- rewritten-dump.rb
+- rewritten-import.rb
 - rewritten-web.rb
 extensions: []
 extra_rdoc_files: []
@@ -137,6 +139,8 @@ files:
 - HISTORY.rdoc
 - README.rdoc
 - Rakefile
+- bin/rewritten-dump.rb
+- bin/rewritten-import.rb
 - bin/rewritten-web.rb
 - config.ru
 - lib/rack/dummy.rb
@@ -176,8 +180,8 @@ files:
 - lib/rewritten/version.rb
 - lib/test.ru
 - rewritten.gemspec
-- test/rewritten_url_test.rb
-- test/test_rewritten.rb
+- test/rack/rewritten_url_test.rb
+- test/rewritten_test.rb
 homepage: ''
 licenses: []
 metadata: {}

data/test/test_rewritten.rb

@@ -1,6 +0,0 @@
-require 'rubygems'
-require 'rack'
-require "../lib/rack/dummy"
-
-run Rack::Dummy.new
-