seiten 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdca338d9f41a0024b0b90dc5c87c7f602ad00aa
-  data.tar.gz: ecb1044492d591194e9f1e7828193eb00ac96cd3
+  metadata.gz: a0ff873128338069249737ba993b223217dd98a8
+  data.tar.gz: 940a0ebd9ce9c3edce4902f88936b3f6e2a9fb65
 SHA512:
-  metadata.gz: c27b5a89c616ea6d2ed275a9368baa8c25a63da8bef13d412913fa64841f880d27f1ad579877f32e490d71190a36a4493db9ddbc9e917982f7c2e1b8961c434e
-  data.tar.gz: a243c6e2addbe1daaee53cdd46717bf8266801df708a0be0215569a9b3c0a7eeaa1f1263087575e7aadb213da7be710ddfbf22527e012223f32e85c405019602
+  metadata.gz: d776bf9d134f8d295b97f570e6429fd92e76f8e3d8bc550f9998c9ef69a3b93464a17120db62a2edc6ca2439eea8cb662ab96408f7f76d6456877dcbe6589b64
+  data.tar.gz: 2ab6292b960d3fae73d9cff0e1344a997b6312c35a61af06ae261cb2197fc7a5486de44d2d21d7701b04ef5211fc5a7f11bd466d2f0b78e71276a246000f2472

data/app/controllers/seiten/pages_controller.rb

@@ -6,6 +6,7 @@ module Seiten
         head :not_found
       else
         @title = current_page.title
+        render layout: current_page.layout if current_page.layout 
       end
     end
   end

data/app/helpers/seiten_helper.rb

@@ -23,8 +23,9 @@ module SeitenHelper
         end
         output += "</li>"
       end
+      output = "<ul>#{output}</ul>"
     end
-    raw "<ul>#{output}</ul>"
+    raw output
   end
 
   def seiten_breadcrumb

data/config/routes.rb

@@ -3,7 +3,7 @@ Rails.application.routes.draw do
   # Redirects
   Seiten::Page.all.each do |page|
     if page.redirect
-      get page.slug => redirect(page.children.first.slug)
+      get page.slug => redirect(page.redirect)
     end
   end
 

data/lib/seiten/page.rb

@@ -2,7 +2,7 @@ module Seiten
 
   class Page
 
-    attr_accessor :id, :parent_id, :title, :children, :slug, :redirect
+    attr_accessor :id, :parent_id, :title, :children, :slug, :redirect, :layout
 
     # initialize Page object with attributes
     def initialize(options={})
@@ -11,6 +11,7 @@ module Seiten
       @title     = options[:title]
       @slug      = options[:slug]
       @redirect  = options[:redirect]
+      @layout    = options[:layout]
     end
 
     def self.all

data/lib/seiten/page_store.rb

@@ -12,41 +12,69 @@ module Seiten
       @storage_file ||= File.join(Rails.root, Seiten.config[:storage_file])
     end
 
+    def build_link(page, prefix_url="")
+      slug = page["url"].nil? ? page["title"].parameterize : page["url"]
+      unless slug[0] == "/" || !!(slug.match(/^https?:\/\/.+/))
+        slug = "#{prefix_url}/#{slug}"
+      end
+      slug
+    end
+
     def load_pages(options={})
 
-      pages  = options[:pages]
-      parent_id = options[:parent_id]
-      url       = options[:url]
+      pages      = options[:pages]
+      parent_id  = options[:parent_id] # || nil
+      layout     = options[:layout]
+      prefix_url = options[:prefix_url] || ""
 
       # Setting default values
       if storage_type == :yaml
         pages ||= YAML.load_file(storage_file)
       end
-      parent_id   ||= nil
-      url         ||= ""
+
       @id         ||= 1
       @navigation ||= []
 
       pages.each_index do |i|
 
+        # Load page and set parent_id and generated page id
         page = pages[i]
         page["id"] = @id
         page["parent_id"] = parent_id
+        page["layout"] ||= layout
+
+        # Increment generated id
         @id += 1
 
         # Build link
-        slug = page["url"].nil? ? page["title"].parameterize : page["url"]
-        if slug[0] == "/" || !!(slug.match(/^https?:\/\/.+/))
-          page["slug"] = slug
-        else
-          page["slug"] = "#{url}/#{slug}"
+        page["slug"] = build_link(page, prefix_url)
+
+        # Set layout
+        if page["layout"]
+          if page["layout"].is_a?(String)
+            inherited_layout = page["layout"]
+          elsif page["layout"].is_a?(Hash)
+            if page["layout"]["inherit"]
+              inherited_layout = page["layout"]
+            else
+              inherited_layout = nil
+            end
+            page["layout"] = page["layout"]["name"]
+          end
+        end
+
+        # Set redirect
+        if page["redirect"]
+          if page["redirect"].is_a?(TrueClass)
+            page["redirect"] = build_link(page["nodes"].first, page["slug"])
+          end
         end
 
+        # Load children
         if page["nodes"]
-          load_pages(pages: page["nodes"], parent_id: page["id"], url: page["slug"])
+          load_pages(pages: page["nodes"], parent_id: page["id"], prefix_url: page["slug"], layout: inherited_layout)
         end
 
-        page.delete("nodes")
         page_params = page.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
         @navigation << Page.new(page_params)
       end

data/lib/seiten/version.rb

@@ -1,3 +1,3 @@
 module Seiten
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/dummy/app/views/layouts/application.html.erb

@@ -8,6 +8,8 @@
 </head>
 <body>
 
+<p>Default Layout</p>
+
 <h1>Navigation</h1>
 <%= seiten_navigation %>
 

data/test/dummy/app/views/layouts/home.html.erb

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%# <%= javascript_include_tag "application" %1> %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<p>Home Layout</p>
+
+<h1>Navigation</h1>
+<%= seiten_navigation %>
+
+<h1>Breadcrumb</h1>
+<%= seiten_breadcrumb %>
+
+<%= yield %>
+
+</body>
+</html>

data/test/dummy/app/views/layouts/products.html.erb

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%# <%= javascript_include_tag "application" %1> %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<p>Products Layout</p>
+
+<h1>Navigation</h1>
+<%= seiten_navigation %>
+
+<h1>Breadcrumb</h1>
+<%= seiten_breadcrumb %>
+
+<%= yield %>
+
+</body>
+</html>

data/test/dummy/app/views/layouts/team.html.erb

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%# <%= javascript_include_tag "application" %1> %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<p>Team Layout</p>
+
+<h1>Navigation</h1>
+<%= seiten_navigation %>
+
+<h1>Breadcrumb</h1>
+<%= seiten_breadcrumb %>
+
+<%= yield %>
+
+</body>
+</html>

data/test/dummy/config/navigation.yml

@@ -1,17 +1,24 @@
 - title: "Home"
   url: "/"
+  layout: "home"
 
 - title: "Products"
+  layout:
+    name: "products"
+    inherit: true
   nodes:
     - title: "Logo Design"
     - title: "Web Development"
     - title: "Hire us"
-      url: "/contact" # links to Contact page
+      redirect: "/contact" # links to Contact page
 
 - title: "About"
   redirect: true # redirects /about to /about/our-team
   nodes:
     - title: "Our Team"
+      layout:
+        name: "team"
+        inherit: false
       nodes:
         - title: "Switzerland"
         - title: "Italy"