petrie 0.1.1 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/petrie/application_controller.rb +2 -0
  3. data/app/helpers/petrie/pages_helper.rb +2 -2
  4. data/app/models/petrie/page.rb +8 -0
  5. data/config/routes.rb +3 -1
  6. data/lib/generators/petrie/install/templates/pages_controller.rb +1 -2
  7. data/lib/petrie/engine.rb +1 -0
  8. data/lib/petrie/version.rb +1 -1
  9. metadata +18 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: da9f08cdff2520b7dc307b54a72dca682e079631
4
- data.tar.gz: 293896af6ae9f4ba2715c00d388ecc10e56ba982
3
+ metadata.gz: 03a36c33edc56989931224f162886951ee18b3e2
4
+ data.tar.gz: 65729af4ab1e288adfc61bf612f2bd6a2ae6e154
5
5
  SHA512:
6
- metadata.gz: d09577468c323cc83b32b0819e18412f7dc8d3e30bb1b627f3d7837186d6cd7f314f17f37ffad777564d50c3ef3c705e4db55dacfe3b993ae6a1e5a0c537906b
7
- data.tar.gz: 069be96b2803f604bc39b828478bce9fc30bf805b51b20f1301d63e91f6813bfbe5d9b95362871c8609223829ac16efc2a6f7329a82aabb35b9e935b93af045a
6
+ metadata.gz: 4de17042a80fb83c943d3c07e0371f588fa8120ad5374ac9d0a3d4add85ff1c9ba15b9fe4ee25c481206fa8522894b54eb498c7af30057b8bd0a5e2d1b72d915
7
+ data.tar.gz: 29bf095349cb4c402e7a6b4b966d04ae3bca276dcc3b73a88c44a9a08e01753f6bee6f18737cff27bda0768adc8b1ff8a96e1e3d3e17e8c612f1d3dfbae9f61e
data/app/controllers/petrie/application_controller.rb CHANGED
@@ -1,3 +1,5 @@
1
+ require 'sir-trevor-rails'
2
+
1
3
  module Petrie
2
4
  class ApplicationController < ActionController::Base
3
5
  end
data/app/helpers/petrie/pages_helper.rb CHANGED
@@ -8,9 +8,9 @@ module Petrie
8
8
  @children ||= ancestor.children
9
9
  end
10
10
 
11
- def page_path(page)
11
+ def petrie_page_path(page)
12
12
  page.self_and_ancestors.collect { |a|
13
- a.slug unless a.slug == 'home'
13
+ a.slug unless a.home?
14
14
  }.unshift('').join('/')
15
15
  end
16
16
  end
data/app/models/petrie/page.rb CHANGED
@@ -13,5 +13,13 @@ module Petrie
13
13
  return parent.top_ancestor if parent
14
14
  self
15
15
  end
16
+
17
+ def top_ancestor?
18
+ self == top_ancestor
19
+ end
20
+
21
+ def home?
22
+ slug == 'home'
23
+ end
16
24
  end
17
25
  end
data/config/routes.rb CHANGED
@@ -2,7 +2,9 @@ Rails.application.routes.draw do
2
2
  root to: 'pages#home'
3
3
 
4
4
  get 'home', to: redirect('/')
5
- get '*page', to: 'pages#show', format: false, as: :page
5
+ get '*page', to: 'pages#show',
6
+ format: false,
7
+ as: :page
6
8
 
7
9
  if defined? ActiveAdmin
8
10
  namespace :admin do
data/lib/generators/petrie/install/templates/pages_controller.rb CHANGED
@@ -1,11 +1,10 @@
1
1
  class PagesController < Petrie::PagesController
2
+ layout 'application'
2
3
 
3
4
  # def home
4
- # super
5
5
  # end
6
6
 
7
7
  # def show
8
- # super
9
8
  # end
10
9
 
11
10
  end
data/lib/petrie/engine.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  require 'friendly_id'
2
2
  require 'awesome_nested_set'
3
+ require 'the_sortable_tree'
3
4
 
4
5
  module Petrie
5
6
  class Engine < ::Rails::Engine
data/lib/petrie/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Petrie
2
- VERSION = "0.1.1"
2
+ VERSION = "0.1.2"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: petrie
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nic Aitch
@@ -24,6 +24,20 @@ dependencies:
24
24
  - - ~>
25
25
  - !ruby/object:Gem::Version
26
26
  version: 4.0.0
27
+ - !ruby/object:Gem::Dependency
28
+ name: friendly_id
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - ~>
32
+ - !ruby/object:Gem::Version
33
+ version: 5.0.0
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ~>
39
+ - !ruby/object:Gem::Version
40
+ version: 5.0.0
27
41
  - !ruby/object:Gem::Dependency
28
42
  name: awesome_nested_set
29
43
  requirement: !ruby/object:Gem::Requirement
@@ -39,19 +53,19 @@ dependencies:
39
53
  - !ruby/object:Gem::Version
40
54
  version: 2.1.6
41
55
  - !ruby/object:Gem::Dependency
42
- name: friendly_id
56
+ name: the_sortable_tree
43
57
  requirement: !ruby/object:Gem::Requirement
44
58
  requirements:
45
59
  - - ~>
46
60
  - !ruby/object:Gem::Version
47
- version: 5.0.0
61
+ version: 2.3.0
48
62
  type: :runtime
49
63
  prerelease: false
50
64
  version_requirements: !ruby/object:Gem::Requirement
51
65
  requirements:
52
66
  - - ~>
53
67
  - !ruby/object:Gem::Version
54
- version: 5.0.0
68
+ version: 2.3.0
55
69
  - !ruby/object:Gem::Dependency
56
70
  name: sqlite3
57
71
  requirement: !ruby/object:Gem::Requirement