seiten 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0ff873128338069249737ba993b223217dd98a8
-  data.tar.gz: 940a0ebd9ce9c3edce4902f88936b3f6e2a9fb65
+  metadata.gz: c07bb134e2faeb0ba5dd11af57a067fef28ceeb2
+  data.tar.gz: 94f0e43ea9839d4bf1598ef7c63e0c8bb39a590a
 SHA512:
-  metadata.gz: d776bf9d134f8d295b97f570e6429fd92e76f8e3d8bc550f9998c9ef69a3b93464a17120db62a2edc6ca2439eea8cb662ab96408f7f76d6456877dcbe6589b64
-  data.tar.gz: 2ab6292b960d3fae73d9cff0e1344a997b6312c35a61af06ae261cb2197fc7a5486de44d2d21d7701b04ef5211fc5a7f11bd466d2f0b78e71276a246000f2472
+  metadata.gz: 341550a0f7cdd4b7e6a9a01b685c70796b6ec8007b13256482c5a028c95e0ada6d42e164994926c5cf4307d819d085944c10874e3e91ca2c9de95e10ef8defb6
+  data.tar.gz: 6657f6f1f45308fcab547c3dff423355c8ac887a154178a545230647829a824ace2361d921c3d94e6739288fe3a99a52a4b9f36d8ad586ebddd9f498b913bcbf

data/app/controllers/seiten/pages_controller.rb

@@ -3,10 +3,27 @@ module Seiten
 
     def show
       if current_page.nil?
-        head :not_found
+        raise ActionController::RoutingError.new("Page /#{params[:page]} not found")
       else
         @title = current_page.title
-        render layout: current_page.layout if current_page.layout 
+
+        if params[:page]
+          filename = params[:page]
+        else
+          filename = Seiten.config[:root_page_filename]
+        end
+
+        if File.exists? Seiten::PageStore.current.file_path(filename: "#{filename}.html.erb", locale: I18n.locale)
+          file = Seiten::PageStore.current.file_path(filename: filename, locale: I18n.locale)
+        else
+          file = Seiten::PageStore.current.file_path(filename: filename)
+        end
+
+        if current_page.layout
+          render file: file, layout: current_page.layout
+        else
+          render file: file
+        end
       end
     end
   end

data/app/helpers/seiten_helper.rb

@@ -1,12 +1,13 @@
 module SeitenHelper
 
-  def render_html
-    if params[:page]
-      filename = params[:page]
+  def link_to_seiten_page(title, slug, options={})
+    if !!(slug.to_s.match(/^https?:\/\/.+/))
+      link_to title, slug
+    elsif slug == nil
+      link_to title, seiten_page_path(page: "")
     else
-      filename = "home"
+      link_to title, seiten_page_path(page: slug)
     end
-    render :file => File.join(Rails.root, Seiten.config[:storage_directory], filename)
   end
 
   def seiten_navigation(options={})
@@ -17,7 +18,7 @@ module SeitenHelper
     if deep > 0
       Seiten::Page.find_by_parent_id(parent_id).each do |page|
         status = page.active?(current_page) ? "active" : "inactive"
-        output += "<li class='#{status}'>#{link_to(page.title, page.slug)}"
+        output += "<li class='#{status}'>#{link_to_seiten_page(page.title, page.slug)}"
         unless page.children.blank?
           output += seiten_navigation(parent_id: page.id, deep: deep-1)
         end
@@ -28,12 +29,14 @@ module SeitenHelper
     raw output
   end
 
-  def seiten_breadcrumb
+  def seiten_breadcrumb(options={})
+    link_separator = options[:link_separator] || ">"
+
     if current_page
       output = content_tag(:ul, class: "breadcrumb") do
         Seiten::Page.get_breadcrumb(current_page).reverse.collect { |page|
           content_tag :li do
-            raw "> #{link_to(page.title, page.slug)}"
+            raw "#{link_separator} #{link_to_seiten_page(page.title, page.slug)}"
           end
         }.join().html_safe
       end

data/config/initializers/seiten.rb

@@ -0,0 +1 @@
+Seiten::PageStore.initialize_page_stores

data/lib/seiten/controllers/helpers.rb

@@ -9,7 +9,7 @@ module Seiten
       end
 
       def current_page
-        @current_page ||= Seiten::Page.find_by_slug(request.fullpath)
+        @current_page ||= Seiten::Page.find_by_slug(params[:page])
       end
     end
   end

data/lib/seiten/page.rb

@@ -14,34 +14,40 @@ module Seiten
       @layout    = options[:layout]
     end
 
-    def self.all
-      page_store = PageStore.new
-      page_store.load_pages
-    end
+    class << self
 
-    # find page by id
-    def self.find(id)
-      Page.all.select { |page| page.id == id }.first
-    end
+      def all
+        Seiten::PageStore.current.pages
+      end
 
-    # find all pages by parent_id
-    def self.find_by_parent_id(parent_id)
-      Page.all.select { |page| page.parent_id == parent_id }
-    end
+      # find page by id
+      def find(id)
+        all.select { |page| page.id == id }.first
+      end
 
-    # find a page by slug
-    def self.find_by_slug(slug)
-      Page.all.select { |page| page.slug == slug }.first
-    end
+      # find all pages by parent_id
+      def find_by_parent_id(parent_id)
+        all.select { |page| page.parent_id == parent_id }
+      end
+
+      # find a page by slug
+      def find_by_slug(slug)
+        if slug
+          slug = slug[1..-1] if slug[0] == "/"
+        end
+        all.select { |page| page.slug == slug }.first
+      end
 
-    # get breadcrumb of given page (reversed)
-    def self.get_breadcrumb(page)
-      pages ||= []
-      pages << page
-      if page.parent
-        pages << Page.get_breadcrumb(page.parent)
+      # get breadcrumb of given page (reversed)
+      def get_breadcrumb(page)
+        pages ||= []
+        pages << page
+        if page.parent
+          pages << get_breadcrumb(page.parent)
+        end
+        pages.flatten
       end
-      pages.flatten
+
     end
 
     # get parent of page

data/lib/seiten/page_store.rb

@@ -2,21 +2,84 @@ module Seiten
 
   class PageStore
 
-    attr_accessor :storage_type, :storage_file, :storage_directory
+    attr_accessor :storage_type, :storage_file, :storage_language, :storage_directory, :pages
 
     def initialize(options={})
-      @storage_type      = options[:storage_type]
-      @storage_file      = options[:storage_file]
+      @storage_type      = options[:storage_type] || Seiten.config[:default_storage_type]
+      @storage_directory = options[:storage_directory] || File.join(Rails.root, Seiten.config[:default_storage_directory])
+      @storage_language  = options[:storage_language] || I18n.locale
+      @storage_language  = @storage_language.to_sym
+      @storage_file      = options[:storage_file] || load_storage_file
+      @pages             = load_pages
+    end
+
+    # def self.new(options={})
+    #   page_store = super(options)
+    #   self.storages << page_store
+    #   # page_store_key = options[:page_store_key] || options[:storage_languagea
+    #   # options.delete :page_store_key if options[:page_store_key]
+    #   # new_page_store = super(options)
+    #   # Seiten.page_store[page_store_key] = new_page_store
+    # end
+
+    @storages = []
+
+    class << self
+
+      def storages
+        @storages
+      end
+
+      def find_by_locale(locale=I18n.locale)
+        storages.select { |storage| storage.storage_language == locale }.first
+      end
+      alias_method :current, :find_by_locale
+
+      def initialize_page_stores
+        if File.directory?(File.join(Rails.root, Seiten.config[:default_storage_file]))
+          Dir[File.join(Rails.root, Seiten.config[:default_storage_file], "*.yml")].each do |file|
+            locale = File.basename(file, '.yml')
+            Seiten::PageStore.storages << Seiten::PageStore.new(storage_language: locale)
+          end
+        else
+          Seiten::PageStore.storages << Seiten::PageStore.new(storage_language: I18n.default_locale)
+        end
+      end
 
-      @storage_type ||= Seiten.config[:storage_type]
-      @storage_file ||= File.join(Rails.root, Seiten.config[:storage_file])
+    end
+
+    def load_storage_file
+      if File.exists?(File.join(Rails.root, Seiten.config[:default_storage_file], "#{storage_language}.yml"))
+        File.join(Rails.root, Seiten.config[:default_storage_file], "#{storage_language}.yml")
+      else
+        File.join(Rails.root, "#{Seiten.config[:default_storage_file]}.yml")
+      end
+    end
+
+    def file_path(options={})
+      File.join(storage_directory, options[:locale].to_s, options[:filename])
     end
 
     def build_link(page, prefix_url="")
+
+      # if url is nil parameterize title otherwise just use url
       slug = page["url"].nil? ? page["title"].parameterize : page["url"]
-      unless slug[0] == "/" || !!(slug.match(/^https?:\/\/.+/))
+
+      # prepend prefix_url if slug is not root or external url
+      unless slug[0] == "/" || !!(slug.match(/^https?:\/\/.+/)) || !prefix_url.present?
         slug = "#{prefix_url}/#{slug}"
       end
+
+      # return nil if page slug is /
+      if slug == "/" || page["root"] == true
+        slug = nil
+      end
+
+      # remove leading slash if present
+      if slug
+        slug = slug[1..-1] if slug[0] == "/"
+      end
+
       slug
     end
 
@@ -67,6 +130,8 @@ module Seiten
         if page["redirect"]
           if page["redirect"].is_a?(TrueClass)
             page["redirect"] = build_link(page["nodes"].first, page["slug"])
+          else
+            page["redirect"] = page["redirect"][1..-1] if page["redirect"][0] == "/"
           end
         end
 

data/lib/seiten/routes_helper.rb

@@ -0,0 +1,16 @@
+class ActionDispatch::Routing::Mapper
+
+  def seiten_resources
+    Seiten::PageStore.storages.each do |page_store|
+      page_store.pages.each do |page|
+        if page.redirect
+          get page.slug, to: redirect { |p, req|
+            Rails.application.routes.url_helpers.seiten_page_path(page: page.redirect, locale: p[:locale])
+          }
+        end
+      end
+    end
+
+    get "(*page)" => "seiten/pages#show", as: :seiten_page
+  end
+end

data/lib/seiten/version.rb

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

data/lib/seiten.rb

@@ -1,13 +1,15 @@
 require 'seiten/engine'
 require 'seiten/page_store'
 require 'seiten/page'
+require 'seiten/routes_helper'
 
 module Seiten
 
   @config = {
-    storage_type: :yaml,
-    storage_file: File.join('config', 'navigation.yml'),
-    storage_directory: File.join('app', 'pages')
+    default_storage_type: :yaml,
+    default_storage_file: File.join('config', 'navigation'),
+    default_storage_directory: File.join('app', 'pages'),
+    root_page_filename: "home"
   }
 
   def self.config

data/test/dummy/app/pages/de/produkte.html.erb

@@ -0,0 +1 @@
+Das ist die Produkte Seite

data/test/dummy/app/pages/en/about/partners.html.erb

@@ -0,0 +1 @@
+<%= seiten_navigation parent_id: Seiten::Page.find_by_slug("about/partners").id %>

data/test/dummy/app/pages/en/products.html.erb

@@ -0,0 +1 @@
+This is the products page

data/test/dummy/app/pages/localization.html.erb

@@ -0,0 +1 @@
+I18n is in root

data/test/dummy/config/navigation/de.yml

@@ -0,0 +1,36 @@
+- title: "Home"
+  url: "/"
+  layout: "home"
+
+- title: "Produkte"
+  layout:
+    name: "products"
+    inherit: true
+  nodes:
+    - title: "Logo Design"
+    - title: "Web Development"
+    - title: "Heuere uns an"
+      redirect: "/kontakt" # links to Contact page
+
+- title: "Über uns"
+  redirect: true # redirects /about to /about/our-team
+  nodes:
+    - title: "Unser Team"
+      layout:
+        name: "team"
+        inherit: false
+      nodes:
+        - title: "Schweiz"
+        - title: "Italien"
+    - title: "Arbeiten"
+    - title: "Partner"
+      nodes:
+        - title: "Daniel Puglisi"
+          url: "http://danielpuglisi.com"
+        - title: "Codegestalt"
+          url: "http://codegestalt.com"
+        - title: "Kreatify"
+          url: "http://kreatify.com"
+
+- title: "Kontakt"
+- title: "I18n"

data/test/dummy/config/navigation/en.yml

@@ -0,0 +1,37 @@
+- title: "Home"
+  root: true
+  layout: "home"
+
+- title: "Products"
+  layout:
+    name: "products"
+    inherit: true
+  nodes:
+    - title: "Logo Design"
+    - title: "Web Development"
+    - title: "Hire us"
+      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"
+    - title: "Works"
+    - title: "Partners"
+      nodes:
+        - title: "Daniel Puglisi"
+          url: "http://danielpuglisi.com"
+        - title: "Codegestalt"
+          url: "http://codegestalt.com"
+        - title: "Kreatify"
+          url: "http://kreatify.com"
+
+- title: "Contact"
+- title: "I18n"
+  url: "/localization"

data/test/dummy/config/navigation.yml

@@ -1,5 +1,5 @@
 - title: "Home"
-  url: "/"
+  root: true
   layout: "home"
 
 - title: "Products"
@@ -33,3 +33,5 @@
           url: "http://kreatify.com"
 
 - title: "Contact"
+- title: "I18n"
+  url: "/localization"

data/test/dummy/config/routes.rb

@@ -2,4 +2,6 @@ Dummy::Application.routes.draw do
   root :to => "seiten/pages#show"
 
   get "/secret", to: "pages#secret"
+
+  seiten_resources
 end