alula 0.2.0c → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.2.0c
+0.2.0

data/lib/alula/assethelper.rb

@@ -0,0 +1,75 @@
+require 'RMagick'
+
+module Alula
+  class AssetHelper
+    IMAGES = %w{jpg png gif}
+    MOVIES = %w{mp4}
+    
+    def initialize(asset_path, options)
+      @options = options
+      @asset_path = asset_path
+    end
+    
+    def process(asset, options)
+      options = @options.deep_merge(options)
+      
+      # Resolve our asset type
+      ext = File.extname(asset)[1..-1].downcase
+      
+      if IMAGES.include?(ext)
+        [:image, process_image(asset, options)]
+      elsif MOVIES.include?(ext)
+        [:movie, process_movie(asset, options)]
+      else
+        raise "Unknown asset type #{ext} for #{asset}"
+      end
+    end
+    
+    private
+    def process_image(asset, options)
+      ext = File.extname(asset)[1..-1].downcase
+      name = File.basename(asset, ext).to_url
+      generated = []
+      
+      # Resolve size for new photo
+      width, height = case options[:type]
+      when :attachment
+        options["images"]["size"].split("x").collect {|i| i.to_i }
+      when :thumbnail
+        options["images"]["thumbnails"].split("x").collect {|i| i.to_i }
+      end
+      
+      file_path = case options[:type]
+      when :attachment
+        File.join("attachments", "_generated", "images", @asset_path)
+      when :thumbnail
+        File.join("attachments", "_generated", "thumbnails", @asset_path)
+      end
+      # Create output path
+      FileUtils.mkdir_p(file_path)
+      
+      # Copy asset to originals
+      if options[:type] == :attachment
+        FileUtils.mkdir_p File.join("attachments", "originals", @asset_path)
+        FileUtils.cp asset, File.join("attachments", "originals", @asset_path, "#{name}.#{ext}")
+      end
+      
+      # Create normal photo
+      image = Magick::Image.read(asset).first
+      image_width, image_height = image.columns, image.rows
+      
+      resized = image.resize_to_fit(width, height)
+      resized.write(File.join(file_path, "#{name}.#{ext}"))
+      generated << File.join(@asset_path, "#{name}.#{ext}")
+      
+      # Generate retina if required
+      if (options["images"]["retina"] and (image_width > width * 2) or (image_height > height * 2))
+        retina = image.resize_to_fit(width * 2, height * 2)
+        resized.write(File.join(file_path, "#{name}_2x.#{ext}"))
+        generated << File.join(@asset_path, "#{name}_2x.#{ext}")
+      end
+      
+      return generated
+    end
+  end
+end

data/lib/alula/cli.rb

@@ -11,7 +11,7 @@ module Alula
     desc "init [PATH]", "Creates a new aLula blog in given path or current directory"
     def init(path = ".")
       # Create directory structure
-      %w{attachments attachments/_originals attachments/_thumbnails posts pages}.each do |dir|
+      %w{attachments attachments/originals attachments/_generated/images attachments/_generated/_thumbnails posts pages}.each do |dir|
         empty_directory File.join(path, dir)
       end
       

data/lib/alula/plugins/assets.rb

@@ -1,5 +1,3 @@
-require 'RMagick'
-
 module Alula
   module Plugins
     class GenericAsset < Liquid::Tag

data/lib/alula/plugins/pagination.rb

@@ -0,0 +1,121 @@
+module Jekyll
+
+  class Pagination < Generator
+    # This generator is safe from arbitrary code execution.
+    safe true
+
+    # Generate paginated pages if necessary.
+    #
+    # site - The Site.
+    #
+    # Returns nothing.
+    def generate(site)
+      site.pages.dup.each do |page|
+        paginate(site, page) if Pager.pagination_enabled?(site.config, page)
+      end
+    end
+
+    # Paginates the blog's posts. Renders the index.html file into paginated
+    # directories, e.g.: page2/index.html, page3/index.html, etc and adds more
+    # site-wide data.
+    #
+    # site - The Site.
+    # page - The index.html Page that requires pagination.
+    #
+    # {"paginator" => { "page" => <Number>,
+    #                   "per_page" => <Number>,
+    #                   "posts" => [<Post>],
+    #                   "total_posts" => <Number>,
+    #                   "total_pages" => <Number>,
+    #                   "previous_page" => <Number>,
+    #                   "next_page" => <Number> }}
+    def paginate(site, page)
+      all_posts = site.site_payload['site']['posts']
+      pages = Pager.calculate_pages(all_posts, site.config['paginate'].to_i)
+      page_dir = page.destination('').sub(/\/[^\/]+$/, '')
+      page_dir_config = site.config['pagination_dir']
+      dir = ((page_dir_config || page_dir) + '/').sub(/^\/+/, '')
+
+      (1..pages).each do |num_page|
+        pager = Pager.new(site.config, num_page, all_posts, page_dir+'/', '/'+dir, pages)
+        if num_page > 1
+          newpage = Page.new(site, site.source, page_dir, page.name)
+          newpage.pager = pager
+          newpage.dir = File.join(page.dir, "#{dir}page/#{num_page}")
+          site.pages << newpage
+        else
+          page.pager = pager
+        end
+      end
+    end
+  end
+
+  class Pager
+    attr_reader :page, :per_page, :posts, :total_posts, :total_pages, :previous_page, :next_page
+
+    # Calculate the number of pages.
+    #
+    # all_posts - The Array of all Posts.
+    # per_page  - The Integer of entries per page.
+    #
+    # Returns the Integer number of pages.
+    def self.calculate_pages(all_posts, per_page)
+      (all_posts.size.to_f / per_page.to_i).ceil
+    end
+
+    # Determine if pagination is enabled for a given file.
+    #
+    # config - The configuration Hash.
+    # file   - The String filename of the file.
+    #
+    # Returns true if pagination is enabled, false otherwise.
+    def self.pagination_enabled?(config, file)
+      file.name == 'index.html' && !config['paginate'].nil? && file.content =~ /paginator\./
+    end
+
+    # Initialize a new Pager.
+    #
+    # config    - The Hash configuration of the site.
+    # page      - The Integer page number.
+    # all_posts - The Array of all the site's Posts.
+    # num_pages - The Integer number of pages or nil if you'd like the number
+    #             of pages calculated.
+    def initialize(config, page, all_posts, index_dir, pagination_dir, num_pages = nil)
+      @page = page
+      @per_page = config['paginate'].to_i
+      @page_dir = pagination_dir + 'page/'
+      @total_pages = num_pages || Pager.calculate_pages(all_posts, @per_page)
+      @previous_page = nil
+
+      if @page > @total_pages
+        raise RuntimeError, "page number can't be greater than total pages: #{@page} > #{@total_pages}"
+      end
+
+      init = (@page - 1) * @per_page
+      offset = (init + @per_page - 1) >= all_posts.size ? all_posts.size : (init + @per_page - 1)
+
+      @total_posts = all_posts.size
+      @posts = all_posts[init..offset]
+      @previous_page = @page != 1 ? @page_dir + (@page - 1).to_s + '/' : nil
+      @previous_page = index_dir if @page - 1 == 1
+      @next_page = @page != @total_pages ? @page_dir + (@page + 1).to_s + '/' : nil
+    end
+
+    # Convert this Pager's data to a Hash suitable for use by Liquid.
+    #
+    # Returns the Hash representation of this Pager.
+    def to_liquid
+      {
+        'page' => page,
+        'per_page' => per_page,
+        'posts' => posts,
+        'total_posts' => total_posts,
+        'total_pages' => total_pages,
+        'previous_page' => previous_page,
+        'next_page' => next_page
+      }
+    end
+  end
+
+end
+

data/lib/alula/plugins.rb

@@ -0,0 +1,23 @@
+module Alula
+  module Plugins
+    # def self.register(plugin, path)
+    #   @@plugins ||= {}
+    #   @@plugins[plugin] = path
+    # end
+    # 
+    # def self.plugins
+    #   @@plugins
+    # end
+    def self.register_attachment_handler(type, handler)
+      @@handlers ||= {}
+      @@handlers[:attachment] ||= {}
+      @@handlers[:attachment][type] = handler
+    end
+    
+    def self.attachment_handler(type)
+      @@handlers ||= {}
+      @@handlers[:attachment] ||= {}
+      @@handlers[:attachment][type]
+    end
+  end
+end

data/lib/alula/site.rb

@@ -1,13 +1,13 @@
 require 'yaml'
 require 'jekyll'
 require 'sprockets'
-require 'RMagick'
 require 'active_support/inflector/methods'
 require 'progressbar'
 require 'stringex'
 
 require 'alula/theme'
-require 'alula/plugin'
+require 'alula/plugins'
+require 'alula/assethelper'
 
 # Compressors
 require 'alula/compressors'
@@ -15,6 +15,7 @@ require 'alula/compressors'
 # Jekyll extensions, plugins, tags
 # These are used always in every blog, i.e. mandatory plugins
 require 'alula/plugins/assets'
+require 'alula/plugins/pagination'
 
 module Alula
   class Site
@@ -71,7 +72,7 @@ module Alula
       @sprockets.append_path File.join("_tmp", "assets")
       
       # Attachments
-      @sprockets.append_path File.join("attachments")
+      @sprockets.append_path File.join("attachments", "_generated")
       
       # Vendor assets
       vendor_path = File.expand_path(File.join(File.dirname(__FILE__), *%w{.. .. vendor}))
@@ -79,13 +80,15 @@ module Alula
       @sprockets.append_path File.join(vendor_path, "javascripts")
       
       # Initialize blog plugins
-      @config["plugins"].each do |plugin, opts|
-        require "alula/plugins/#{plugin}"
+      if @config["plugins"] != nil
+        @config["plugins"].each do |plugin, opts|
+          require "alula/plugins/#{plugin}"
         
-        plugin_class = Alula::Plugins.const_get(ActiveSupport::Inflector.camelize(plugin, true))
-        path = plugin_class.install(opts)
-        @sprockets.append_path File.join(path, "stylesheets")
-        @sprockets.append_path File.join(path, "javascripts")
+          plugin_class = Alula::Plugins.const_get(ActiveSupport::Inflector.camelize(plugin, true))
+          path = plugin_class.install(opts)
+          @sprockets.append_path File.join(path, "stylesheets")
+          @sprockets.append_path File.join(path, "javascripts")
+        end
       end
     end
     
@@ -137,55 +140,32 @@ module Alula
       post = find_post(a_post) or raise "Cannot find post #{a_post}"
       
       /(?<date>(\d{4}-\d{2}-\d{2}))/ =~ post
-      # require 'pry';binding.pry
       date = Time.parse(date)
-      
-      width, height = @config["images"]["size"].split("x").collect {|i| i.to_i }
       asset_path = File.join(%w{%Y %m %d}.collect{|f| date.strftime(f) })
-      file_path = File.join("attachments", "_originals", asset_path)
-      FileUtils.mkdir_p(file_path)
       
-      processed = []
+      helper = Alula::AssetHelper.new(asset_path, @config)
       
       post_io = File.open(post, "a")
-      
-      # Generate assets
-      image_types = [".jpg", ".png"]
       assets.each do |asset|
-        asset_ext = File.extname(asset).downcase
-        asset_base = File.basename(asset).downcase
-        asset_plain = File.basename(asset, asset_ext).to_url
-        
-        if image_types.include?(asset_ext)
-          img = Magick::Image.read(asset).first
-          orig_w, orig_h = img.columns, img.rows
-          
-          img_normal = img.resize_to_fit(width, height)
-          img_normal.write(File.join(file_path, "#{asset_plain}#{asset_ext}"))
-          img_normal = nil
-          
-          if (@config["images"]["retina"] and (orig_w > width * 2) or (orig_h > height * 2))
-            img_retina = img.resize_to_fit(width * 2, height * 2)
-            retina_fname = File.join(file_path, "#{asset_plain}_2x#{asset_ext}")
-            img_retina.write(retina_fname)
-            img_retina = nil
-          end
-          
-          processed << File.join(asset_path, asset_base)
-          
-          if @config["plugins"].keys.include?("lightbox")
-            post_io.puts "{% lightbox #{File.join(asset_path, "#{asset_plain}#{asset_ext}")} %}"
+        type, generated = helper.process(asset, :type => :attachment)
+        tn_type, tn_generated = helper.process(asset, :type => :thumbnail)
+        if generated and tn_generated
+          # Asset processed
+          puts "(#{asset}) done."
+          if handler = Alula::Plugins.attachment_handler(type)
+            post_io.puts handler.call(generated[0])
           else
-            post_io.puts "{% image #{File.join("_originals", asset_path, "#{asset_plain}#{asset_ext}")} %}"
+            post_io.puts "{% image _images/#{generated[0]} %}"
           end
+        else
+          puts "(#{asset}) cannot process."
         end
       end
-      
-      post_io.close
     end
     
     def clean
       cleanup
+      FileUtils.rm_rf(Dir[File.join("attachments", "_images", "*")])
       FileUtils.rm_rf(Dir[File.join("attachments", "_thumbnails", "*")])
     end
     
@@ -228,7 +208,13 @@ module Alula
       FileUtils.cp_r Dir[File.join("posts", "*")], File.join("_tmp", "_posts")
       
       # Copy pages
-      FileUtils.cp_r Dir[File.join("pages", "**", "*")], File.join("_tmp")
+      Dir[File.join("pages", "**", "*")].each do |page|
+        next unless File.file?(page)
+        page = File.join(page.split("/")[1..-1])
+        
+        FileUtils.mkdir_p File.join("_tmp", File.dirname(page))
+        FileUtils.cp File.join("pages", page), File.join("_tmp", page)
+      end
       
       FileUtils.mkdir_p File.join("_tmp", "assets")
     end
@@ -239,23 +225,31 @@ module Alula
       width, height = @config["images"]["thumbnails"].split("x").collect {|i| i.to_i }
       
       # Get all attachements
-      originals_path = File.join("attachments", "_originals")
-      thumbnails_path = File.join("attachments", "_thumbnails")
+      images_path = File.join("attachments", "_generated", "images")
+      thumbnails_path = File.join("attachments", "_generated", "thumbnails")
       
-      assets = Dir[File.join(originals_path, "**", "*")]
+      assets = Dir[File.join(images_path, "**", "*")]
         .select {|f| File.file?(f) }
-        .collect {|f| File.join(f.split("/")[2..-1])}
+        .collect {|f| File.join(f.split("/")[3..-1])}
       pb = ProgressBar.new "Assets", assets.count
+      # helper = Alula::AssetHelper.new(asset_path, @config)
       
-      assets.each do |original|
-        unless File.exists?(File.join(thumbnails_path, original))
-          image = Magick::Image.read(File.join(originals_path, original)).first
-          image.crop_resized!(width, height, Magick::NorthGravity)
-          FileUtils.mkdir_p File.dirname(File.join(thumbnails_path, original))
-          image.write(File.join(thumbnails_path, original))
+      assets.each do |asset|
+        unless File.exists?(File.join(thumbnails_path, asset))
+          helper = Alula::AssetHelper.new(File.dirname(asset), @config)
+          tn_type, tn_generated = helper.process(File.join("attachments", "originals", asset), :type => :thumbnail)
+          pb.inc
         end
-        pb.inc
       end
+      # assets.each do |original|
+      #   unless File.exists?(File.join(thumbnails_path, original))
+      #     image = Magick::Image.read(File.join(originals_path, original)).first
+      #     image.crop_resized!(width, height, Magick::NorthGravity)
+      #     FileUtils.mkdir_p File.dirname(File.join(thumbnails_path, original))
+      #     image.write(File.join(thumbnails_path, original))
+      #   end
+      #   pb.inc
+      # end
       
       pb.finish
     end
@@ -268,7 +262,9 @@ module Alula
         tf.puts "/*"
         tf.puts " *=require #{@config["theme"]}"
         # Plugins
-        @config["plugins"].each { |plugin, opts| tf.puts " *=require #{plugin}" }
+        if @config["plugins"]
+          @config["plugins"].each { |plugin, opts| tf.puts " *=require #{plugin}" }
+        end
         tf.puts " */"
       end
       
@@ -276,13 +272,17 @@ module Alula
       File.open(File.join("_tmp", "assets", "scripts.js"), "w") do |tf|
         tf.puts "//=require #{@config["theme"]}"
         # Plugins
-        @config["plugins"].each { |plugin, opts| tf.puts "//=require #{plugin}" }
+        if @config["plugins"]
+          @config["plugins"].each { |plugin, opts| tf.puts "//=require #{plugin}" }
+        end
       end
 
       File.open(File.join("_tmp", "assets", "scripts_body.js"), "w") do |tf|
         tf.puts "//=require #{@config["theme"]}_body"
         # Plugins
-        @config["plugins"].each { |plugin, opts| tf.puts "//=require #{plugin}_body" }
+        if @config["plugins"]
+          @config["plugins"].each { |plugin, opts| tf.puts "//=require #{plugin}_body" }
+        end
       end
       
       

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: alula
 version: !ruby/object:Gem::Version
-  version: 0.2.0c
-  prerelease: 5
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Mikko Kokkonen
@@ -13,7 +13,7 @@ date: 2012-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &70293003811360 !ruby/object:Gem::Requirement
+  requirement: &70277502059980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.11'
   type: :runtime
   prerelease: false
-  version_requirements: *70293003811360
+  version_requirements: *70277502059980
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70293003810680 !ruby/object:Gem::Requirement
+  requirement: &70277502059420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70293003810680
+  version_requirements: *70277502059420
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70293003826360 !ruby/object:Gem::Requirement
+  requirement: &70277502058720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *70293003826360
+  version_requirements: *70277502058720
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &70293003825620 !ruby/object:Gem::Requirement
+  requirement: &70277502057920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.13'
   type: :runtime
   prerelease: false
-  version_requirements: *70293003825620
+  version_requirements: *70277502057920
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70293003824960 !ruby/object:Gem::Requirement
+  requirement: &70277502073420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70293003824960
+  version_requirements: *70277502073420
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70293003824280 !ruby/object:Gem::Requirement
+  requirement: &70277502071820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70293003824280
+  version_requirements: *70277502071820
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70293003823560 !ruby/object:Gem::Requirement
+  requirement: &70277502070340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70293003823560
+  version_requirements: *70277502070340
 - !ruby/object:Gem::Dependency
   name: front-compiler
-  requirement: &70293003822880 !ruby/object:Gem::Requirement
+  requirement: &70277502069600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70293003822880
+  version_requirements: *70277502069600
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70293003822100 !ruby/object:Gem::Requirement
+  requirement: &70277502067420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70293003822100
+  version_requirements: *70277502067420
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70293003820960 !ruby/object:Gem::Requirement
+  requirement: &70277502066880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70293003820960
+  version_requirements: *70277502066880
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
-  requirement: &70293003820100 !ruby/object:Gem::Requirement
+  requirement: &70277502066400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70293003820100
+  version_requirements: *70277502066400
 - !ruby/object:Gem::Dependency
   name: version
-  requirement: &70293003819560 !ruby/object:Gem::Requirement
+  requirement: &70277502065920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70293003819560
+  version_requirements: *70277502065920
 description: Alula is a simple tool for creating fast, static blogs easily.
 email:
 - mikko@owlforestry.com
@@ -160,10 +160,12 @@ files:
 - alula.gemspec
 - bin/alula
 - lib/alula.rb
+- lib/alula/assethelper.rb
 - lib/alula/cli.rb
 - lib/alula/compressors.rb
-- lib/alula/plugin.rb
+- lib/alula/plugins.rb
 - lib/alula/plugins/assets.rb
+- lib/alula/plugins/pagination.rb
 - lib/alula/rake_tasks.rb
 - lib/alula/site.rb
 - lib/alula/tasks.rb
@@ -187,9 +189,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17

data/lib/alula/plugin.rb

@@ -1,12 +0,0 @@
-module Alula
-  class Plugin
-    def self.register(plugin, path)
-      @@plugins ||= {}
-      @@plugins[plugin] = path
-    end
-    
-    def self.plugins
-      @@plugins
-    end
-  end
-end