seiten 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c07bb134e2faeb0ba5dd11af57a067fef28ceeb2
-  data.tar.gz: 94f0e43ea9839d4bf1598ef7c63e0c8bb39a590a
+  metadata.gz: aac1c7e2cff18662cca1155e49a8f43b13df73f7
+  data.tar.gz: c6e449e0518a93591b26832d3c3dfa94aacef1c9
 SHA512:
-  metadata.gz: 341550a0f7cdd4b7e6a9a01b685c70796b6ec8007b13256482c5a028c95e0ada6d42e164994926c5cf4307d819d085944c10874e3e91ca2c9de95e10ef8defb6
-  data.tar.gz: 6657f6f1f45308fcab547c3dff423355c8ac887a154178a545230647829a824ace2361d921c3d94e6739288fe3a99a52a4b9f36d8ad586ebddd9f498b913bcbf
+  metadata.gz: 117b93f29193643c09bdaff2e2b663c9e636907c6e18ec6f300302fbe51bfca58ac69d0f14ca05a73b0bfdf759368e14973da4a24426367887e1b0b887bd2903
+  data.tar.gz: dee87d889d81b4d9698dd14c1e2453f1a1a4c5dcda62798d9f8b7c3841d8e4876ab5ee8c075b222058f4ace35ef0d31b8a25148c5da4fb1154dcd0bc33c1b20f

data/app/controllers/seiten/pages_controller.rb

@@ -13,11 +13,7 @@ module Seiten
           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
+        file = Seiten::PageStore.current.file_path(filename: filename)
 
         if current_page.layout
           render file: file, layout: current_page.layout

data/lib/seiten/page.rb

@@ -10,6 +10,7 @@ module Seiten
       @parent_id = options[:parent_id]
       @title     = options[:title]
       @slug      = options[:slug]
+      @external  = options[:external]
       @redirect  = options[:redirect]
       @layout    = options[:layout]
     end
@@ -50,11 +51,30 @@ module Seiten
 
     end
 
+    # returns true if slug starts with http:// or https://
+    def external?
+      !!(slug.match(/^https?:\/\/.+/))
+    end
+
     # get parent of page
     def parent
       Page.find(parent_id)
     end
 
+    def parent?
+      parent.present?
+    end
+
+    # TODO: Find a better name for this
+    # get root page of current page branch
+    def branch_root
+      if self.parent?
+        self.parent.branch_root
+      else
+        self
+      end
+    end
+
     # get children of page
     def children
       Page.all.select { |page| page.parent_id == id }

data/lib/seiten/page_store.rb

@@ -13,15 +13,6 @@ module Seiten
       @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
@@ -30,20 +21,39 @@ module Seiten
         @storages
       end
 
-      def find_by_locale(locale=I18n.locale)
-        storages.select { |storage| storage.storage_language == locale }.first
+      def storages=(storages)
+        @storages = storages
+      end
+
+      def current
+        Seiten.config[:current_page_store]
+      end
+
+      def set_current_page_store(options={})
+        Seiten.config[:current_page_store] = find_by(options) if options
+      end
+
+      def find_by(options={})
+        tmp_storages = storages
+        options.each do |option|
+          tmp_storages = tmp_storages.select { |storage| storage.send(option[0]) == option[1] }
+        end
+        tmp_storages.first
       end
-      alias_method :current, :find_by_locale
 
       def initialize_page_stores
+        # Check if config/navigation exists?
+        # If true:  Initialize localized navigation page stores with locale language and directory
+        # If false: Initialize the default storage file
         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)
+            Seiten::PageStore.storages << Seiten::PageStore.new(storage_language: locale, storage_directory: File.join(Rails.root, "app", "pages", locale))
           end
         else
           Seiten::PageStore.storages << Seiten::PageStore.new(storage_language: I18n.default_locale)
         end
+        set_current_page_store(storage_language: I18n.default_locale)
       end
 
     end
@@ -57,7 +67,7 @@ module Seiten
     end
 
     def file_path(options={})
-      File.join(storage_directory, options[:locale].to_s, options[:filename])
+      File.join(storage_directory, options[:filename])
     end
 
     def build_link(page, prefix_url="")
@@ -137,7 +147,7 @@ module Seiten
 
         # Load children
         if page["nodes"]
-          load_pages(pages: page["nodes"], parent_id: page["id"], prefix_url: page["slug"], layout: inherited_layout)
+          load_pages(pages: page["nodes"], parent_id: page["id"], prefix_url: page["slug"], layout: inherited_layout, external: page["external"])
         end
 
         page_params = page.each_with_object({}){|(k,v), h| h[k.to_sym] = v}

data/lib/seiten/routes_helper.rb

@@ -6,7 +6,7 @@ class ActionDispatch::Routing::Mapper
         if page.redirect
           get page.slug, to: redirect { |p, req|
             Rails.application.routes.url_helpers.seiten_page_path(page: page.redirect, locale: p[:locale])
-          }
+          }, as: nil
         end
       end
     end

data/lib/seiten/version.rb

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

data/lib/seiten.rb

@@ -9,6 +9,7 @@ module Seiten
     default_storage_type: :yaml,
     default_storage_file: File.join('config', 'navigation'),
     default_storage_directory: File.join('app', 'pages'),
+    current_page_store: nil,
     root_page_filename: "home"
   }