wst 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 723c892f789eacb670ebb1a44dfda254c9bfc918
-  data.tar.gz: c46c1e6e3739c985f9a4113ed334e1a8c6a3bd33
+  metadata.gz: 5780fc012bd4a1464f33820f2b1e87e78e20cbc8
+  data.tar.gz: 78ca2b68b04a8d910a3d7b3f5e6fb6e1ed56c309
 SHA512:
-  metadata.gz: abbcc6b49120ba2cd7c15ae3516876a27b6a0f0fdfd9994e060f568734a03abada64c490aaaf6f099b33c9e8339f9c9feae8cfb6c006494b948ab1d595307018
-  data.tar.gz: 3ca844e17483d1f3eeb4c1d602283dea52563339d7f4c508bd68258d97df87cc74e11a00b0164c13d41fabef25420656a686839f662a966a2136a76fa141f4c6
+  metadata.gz: 86746cf2fe7cae704138f752013773fcc6d8bffea36c1d4e585810ef4abef2ac22d721ff29faf75146f97912b366b240f62a823aceaa8bd5f979ee6cb5fea171
+  data.tar.gz: 77b8ca27579bd135db248ab2cdbdb3a43105898ae84aa7c982bab40e392280999936d2866f5c77547082a26c08437e3f37eea4d32a61109f53f3a8010e17e829

data/lib/wst/logging.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'wst/logger'
+require 'logger'
 
 module Wst
   module Logging

data/lib/wst/main.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'haml_helpers_wlt_extensions'
+require 'wst/haml_helpers_wlt_extensions'
 require 'wst/post'
 require 'wst/page'
 require 'wst/renderer_factory'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wst
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Yves Brissaud
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: wst-parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -135,20 +149,14 @@ files:
 - lib/.editorconfig
 - lib/wst.rb
 - lib/wst/colored.rb
-- lib/wst/configuration.rb
-- lib/wst/content.rb
 - lib/wst/css_renderer.rb
-- lib/wst/haml_content.rb
 - lib/wst/haml_helpers_wlt_extensions.rb
 - lib/wst/haml_renderer.rb
 - lib/wst/html_with_pygments.rb
 - lib/wst/js_renderer.rb
 - lib/wst/logging.rb
 - lib/wst/main.rb
-- lib/wst/md_content.rb
 - lib/wst/md_renderer.rb
-- lib/wst/page.rb
-- lib/wst/post.rb
 - lib/wst/reader.rb
 - lib/wst/renderer.rb
 - lib/wst/renderer_factory.rb

data/lib/wst/configuration.rb

@@ -1,65 +0,0 @@
-# encoding: utf-8
-
-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
-      Configuration.read_translations
-    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.read_translations
-      @config['translations'] = {}
-      self.translation_files.each do |file|
-        translation = YAML.load File.open(file, 'r:utf-8').read
-        lang = File.basename file, '.yaml'
-        @config['translations'][lang] = translation
-      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
-
-    def self.translation_files
-      Dir.glob File.join config['path'], "_translations", "**.yaml"
-    end
-  end
-end

data/lib/wst/content.rb

@@ -1,100 +0,0 @@
-# encoding: utf-8
-require 'yaml'
-require 'wst/configuration'
-require 'digest/md5'
-
-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 content
-      c = self
-      while !c.child.nil?
-        c = c.child
-      end
-      c
-    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
-      end
-    end
-
-    def raw_content
-      @plain_content
-    end
-
-    def content_url= url
-      @url = url
-    end
-
-    def content_url
-      @url ||= ''
-    end
-
-    def datas
-      @datas
-    end
-
-    def gravatar?
-      email?
-    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 nil unless account? name
-      return config["accounts"][name]
-    end
-
-    protected
-
-    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
-        end
-      rescue => e
-        puts "YAML Exception reading #{@file_path}: #{e.message}"
-      end
-    end
-  end
-end

data/lib/wst/haml_content.rb

@@ -1,23 +0,0 @@
-# encoding: utf-8
-require 'wst/content'
-
-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 deep_content
-      c = self
-      while !c.child.nil? && !c.child.child.nil?
-        c = c.child
-      end
-      c
-    end
-  end
-end

data/lib/wst/md_content.rb

@@ -1,49 +0,0 @@
-# encoding: utf-8
-require 'wst/content'
-require 'wst/configuration'
-
-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 raw_content
-      if useDefaultLinks?
-        content_with_links
-      else
-        @plain_content
-      end
-    end
-
-    def self.matcher
-      @@matcher
-    end
-
-    protected
-
-    def content_with_links
-      @plain_content + defaultLinks
-    end
-
-    def useDefaultLinks?
-      if @datas.has_key? 'nolinks'
-        @datas['nolinks'] == 'true'
-      else
-        true
-      end
-    end
-  end
-end

data/lib/wst/page.rb

@@ -1,89 +0,0 @@
-# encoding: utf-8
-require 'wst/md_content'
-require 'wst/haml_content'
-require 'cgi'
-
-module Wst
-  module PageComparison
-    def <=> obj
-      return content_url <=> obj.content_url
-    end
-  end
-
-  class HamlPage < HamlContent
-    include PageComparison
-
-    @@matcher = /^(.+\/)*(.*)(\.[^.]+)$/
-
-    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
-
-    def content_url
-      "#{@cats + '/' if @cats != ''}#{CGI.escape @slug}.html"
-    end
-
-    def self.matcher
-      @@matcher
-    end
-  end
-
-  class MdPage < MdContent
-    include PageComparison
-
-    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
-
-    def content_url
-      "#{@cats + '/' if @cats != ''}#{CGI.escape @slug}.html"
-    end
-  end
-
-  class Page
-    @@glob_md = '*.{md,mkd,markdown}'
-    @@glob_haml = '*.haml'
-
-    class << self
-      def all
-        (haml_pages + md_pages).sort
-      end
-
-      private
-
-      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 page_files glob, matcher
-        select_match all_files(glob), matcher
-      end
-
-      def select_match files, matcher
-        files.select { |file| file =~ matcher }
-      end
-
-      def all_files glob
-        Dir.glob glob_path glob
-      end
-
-      def glob_path glob
-        File.join "#{Configuration.config['path']}/_pages", '**', glob
-      end
-    end
-  end
-end

data/lib/wst/post.rb

@@ -1,53 +0,0 @@
-# encoding: utf-8
-require 'wst/md_content'
-
-module Wst
-  class Post < MdContent
-    @@glob = "*.{md,mkd,markdown}"
-
-    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 content_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
-
-    class << self
-      def all
-        post_files.inject([]) { |posts, file| posts << Post.new(file) }
-      end
-
-      private
-
-      def glob_path
-        File.join "#{Configuration.config['path']}/_posts", '**', @@glob
-      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
-      end
-    end
-  end
-end