alula 0.4.12 → 0.4.13

data/lib/alula/contents/item.rb

@@ -147,11 +147,6 @@ module Alula
           _old_locale = self.current_locale
           self.current_locale = locale
           
-          # Flush if we have generator
-          # if @hooks[:render]
-          #   instance_exec(locale, &@hooks[:render])
-          # end
-          
           # Make sure our content is parsed
           parse_liquid(locale)
           parse_markdown(locale)
@@ -268,9 +263,6 @@ module Alula
           else
             template = @metadata.template || (self.class.to_s == "Alula::Content::Page" ? @site.config.pagelinks : @site.config.permalinks)
             substitude(template, locale)
-            # self.substitutes(locale).inject(template) { |result, token|
-            #   result.gsub(/:#{Regexp.escape token.first}/, token.last)
-            # }.gsub(/\/\//, '/')
           end
           # Add .html only if we don't have extension already
           if ::File.extname(url).empty?
@@ -335,24 +327,29 @@ module Alula
         end
       end
       
-      # Substitues for URL
+      # Substitudes for URL
       def substitude(template, locale = nil)
-        self.substitutes(locale).inject(template) { |result, token|
+        s = self.substitutes(locale).inject(template) { |result, token|
           result.gsub(/:#{Regexp.escape token.first}/, token.last)
-        }.gsub(/\/\//, '/')
+        }
+        s.gsub(/\/{2,}/, '/')
       end
       
       def substitutes(locale = nil)
         locale ||=  self.current_locale || self.site.config.locale
         @substitutes[locale] ||= begin
           subs = {
-            "year"   => @metadata.date.strftime('%Y'),
-            "month"  => @metadata.date.strftime('%m'),
-            "day"    => @metadata.date.strftime('%d'),
-            "locale" => (@site.config.locale == locale && @site.config.hides_base_locale ? "" : locale),
-            "name"   => CGI.escape(name).gsub('%2F', '/'),
-            "slug"   => CGI.escape(@metadata.slug(locale)).gsub('%2F', '/'),
-            "title"  => @metadata.title(locale).to_url,
+            "year"        => @metadata.date.strftime('%Y'),
+            "month"       => @metadata.date.strftime('%m'),
+            "monthname"   => @metadata.date.strftime('%B'),
+            "monthabbr"   => @metadata.date.strftime('%b'),
+            "day"         => @metadata.date.strftime('%d'),
+            "weekday"     => @metadata.date.strftime('%A'),
+            "weekdayabbr" => @metadata.date.strftime('%a'),
+            "locale"      => (@site.config.locale == locale && @site.config.hides_base_locale ? "" : locale),
+            "name"        => CGI.escape(name).gsub('%2F', '/'),
+            "slug"        => CGI.escape(@metadata.slug(locale)).gsub('%2F', '/'),
+            "title"       => @metadata.title(locale).to_url,
           }
           if self.metadata.generator
             subs.merge!(self.metadata.generator.substitutes(locale, self))
@@ -363,19 +360,11 @@ module Alula
       
       private
       def _last_modified
-        # if @hooks[:last_modified]
-        #   return instance_exec(locale, &@hooks[:next])
-        # end
-        # 
         return unless self.class.to_s[/Page|Post/]
+
         mtime = nil
         unless @item.nil?
           mtime = @item.mtime
-          # if self.site.git
-          #   rev = %x{git rev-list -n 1 HEAD #{Shellwords.escape(@item.filepath)}}.strip
-          #   time = %x{git show --pretty=format:%ai --abbrev-commit #{rev}|head -1}.strip
-          #   mtime = Time.parse(time) rescue nil
-          # end
         end
         mtime
       end

data/lib/alula/generators/archive.rb

@@ -17,8 +17,12 @@ module Alula
         options.templates.collect do |template|
           posts.collect do |post|
             archives[post.substitude(template, lang)] ||= {}
-            archives[post.substitude(template, lang)][lang] ||= []
-            archives[post.substitude(template, lang)][lang] << post
+            key = "archive.title." + template.scan(/:(\w+)*/).flatten.join('-')
+            archives[post.substitude(template, lang)][:title] ||= I18n.t(key, Hash[post.substitutes(lang).map{|k,v|[k.to_sym,v]}].merge(locale: lang))
+            archives[post.substitude(template, lang)][:key] ||= key
+            archives[post.substitude(template, lang)][:content] ||= {}
+            archives[post.substitude(template, lang)][:content][lang] ||= []
+            archives[post.substitude(template, lang)][:content][lang] << post
           end
         end
       end
@@ -26,15 +30,39 @@ module Alula
       archives.each do |name, archive|
         self.site.content.pages << Alula::Content::Page.new({
           generator: self,
-          posts: archive,
-          title: titles.select {|lang, title| archive.keys.include?(lang)},
+          posts: archive[:content],
+          title: archive[:title],#titles.select {|lang, title| archive.keys.include?(lang)},
           name: name,
           slug: name,
           sidebar: false,
           template: "/:locale/:name/",
           site: self.site,
-          view: "archive"
-        })
+          view: "archive",
+          key: archive[:key],
+        },
+        :previous => ->(hook, locale = nil) {
+          pos = self.navigation(locale).index(self)
+          if pos and pos < (self.navigation(locale).count - 1)
+            self.navigation(locale)[pos + 1]
+          else
+            nil
+          end
+        },
+        :next => ->(hook, locale = nil) {
+          pos = self.navigation(locale).index(self)
+          if pos and pos > 0
+            self.navigation(locale)[pos - 1]
+          else
+            nil
+          end
+        },
+        :navigation => ->(hook, locale = nil) {
+          locale ||= self.current_locale || self.site.config.locale
+          @navigation[locale] ||= self.site.content.pages.select { |item|
+            item.metadata.generator == self.generator and item.metadata.key == self.metadata.key
+          }
+        }
+        )
       end
     end
     

data/lib/alula/version.rb

@@ -2,7 +2,7 @@ module Alula
   module VERSION
     MAJOR = 0
     MINOR = 4
-    PATCH = 12
+    PATCH = 13
     PRE   = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alula
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
   prerelease: 
 platform: ruby
 authors: