alula 0.4.0b → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.4.0b
+0.4.0

data/lib/alula/cli.rb

@@ -53,6 +53,11 @@ module Alula
           copy_file tpl, File.join(path, name)
         end
       end
+      
+      inside File.expand_path(path) do
+        # Run bundle command
+        run "bundle install"
+      end
     end
     
     desc "generate", "Generates blog"

data/lib/alula/compressors.rb

@@ -36,7 +36,9 @@ module Alula
     
     class HTMLCompressor
       def initialize
-        @compressor = HtmlCompressor::Compressor.new
+        @compressor = HtmlCompressor::Compressor.new({
+          remove_surrounding_spaces: HtmlCompressor::Compressor::BLOCK_TAGS_MAX + ",source",
+        })
       end
       
       def compress(content)

data/lib/alula/config.rb

@@ -86,14 +86,15 @@ module Alula
         },
         feedbuilder: {
           items: 10,
+          name: "feed.xml",
+          slug: "feed",
+          template: "/:locale/:name",
         },
         sitemap: {}
       },
       
       # Plugins
-      plugins: {
-        emphasis: {},
-      },
+      plugins: {},
       
       # Blog Content options
       content: {

data/lib/alula/content.rb

@@ -43,53 +43,21 @@ module Alula
     
     private
     def read_content(*types)
-      @@lock = Mutex.new
       # Load all posts if requested
       if (types.include?(:posts))
-        # Read posts
-        @site.progress.create :load_posts, title: "Loading posts", total: @site.storage.posts.count
-        @site.progress.display
-        @site.storage.posts.each do |item|
-          name, entry = item
-          post = Post.load(item: entry, site: @site)
-          @posts << post unless post.nil?
-          @@lock.synchronize { @site.progress.step :load_posts }
-        end
-        # Sort
+        @posts = _read_content_type(Post, @site.storage.posts, "Loading Posts")
         @posts.sort!.reverse!
-        @site.progress.finish :load_posts
       end
       
       # Load all pages if requested
       if (types.include?(:pages))
-        @site.progress.create :load_pages, title: "Loading pages", total: @site.storage.pages.count
-        @site.progress.display
-        
-        @site.storage.pages.each do |item|
-          name, entry = item
-          page = Page.load(item: entry, site: @site)
-          @pages << page unless page.nil?
-          
-          @@lock.synchronize { @site.progress.step :load_pages }
-        end
+        @pages = _read_content_type(Page, @site.storage.pages, "Loading Pages")
         @pages.sort!
-        @site.progress.finish :load_pages
       end
 
-      # Load all pages if requested
+      # Load all attachments if requested
       if (types.include?(:attachments))
-        @site.progress.create :load_attachments, title: "Loading attachments", total: @site.storage.attachments.count
-        @site.progress.display
-        
-        @site.storage.attachments.each do |item|
-          name, entry = item
-          attachment = Attachment.load(item: entry, site: @site)
-          @attachments << attachment unless attachment.nil?
-          
-          @@lock.synchronize { @site.progress.step :load_attachments }
-        end
-        
-        @site.progress.finish :load_attachments
+        @attachments = _read_content_type(Attachment, @site.storage.attachments, "Loading Attachments")
       end
       
       # Load all statics
@@ -109,5 +77,26 @@ module Alula
         end
       end
     end
+
+    def _read_content_type(type, items, title)
+      @@lock ||= Mutex.new
+      
+      @collection = []
+      
+      @site.progress.create "load_#{type.to_s}", title: title, total: items.count
+      @site.progress.display
+      
+      items.each do |item|
+        name, entry = item
+        itm = type.load(item: entry, site: @site)
+        @collection << itm unless itm.nil?
+        @@lock.synchronize { @site.progress.step "load_#{type.to_s}" }
+      end
+
+      # Sort
+      @site.progress.finish "load_#{type.to_s}"
+      
+      @collection
+    end
   end
 end

data/lib/alula/contents/item.rb

@@ -55,7 +55,19 @@ module Alula
         @name = opts.delete(:name) || @item.name
         
         # Set up method overrides
-        @hooks = hooks
+        @hooks = {}
+        # @hooks = hooks
+        hooks.each do |name, blk|
+          hook_id = blk.hash.to_s(36)
+          hook_name = "#{name}_#{hook_id}"
+          prev_hook_name = "#{name}_without_#{hook_id}"
+          (class << self; self; end).send(:define_method, hook_name) do |*args|
+            previous_hook = self.method(prev_hook_name)
+            instance_exec(previous_hook, args, &blk)
+          end
+          (class << self; self; end).send(:alias_method, prev_hook_name, name)
+          (class << self; self; end).send(:alias_method, name, hook_name)
+        end
         # hooks.each do |name, impl|
         #   self.class.send(:define_method, name, &impl)
         # end
@@ -74,7 +86,8 @@ module Alula
         @metadata = Metadata.new({
           # Defaults
           date: Time.new(0),
-          pin: 500, # Default sorting pin
+          pin: 500,       # Default sorting pin
+          sidebar: true,  # Display item in sidebar (if page etc)
           layout: 'default',
           view: (self.class.to_s == "Alula::Content::Page" ? "page" : "post"),
           
@@ -131,9 +144,9 @@ module Alula
           self.current_locale = locale
           
           # Flush if we have generator
-          if @hooks[:render]
-            instance_exec(locale, &@hooks[:render])
-          end
+          # if @hooks[:render]
+          #   instance_exec(locale, &@hooks[:render])
+          # end
           
           # Make sure our content is parsed
           parse_liquid(locale)
@@ -218,13 +231,19 @@ module Alula
           items = self.site.config.content.sidebar.collect do |item|
             case item
             when :pages
-              self.site.content.pages.select{|p| p.generator.nil? and p.languages.include?(locale) }
+              self.site.content.pages
+                .select{|p| p.languages.include?(locale) }
+                .reject{|p| p.metadata.sidebar == false}
             when :languages
-              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: url(lang), title: I18n.t('language_name', locale: lang)}) }
+                .collect{|lang| Hashie::Mash.new({url: index_page.url(lang), title: I18n.t('language_name', locale: lang)}) }
+            when Hash
+              item
             else
-              @content.by_slug(self.config.index)
+              self.site.content.by_slug(item)
             end
           end
           items.flatten.select {|i| !i.nil?}
@@ -267,21 +286,22 @@ module Alula
       end
       
       def previous(locale = nil)
-        if @hooks[:previous]
-          instance_exec(locale, &@hooks[:previous])
-        end
+        # if @hooks[:previous]
+        #   instance_exec(locale, &@hooks[:previous])
+        # end
       end
       
       def next(locale = nil)
-        if @hooks[:next]
-          instance_exec(locale, &@hooks[:next])
-        end
+        # if @hooks[:next]
+        #   binding.pry
+        #   instance_exec(locale, &@hooks[:next])
+        # end
       end
       
       def navigation(locale = nil)
-        if @hooks[:navigation]
-          instance_exec(locale, &@hooks[:navigation])
-        end
+        # if @hooks[:navigation]
+        #   instance_exec(locale, &@hooks[:navigation])
+        # end
       end
       
       # 
@@ -337,10 +357,10 @@ module Alula
       
       private
       def _last_modified
-        if @hooks[:last_modified]
-          return instance_exec(locale, &@hooks[:next])
-        end
-        
+        # if @hooks[:last_modified]
+        #   return instance_exec(locale, &@hooks[:next])
+        # end
+        # 
         return unless self.class.to_s[/Page|Post/]
         mtime = nil
         unless @item.nil?

data/lib/alula/core_ext/tags/image.rb

@@ -16,7 +16,7 @@ module Alula
     def content
       hires = hires_url(@source, :image)
       tag = "<a href=\"#{attachment_url(@source, :image)}\""
-      tag += " data-hires=\"#{hires}\"" if context.site.config.attachments["image"]["hires"] and hires
+      tag += " data-hires=\"#{hires}\"" if context.site.config.attachments["image"]["hires"] and hires and self.context.item.metadata.renderer.class.to_s != "Alula::Generator::FeedBuilder"
       tag += ">"
       tag += imagetag(@source, :thumbnail)
       tag += "</a>"
@@ -32,13 +32,13 @@ module Alula
       tag += " alt=\"#{@options["alternative"]}\"" if @options["alternative"]
       tag += " title=\"#{@options["title"]}\"" if @options["title"]
       tag += " class=\"#{classes.join(" ")}\""
-      if context.site.config.attachments.image.lazyload
+      if context.site.config.attachments.image.lazyload and self.context.item.metadata.renderer.class.to_s != "Alula::Generator::FeedBuilder"
         tag += " src=\"#{asset_url("grey.gif")}\""
         tag += " data-original=\"#{src}\""
       else
         tag += " src=\"#{src}\""
       end
-      tag += " data-hires=\"#{hires}\"" if context.site.config.attachments.image.hires and hires
+      tag += " data-hires=\"#{hires}\"" if context.site.config.attachments.image.hires and hires and self.context.item.metadata.renderer.class.to_s != "Alula::Generator::FeedBuilder"
       tag += " width=\"#{info(source, type).width}\" height=\"#{info(source, type).height}\""
       tag += " />"
     end

data/lib/alula/core_ext/tags/video.rb

@@ -37,7 +37,7 @@ module Alula
     
     def sources
       @sources ||= begin
-        variants.collect {|variant|
+        sources = variants.collect {|variant|
           name = @source.gsub(/#{File.extname(@source)}$/, variant[:ext])
           {
             name: name,
@@ -46,7 +46,7 @@ module Alula
             hires: variant[:hires],
             mobile: variant[:mobile]
           }
-        }
+        }.reject{|source| source[:url].nil? }
       end
     end
     

data/lib/alula/generators/feedbuilder.rb

@@ -5,7 +5,7 @@ module Alula
     def generate
       # Loop all languages and count posts per language
       @languages = {}
-      self.site.content.posts.each do |post|
+      (self.site.content.posts + self.site.content.pages).each do |post|
         post.languages.each do |lang|
           @languages[lang] ||= []
           @languages[lang] << post
@@ -22,15 +22,25 @@ module Alula
         generator: self,
         posts: posts,
         title: titles,
-        name: "feed.xml",
-        slug: "feed",
-        template: self.options.template || "/:locale/:name",
+        name: self.options.name,
+        slug: self.options.slug,
+        sidebar: false,
+        template: self.options.template,
         site: self.site,
         layout: "feed",
       },
-      :previous => ->(locale) { nil },
-      :next => ->(locale) { nil },
-      :navigation => ->(locale) { nil },
+      :previous => ->(hook, locale) { nil },
+      :next => ->(hook, locale) { nil },
+      :navigation => ->(hook, locale) { nil },
+      :write => ->(hook, locale) {
+        begin
+          _old_renderer = self.posts.collect{|p| p.metadata.renderer}
+          self.posts.cycle(1) { |p| p.flush; p.metadata.renderer = self.generator;}
+          hook.call
+        ensure
+          self.posts.cycle(1) {|p| p.metadata.renderer = _old_renderer.shift }
+        end
+      },
       )
       self.site.content.pages << @feed_page
       

data/lib/alula/generators/paginate.rb

@@ -34,11 +34,12 @@ module Alula
           title: titles,
           name: "page-#{(page + 1)}",
           slug: "page-#{(page + 1)}",
+          sidebar: false,
           template: self.options.template,
           site: self.site,
           view: self.options.view || "paginate",
         },
-        :previous => ->(locale) {
+        :previous => ->(hook, locale) {
           pos = self.navigation(locale).index(self)
           if pos and pos < (self.navigation(locale).count - 1)
             self.navigation(locale)[pos + 1]
@@ -46,7 +47,7 @@ module Alula
             nil
           end
         },
-        :next => ->(locale) {
+        :next => ->(hook, locale) {
           pos = self.navigation(locale).index(self)
           if pos and pos > 0
             self.navigation(locale)[pos - 1]
@@ -54,7 +55,7 @@ module Alula
             nil
           end
         },
-        :navigation => ->(locale) {
+        :navigation => ->(hook, locale) {
           locale ||= self.current_locale || self.site.config.locale
           @navigation[locale] ||= self.site.content.pages.select { |item| item.metadata.generator == self.generator and item.languages.include?(locale) }
         }

data/lib/alula/generators/sitemap.rb

@@ -3,20 +3,26 @@ require 'builder' # For Tilt
 module Alula
   class Generator::Sitemap < Generator
     def generate
-      self.site.content.pages << Alula::Content::Page.new({
-        generator: self,
-        urls: ->(context) {
-          (context.site.content.posts + context.site.content.pages).collect { |content|
+      urls_callback = ->(context) {
+        (context.site.content.posts + context.site.content.pages)
+          .reject {|content| content.generator == self }
+          .collect { |content|
             content.languages.collect{|lang| {
               url: content.url(lang),
               lastmod: content.last_modified,
               priority: content.generator.nil? ? 0.5 : 0.3,
             }
-          }}.flatten
-          },
+          }
+        }.flatten
+      }
+      
+      self.site.content.pages << Alula::Content::Page.new({
+        generator: self,
+        urls: urls_callback,
         title: "Sitemap",
         name: "sitemap.xml",
         slug: "sitemap",
+        sidebar: false,
         template: self.options.template || "/:locale/:name",
         site: self.site,
         layout: "sitemap",

data/lib/alula/processor.rb

@@ -48,6 +48,7 @@ module Alula
       # Networked processors, create global 'queues' to prevent multiple simultanous upload/downloads
       @@upload ||= Mutex.new
       @@download ||= Mutex.new
+      @@lock ||= Mutex.new
     end
     
     def cleanup

data/lib/alula/processors/video.rb

@@ -39,7 +39,7 @@ module Alula
         .select {|tn| !tn[:hires] or (tn[:hires] and self.site.config.attachments.image.hires)}
         .select{|tn|
           width, height = tn[:size].split("x").collect{|i| i.to_i};
-          !File.exists?(tn[:output]) and !((width > self.info.width and height > self.info.height) and format[:hires])
+          !File.exists?(tn[:output]) and !((width > self.info.width and height > self.info.height) and tn[:hires])
         }
       
       thumbnails = Hash[thumbnails.collect{|tn| [tn[:label], tn]}]

data/lib/alula/processors/zencoder.rb

@@ -14,11 +14,13 @@ module Alula
     def initialize(item, opts)
       super
       
-      ::Zencoder.api_key = options.token
-      @s3 = ::AWS::S3.new({
-        :access_key_id     => options.key_id,
-        :secret_access_key => options.access_key,
-      })
+      @@lock.synchronize do
+        ::Zencoder.api_key = options.token
+        @s3 = ::AWS::S3.new({
+          :access_key_id     => options.key_id,
+          :secret_access_key => options.access_key,
+        })
+      end
     end
     
     def cleanup
@@ -102,6 +104,7 @@ module Alula
     end
     
     def zencoder_encode(job)
+      File.open('cache/job.yml', 'w') {|io| io.write job.to_yaml}
       response = ::Zencoder::Job.create(job)
       return false if response.code != "201"
       

data/lib/alula/site.rb

@@ -17,6 +17,7 @@ require 'sprockets'
 require 'i18n'
 require 'parallel'
 require 'hashie/mash'
+require 'json'
 
 # Silence Tilt
 require 'sass'
@@ -221,7 +222,7 @@ module Alula
       # Theme, plugins, vendor and customisation
       [
         self.theme.path,
-        *plugins.collect{|name, plugin| plugin.asset_path},
+        *plugins.collect{|name, plugin| plugin.path},
         ::File.join(File.dirname(__FILE__), "..", "..", "vendor"),
       ].each do |path|
         %w{javascripts stylesheets images}.each {|p|
@@ -273,9 +274,8 @@ module Alula
       progress.finish(:attachments)
       progress.hide
       
-      # DEBUG
-      require 'json'
-      File.open(self.storage.path(:cache) + "/mapping.json", 'w') {|io| io.puts self.attachments.mapping.to_json}
+      # Output mapping information
+      File.open(self.storage.path(:cache) + "/mapping.yml", 'w') {|io| io.puts JSON(self.attachments.mapping.to_json).to_yaml}
     end
     
     def compile_assets
@@ -337,7 +337,7 @@ module Alula
       
       @manifest = Manifest.new(@environment, @storage.path(:assets))
       @manifest.progress = -> { progress.step(:assets) }
-      
+
       @manifest.compile
 
       progress.finish(:assets)
@@ -362,9 +362,26 @@ module Alula
       progress.finish(:render)
       
       # Copy static content
-      progress.create :static, title: "Copy statics", total: self.content.statics.count
-      self.content.statics.each do |static|
-        @storage.output_public(static.name) { |io| io.write(static.read) }
+      # Create directory path
+      static_dirs = [
+        ::File.join(File.dirname(__FILE__), "..", "..", "vendor"),
+        *plugins.collect{|name, plugin| plugin.path},
+        self.theme.path,
+      ]
+      statics = static_dirs.collect{|path|
+        Dir[File.join(path, "static", "**", "*")].collect{|p|
+          {path: File.join(path, "static"), item: p}
+        }
+      }.flatten
+
+      progress.create :static, title: "Copy statics", total: self.content.statics.count + statics.count
+      (statics + self.content.statics).each do |static|
+        if static.kind_of?(Hash)
+          name = static[:item].gsub(/^#{static[:path]}\//, '')
+          @storage.output_public(name) {|io| File.read(static[:item]) }
+        else
+          @storage.output_public(static.name) { |io| static.read }
+        end
         
         progress.step :static
       end
@@ -383,10 +400,11 @@ module Alula
         .collect{|u| File.join(asset_path, u.digest_path)}
       outputted = @storage.outputted.reject{|o|o[/^#{asset_path}/]}
       
-      keep = assets + outputted
+      keep = (assets + outputted).collect{|p| File.expand_path(p)}
+      
       Dir[File.join(@storage.path(:public), "**", "*")].each do |entry|
         next unless File.file?(entry)
-        FileUtils.rm entry if File.file?(entry) and !keep.include?(entry)
+        FileUtils.rm entry if File.file?(entry) and !keep.include?(File.expand_path(entry))
       end
       
       # Clean up empty directories

data/lib/alula/storages/filestorage.rb

@@ -76,7 +76,7 @@ module Alula
       FileUtils.mkdir_p dirname unless ::File.directory?(dirname)
   
       ::File.open(fname, "w") do |io|
-        io.puts yield io
+        io.write yield io
       end
       
       fname

data/lib/alula/support/commonlogger.rb

@@ -3,7 +3,7 @@ module Alula
     # Common Log Format: http://httpd.apache.org/docs/1.3/logs.html#common
     # lilith.local - - [07/Aug/2006 23:58:02] "GET / HTTP/1.1" 500 -
     #             %{%s - %s [%s] "%s %s%s %s" %d %s\n} %
-    FORMAT = %{[%s] %s %s\n}
+    # FORMAT = %{[%s] %s %s\n}
 
     def initialize(app, logger=nil)
       @app = app
@@ -11,8 +11,10 @@ module Alula
     end
 
     def call(env)
+      request_start = Time.now
       status, header, body = @app.call(env)
       header = Rack::Utils::HeaderHash.new(header)
+      env["REQUEST_TIME"] = (Time.now - request_start) * 1000.0
       body = Rack::BodyProxy.new(body) { log(env, status, header) }
       [status, header, body]
     end
@@ -21,9 +23,11 @@ module Alula
 
     def log(env, status, header)
       logger = @logger || env['rack.errors']
-      logger.write FORMAT % [
+      logger.write %{[%s] %s %d %.3fms %s\n} % [
         env["REMOTE_ADDR"],
         env["REQUEST_METHOD"],
+        status,
+        env["REQUEST_TIME"],
         Rack::Utils.unescape(env["PATH_INFO"])]
     end
   end

data/lib/alula/theme.rb

@@ -72,7 +72,7 @@ module Alula
     def options(file)
       options = case File.extname(file)[1..-1]
         when "haml"
-          { :format => :html5 }
+          { :format => :html5, :ugly => @site.config.assets.compress }
         else
           {}
         end

data/template/Gemfile.erb

@@ -11,5 +11,5 @@ gem 'alula-plugins', git: 'git://github.com/owlforestry/alula-plugins.git'
 <% else %>
 gem 'alula'
 gem 'alula-themes'
-#gem 'alula-plugins'
+gem 'alula-plugins'
 <% end %>

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: alula
 version: !ruby/object:Gem::Version
-  version: 0.4.0b
-  prerelease: 5
+  version: 0.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Mikko Kokkonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-14 00:00:00.000000000 Z
+date: 2012-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -627,6 +627,7 @@ files:
 - vendor/assets/javascripts/lazyload.js.coffee
 - vendor/layouts/feed.xml.builder
 - vendor/layouts/sitemap.xml.builder
+- vendor/static/favicon.ico
 - vendor/views/feed_post.html.haml
 homepage: http://owlforestry.github.com/alula
 licenses: []
@@ -642,13 +643,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2415179494811451467
+      hash: 935586330715583609
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 935586330715583609
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23