Skip to content

Commit 298c0ee

Browse files
committed
Remove friendy_id and use standart named routing
1 parent e058cce commit 298c0ee

11 files changed

+5
-154
lines changed

Gemfile.lock

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
PATH
22
remote: .
33
specs:
4-
kebapage (1.0.0)
4+
kebapage (1.1.0)
55
bootstrap-wysihtml5-rails (~> 0.3.1.23)
66
dropzonejs-rails (= 0.4.12)
7-
friendly_id (~> 5.0.2)
87
haml (~> 4.0.2)
98
haml-rails (~> 0.5.3)
109
i18n (~> 0.6.9)
1110
paperclip
1211
rails (~> 4.0.2)
1312
rails-i18n (~> 4.0.1)
14-
simple_form (~> 3.0.1)
1513

1614
GEM
1715
remote: https://rubygems.org/
@@ -52,8 +50,6 @@ GEM
5250
dropzonejs-rails (0.4.12)
5351
rails (> 3.1)
5452
erubis (2.7.0)
55-
friendly_id (5.0.2)
56-
activerecord (~> 4.0.0)
5753
haml (4.0.5)
5854
tilt
5955
haml-rails (0.5.3)
@@ -95,9 +91,6 @@ GEM
9591
rake (>= 0.8.7)
9692
thor (>= 0.18.1, < 2.0)
9793
rake (10.1.1)
98-
simple_form (3.0.1)
99-
actionpack (>= 4.0.0, < 4.1)
100-
activemodel (>= 4.0.0, < 4.1)
10194
sprockets (2.10.1)
10295
hike (~> 1.2)
10396
multi_json (~> 1.0)

app/controllers/kebapage/static_pages_controller.rb

+2-6
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ def index
1010
end
1111

1212
def show
13-
if request.path != main_app.pages_path(@static_page)
14-
redirect_to main_app.pages_path(@static_page), status: :moved_permanently
15-
else
16-
render layout: Rails.configuration.kebapage.front_layout, template: 'kebapage/show'
17-
end
13+
render layout: Rails.configuration.kebapage.front_layout, template: 'kebapage/show'
1814
end
1915

2016
def new
@@ -51,7 +47,7 @@ def destroy
5147

5248
private
5349
def set_static_page
54-
@static_page = StaticPage.friendly.find(params[:id])
50+
@static_page = StaticPage.find(params[:id])
5551
end
5652

5753
def static_page_params

app/models/kebapage/static_page.rb

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
require 'friendly_id'
2-
31
module Kebapage
42
class StaticPage < ActiveRecord::Base
53
validates :title, :content, presence: true
6-
extend FriendlyId
7-
friendly_id :title, use: [:slugged, :history]
84

9-
def should_generate_new_friendly_id?
10-
slug.blank? || title_changed?
5+
def to_param
6+
"#{id} #{title}".parameterize
117
end
128
end
139
end

config/initializers/friendly_id.rb

-88
This file was deleted.

db/migrate/20140104083052_add_slug_to_kebapage_static_pages.rb

-6
This file was deleted.

db/migrate/20140104084609_create_friendly_id_slugs.rb

-15
This file was deleted.

kebapage.gemspec

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
2020
s.add_dependency 'rails-i18n', '~> 4.0.1'
2121
s.add_dependency 'i18n', '~> 0.6.9'
2222
s.add_dependency 'haml-rails', '~> 0.5.3'
23-
s.add_dependency 'friendly_id', '~> 5.0.2'
2423
s.add_dependency 'bootstrap-wysihtml5-rails', '~> 0.3.1.23'
2524
s.add_dependency 'dropzonejs-rails', '0.4.12'
2625
s.add_dependency 'paperclip'

lib/generators/kebapage/install/install_generator.rb

-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ def self.next_migration_number(dirname)
2626
def create_migration_file
2727
migration_template 'migrations/static_pages.rb', 'db/migrate/create_kebapage_static_pages.rb' rescue nil
2828
migration_template 'migrations/media.rb', 'db/migrate/create_kebapage_media.rb' rescue nil
29-
migration_template 'migrations/add_slug_to_kebapage_static_pages.rb', 'db/migrate/add_slug_to_kebapage_static_pages.rb' rescue nil
30-
migration_template 'migrations/friendly_id_slugs.rb', 'db/migrate/create_friendly_id_slugs.rb' rescue nil
3129
end
3230

3331
def copy_locales

lib/generators/kebapage/install/templates/migrations/add_slug_to_kebapage_static_pages.rb

-6
This file was deleted.

lib/generators/kebapage/install/templates/migrations/friendly_id_slugs.rb

-15
This file was deleted.

lib/kebapage.rb

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
require "kebapage/engine"
2-
require "friendly_id"
32
require "bootstrap-wysihtml5-rails"
43
require "dropzonejs-rails"
54
require "paperclip"

0 commit comments

Comments
 (0)