petrie 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da9f08cdff2520b7dc307b54a72dca682e079631
-  data.tar.gz: 293896af6ae9f4ba2715c00d388ecc10e56ba982
+  metadata.gz: 03a36c33edc56989931224f162886951ee18b3e2
+  data.tar.gz: 65729af4ab1e288adfc61bf612f2bd6a2ae6e154
 SHA512:
-  metadata.gz: d09577468c323cc83b32b0819e18412f7dc8d3e30bb1b627f3d7837186d6cd7f314f17f37ffad777564d50c3ef3c705e4db55dacfe3b993ae6a1e5a0c537906b
-  data.tar.gz: 069be96b2803f604bc39b828478bce9fc30bf805b51b20f1301d63e91f6813bfbe5d9b95362871c8609223829ac16efc2a6f7329a82aabb35b9e935b93af045a
+  metadata.gz: 4de17042a80fb83c943d3c07e0371f588fa8120ad5374ac9d0a3d4add85ff1c9ba15b9fe4ee25c481206fa8522894b54eb498c7af30057b8bd0a5e2d1b72d915
+  data.tar.gz: 29bf095349cb4c402e7a6b4b966d04ae3bca276dcc3b73a88c44a9a08e01753f6bee6f18737cff27bda0768adc8b1ff8a96e1e3d3e17e8c612f1d3dfbae9f61e

data/app/controllers/petrie/application_controller.rb

@@ -1,3 +1,5 @@
+require 'sir-trevor-rails'
+
 module Petrie
   class ApplicationController < ActionController::Base
   end

data/app/helpers/petrie/pages_helper.rb

@@ -8,9 +8,9 @@ module Petrie
       @children ||= ancestor.children
     end
 
-    def page_path(page)
+    def petrie_page_path(page)
       page.self_and_ancestors.collect { |a|
-        a.slug unless a.slug == 'home'
+        a.slug unless a.home?
       }.unshift('').join('/')
     end
   end

data/app/models/petrie/page.rb

@@ -13,5 +13,13 @@ module Petrie
       return parent.top_ancestor if parent
       self
     end
+
+    def top_ancestor?
+      self == top_ancestor
+    end
+
+    def home?
+      slug == 'home'
+    end
   end
 end

data/config/routes.rb

@@ -2,7 +2,9 @@ Rails.application.routes.draw do
   root to: 'pages#home'
 
   get 'home', to: redirect('/')
-  get '*page', to: 'pages#show', format: false, as: :page
+  get '*page', to: 'pages#show',
+               format: false,
+               as: :page
 
   if defined? ActiveAdmin
     namespace :admin do

data/lib/generators/petrie/install/templates/pages_controller.rb

@@ -1,11 +1,10 @@
 class PagesController < Petrie::PagesController
+  layout 'application'
 
   # def home
-  #   super
   # end
 
   # def show
-  #   super
   # end
 
 end

data/lib/petrie/engine.rb

@@ -1,5 +1,6 @@
 require 'friendly_id'
 require 'awesome_nested_set'
+require 'the_sortable_tree'
 
 module Petrie
   class Engine < ::Rails::Engine

data/lib/petrie/version.rb

@@ -1,3 +1,3 @@
 module Petrie
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: petrie
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nic Aitch
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: friendly_id
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.6
 - !ruby/object:Gem::Dependency
-  name: friendly_id
+  name: the_sortable_tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement