rewritten 0.15.2 → 0.16.0

data/lib/rewritten/config.ru

@@ -1,4 +1,3 @@
 require 'rewritten'
 
 run Rewritten::Server
-

data/lib/rewritten/document.rb

@@ -7,32 +7,31 @@ module Rewritten
     def path
       plural = ActiveSupport::Inflector.pluralize(self.class.to_s)
       resources = ActiveSupport::Inflector.underscore(plural)
-      "/#{resources}/#{self.id}"
+      "/#{resources}/#{id}"
     end
 
     def rewritten_url
-      return "" unless persisted? 
+      return '' unless persisted?
       Rewritten.get_current_translation(path)
     end
 
     def rewritten_url=(new_url)
-      if !new_url.nil? && new_url != "" && new_url != rewritten_url
+      if !new_url.nil? && new_url != '' && new_url != rewritten_url
         Rewritten.add_translation(new_url, path)
       end
     end
 
     def rewritten_urls
-      return [] unless persisted? 
+      return [] unless persisted?
       Rewritten.get_all_translations(path)
     end
 
-    def has_rewritten_url?
+    def rewritten_url?
       Rewritten.exist_translation_for?(path)
     end
-    
+
     def remove_rewritten_urls
       Rewritten.remove_all_translations(path)
     end
-    
   end
 end

data/lib/rewritten/helpers.rb

@@ -55,4 +55,3 @@ module Rewritten
     end
   end
 end
-

data/lib/rewritten/rails/url_helpers.rb

@@ -1,12 +1,9 @@
 module Rewritten
   module Rails
     module UrlHelper
-
       def url_for(options = nil)
         Rewritten.get_current_translation(super)
       end
-
     end
   end
 end
-

data/lib/rewritten/server.rb

@@ -6,7 +6,6 @@ require 'time'
 
 module Rewritten
   class Server < Sinatra::Base
-
     dir = File.dirname(File.expand_path(__FILE__))
 
     set :views,  "#{dir}/server/views"
@@ -18,15 +17,15 @@ module Rewritten
       alias_method :h, :escape_html
 
       def current_section
-        url_path request.path_info.sub('/','').split('/')[0].downcase
+        url_path request.path_info.sub('/', '').split('/')[0].downcase
       end
 
       def current_page
-        url_path request.path_info.sub('/','')
+        url_path request.path_info.sub('/', '')
       end
 
       def url_path(*path_parts)
-        [ path_prefix, path_parts ].join("/").squeeze('/')
+        [path_prefix, path_parts].join('/').squeeze('/')
       end
       alias_method :u, :url_path
 
@@ -63,7 +62,7 @@ module Rewritten
         end
       end
 
-      def redis_get_value_as_array(key, start=0)
+      def redis_get_value_as_array(key, start = 0)
         case Resque.redis.type(key)
         when 'none'
           []
@@ -79,12 +78,12 @@ module Rewritten
       end
 
       def extract_translations
-        text = params[:translations] or ""
+        text = params[:translations] || ''
         text.split("\n").map(&:strip).reject(&:empty?)
       end
 
       def show_args(args)
-        Array(args).map { |a| a.inspect }.join("\n")
+        Array(args).map(&:inspect).join("\n")
       end
 
       def worker_hosts
@@ -95,7 +94,7 @@ module Rewritten
         hosts = Hash.new { [] }
 
         Resque.workers.each do |worker|
-          host, _ = worker.to_s.split(':')
+          host, = worker.to_s.split(':')
           hosts[host] += [worker.to_s]
         end
 
@@ -108,94 +107,86 @@ module Rewritten
 
       def partial(template, local_vars = {})
         @partial = true
-        erb(template.to_sym, {:layout => false}, local_vars)
+        erb(template.to_sym, { layout: false }, local_vars)
       ensure
         @partial = false
       end
 
       def poll
         if @polling
-          text = "Last Updated: #{Time.now.strftime("%H:%M:%S")}"
+          text = "Last Updated: #{Time.now.strftime('%H:%M:%S')}"
         else
           text = "<a href='#{u(request.path_info)}.poll' rel='poll'>Live Poll</a>"
         end
         "<p class='poll'>#{text}</p>"
       end
-
     end # enf of helpers
-   
 
     def show(page, layout = true)
-      begin
-        erb page.to_sym, {:layout => layout}, :rewritten => Rewritten
-      rescue Errno::ECONNREFUSED
-        erb :error, {:layout => false}, :error => "Can't connect to Redis! (#{Rewritten.redis_id})"
-      end
+      erb page.to_sym, { layout: layout }, rewritten: Rewritten
+    rescue Errno::ECONNREFUSED
+      erb :error, { layout: false }, error: "Can't connect to Redis! (#{Rewritten.redis_id})"
     end
-    
+
     def show_for_polling(page)
-      content_type "text/html"
+      content_type 'text/html'
       @polling = true
       show(page.to_sym, false).gsub(/\s{1,}/, ' ')
     end
 
-
     ################################################################################
 
-
-    get "/?" do
+    get '/?' do
       redirect url_path(:translations)
     end
 
-    get "/translations" do
+    get '/translations' do
       @size = 0
       @start = params[:start].to_i
 
       filter = params[:f]
 
-      if filter && filter != ""
+      if filter && filter != ''
         @translations = []
 
         keys = Rewritten.redis.keys("from:#{filter}") +
-               Rewritten.redis.keys("to:#{filter}") 
+               Rewritten.redis.keys("to:#{filter}")
 
         keys.each do |key|
-          prefix, url = key.split(":") 
-          if prefix == "from"
+          prefix, url = key.split(':')
+          if prefix == 'from'
             to = Rewritten.translate(url)
             @translations << [url, to]
-          elsif prefix == "to"
-            from = Rewritten.get_current_translation(url) 
+          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]
+        @translations = @translations[params[:start].to_i..params[:start].to_i + Rewritten.per_page - 1]
 
       else
         @size = Rewritten.num_froms
-        froms = Rewritten.all_froms[@start, @start+Rewritten.per_page-1]
-        @translations = froms.map{|f| [f, Rewritten.translate(f)]}
+        froms = Rewritten.all_froms[@start, @start + Rewritten.per_page - 1]
+        @translations = froms.map { |f| [f, Rewritten.translate(f)] }
       end
 
-
       show 'translations'
     end
 
-    get "/new" do 
+    get '/new' do
       @translations = []
-      show "new"
+      show 'new'
     end
 
-    get "/edit" do
+    get '/edit' do
       @old_to = @to = params[:to]
-      @translations = Rewritten.get_all_translations(@to).map{|t| Rewritten.full_line(t)}
-      show "edit"
+      @translations = Rewritten.get_all_translations(@to).map { |t| Rewritten.full_line(t) }
+      show 'edit'
     end
 
-    post "/edit" do
-
+    post '/edit' do
       @old_to = params[:old].strip
       @to = params[:to].strip
       @translations = extract_translations
@@ -205,85 +196,79 @@ module Rewritten
         # delete old translations
         Rewritten.remove_all_translations(@old_to)
         # create new translations
-        
+
         Rewritten.add_translations(@to, @translations)
 
         redirect u("/to?to=#{escape(@to)}")
       else
-        show "edit"
+        show 'edit'
       end
-
     end
 
-    post "/translations" do
+    post '/translations' do
       @to = params[:to].strip
-      @translations = extract_translations 
+      @translations = extract_translations
       if @to != '' && @translations.size > 0
         Rewritten.add_translations(@to, @translations)
         redirect u('translations')
       else
-        show "new"
+        show 'new'
       end
     end
 
-    get "/to" do
+    get '/to' do
       @translations = Rewritten.get_all_translations(params[:to])
-      show "to" 
+      show 'to'
     end
 
-    get "/cleanup" do
+    get '/cleanup' do
       # find keys that have no target
-      @from_without_tos= []
+      @from_without_tos = []
       Rewritten.all_froms.each do |from|
-        if Rewritten.redis.get("from:#{from}").empty?
-          @from_without_tos << from
-        end
+        @from_without_tos << from if Rewritten.redis.get("from:#{from}").empty?
       end
-      
-      show "cleanup"
+
+      show 'cleanup'
     end
 
-    get "/delete" do
+    get '/delete' do
       @from = params[:from]
       @to = params[:to]
-      show "delete"
+      show 'delete'
     end
 
     post '/delete' do
       from = params[:from]
       to   = params[:to]
       Rewritten.remove_translation(from, to)
-      redirect u("/")
+      redirect u('/')
     end
 
-    get "/delete_all" do
+    get '/delete_all' do
       @to = params[:to]
-      show "delete_all"
+      show 'delete_all'
     end
 
-    post "/delete_all" do
+    post '/delete_all' do
       Rewritten.remove_all_translations(params[:to])
-      redirect u("/")
+      redirect u('/')
     end
 
-    get "/hits" do
-      show "hits"
+    get '/hits' do
+      show 'hits'
     end
 
-    get "/hits/clear" do
-      show "clear_hits"
+    get '/hits/clear' do
+      show 'clear_hits'
     end
 
-    post "/hits/clear" do
-      Rewritten.redis.del("hits")
-      redirect u("/hits") 
+    post '/hits/clear' do
+      Rewritten.redis.del('hits')
+      redirect u('/hits')
     end
 
     def self.tabs
-      @tabs ||= ["Translations", "Hits"] 
+      @tabs ||= %w(Translations Hits)
     end
-
   end
 end
-
-

data/lib/rewritten/server/test_helper.rb

@@ -7,10 +7,10 @@ module Resque
       include Rack::Test::Methods
       def app
         Resque::Server.new
-      end 
+      end
 
       def self.should_respond_with_success
-        test "should respond with success" do
+        test 'should respond with success' do
           assert last_response.ok?, last_response.errors
         end
       end

data/lib/rewritten/version.rb

@@ -1,4 +1,3 @@
 module Rewritten
-  VERSION = "0.15.2"
+  VERSION = '0.16.0'
 end
-

data/rewritten.gemspec

@@ -1,32 +1,32 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "rewritten/version"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'rewritten/version'
 
 Gem::Specification.new do |s|
-  s.name        = "rewritten"
+  s.name        = 'rewritten'
   s.version     = Rewritten::VERSION
-  s.authors     = ["Kai Rubarth"]
-  s.email       = ["kai@doxter.de"]
-  s.homepage    = ""
-  s.summary     = %q{A redis-based URL rewriting engine}
+  s.authors     = ['Kai Rubarth']
+  s.email       = ['kai@doxter.de']
+  s.homepage    = ''
+  s.summary     = 'A redis-based URL rewriting engine'
 
-  s.rubyforge_project = "rewritten"
+  s.rubyforge_project = 'rewritten'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
-  s.add_dependency "redis-namespace"
-  s.add_dependency "vegas",           "~> 0.1.2"
-  s.add_dependency "sinatra",         ">= 0.9.2"
-  s.add_dependency "multi_json",      "~> 1.0"
-  s.add_dependency "activesupport"
+  s.add_dependency 'redis-namespace'
+  s.add_dependency 'vegas',           '~> 0.1.2'
+  s.add_dependency 'sinatra',         '>= 0.9.2'
+  s.add_dependency 'multi_json',      '~> 1.0'
+  s.add_dependency 'activesupport'
 
-  s.add_development_dependency "rake"
-  s.add_development_dependency "minitest"
-  s.add_development_dependency "pry"
-  s.add_development_dependency "coveralls"
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'coveralls'
 
   s.description = <<description
     Rewritten is a lookup-based rewriting engine that rewrites requested
@@ -46,7 +46,4 @@ Gem::Specification.new do |s|
     4. A Rack app for substituting URLs in HTML pages with their current translation (Rack::Rewritten::Html)
     5. A Rack app for recording successful request (Rack::Rewritten::Record)
 description
-
 end
-
-

data/test/rack/rewritten_canonical_test.rb

@@ -1,22 +1,20 @@
 require 'test_helper'
 
 describe Rack::Rewritten::Canonical do
-
-  def call_args(overrides={})
-    {'HTTP_HOST' => 'www.example.org',
+  def call_args(overrides = {})
+    { 'HTTP_HOST' => 'www.example.org',
       'REQUEST_URI' => '/foo/with/params',
-      'SCRIPT_INFO'=> '',
+      'SCRIPT_INFO' => '',
       'PATH_INFO' => '/foo/with/params',
       'QUERY_STRING' => '',
       'SERVER_PORT' => 80,
       'rack.input' => '',
-      'rack.url_scheme' => 'http'}.merge(overrides)
-  end
-  
-  def request_url(url, params={})
-    call_args.merge({'REQUEST_URI' => url, 'PATH_INFO' => url}.merge(params) )
+      'rack.url_scheme' => 'http' }.merge(overrides)
   end
 
+  def request_url(url, params = {})
+    call_args.merge({ 'REQUEST_URI' => url, 'PATH_INFO' => url }.merge(params))
+  end
 
   before do
     Rewritten.add_translation '/foo/bar', '/products/1'
@@ -29,37 +27,31 @@ describe Rack::Rewritten::Canonical do
       <body>Hello</body>
     </html>
     HTML
-    @rack = Rack::Rewritten::Canonical.new(lambda{|env| [200, {'Content-Type' => 'text/html'}, [@html_body]]})
-
+    @rack = Rack::Rewritten::Canonical.new(->(_env) { [200, { 'Content-Type' => 'text/html' }, [@html_body]] })
   end
 
-  describe 'canonical tag' do 
-
-    it "must add the canonical tag to current translation if on non-translated page" do
-      res,env,body = @rack.call request_url('/products/1')
-      html = body.join("")
-      html.must_include  '<link rel="canonical" href="http://www.example.org/foo/baz"/>'
+  describe 'canonical tag' do
+    it 'must add the canonical tag to current translation if on non-translated page' do
+      _res, _env, body = @rack.call request_url('/products/1')
+      html = body.join('')
+      html.must_include '<link rel="canonical" href="http://www.example.org/foo/baz"/>'
     end
 
-    it "the target of the canonical tag must have no params" do
-      res,env,body = @rack.call request_url('/products/1').merge('QUERY_STRING' => 'some=param' )
-      html = body.join("")
-      html.must_include  '<link rel="canonical" href="http://www.example.org/foo/baz"/>'
+    it 'the target of the canonical tag must have no params' do
+      _res, _env, body = @rack.call request_url('/products/1').merge('QUERY_STRING' => 'some=param')
+      html = body.join('')
+      html.must_include '<link rel="canonical" href="http://www.example.org/foo/baz"/>'
     end
 
     describe 'context partial' do
-      before{ Rewritten.translate_partial = true }
-      after{ Rewritten.translate_partial = false }
+      before { Rewritten.translate_partial = true }
+      after { Rewritten.translate_partial = false }
 
-      it "must add the canonical tag to pages with tail" do
-        res,env,body = @rack.call request_url('/products/1/with/tail')
-        html = body.join("")
-        html.must_include  '<link rel="canonical" href="http://www.example.org/foo/baz"/>'
+      it 'must add the canonical tag to pages with tail' do
+        _res, _env, body = @rack.call request_url('/products/1/with/tail')
+        html = body.join('')
+        html.must_include '<link rel="canonical" href="http://www.example.org/foo/baz"/>'
       end
-
     end
-
   end
-
 end
-