alula 0.4.6 → 0.4.7

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.7

data/lib/alula/compressors.rb

@@ -5,12 +5,20 @@ require 'htmlcompressor'
 module Alula
   class Compressors
     class DummyCompressor
+      def compresses?(item)
+        return false
+      end
+      
       def compress(content)
         content
       end
     end
     
     class CSSCompressor
+      def compresses?(item)
+        return true
+      end      
+      
       def compress(content)
         if content.count("\n") > 2
           Sass::Engine.new(content,
@@ -29,6 +37,10 @@ module Alula
         @compressor = Uglifier.new
       end
       
+      def compresses?(item)
+        return true
+      end
+      
       def compress(content)
         @compressor.compress(content)
       end
@@ -36,13 +48,72 @@ module Alula
     
     class HTMLCompressor
       def initialize
-        @compressor = HtmlCompressor::Compressor.new({
-          remove_surrounding_spaces: HtmlCompressor::Compressor::BLOCK_TAGS_MAX + ",source",
-        })
+        HtmlCompressor::Compressor.send(:include, HTMLCompressorExt)
+        @compressor = HtmlCompressor::Compressor.new
+        #   remove_surrounding_spaces: HtmlCompressor::Compressor::BLOCK_TAGS_MAX + ",source,title,meta,header,footer,div,section,article,time,img,video,script",
+        #   remove_intertag_spaces: true,
+        #   remove_quotes: true,
+        #   remove_script_attributes: true,
+        #   remove_style_attributes: true,
+        #   remove_link_attributes: true,
+        #   simple_boolean_attributes: true,
+        #   remove_http_protocol: false,
+        #   remove_https_protocol: false,
+        # })
+        @compressor.profile = :high
       end
       
-      def compress(content)
+      def compresses?(item)
+        return true if item.generator.nil?
+        
+        return item.generator.allow_compressing? != :none
+      end
+      
+      def compress(item, content)
+        _old_profile = @compressor.profile
+        unless item.generator.nil?
+          @compressor.profile = item.generator.allow_compressing?
+        end
+
         @compressor.compress(content)
+      ensure
+        @compressor.profile = _old_profile
+      end
+      
+      module HTMLCompressorExt
+        def profile
+          @profile
+        end
+      
+        def profile=(profile)
+          @profile = profile
+          case profile
+          when :none
+            @options[:enabled] = false
+          when :normal
+            @options[:enabled] = true
+            @options[:remove_surrounding_spaces] = HtmlCompressor::Compressor::BLOCK_TAGS_MAX + ",source,title,meta,header,footer,div,section,article,time,img,video,script"
+            @options[:remove_intertag_spaces] = true
+            @options[:remove_quotes] = false
+            @options[:remove_script_attributes] = true
+            @options[:remove_style_attributes] = true
+            @options[:remove_link_attributes] = true
+            @options[:simple_boolean_attributes] = true
+            @options[:remove_http_protocol] = false
+            @options[:remove_https_protocol] = false
+          when :high
+            @options[:enabled] = true
+            @options[:remove_surrounding_spaces] = HtmlCompressor::Compressor::BLOCK_TAGS_MAX + ",source,title,meta,header,footer,div,section,article,time,img,video,script"
+            @options[:remove_intertag_spaces] = true
+            @options[:remove_quotes] = true
+            @options[:remove_script_attributes] = true
+            @options[:remove_style_attributes] = true
+            @options[:remove_link_attributes] = true
+            @options[:simple_boolean_attributes] = true
+            @options[:remove_http_protocol] = "href,src,cite,action,data-original,data-hires"
+            @options[:remove_https_protocol] = "href,src,cite,action,data-original,data-hires"
+          end
+        end
       end
     end
   end

data/lib/alula/config.rb

@@ -42,7 +42,9 @@ module Alula
       # Tagline of the blog
       tagline: "This has no tagline.",
       # The author, default
-      author: "John Doe",
+      author: "",
+      # The blog description
+      description: "",
       # The host where blog is available
       url: "http://localhost:3000",
       
@@ -85,21 +87,28 @@ module Alula
       content: {
         generators: {
           paginate: {
-            items: 10,
+               items: 10,
             template: "/:locale/page/:page/",
           },
           feedbuilder: {
-            items: 10,
-            name: "feed.xml",
-            slug: "feed",
+                items: 10,
+                name: "feed.xml",
+                slug: "feed",
             template: "/:locale/:name",
           },
-          sitemap: {}
+          sitemap: {},
+          archive: {
+            template: "/:locale/:name/",
+            templates: [
+              "/:year/",
+              "/:year/:month/",
+            ],
+          },
         },
         filters: {
           smilies: nil,
         },
-        sidebar: [ :pages, :languages ]
+        sidebar: [ :pages, :languages ],
       },
       
       assets: {
@@ -108,6 +117,7 @@ module Alula
           gzip: true,
         },
       },
+      gzip_types: [ "js", "css", "xml", "html", "ttf", "svg", "eot" ],
       
       # Attachement Processors
       attachments: {

data/lib/alula/contents/item.rb

@@ -109,6 +109,10 @@ module Alula
         read_payload if has_payload?
       end
       
+      def inspect
+        "#<#{self.class.to_s} name=#{self.name}>"
+      end
+      
       # Functionality, existence
       def exists?
         @item.exists?
@@ -181,7 +185,11 @@ module Alula
             
             # Write content to file
             @site.storage.output_public(self.path(locale)) do
-              self.site.compressors.html.compress(output)
+              if self.site.compressors.html.compresses?(self)
+                self.site.compressors.html.compress(self, output)
+              else
+                output
+              end
             end
           ensure
             self.current_locale = _old_locale
@@ -237,9 +245,11 @@ module Alula
             when :languages
               # Get index page titles
               index_page = site.content.by_slug("index")
-              index_page.languages
-                .reject{|lang| lang == locale}
-                .collect{|lang| Hashie::Mash.new({url: index_page.url(lang), title: I18n.t('language_name', locale: lang)}) }
+              if index_page
+                index_page.languages
+                  .reject{|lang| lang == locale}
+                  .collect{|lang| Hashie::Mash.new({url: index_page.url(lang), title: I18n.t('language_name', locale: lang)}) }
+              end
             when Hash
               item
             else
@@ -257,9 +267,10 @@ module Alula
             @metadata.permalink(locale)
           else
             template = @metadata.template || (self.class.to_s == "Alula::Content::Page" ? @site.config.pagelinks : @site.config.permalinks)
-            self.substitutes(locale).inject(template) { |result, token|
-              result.gsub(/:#{Regexp.escape token.first}/, token.last)
-            }.gsub(/\/\//, '/')
+            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?
@@ -325,9 +336,14 @@ module Alula
       end
       
       # Substitues for URL
+      def substitude(template, locale = nil)
+        self.substitutes(locale).inject(template) { |result, token|
+          result.gsub(/:#{Regexp.escape token.first}/, token.last)
+        }.gsub(/\/\//, '/')
+      end
+      
       def substitutes(locale = nil)
         locale ||=  self.current_locale || self.site.config.locale
-        
         @substitutes[locale] ||= begin
           subs = {
             "year"   => @metadata.date.strftime('%Y'),

data/lib/alula/generator.rb

@@ -1,21 +1,28 @@
 module Alula
   class Generator
-    autoload :Paginate, 'alula/generators/paginate'
-    autoload :FeedBuilder, 'alula/generators/feedbuilder'
-    autoload :Sitemap, 'alula/generators/sitemap'
+    # autoload :Paginate, 'alula/generators/paginate'
+    # autoload :FeedBuilder, 'alula/generators/feedbuilder'
+    # autoload :Sitemap, 'alula/generators/sitemap'
+    def self.register(name, klass); generators[name.to_s] = klass; end
+    def self.generators; @@generators ||= {}; end
+    def generators; self.class.generators; end
     
     attr_reader :options
     attr_reader :site
     
     def self.load(opts)
-      type = opts.delete(:type)
+      name = opts.delete(:type).to_s
       options = opts.delete(:options)
       
       # Try to find our generator
-      cls_name = self.constants.select {|t| t.to_s.downcase == type.downcase}.first
-      if cls_name
-        cls = self.const_get(cls_name)
-        gen = cls.new(options, opts)
+      # cls_name = self.constants.select {|t| t.to_s.downcase == type.downcase}.first
+      # if cls_name
+        # cls = self.const_get(cls_name)
+        # gen = cls.new(options, opts)
+      # end
+      if generators[name] and !(!!options == options and !options)
+        generator = generators[name]
+        return generator.new(options, opts)
       end
     end
     
@@ -27,5 +34,12 @@ module Alula
     def substitutes(locale, item)
       {}
     end
+    
+    def allow_compressing?
+      :high
+    end
   end
 end
+
+# Load all generators
+Dir[File.join(File.dirname(__FILE__), "generators", "*.rb")].each {|f| require f}

data/lib/alula/generators/archive.rb

@@ -0,0 +1,49 @@
+module Alula
+  class Archive < Generator
+    def generate
+      # Loop all languages and count posts per language
+      @languages = {}
+      self.site.content.posts.each do |post|
+        post.languages.each do |lang|
+          @languages[lang] ||= []
+          @languages[lang] << post
+        end
+      end
+      
+      titles = Hash[@languages.collect {|lang, x| [lang, I18n.t("archive.title", locale: lang)]}]
+      
+      archives = {}
+      @languages.each do |lang, posts|
+        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
+          end
+        end
+      end
+
+      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)},
+          name: name,
+          slug: name,
+          sidebar: false,
+          template: "/:locale/:name/",
+          site: self.site,
+          view: "archive"
+        })
+      end
+    end
+    
+    def substitutes(locale, item)
+      {
+        "page" => item.metadata.pagenum.to_s,
+      }
+    end
+  end
+end
+
+Alula::Generator.register :archive, Alula::Archive

data/lib/alula/generators/feedbuilder.rb

@@ -1,7 +1,11 @@
-require 'builder' # As suggested by tilt
+require 'builder'
 
 module Alula
-  class Generator::FeedBuilder < Generator
+  class FeedBuilder < Generator
+    def allow_compressing?
+      :normal
+    end
+    
     def generate
       # Loop all languages and count posts per language
       @languages = {}
@@ -52,3 +56,5 @@ module Alula
     end
   end
 end
+
+Alula::Generator.register :feedbuilder, Alula::FeedBuilder

data/lib/alula/generators/paginate.rb

@@ -1,5 +1,5 @@
 module Alula
-  class Generator::Paginate < Generator
+  class Paginate < Generator
     def generate
       # Loop all languages and count posts per language
       @languages = {}
@@ -68,22 +68,7 @@ module Alula
         "page" => item.metadata.pagenum.to_s,
       }
     end
-    
-    # def generate_content
-    #   # Generate pagination and pages
-    #   num_posts = @site.content.posts.count
-    #   pages = (num_posts / options.items).ceil
-    #   
-    #   (0..pages).each do |pagenum|
-    #     pagename = "page#{pagenum}"
-    #     
-    #     @site.generated << Alula::Content::Page.new({
-    #       site: @site,
-    #       posts: @site.content.posts.slice(options.items * pagenum, options.items),
-    #       current_page: (pagenum + 1),
-    #       name: pagename,
-    #     })
-    #   end
-    # end
   end
 end
+
+Alula::Generator.register :paginate, Alula::Paginate

data/lib/alula/generators/sitemap.rb

@@ -1,7 +1,11 @@
 require 'builder' # For Tilt
 
 module Alula
-  class Generator::Sitemap < Generator
+  class Sitemap < Generator
+    def allow_compressing?
+      return :normal
+    end
+    
     def generate
       urls_callback = ->(context) {
         (context.site.content.posts + context.site.content.pages)
@@ -17,7 +21,7 @@ module Alula
         }.flatten
       }
       
-      self.site.content.pages << Alula::Content::Page.new({
+      @sitemap_page = Alula::Content::Page.new({
         generator: self,
         urls: urls_callback,
         title: "Sitemap",
@@ -28,6 +32,14 @@ module Alula
         site: self.site,
         layout: "sitemap",
       })
+      self.site.content.pages << @sitemap_page
+      
+      # Add link to head
+      Alula::Plugin.addon(:head, ->(context) {
+        "<link rel=\"sitemap\" type=\"application/xml\" title=\"Sitemap\" href=\"#{context.url_for(@sitemap_page.url(context.locale))}\">"
+      })
     end
   end
-end
+end
+
+Alula::Generator.register :sitemap, Alula::Sitemap

data/lib/alula/plugin.rb

@@ -15,6 +15,7 @@ module Alula
     
     def self.addons; @@addons ||= Hash.new {|hash, key| hash[key] = []}; end
     def self.addon(type, content_or_block); addons[type] << content_or_block; end
+    def self.prepend_addon(type, content_or_block); addons[type].unshift content_or_block; end
     
     def self.script_load_mode=(mode)
       @@script_load_mode = case mode

data/lib/alula/site.rb

@@ -80,6 +80,7 @@ module Alula
         
         title: @config.title,
         author: @config.author,
+        description: @config.description,
         tagline: @config.tagline,
         url: @config.url,
         
@@ -134,6 +135,8 @@ module Alula
     
     # Compiles a site to static website
     def generate
+      banner
+      
       # Load our plugins and filters
       load_plugins
       load_filters
@@ -150,6 +153,9 @@ module Alula
       render
       
       cleanup
+      
+      compress
+      
       # Store cached version of configuration
       cached_config = File.join(storage.path(:cache), "config.yml")
       @config.write_cache(cached_config)
@@ -167,12 +173,22 @@ module Alula
     end
     
     private
+    def banner
+      puts ""
+      puts "Alula #{Alula::VERSION}"
+    end
+    
     def load_plugins
       config.plugins.each do |name, options|
         if plugin = Alula::Plugin.load(name, options)
           @plugins[name] = plugin
         end
       end
+      
+      if @plugins
+        puts "Plugins: " + @plugins.collect {|name, plugin| "#{name} #{plugin.version}"}.join(" ")
+      end
+      puts ""
     end
     
     def load_filters
@@ -304,7 +320,7 @@ module Alula
         io.puts "*/"
       end
       # Add stlesheet to template
-      Alula::Plugin.addon(:head, ->(context){ context.stylesheet_link("style") })
+      Alula::Plugin.prepend_addon(:head, ->(context){ context.stylesheet_link("style") })
       
       # Generate javascript
       @storage.output(:cache, "assets/script.js") do |io|
@@ -339,7 +355,7 @@ module Alula
         if asset = @environment.find_asset(logical_path)
           target = File.join(@storage.path(:assets), asset.digest_path)
           asset.write_to(target)
-          asset.write_to("#{target}.gz") if target =~ /\.(css|js)$/ and self.config.assets.gzip
+          # asset.write_to("#{target}.gz") if target =~ /\.(css|js)$/ and self.config.assets.gzip
         end
         
         progress.step :assets
@@ -402,7 +418,7 @@ module Alula
       assets = @environment.used.collect do |asset_name|
         if asset = @environment[asset_name]
           filename = File.join(asset_path, asset.digest_path)
-          [filename, self.config.assets.gzip ? "#{filename}.gz" : ""]
+          # [filename, self.config.assets.gzip ? "#{filename}.gz" : ""]
         end
       end.flatten.reject { |u| u.nil? or !File.exists?(u) }
       outputted = @storage.outputted.reject{|o|o[/^#{asset_path}/]}
@@ -420,6 +436,22 @@ module Alula
         FileUtils.rmdir entry if Dir[File.join(entry, "**", "*")].count == 0
       end
     end
+
+    def compress
+      return unless config.assets.gzip
+      
+      say "==> Compressing content"
+      Dir[File.join(@storage.path(:public), "**", "*")].each do |entry|
+        next unless config.gzip_types.include?(File.extname(entry)[1..-1])
+        
+        gz = Zlib::GzipWriter.open("#{entry}.gz", Zlib::BEST_COMPRESSION) do |gz|
+          gz.write File.read(entry)
+        end
+        
+        @storage.outputted << "#{entry}.gz"
+      end
+    end
+    
     
     # Output helpers
     def say(msg)

data/locales/en.yml

@@ -6,4 +6,6 @@ en:
     newer_posts: Newer
   post:
     previous: Previous Post
-    next: Next Post
+    next: Next Post
+  archive:
+    title: Archive

data/locales/fi.yml

@@ -7,4 +7,5 @@ fi:
   post:
     previous: Edellinen kirjoitus
     next: Seuraava kirjoitus
-    
+  archive:
+    title: Arkisto

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alula
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -486,6 +486,7 @@ files:
 - lib/alula/core_ext/tags/locale.rb
 - lib/alula/core_ext/tags/video.rb
 - lib/alula/generator.rb
+- lib/alula/generators/archive.rb
 - lib/alula/generators/feedbuilder.rb
 - lib/alula/generators/paginate.rb
 - lib/alula/generators/sitemap.rb
@@ -643,7 +644,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1337494601730845437
+      hash: -343637892775582502
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -652,7 +653,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1337494601730845437
+      hash: -343637892775582502
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23