wst 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ad7bbcd44506f55c13dcc5ad1b3d2754ead6932
-  data.tar.gz: 66f25db1788a3bcd5d9bb515f8b8231414c70c5e
+  metadata.gz: 1d4e39821ab781b82410d564e334910a830ea243
+  data.tar.gz: e23a8193b48e32a9011fb36fb0f3f96c8ad94c8b
 SHA512:
-  metadata.gz: b606ad1888543d91369361ea4e79aee979ea606e04006d5be0a2da2e1f43aa5eb79a4036887aa93e1528c6e4107b8a691b5c1b7aae674f2b078976f73bd29e5e
-  data.tar.gz: 67e7d4dd3f7ba5effc36718c2077759372e78d61ee4cfd39552194046c483b5531447067ad2bf697380c52a5831795a8b04d37aa6b9e2c993f7969739e7432c2
+  metadata.gz: 5df0d135f7cba7a499d7b5e6cb6206dd356a93a687e83839fe2d869a868c574ae139144920241f0646ce1fe6a3b6b24e549431a98ee8d97348b82d28c9f7ee01
+  data.tar.gz: f52fe27732d41d984585f8d910c0a193878460c62de4399f73b22a553c12c62fd3cbce6c31856e5efe708b81797e59c7debf4990eb4a82689146cb0cef4b5fab

data/bin/wst

@@ -4,9 +4,9 @@ require 'wst'
 
 dir = ARGV[0] || Dir.pwd
 
-Logging.logger.formatter = proc do |severity, datetime, progname, msg|
+Wst::Logging.logger.formatter = proc do |severity, datetime, progname, msg|
   "#{msg}\n"
 end
-Configuration.read_config dir, false
+Wst::Configuration.read_config dir, false
 
-Wst.new.generate
+Wst::Wst.new.generate

data/bin/wst-serve

@@ -7,11 +7,11 @@ require 'wst'
 
 dir = ARGV[0] || Dir.pwd
 
-Logging.logger.formatter = proc do |severity, datetime, progname, msg|
+Wst::Logging.logger.formatter = proc do |severity, datetime, progname, msg|
   "#{msg}\n"
 end
-Configuration.read_config dir, false
+Wst::Configuration.read_config dir, false
 
-Wst.new.generate
+Wst::Wst.new.generate
 
 Serve::Application.run ["_site"]

data/lib/configuration.rb

@@ -1,48 +1,51 @@
 # encoding: utf-8
 
-module Configuration
-  def config
-    Configuration.config
-  end
-
-  def self.config
-    @config
-  end
-
-  def defaultLinks
-    Configuration.defaultLinks
-  end
-
-  def self.defaultLinks
-    @defaultLinks
-  end
-
-  def self.read_config location, local
-    Configuration.read_configuration location, local
-    Configuration.read_default_links
-  end
-
-  def self.read_configuration location, local
-    raise "Not a valid Web Log Today location" unless self.valid_location? location
-    @config = YAML.load File.open(File.join(location, 'config.yaml'), 'r:utf-8').read
-    @config["__site_url__"] = @config["site_url"]
-    @config["site_url"] = "http://localhost:4000" if local
-    @config["path"] = location
-  end
-
-  def self.read_default_links
-    @defaultLinks = if File.exists? self.links_file_path then "\n" + File.open(self.links_file_path, "r:utf-8").read else "" end
-  end
-
-  def self.valid_location? location
-    return false unless File.exists? File.join location, "config.yaml"
-    return false unless File.directory? File.join location, "_posts"
-    return false unless File.directory? File.join location, "_pages"
-    return false unless File.directory? File.join location, "_layouts"
-    return true
-  end
-
-  def self.links_file_path
-    File.join config['path'], "links.md"
+module Wst
+  module Configuration
+    def config
+      Configuration.config
+    end
+
+    def self.config
+      @config
+    end
+
+    def defaultLinks
+      Configuration.defaultLinks
+    end
+
+    def self.defaultLinks
+      @defaultLinks
+    end
+
+    def self.read_config location, local
+      Configuration.read_configuration location, local
+      Configuration.read_default_links
+    end
+
+    def self.read_configuration location, local
+      raise "Not a valid Web Log Today location" unless self.valid_location? location
+      @config = YAML.load File.open(File.join(location, 'config.yaml'), 'r:utf-8').read
+      @config["__site_url__"] = @config["site_url"]
+      @config["site_url"] = "http://localhost:4000" if local
+      @config["path"] = location
+      @config["debug"] = ENV['WST_ENV'] != nil && ENV['WST_ENV'].casecmp('debug').zero?
+    end
+
+    def self.read_default_links
+      @defaultLinks = if File.exists? self.links_file_path then "\n" + File.open(self.links_file_path, "r:utf-8").read else "" end
+    end
+
+    def self.valid_location? location
+      return false unless File.exists? File.join location, "config.yaml"
+      return false unless File.directory? File.join location, "_posts"
+      return false unless File.directory? File.join location, "_pages"
+      return false unless File.directory? File.join location, "_layouts"
+      return true
+    end
+
+    def self.links_file_path
+      File.join config['path'], "links.md"
+    end
   end
 end

data/lib/content.rb

@@ -3,96 +3,98 @@ require 'yaml'
 require 'configuration'
 require 'digest/md5'
 
-class Content
-  include Configuration
-
-  def initialize file_path, child = nil
-    @file_path = file_path
-    @plain_content = ""
-    @datas = Hash.new
-    @cats = ""
-    @child = child
-    @content = content
-
-    read_content
-  end
+module Wst
+  class Content
+    include Configuration
+
+    def initialize file_path, child = nil
+      @file_path = file_path
+      @plain_content = ""
+      @datas = Hash.new
+      @cats = ""
+      @child = child
+      @content = content
+
+      read_content
+    end
 
-  def child
-    @child
-  end
+    def child
+      @child
+    end
 
-  def content
-    c = self
-    while !c.child.nil?
-      c = c.child
+    def content
+      c = self
+      while !c.child.nil?
+        c = c.child
+      end
+      c
     end
-    c
-  end
 
-  def dir
-    File.dirname @file_path
-  end
+    def dir
+      File.dirname @file_path
+    end
 
-  def method_missing(m, *args, &block)
-    if m =~ /^(.*)\?$/
-      return @datas.has_key? $1
-    elsif @datas.has_key? m.to_s
-      return @datas[m.to_s]
-    else
-      return nil
+    def method_missing(m, *args, &block)
+      if m =~ /^(.*)\?$/
+        return @datas.has_key? $1
+      elsif @datas.has_key? m.to_s
+        return @datas[m.to_s]
+      else
+        return nil
+      end
     end
-  end
 
-  def raw_content
-    @plain_content
-  end
+    def raw_content
+      @plain_content
+    end
 
-  def url= url
-    @url = url
-  end
+    def url= url
+      @url = url
+    end
 
-  def url
-    @url ||= ''
-  end
+    def url
+      @url ||= ''
+    end
 
-  def datas
-    @datas
-  end
+    def datas
+      @datas
+    end
 
-  def gravatar?
-    email?
-  end
+    def gravatar?
+      email?
+    end
 
-  def gravatar
-    hash = Digest::MD5.hexdigest(email)
-    "http://www.gravatar.com/avatar/#{hash}"
-  end
+    def gravatar
+      hash = Digest::MD5.hexdigest(email)
+      "http://www.gravatar.com/avatar/#{hash}"
+    end
 
-  def account? name
-    return false unless config.has_key? "accounts"
-    return config["accounts"].has_key? name
-  end
+    def account? name
+      return false unless config.has_key? "accounts"
+      return config["accounts"].has_key? name
+    end
 
-  def account name
-    return nil unless account? name
-    return config["accounts"][name]
-  end
+    def account name
+      return nil unless account? name
+      return config["accounts"][name]
+    end
 
-  protected
+    protected
 
-  def default_links_path
-    "#{config['path']}/links.md"
-  end
+    def default_links_path
+      "#{config['path']}/links.md"
+    end
 
-  def read_content
-    @plain_content = File.open(@file_path, "r:utf-8").read
-    begin
-      if @plain_content =~ /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
-        @plain_content = $'
-        @datas = YAML.load $1
+    def read_content
+      @plain_content = File.open(@file_path, "r:utf-8").read
+      begin
+        if @plain_content =~ /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
+          @plain_content = $'
+          @datas = YAML.load $1
+        end
+      rescue => e
+        puts "YAML Exception reading #{@file_path}: #{e.message}"
       end
-    rescue => e
-      puts "YAML Exception reading #{@file_path}: #{e.message}"
     end
   end
 end

data/lib/css_renderer.rb

@@ -0,0 +1,67 @@
+# encoding: utf-8
+require 'configuration'
+require 'logging'
+require 'sass'
+
+module Wst
+  class CssRenderer
+    include Logging
+    include Configuration
+
+    def generate_all
+      logger.info 'Css'.blue
+      css_conf.each do |css_name|
+        logger.info "  #{css_name}"
+        compile css_name
+      end
+    end
+
+    # @param [String] css_name Name of the css to compile
+    def compile(css_name)
+      css_file = get_css css_name
+      return if css_file.nil?
+      sass_style = unless config['debug'] then
+                     :compressed
+                   else
+                     :expanded
+                   end
+      output_file = "#{config['path']}/_site/#{css_name.split('/').last}.css"
+      File.open(output_file, 'w') do |f|
+        f.write css(css_file, sass_style)
+      end
+    end
+
+    private
+    # @return [Array<String>] Array of css configurations.
+    def css_conf
+      if config.has_key?('assets') &&
+          config['assets'].has_key?('css') &&
+          config['assets']['css'].kind_of?(Array)
+        config['assets']['css']
+      else
+        []
+      end
+    end
+
+    # @param [String] css_file css file to compile
+    # @param [Symbol] sass_style Style for Sass
+    def css(css_file, sass_style)
+      sass_engine = Sass::Engine.for_file(css_file, :syntax => sass_syntax(css_file), :style => sass_style)
+      sass_engine.render
+    end
+
+    # Get the css file path.
+    # @param [String] css_name Name of the css relatively to _css directory
+    # @return [String] Name of the css relatively to _css directory
+    def get_css(css_name)
+      Dir.glob(File.join(config['path'], '_css', "#{css_name}.*")).first
+    end
+
+    # Get syntax (sass or scss) for a file
+    # @param [String] css Name of the file
+    # @return [symbol] :sass or :scss
+    def sass_syntax(css)
+      File.extname(css).delete('.').to_sym
+    end
+  end
+end

data/lib/haml_content.rb

@@ -1,21 +1,23 @@
 # encoding: utf-8
 require 'content'
 
-class HamlContent < Content
-  def initialize file_path, child = nil, sub_content = ''
-    super file_path, child
-    @sub_content = sub_content
-  end
+module Wst
+  class HamlContent < Content
+    def initialize file_path, child = nil, sub_content = ''
+      super file_path, child
+      @sub_content = sub_content
+    end
 
-  def sub_content
-    @sub_content
-  end
+    def sub_content
+      @sub_content
+    end
 
-  def deep_content
-    c = self
-    while !c.child.nil? && !c.child.child.nil?
-      c = c.child
+    def deep_content
+      c = self
+      while !c.child.nil? && !c.child.child.nil?
+        c = c.child
+      end
+      c
     end
-    c
   end
 end

data/lib/haml_helpers_wlt_extensions.rb

@@ -10,7 +10,7 @@ module Haml
     @@wlt_extensions_defined = true
 
     module WltExtensions
-      include Configuration
+      include Wst::Configuration
 
       def link_to name, content, ext = 'html'
         "<a href='#{url_for(content, ext)}'>#{name}</a>"
@@ -71,7 +71,7 @@ module Haml
       end
 
       def partial_haml_content partial
-        HamlContent.new partial_path(partial), content
+        Wst::HamlContent.new partial_path(partial), content
       end
 
       def url_for_string url, ext

data/lib/haml_renderer.rb

@@ -3,22 +3,24 @@ require 'renderer'
 require 'haml'
 require 'configuration'
 
-class HamlRenderer < Renderer
-  protected
+module Wst
+  class HamlRenderer < Renderer
+    protected
 
-  def render_layout
-    hamlcontent = HamlContent.new layout_path, @content, render_content
-    renderer = HamlRenderer.new hamlcontent
-    renderer.render
-  end
+    def render_layout
+      hamlcontent = HamlContent.new layout_path, @content, render_content
+      renderer = HamlRenderer.new hamlcontent
+      renderer.render
+    end
 
-  def render_content
-    haml_engine.render(@content) do
-      @content.sub_content
+    def render_content
+      haml_engine.render(@content) do
+        @content.sub_content
+      end
     end
-  end
 
-  def haml_engine
-    Haml::Engine.new @content.raw_content
+    def haml_engine
+      Haml::Engine.new @content.raw_content
+    end
   end
 end

data/lib/html_with_pygments.rb

@@ -1,8 +1,10 @@
 # encoding: utf-8
 require 'pygments'
 
-class HTMLwithPygments < Redcarpet::Render::XHTML
-  def block_code(code, language)
-    Pygments.highlight(code, :lexer => language)
+module Wst
+  class HTMLwithPygments < Redcarpet::Render::XHTML
+    def block_code(code, language)
+      Pygments.highlight(code, :lexer => language)
+    end
   end
 end

data/lib/js_renderer.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+require 'configuration'
+require 'logging'
+
+module Wst
+  class JsRenderer
+    include Logging
+    include Configuration
+
+    def generate_all
+      logger.info 'Js'.blue
+      js_conf.each do |js_name|
+        logger.info "  #{js_name}"
+        compile js_name
+      end
+    end
+
+    # @param [String] js_name Name of the js to compile
+    def compile(js_name)
+      lines = read_and_expand js_name
+      js = lines.flatten.join
+      compiled = unless config['debug'] then
+                   Uglifier.compile js
+                 else
+                   js
+                 end
+      output_file = "#{config['path']}/_site/#{js_name.split('/').last}.js"
+      File.open(output_file, 'w') do |f|
+        f.write compiled
+      end
+    end
+
+    private
+    # @return [Array<String>] Array of js configurations.
+    def js_conf
+      if config.has_key?('assets') &&
+          config['assets'].has_key?('js') &&
+          config['assets']['js'].kind_of?(Array)
+        config['assets']['js']
+      else
+        []
+      end
+    end
+
+    # @param [String] js_name Name of the js file to compile
+    def read_and_expand(js_name)
+      js_file = File.join File.join(config['path'], '_js', "#{js_name}.js")
+      return [] unless File.exists? js_file
+      content = File.read js_file
+      content.lines.inject([]) do |lines, line|
+        if line =~ /\/\/=\srequire\s['"](.*)['"]/
+          lines << read_and_expand("#{$1}")
+        else
+          lines << line
+        end
+      end
+    end
+  end
+end

data/lib/logging.rb

@@ -1,16 +1,18 @@
 # encoding: utf-8
 require 'logger'
 
-module Logging
-  def logger
-    Logging.logger
-  end
+module Wst
+  module Logging
+    def logger
+      Logging.logger
+    end
 
-  def self.logger
-    @logger ||= Logger.new(STDOUT)
-  end
+    def self.logger
+      @logger ||= Logger.new(STDOUT)
+    end
 
-  def self.logger= logger
-    @logger = logger
+    def self.logger= logger
+      @logger = logger
+    end
   end
 end

data/lib/md_content.rb

@@ -2,46 +2,48 @@
 require 'content'
 require 'configuration'
 
-class MdContent < Content
-  @@matcher = /^(.+\/)*(\d+-\d+-\d+)?-?(.*)(\.[^.]+)$/
-
-  def initialize file_path
-    super file_path
-
-    m, cats, date, slug, ext = *file_path.match(@@matcher)
-    @cats = cats
-    @date = Time.parse(date) if date
-    @slug = slug
-    @ext = ext
-  end
+module Wst
+  class MdContent < Content
+    @@matcher = /^(.+\/)*(\d+-\d+-\d+)?-?(.*)(\.[^.]+)$/
+
+    def initialize file_path
+      super file_path
+
+      m, cats, date, slug, ext = *file_path.match(@@matcher)
+      @cats = cats
+      @date = Time.parse(date) if date
+      @slug = slug
+      @ext = ext
+    end
 
-  def date
-    @date
-  end
+    def date
+      @date
+    end
 
-  def raw_content
-    if useDefaultLinks?
-      content_with_links
-    else
-      @plain_content
+    def raw_content
+      if useDefaultLinks?
+        content_with_links
+      else
+        @plain_content
+      end
     end
-  end
 
-  def self.matcher
-    @@matcher
-  end
+    def self.matcher
+      @@matcher
+    end
 
-  protected
+    protected
 
-  def content_with_links
-    @plain_content + defaultLinks
-  end
+    def content_with_links
+      @plain_content + defaultLinks
+    end
 
-  def useDefaultLinks?
-    if @datas.has_key? 'nolinks'
-      @datas['nolinks'] == 'true'
-    else
-      true
+    def useDefaultLinks?
+      if @datas.has_key? 'nolinks'
+        @datas['nolinks'] == 'true'
+      else
+        true
+      end
     end
   end
 end

data/lib/md_renderer.rb

@@ -4,26 +4,28 @@ require 'renderer_factory'
 require 'redcarpet'
 require 'html_with_pygments'
 
-class MdRenderer < Renderer
-  protected
+module Wst
+  class MdRenderer < Renderer
+    protected
 
-  def render_layout
-    hamlcontent = HamlContent.new layout_path, @content, render_content
-    renderer = RendererFactory.for hamlcontent
-    renderer.render
-  end
+    def render_layout
+      hamlcontent = HamlContent.new layout_path, @content, render_content
+      renderer = RendererFactory.for hamlcontent
+      renderer.render
+    end
 
-  def render_content
-    markdown_renderer.render @content.raw_content
-  end
+    def render_content
+      markdown_renderer.render @content.raw_content
+    end
 
-  def markdown_renderer
-    Redcarpet::Markdown.new(HTMLwithPygments,
-      :with_toc_data => true,
-      :fenced_code_blocks => true,
-      :strikethrough => true,
-      :autolink => true,
-      :no_intra_emphasis => true,
-      :tables => true)
+    def markdown_renderer
+      Redcarpet::Markdown.new(HTMLwithPygments,
+        :with_toc_data => true,
+        :fenced_code_blocks => true,
+        :strikethrough => true,
+        :autolink => true,
+        :no_intra_emphasis => true,
+        :tables => true)
+    end
   end
 end

data/lib/page.rb

@@ -3,85 +3,87 @@ require 'md_content'
 require 'haml_content'
 require 'cgi'
 
-module PageComparison
-  def <=> obj
-    return url <=> obj.url
+module Wst
+  module PageComparison
+    def <=> obj
+      return url <=> obj.url
+    end
   end
-end
 
-class HamlPage < HamlContent
-  include PageComparison
+  class HamlPage < HamlContent
+    include PageComparison
 
-  @@matcher = /^(.+\/)*(.*)(\.[^.]+)$/
+    @@matcher = /^(.+\/)*(.*)(\.[^.]+)$/
 
-  def initialize file_path
-    super file_path
+    def initialize file_path
+      super file_path
 
-    m, cats, slug, ext = *file_path.match(@@matcher)
-    base_path = File.join(Configuration.config['path'], '_pages') + '/'
-    @cats = cats.gsub(base_path, '').chomp('/') if !cats.nil? && cats != base_path
-    @slug = slug
-    @ext = ext
-  end
+      m, cats, slug, ext = *file_path.match(@@matcher)
+      base_path = File.join(Configuration.config['path'], '_pages') + '/'
+      @cats = cats.gsub(base_path, '').chomp('/') if !cats.nil? && cats != base_path
+      @slug = slug
+      @ext = ext
+    end
 
-  def url
-    "#{@cats + '/' if @cats != ''}#{CGI.escape @slug}.html"
-  end
+    def url
+      "#{@cats + '/' if @cats != ''}#{CGI.escape @slug}.html"
+    end
 
-  def self.matcher
-    @@matcher
+    def self.matcher
+      @@matcher
+    end
   end
-end
 
-class MdPage < MdContent
-  include PageComparison
+  class MdPage < MdContent
+    include PageComparison
 
-  def initialize file_path
-    super file_path
+    def initialize file_path
+      super file_path
 
-    base_path = File.join(Configuration.config['path'], '_pages') + '/'
-    @cats = @cats.gsub(base_path, '') if !@cats.nil?
-    @cats.chomp!('/')
-  end
+      base_path = File.join(Configuration.config['path'], '_pages') + '/'
+      @cats = @cats.gsub(base_path, '') if !@cats.nil?
+      @cats.chomp!('/')
+    end
 
-  def url
-    "#{@cats + '/' if @cats != ''}#{CGI.escape @slug}.html"
+    def url
+      "#{@cats + '/' if @cats != ''}#{CGI.escape @slug}.html"
+    end
   end
-end
 
-class Page
-  @@glob_md = '*.{md,mkd,markdown}'
-  @@glob_haml = '*.haml'
+  class Page
+    @@glob_md = '*.{md,mkd,markdown}'
+    @@glob_haml = '*.haml'
 
-  class << self
-    def all
-      (haml_pages + md_pages).sort
-    end
+    class << self
+      def all
+        (haml_pages + md_pages).sort
+      end
 
-    private
+      private
 
-    def haml_pages
-      page_files(@@glob_haml, HamlPage.matcher).inject([]) { |pages, file| pages << HamlPage.new(file) }
-    end
+      def haml_pages
+        page_files(@@glob_haml, HamlPage.matcher).inject([]) { |pages, file| pages << HamlPage.new(file) }
+      end
 
-    def md_pages
-      page_files(@@glob_md, MdContent.matcher).inject([]) { |pages, file| pages << MdPage.new(file) }
-    end
+      def md_pages
+        page_files(@@glob_md, MdContent.matcher).inject([]) { |pages, file| pages << MdPage.new(file) }
+      end
 
-    def page_files glob, matcher
-      select_match all_files(glob), matcher
-    end
+      def page_files glob, matcher
+        select_match all_files(glob), matcher
+      end
 
-    def select_match files, matcher
-      files.select { |file| file =~ matcher }
-    end
+      def select_match files, matcher
+        files.select { |file| file =~ matcher }
+      end
 
-    def all_files glob
-      Dir.glob glob_path glob
-    end
+      def all_files glob
+        Dir.glob glob_path glob
+      end
 
-    def glob_path glob
-      File.join "#{Configuration.config['path']}/_pages", '**', glob
+      def glob_path glob
+        File.join "#{Configuration.config['path']}/_pages", '**', glob
+      end
     end
   end
 end

data/lib/post.rb

@@ -1,51 +1,53 @@
 # encoding: utf-8
 require 'md_content'
 
-class Post < MdContent
-  @@glob = "*.{md,mkd,markdown}"
+module Wst
+  class Post < MdContent
+    @@glob = "*.{md,mkd,markdown}"
 
-  def initialize file_path
-    super file_path
+    def initialize file_path
+      super file_path
 
-    base_path = File.join(Configuration.config['path'], '_posts') + '/'
-    @cats = @cats.gsub(base_path, '') if !@cats.nil?
-    @cats.chomp!('/')
-  end
-
-  def url
-    generate_url = {
-      "year"  => @date.strftime("%Y"),
-      "month" => @date.strftime("%m"),
-      "day"   => @date.strftime("%d"),
-      "title" => CGI.escape(@slug)
-    }.inject(":year/:month/:day/:title.html") { |result, token|
-      result.gsub(/:#{Regexp.escape token.first}/, token.last)
-    }.gsub(/\/\//, "/")
-    generate_url = "#{@cats}/#{generate_url}" if @cats != ''
-    generate_url
-  end
+      base_path = File.join(Configuration.config['path'], '_posts') + '/'
+      @cats = @cats.gsub(base_path, '') if !@cats.nil?
+      @cats.chomp!('/')
+    end
 
-  class << self
-    def all
-      post_files.inject([]) { |posts, file| posts << Post.new(file) }
+    def url
+      generate_url = {
+        "year"  => @date.strftime("%Y"),
+        "month" => @date.strftime("%m"),
+        "day"   => @date.strftime("%d"),
+        "title" => CGI.escape(@slug)
+      }.inject(":year/:month/:day/:title.html") { |result, token|
+        result.gsub(/:#{Regexp.escape token.first}/, token.last)
+      }.gsub(/\/\//, "/")
+      generate_url = "#{@cats}/#{generate_url}" if @cats != ''
+      generate_url
     end
 
-    private
+    class << self
+      def all
+        post_files.inject([]) { |posts, file| posts << Post.new(file) }
+      end
 
-    def glob_path
-      File.join "#{Configuration.config['path']}/_posts", '**', @@glob
-    end
+      private
 
-    def all_files
-      Dir.glob glob_path
-    end
+      def glob_path
+        File.join "#{Configuration.config['path']}/_posts", '**', @@glob
+      end
 
-    def select_match files
-      files.select { |file| file =~ @@matcher }
-    end
+      def all_files
+        Dir.glob glob_path
+      end
+
+      def select_match files
+        files.select { |file| file =~ @@matcher }
+      end
 
-    def post_files
-      select_match(all_files).sort
+      def post_files
+        select_match(all_files).sort
+      end
     end
   end
 end

data/lib/renderer.rb

@@ -3,49 +3,51 @@ require 'configuration'
 require 'haml_content'
 require 'fileutils'
 
-class Renderer
-  include Configuration
+module Wst
+  class Renderer
+    include Configuration
 
-  def initialize content
-    @content = content
-  end
+    def initialize content
+      @content = content
+    end
 
-  def render
-    if has_layout?
-      render_layout
-    else
-      render_content
+    def render
+      if has_layout?
+        render_layout
+      else
+        render_content
+      end
     end
-  end
 
-  def write_to_site
-  	out = File.join config['path'], '_site', @content.url
-  	FileUtils.mkdir_p File.dirname out
-  	write_to out
-  end
+    def write_to_site
+      out = File.join config['path'], '_site', @content.url
+      FileUtils.mkdir_p File.dirname out
+      write_to out
+    end
 
-  protected
+    protected
 
-  def write_to out
-  	File.open(out, 'w') { |f| f.write render }
-  end
+    def write_to out
+      File.open(out, 'w') { |f| f.write render }
+    end
 
-  def render_layout
-  end
+    def render_layout
+    end
 
-  def render_content
-    @content.raw_content
-  end
+    def render_content
+      @content.raw_content
+    end
 
-  def has_layout?
-    @content.layout? && layout_exists?
-  end
+    def has_layout?
+      @content.layout? && layout_exists?
+    end
 
-  def layout_path
-    "#{config['path']}/_layouts/#{@content.layout}.haml"
-  end
+    def layout_path
+      "#{config['path']}/_layouts/#{@content.layout}.haml"
+    end
 
-  def layout_exists?
-    File.exists? layout_path
+    def layout_exists?
+      File.exists? layout_path
+    end
   end
 end

data/lib/renderer_factory.rb

@@ -5,27 +5,29 @@ require 'haml_content'
 require 'md_renderer'
 require 'haml_renderer'
 
-module RendererFactory
-  module_function
+module Wst
+  module RendererFactory
+    module_function
 
-  def for content
-    send content.class.name.downcase.to_sym, content
-  end
+    def for content
+      send content.class.name.split('::').last.downcase.to_sym, content
+    end
 
-  def post content
-    MdRenderer.new content
-  end
+    def post content
+      MdRenderer.new content
+    end
 
-  def mdpage content
-    MdRenderer.new content
-  end
+    def mdpage content
+      MdRenderer.new content
+    end
 
-  def hamlpage content
-    HamlRenderer.new content
-  end
+    def hamlpage content
+      HamlRenderer.new content
+    end
 
-  def hamlcontent content
-    HamlRenderer.new content
-  end
+    def hamlcontent content
+      HamlRenderer.new content
+    end
 
+  end
 end

data/lib/wst.rb

@@ -3,138 +3,108 @@ require 'haml_helpers_wlt_extensions'
 require 'post'
 require 'page'
 require 'renderer_factory'
+require 'css_renderer'
+require 'js_renderer'
 require 'configuration'
-require "sass"
 require 'logging'
 require 'colored'
 require 'uglifier'
 
-class Wst
-  include Logging
-  include Configuration
+module Wst
+  class Wst
+    include Logging
+    include Configuration
 
-  def generate all = false
-    init
-    css
-    js
-    content all
-    pub
-  end
-
-  private
-
-  def init
-    logger.info "Clean".blue
-    FileUtils.mkdir_p File.join config['path'], "_site"
-    FileUtils.rm_rf Dir.glob File.join config['path'], "_site/*"
-  end
-
-  def css
-    return unless config.has_key? "assets"
-    return unless config["assets"].has_key? "css"
-    cssconf = config["assets"]["css"]
-    return unless cssconf.kind_of? Array
-
-    logger.info "Css".blue
-    cssconf.each do |cssname|
-      logger.info "  #{cssname}"
-      compile_css cssname
+    def initialize
+      @css_renderer = CssRenderer.new
+      @js_renderer = JsRenderer.new
     end
-  end
-
-  def kss
-    return unless config.has_key? "assets"
-    return unless config["assets"].has_key? "css"
-    cssconf = config["assets"]["css"]
-    return unless cssconf.kind_of? Array
 
-    logger.info "KSS".blue
-    cssconf.each do |cssname|
-      logger.info "  #{cssname}"
-      compile_css_expanded cssname
+    # @param [Boolean] all Generate all content or only published content
+    def generate(all = false)
+      init
+      css
+      js
+      content all
+      pub
     end
-  end
-
-  def js
-    return unless config.has_key? "assets"
-    return unless config["assets"].has_key? "js"
-    jsconf = config["assets"]["js"]
-    return unless jsconf.kind_of? Array
 
-    logger.info "Js".blue
-    jsconf.each do |jsname|
-      logger.info "  #{jsname}"
-      compile_js jsname
+    # Compile all css files
+    def css
+      @css_renderer.generate_all
     end
-  end
 
-  def compile_js jsname
-    lines = read_and_expand jsname
-    js = lines.flatten.join
-    #compiled = Uglifier.compile js
-    compiled = js
-    File.open("#{config['path']}/_site/#{jsname.split('/').last}.js", "w") { |f| f.write(compiled) }
-  end
-
-  def read_and_expand jsname
-    jsfile = File.join File.join(config['path'], '_js', "#{jsname}.js")
-    return [] unless File.exists? jsfile
-    content = File.read jsfile
-    lines = content.lines.inject([]) do |lines, line|
-      if line =~ /\/\/=\srequire\s['"](.*)['"]/
-        lines << read_and_expand("#{$1}")
-      else
-        lines << line
-      end
+    # Compile a single css file
+    # @param [String] css_name Css name to compile
+    def compile_css(css_name)
+      @css_renderer.compile css_name
     end
-  end
 
-  def content all
-    logger.info "Content".blue
-    contents(all).each do |doc|
-      logger.info "  #{doc.url}"
-      renderer = RendererFactory.for doc
-      renderer.write_to_site
+    # Compile all js files
+    def js
+      @js_renderer.generate_all
     end
-  end
 
-  def pub
-    logger.info "Pub".blue
-    FileUtils.cp_r File.join(config['path'], '_pub', '.') , File.join(config['path'], '_site')
-  end
+    # Compile a single js file
+    # @param [String] js_name Js name to compile
+    def compile_js(js_name)
+      @js_renderer.compile js_name
+    end
 
-  def contents all
-    return all_content if all
-    all_content.select { |c| c.published }
-  end
+    private
 
-  def all_content
-    [Post.all, Page.all].flatten
-  end
+    def init
+      logger.info 'Clean'.blue
+      FileUtils.mkdir_p File.join config['path'], '_site'
+      FileUtils.rm_rf Dir.glob File.join config['path'], '_site/*'
+    end
 
-  def compile_css cssname
-    cssfile = get_css cssname
-    return if cssfile.nil?
-    sassengine = Sass::Engine.for_file(cssfile, :syntax => sass_syntax(cssfile), :style => :compressed)
-    css = sassengine.render
+    #def kss
+    #  return unless config.has_key? 'assets'
+    #  return unless config['assets'].has_key? 'css'
+    #  css_conf = config['assets']['css']
+    #  return unless css_conf.kind_of? Array
+
+    #  logger.info 'KSS'.blue
+    #  css_conf.each do |css_name|
+    #    logger.info "  #{css_name}"
+    #    compile_css_expanded css_name
+    #  end
+    #end
+
+    # @param [Boolean] all Generate all content or only published content
+    def content(all)
+      logger.info 'Content'.blue
+      contents(all).each do |doc|
+        logger.info "  #{doc.url}"
+        renderer = RendererFactory.for doc
+        renderer.write_to_site
+      end
+    end
 
-    File.open("#{config['path']}/_site/#{cssname.split('/').last}.css", "w") { |f| f.write(css) }
-  end
+    def pub
+      logger.info 'Pub'.blue
 
-  def compile_css_expanded cssname
-    cssfile = get_css cssname
-    return if cssfile.nil?
-    sassengine = Sass::Engine.for_file(cssfile, :syntax => sass_syntax(cssfile), :style => :expanded)
-    css = sassengine.render
+      out_dir = File.join(config['path'], '_site')
+      in_dir = File.join(config['path'], '_pub', '.')
 
-    File.open("#{config['path']}/_kss/#{cssname.split('/').last}.css", "w") { |f| f.write(css) }
-  end
+      FileUtils.cp_r in_dir , out_dir
+      hidden = Dir.glob("#{in_dir}*").select do |file|
+        File.basename(file) != '.' && File.basename(file) != '..'
+      end
+      FileUtils.cp_r hidden , out_dir
+    end
 
-  def get_css cssname
-    Dir.glob(File.join(config['path'], '_css', "#{cssname}.*")).first
-  end
+    # @param [Boolean] all Get all content or only published content
+    # @return [Array<Content>] Contents
+    def contents(all)
+      return all_content if all
+      all_content.select { |c| c.published }
+    end
 
-  def sass_syntax css
-    File.extname(css).delete('.').to_sym
+    # @return [Array<Content>] All post and page content
+    def all_content
+      [Post.all, Page.all].flatten
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wst
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Yves Brissaud
@@ -136,10 +136,12 @@ files:
 - lib/colored.rb
 - lib/configuration.rb
 - lib/content.rb
+- lib/css_renderer.rb
 - lib/haml_content.rb
 - lib/haml_helpers_wlt_extensions.rb
 - lib/haml_renderer.rb
 - lib/html_with_pygments.rb
+- lib/js_renderer.rb
 - lib/logging.rb
 - lib/md_content.rb
 - lib/md_renderer.rb