seiten 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aac1c7e2cff18662cca1155e49a8f43b13df73f7
-  data.tar.gz: c6e449e0518a93591b26832d3c3dfa94aacef1c9
+  metadata.gz: 048ecf4f24e37168dfc694a467371919f46ce631
+  data.tar.gz: 63c13ce42bc05f60039f5e0f437d3f9810f72e85
 SHA512:
-  metadata.gz: 117b93f29193643c09bdaff2e2b663c9e636907c6e18ec6f300302fbe51bfca58ac69d0f14ca05a73b0bfdf759368e14973da4a24426367887e1b0b887bd2903
-  data.tar.gz: dee87d889d81b4d9698dd14c1e2453f1a1a4c5dcda62798d9f8b7c3841d8e4876ab5ee8c075b222058f4ace35ef0d31b8a25148c5da4fb1154dcd0bc33c1b20f
+  metadata.gz: a123a3ecdbdb8d2e529169b352bf2a242abc8f52d0b89902a7a09af951423ef87aec1a8ac117c5eb1c93f4cb4a4b920eb764a9d81e71f5f699aaa0c0f80f3b30
+  data.tar.gz: 2489e06d4d622e9ae121f50ef73f803600c6be8387afe4764931613395ca11e3aa55cfad861e0f08fc89d1ffeb780f1a31e7c1c8e51a801bfd5fbde8b69d2591

data/app/controllers/seiten/pages_controller.rb

@@ -5,7 +5,6 @@ module Seiten
       if current_page.nil?
         raise ActionController::RoutingError.new("Page /#{params[:page]} not found")
       else
-        @title = current_page.title
 
         if params[:page]
           filename = params[:page]

data/lib/seiten/page.rb

@@ -2,7 +2,7 @@ module Seiten
 
   class Page
 
-    attr_accessor :id, :parent_id, :title, :children, :slug, :redirect, :layout
+    attr_accessor :id, :parent_id, :title, :children, :slug, :redirect, :layout, :metadata
 
     # initialize Page object with attributes
     def initialize(options={})
@@ -13,6 +13,7 @@ module Seiten
       @external  = options[:external]
       @redirect  = options[:redirect]
       @layout    = options[:layout]
+      @metadata  = options[:metadata].each_with_object({}){|(k,v), h| h[k.to_sym] = v} if options[:metadata]
     end
 
     class << self

data/lib/seiten/page_store.rb

@@ -7,8 +7,7 @@ module Seiten
     def initialize(options={})
       @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_language  = (options[:storage_language] || I18n.locale).to_sym
       @storage_file      = options[:storage_file] || load_storage_file
       @pages             = load_pages
     end
@@ -51,9 +50,15 @@ module Seiten
             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)
+          Seiten::PageStore.storages << Seiten::PageStore.new(storage_language: default_locale)
         end
-        set_current_page_store(storage_language: I18n.default_locale)
+        set_current_page_store(storage_language: default_locale)
+      end
+
+      # NOTE: Haven't found out what's the problem, but Rails has some weird I18n behaviour on initialization.
+      #       This method returns I18n.default_locale if config.i18n.default_locale is not set.
+      def default_locale
+        Rails.application.config.i18n.default_locale || I18n.default_locale
       end
 
     end

data/lib/seiten/version.rb

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

data/lib/seiten.rb

@@ -9,7 +9,6 @@ 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"
   }
 

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

@@ -8,7 +8,15 @@
     inherit: true
   nodes:
     - title: "Logo Design"
+      metadata:
+        header_image: "logo.jpg"
+        description: "Our logo design is awesome."
+      variables:
+        fuck: "you"
     - title: "Web Development"
+      metadata:
+        header_image: "web-development.jpg"
+        description: "First class web development."
     - title: "Hire us"
       redirect: "/contact" # links to Contact page
 

data/test/dummy/log/development.log

@@ -4556,3 +4556,4 @@ Processing by Seiten::PagesController#show as HTML
 Completed 200 OK in 5ms (Views: 5.2ms | ActiveRecord: 0.0ms)
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
+Connecting to database specified by database.yml