Skip to content

Commit

Permalink
rename rewrite to redirect
Browse files Browse the repository at this point in the history
  • Loading branch information
champierre committed Sep 29, 2011
1 parent a510b2b commit 624c0b2
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 75 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This plugin is for the website using Lokka deployed on Heroku. The plugin can cr
## Installation

$ cd LOKKA_ROOT/public/plugin
$ git clone git@github.com:champierre/lokka-rewrite.git
$ git clone git@github.com:champierre/lokka-redirect.git

## Usage

Expand All @@ -30,7 +30,7 @@ create the following rule from "rewrite" plugin admin page.
</tr>
</table>

## Examples of Rewrite Rules
## Examples of Redirect Rules

<table>
<tr>
Expand Down
65 changes: 65 additions & 0 deletions lib/lokka/redirect.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
module Lokka
module Redirect
def self.registered(app)
app.get '/admin/plugins/redirect' do
redirect '/admin/plugins/redirect/rules'
end

app.get '/admin/plugins/redirect/rules' do
@rules = Option.lokka_redirect_rules ? JSON.parse(Option.lokka_redirect_rules) : []
haml :"plugin/lokka-redirect/views/rules/index", :layout => :"admin/layout"
end

app.get '/admin/plugins/redirect/rules/new' do
haml :"plugin/lokka-redirect/views/rules/new", :layout => :"admin/layout"
end

app.post '/admin/plugins/redirect/rules' do
@rules = Option.lokka_redirect_rules ? JSON.parse(Option.lokka_redirect_rules) : []
@rules.push params['rule']
Option.lokka_redirect_rules = @rules.to_json
flash[:notice] = 'Redirect Rule was successfully created.'
redirect '/admin/plugins/redirect/rules'
end

app.get '/admin/plugins/redirect/rules/:id/edit' do |id|
@rules = Option.lokka_redirect_rules ? JSON.parse(Option.lokka_redirect_rules) : []
@rule = @rules[id.to_i]
haml :"plugin/lokka-redirect/views/rules/edit", :layout => :"admin/layout"
end

app.put '/admin/plugins/redirect/rules/:id' do |id|
@rules = Option.lokka_redirect_rules ? JSON.parse(Option.lokka_redirect_rules) : []
@rules[id.to_i] = params['rule']
Option.lokka_redirect_rules = @rules.to_json
flash[:notice] = 'Redirect Rule was successfully updated.'
redirect '/admin/plugins/redirect/rules'
end

app.delete '/admin/plugins/redirect/rules/:id' do |id|
@rules = Option.lokka_redirect_rules ? JSON.parse(Option.lokka_redirect_rules) : []
@rules.delete_at(id.to_i)
Option.lokka_redirect_rules = @rules.to_json
flash[:notice] = 'Redirect Rule was successfully deleted.'
redirect '/admin/plugins/redirect/rules'
end

app.get '*' do |path|
pass if path =~ /^\/admin\//

@rules = Option.lokka_redirect_rules ? JSON.parse(Option.lokka_redirect_rules) : []
@rules.each do |rule|
pattern = rule['pattern']
substitution = rule['substitution']
if pattern && substitution
regexp = Regexp.new(pattern)
if path =~ regexp
redirect path.gsub(regexp, substitution), 301
end
end
end
pass
end
end
end
end
65 changes: 0 additions & 65 deletions lib/lokka/rewrite.rb

This file was deleted.

4 changes: 2 additions & 2 deletions views/rules/edit.haml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%h2 Edit Rewrite Rule
%form{:action => "/admin/plugins/rewrite/rules/#{params[:id]}", :method => 'post'}
%h2 Edit Redirect Rule
%form{:action => "/admin/plugins/redirect/rules/#{params[:id]}", :method => 'post'}
%input{:type => 'hidden', :name => '_method', :value => 'put'}
.field
%label{:for => 'rule_pattern'} Pattern
Expand Down
8 changes: 4 additions & 4 deletions views/rules/index.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%h2 Rewrite
%h2 Redirect
%h3 Examples
%table{:style => 'margin-bottom:30px'}
%tr
Expand All @@ -24,8 +24,8 @@
%td= rule['pattern']
%td= rule['substitution']
%td
%a.button{:href => "/admin/plugins/rewrite/rules/#{i}/edit"}= t.edit
%a.button{:href => "/admin/plugins/redirect/rules/#{i}/edit"}= t.edit
%td
= link_to t.delete, "/admin/plugins/rewrite/rules/#{i}", :class => 'button', :confirm => t.are_you_sure, :method => :delete
= link_to t.delete, "/admin/plugins/redirect/rules/#{i}", :class => 'button', :confirm => t.are_you_sure, :method => :delete
%div
%a.button{:href => "/admin/plugins/rewrite/rules/new"}= t.new
%a.button{:href => "/admin/plugins/redirect/rules/new"}= t.new
4 changes: 2 additions & 2 deletions views/rules/new.haml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%h2 New Rewrite Rule
%form{:action => '/admin/plugins/rewrite/rules', :method => 'post'}
%h2 New Redirect Rule
%form{:action => '/admin/plugins/redirect/rules', :method => 'post'}
.field
%label{:for => 'rule_pattern'} Pattern
%br
Expand Down

0 comments on commit 624c0b2

Please sign in to comment.