alula 0.2.3 → 0.4.0b

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+.DS_Store

data/Gemfile

@@ -2,3 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in alula.gemspec
 gemspec
+
+group :development do
+  gem 'coolline'
+  gem 'guard'
+  gem 'guard-minitest'
+  gem 'pry'
+end

data/Guardfile

@@ -0,0 +1,9 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'minitest' do
+  # with Minitest::Unit
+  watch(%r|^test/(.*)\/?test_(.*)\.rb|)
+  watch(%r|^lib/(.*)([^/]+)\.rb|)
+  watch(%r|^test/test_helper\.rb|)
+end

data/Rakefile

@@ -1,6 +1,17 @@
 #!/usr/bin/env rake
+require "bundler/setup"
 require "bundler/gem_tasks"
 
 # Versioning
 require 'rake/version_task'
-Rake::VersionTask.new
+Rake::VersionTask.new
+
+# Tests
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.pattern = "test/**/test_*.rb"
+end
+
+task :default => :test

data/VERSION

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

data/alula.gemspec

@@ -16,17 +16,33 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Alula::VERSION
   
-  gem.add_dependency 'jekyll', '~> 0.11'
+  gem.add_dependency 'parallel'
+  gem.add_dependency 'hashie', '~> 1.2'
+  gem.add_dependency 'thin'
+  gem.add_dependency 'tilt'
+  gem.add_dependency 'liquid'
+  gem.add_dependency 'builder'
+  gem.add_dependency 'kramdown'
   gem.add_dependency 'sprockets', '~> 2.4'
   gem.add_dependency 'thor', '~> 0.14'
+  gem.add_dependency 'i18n'
   gem.add_dependency 'rmagick', '~> 2.13'
   gem.add_dependency 'sass', '~> 3.1'
   gem.add_dependency 'coffee-script', '~> 2.2'
   gem.add_dependency 'uglifier', '~> 1.2'
-  gem.add_dependency 'front-compiler', '~> 1.1'
-  gem.add_dependency 'activesupport', '~> 3.2'
+  gem.add_dependency 'htmlcompressor'
   gem.add_dependency 'stringex', '~> 1.3'
-  gem.add_dependency 'ruby-progressbar', '~> 0.0.10'
+  gem.add_dependency 'powerbar'
+  gem.add_dependency 'mimemagic'
+  gem.add_dependency 'aws-sdk'
+  gem.add_dependency 'zencoder'
+  gem.add_dependency 'mini_exiftool', '~> 1.3'
+  gem.add_dependency 'dimensions'
+  gem.add_dependency 'htmlentities'
 
   gem.add_development_dependency 'version', '~> 1.0'
+  gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'turn'
+  gem.add_development_dependency 'simplecov'
+  
 end

data/lib/alula/attachment_processor.rb

@@ -0,0 +1,77 @@
+module Alula
+  class AttachmentProcessor
+    def self.register(name, klass); processors[name] = klass; end
+    def self.processors; @@processors ||= {}; end
+    def processors; self.class.processors; end
+    
+    attr_reader :site
+    
+    def initialize(opts)
+      @site = opts.delete(:site)
+      
+      @@lock = Mutex.new
+    end
+    
+    def mapping
+      @mapping ||= {}
+    end
+    
+    def asset_name(name, *path)
+      path ||= []
+
+      @@lock.synchronize do      
+        md5 = Digest::MD5.hexdigest(name)
+        asset_hash = md5[0..3]
+        until !mapping.key(asset_hash) or mapping.key(asset_hash) == name
+          asset_hash = md5[0..(asset_hash.length + 1)]
+        end
+      
+        mapping[name] = File.join(path + [asset_hash]) + File.extname(name)
+      end
+      
+      mapping[name]
+    end
+    
+    def get(item)
+      # Try to use cached processor for extension
+      type = _type(item)
+      options = site.config.attachments[type]
+      self.processors[type].new(item, options: options, site: site, attachments: self)
+    end
+    
+    private
+    def cached
+      @cached ||= {}
+    end
+    
+    def _type(item)
+      if cached[item.extension] and self.processors[cached[item.extension]].process?(item, fast: true)
+        return cached[item.extension]
+      end
+      
+      types = available.collect { |t| [t, false] } + available.collect { |t| [t, true] }
+      types.each do |type, fast|
+        processor = self.processors[type]
+        if processor.process?(item, fast: fast)
+          cached[item.extension] = type
+          return type
+        end
+      end
+      
+      return "dummy"
+    end
+    
+    def available
+      @@lock.synchronize do
+        @available ||= begin
+          self.site.config.attachments.processors.select { |p|
+            options = self.site.config.attachments[p] || {}
+            self.processors.has_key?(p) and self.processors[p].available?(options)
+          }
+        end
+      end
+    end
+  end
+end
+
+require 'alula/processor'

data/lib/alula/cdn.rb

@@ -0,0 +1,30 @@
+module Alula
+  class CDN
+    def self.register(name, klass); cdns[name.to_s] = klass; end
+    def self.cdns; @@cdns ||= {}; end
+    def cdns; self.class.cdns; end
+    
+    def self.load(opts)
+      site = opts[:site]
+      
+      # Check if we have environment related
+      site.config.cdn.reverse_each do |cdn, opts|
+        if cdns.has_key?(cdn)
+          return cdns[cdn].new(opts, site: site)
+        end
+      end
+      
+      raise "Cannot find CDN Provider(s): #{site.config.cdn.keys}"
+    end
+    
+    attr_reader :site
+    attr_reader :options
+    
+    def initialize(options, opts)
+      @site = opts.delete(:site)
+      @options = options
+    end
+  end
+end
+
+Dir[File.join(File.dirname(__FILE__), "cdns", "*.rb")].each {|f| require f}

data/lib/alula/cdns/edgecast.rb

@@ -0,0 +1,16 @@
+module Alula
+  class Edgecast < CDN
+    THRESHOLD = 300 * 1024 # 300kB
+    
+    def url_for(name, opts)
+      file = opts.delete(:file)
+      
+      hosts = File.size(file) < THRESHOLD ? self.options.small : self.options.large
+      
+      host = hosts[Digest::MD5.hexdigest(name).to_i(16) % hosts.count]
+      File.join(host, name)
+    end
+  end
+end
+
+Alula::CDN.register :edgecast, Alula::Edgecast

data/lib/alula/cdns/hosts.rb

@@ -0,0 +1,14 @@
+module Alula
+  class Hosts < CDN
+    def url_for(name, opts)
+      if self.options[0] == "/"
+        File.join("/", name)
+      else
+        host = self.options[Digest::MD5.hexdigest(name).to_i(16) % self.options.count]
+        File.join(host, name)
+      end
+    end
+  end
+end
+
+Alula::CDN.register :hosts, Alula::Hosts

data/lib/alula/cli.rb

@@ -1,61 +1,112 @@
 require 'thor'
 require 'alula/site'
+if File.exists?("Gemfile")
+  require 'bundler'
+  Bundler.require
+end
 
 module Alula
   class CLI < Thor
     include Thor::Actions
     
-    source_root File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. template]))
+    TEMPLATE_DIR = File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. template]))
+    source_root TEMPLATE_DIR
     
+    def self.generate_options
+      # option :development, :type => :boolean, :default => true,
+      #   :desc => "Generate site using development settings. Keeps all assets and HTML uncompressed."
+      # option :production, :type => :boolean, :default => false,
+      #   :desc => "Generate site using production settings. Compresses all assets and HTML."
+      option :environment, :type => :string, :default => 'development', :aliases => "-e",
+        :desc => "Environment where site is built"
+      option :verbose, :type => :boolean, :default => false, :aliases => "-v",
+        :desc => "Be verbose during site generation."
+      option :test, :type => :boolean, :default => false, :aliases => "-t",
+        :desc => "Turn on some testing features, i.e. doesn't upload/convert all files etc."
+      option :debug, :type => :boolean, :default => false, :aliases => "-d"
+    end    
     
-    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/_generated/images attachments/_generated/_thumbnails posts pages}.each do |dir|
-        empty_directory File.join(path, dir)
-      end
+    desc "version", "Displays current version information about loaded components"
+    def version
+      Alula::Version.print
+    end
+    
+    desc "new [PATH]", "Creates a new empty blog"
+    option :edge, :type => :boolean, :default => false, :desc => "Use edge version from GIT"
+    option :path, :type => :string, :desc => "Use given path as alula source"
+    def new(path = ".")
+      puts "Create blog at #{path}"
       
-      # Insert templates
-      %w{Gemfile config.yml}.each do |tpl|
-        template "#{tpl}.erb", File.join(path, tpl)
+      # Init directories
+      %w{content
+        content/attachments content/pages content/posts content/static
+        custom
+        custom/images custom/javascripts custom/stylesheets}.each do |dir|
+        empty_directory File.join(path, dir)
+        create_file File.join(path, dir, ".gitkeep")
       end
-      
-      # Initialize system
-      inside File.join(path) do
-        run "bundle install"
+      Dir[File.join(TEMPLATE_DIR, "**/*")].each do |tpl|
+        name = tpl.gsub("#{TEMPLATE_DIR}/", '')
+        if tpl[/\.erb$/]
+          template tpl, File.join(path, name.gsub(/\.erb$/, ''))
+        else
+          copy_file tpl, File.join(path, name)
+        end
       end
     end
     
     desc "generate", "Generates blog"
-    method_option :development, :type => :boolean, :default => true,
-      :desc => "Generate site using development settings. Keeps all assets and HTML uncompressed."
-    method_option :production, :type => :boolean, :default => false,
-      :desc => "Generate site using production settings. Compresses all assets and HTML."
-    def generate
-      site = Alula::Site.new("asset_compress" => (!options["development"] or options["production"]))
+    generate_options
+    def generate(*args)
+      unless args.empty?
+        args.each {|a| puts "Unknown option #{a} given."}; exit
+      end
       site.generate
     end
-
-    desc "preview", "Preview blog"
-    method_option :development, :type => :boolean, :default => true,
-      :desc => "Preview site using development settings. Keeps all assets and HTML uncompressed."
-    method_option :production, :type => :boolean, :default => false,
-      :desc => "Preview site suing production settings. Compresses all assets and HTML."
-    def preview
-      site = Alula::Site.new("asset_compress" => (!options["development"] or options["production"]))
-      site.preview
-    end
     
-    desc "attach POST ASSET", "Attached given asset, photo or video to given post"
-    def attach(post, *assets)
-      site = Alula::Site.new
-      site.asset_attach(post, assets)
+    desc "preview", "Preview blog"
+    generate_options
+    option "skip-generate", :type => :boolean, :default => false, :aliases => "-s",
+      :desc => "Skip site generation before web server launch."
+    def preview(*args)
+      unless args.empty?
+        args.each {|a| puts "Unknown option #{a} given."}; exit
+      end
+      site.generate unless options['skip-generate']
+            
+      # Start webserver
+      begin
+        require 'thin'
+        require 'alula/support/commonlogger'
+        
+        public_path = site.storage.path(:public)
+        s = Thin::Server.start('0.0.0.0', site.config.port) do
+          @root = File.expand_path(public_path)
+          use CommonLogger
+          run Proc.new { |env|
+            path = Rack::Utils.unescape(env['PATH_INFO'])
+            index_file = File.join(@root, path, "index.html")
+            
+            if File.exists?(index_file)
+              [200, {'Content-Type' => 'text/html'}, [File.read(index_file)]]
+            else
+              Rack::Directory.new(@root).call(env)
+            end
+          }
+        end
+      rescue LoadError => e
+        puts "Please install thin gem to use preview functionality (gem install thin)."
+      end
     end
     
-    desc "clean", "Clean up all generated content"
-    def clean
-      site = Alula::Site.new
-      site.clean
+    private
+    def site
+      @site ||= Alula::Site.new({
+        "environment" => options["environment"],
+        "verbose"     => options["verbose"],
+        "debug"       => options["debug"],
+        "testing"     => options["test"]
+      })
     end
   end
-end
+end

data/lib/alula/compressors.rb

@@ -1,9 +1,15 @@
 require 'sass'
 require 'uglifier'
-require 'front-compiler'
+require 'htmlcompressor'
 
 module Alula
-  module Compressors
+  class Compressors
+    class DummyCompressor
+      def compress(content)
+        content
+      end
+    end
+    
     class CSSCompressor
       def compress(content)
         if content.count("\n") > 2
@@ -17,19 +23,25 @@ module Alula
         end
       end
     end
-    
+  
     class JSCompressor
+      def initialize
+        @compressor = Uglifier.new
+      end
+      
       def compress(content)
-        @@compressor ||= Uglifier.new
-        @@compressor.compress(content)
+        @compressor.compress(content)
       end
     end
     
-    module HTMLCompressor
-      def output_with_compression
-        @@compressor ||= FrontCompiler.new
-        @@compressor.compact_html(@output)
+    class HTMLCompressor
+      def initialize
+        @compressor = HtmlCompressor::Compressor.new
+      end
+      
+      def compress(content)
+        @compressor.compress(content)
       end
     end
   end
-end
+end

data/lib/alula/config.rb

@@ -0,0 +1,141 @@
+require 'hashie/mash'
+
+module Alula
+  class Config
+    def initialize(override = {}, config_file = "config.yml")
+      @config = Hashie::Mash.new
+      @_used = Hashie::Mash.new # Keep track of applied configuration
+      
+      # Load default configuration
+      @config.update(DEFAULT_CONFIG)
+      
+      # Load project specific configuration
+      @config.update(YAML.load_file(config_file)) if ::File.exists?(config_file)
+      
+      # Load overrides
+      @config.update(override)
+    end
+    
+    def write_cache(file)
+      File.open(file, 'w') {|io| io.puts JSON.parse(@_used.to_json).to_yaml }
+    end
+    
+    def method_missing(meth, *args, &blk)
+      if meth[/=$/]
+        @config.send(meth, *args)
+      else
+        value = @config.send(:[], meth)
+        if value.kind_of?(Hashie::Mash)
+          # Try environment
+          value = value[environment] if value.has_key?(environment)
+        end
+        @_used.send("#{meth}=", value)
+        
+        value
+      end
+    end
+    
+    private
+    DEFAULT_CONFIG = {
+      # The title of the blog
+      title: "The Unnamed Blog",
+      # Tagline of the blog
+      tagline: "This has no tagline.",
+      # The author, default
+      author: "John Doe",
+      # The host where blog is available
+      url: "http://localhost:3000",
+      
+      # Base locale which is used is no other locale defined
+      locale: "en",
+      hides_base_locale: true, # Hide default locale
+      
+      # Default theme
+      theme: 'minimal',
+      
+      # Template for generating post permalinks
+      permalinks: '/:locale/:year/:month/:title/',
+      # Template for generating pages paths
+      pagelinks: '/:locale/:slug',
+      
+      # Directories and storage
+      storage: {
+        file: {
+          content_path:     'content',
+          pages_path:       'content/pages',
+          posts_path:       'content/posts',
+          attachments_path: 'content/attachments',
+          static_path:      'content/static',
+          custom_path:      'custom',
+          cache_path:       'cache',
+          public_path:      'public',
+        }
+      },
+      
+      # CDN Configuration
+      cdn: {
+        development: { hosts: ["/"] },
+         production: { hosts: ["/"] },
+      },
+      
+      # Content generators
+      generators: {
+        paginate: {
+          items: 10,
+          template: "/:locale/page/:page/",
+        },
+        feedbuilder: {
+          items: 10,
+        },
+        sitemap: {}
+      },
+      
+      # Plugins
+      plugins: {
+        emphasis: {},
+      },
+      
+      # Blog Content options
+      content: {
+        filters: {
+          smilies: nil,
+        },
+        sidebar: [ :pages, :languages ]
+      },
+      
+      assets: {
+        production: {
+          compress: true,
+        },
+      },
+      
+      # Attachement Processors
+      attachments: {
+        "image" => {
+          "size"      => "800x600",
+          "thumbnail" => "300x300",
+          "keep_tags" => ["CopyrightNotice", "Title", "DateTimeOriginal"],
+          "hires"     => true,
+          "lazyload"  => true,
+        },
+        "video" => {
+          "size-hd"        => "1280x720",
+          "size-mobile-hd" => "1280x720",
+          "size-sd"        => "640x360",
+          "size-mobile-sd" => "640x360",
+          "thumbnail"      => "300x300",            
+          "formats"        => ["mp4", "webm", "ogg"],
+          "hires"          => true,
+          "mobile"         => true,
+        },
+        "audio" => {},
+        
+        "processors" => ["magick", "zencoder"],
+        "magick"     => {},
+        "zencoder"   => {
+          "bucket" => "alula.attachments",
+        }
+      }
+    }
+  end
+end