polygon 0.0.3 → 0.9.1

data/CHANGELOG.md

@@ -1,15 +1,3 @@
-# 0.0.3 / 2018-03-21
-
-* Fix Encoing => Encoding
-
-* Removed yard rake task, that fails under modern ruby
-
-# 0.0.2 / 2018-03-21
-
-* Force UTF8 encoding on content
-
-* Remove json dependency
-
 # 0.0.1 / FIX ME
 
 * Enhancements

data/Gemfile

@@ -1,9 +1,12 @@
 source 'http://rubygems.org'
 
 group :runtime do
+  gem "json", ">= 0"
   gem "sinatra", "~> 1.3"
-  gem "epath", "~> 0.2.0"
-  gem "wlang", "~> 0.10.2"
+  gem "wlang", "~> 2.1.1"
+  gem "alf", "~> 0.12.2"
+  gem "quickl", "~> 0.4.2"
+  gem "path", "~> 1.3.1"
 end
 
 group :development do

data/Gemfile.lock

@@ -1,11 +1,20 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    alf (0.12.2)
+      backports (~> 2.6)
+      myrrha (~> 1.2.1)
+      quickl (~> 0.4.2)
+    backports (2.6.1)
     bluecloth (2.2.0)
+    citrus (2.4.1)
     diff-lcs (1.1.3)
-    epath (0.2.0)
-    rack (1.4.1)
-    rack-protection (1.2.0)
+    json (1.7.3)
+    myrrha (1.2.2)
+    path (1.3.1)
+    quickl (0.4.3)
+    rack (1.4.4)
+    rack-protection (1.3.2)
       rack
     rake (0.9.2.2)
     rspec (2.10.0)
@@ -16,26 +25,32 @@ GEM
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.10.1)
-    sinatra (1.3.2)
+    sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
+    temple (0.4.1)
     tilt (1.3.3)
-    wlang (0.10.2)
+    wlang (2.1.1)
+      backports (~> 2.6)
+      citrus (~> 2.4.1)
+      path (~> 1.3)
+      quickl (~> 0.4.3)
+      temple (~> 0.4.0)
     yard (0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  alf (~> 0.12.2)
   bluecloth (~> 2.2)
   bundler (~> 1.0)
-  epath (~> 0.2.0)
+  json
+  path (~> 1.3.1)
+  quickl (~> 0.4.2)
   rake (~> 0.9.2)
   rspec (~> 2.10)
   sinatra (~> 1.3)
-  wlang (~> 0.10.2)
+  wlang (~> 2.1.1)
   yard (~> 0.7.2)
-
-BUNDLED WITH
-   1.16.0

data/lib/polygon/base.rb

@@ -2,19 +2,21 @@ module Polygon
   class Base < Sinatra::Base
 
     configure do
-      set :static,        Proc.new { root && root/:content/:static   }
-      set :public_folder, Proc.new { root && root/:content/:static   }
-      set :dynamic,       Proc.new { root && root/:content/:dynamic  }
-      set :templates,     Proc.new { root && root/:design/:templates }
-      set :views,         Proc.new { root && root/:design/:templates }
+      set :public_folder, Proc.new { 'content/static'                }
+      set :views,         Proc.new { 'design/views'                  }
+      set :database,      Proc.new { Database.new('content/dynamic') }
+      set :wlang,         :layout => :"layouts/html5"
       enable  :logging
       enable  :raise_errors
       disable :show_exceptions
     end
 
-    get '/sitemap.xml' do
-      content_type "application/xml"
-      wlang :sitemap
+    not_found do
+      send_file settings.public_folder + '/404.html', :status => 404
+    end
+
+    error do
+      send_file settings.public_folder + '/500.html', :status => 500
     end
 
     helpers Polygon::Helpers

data/lib/polygon/core_ext/path.rb

@@ -0,0 +1,24 @@
+class Path
+
+  register_loader '.rb', '.ruby' do |path|
+    ::Kernel.eval(path.read, TOPLEVEL_BINDING, path.to_s)
+  end
+
+  register_loader '.md' do |path|
+    require 'yaml'
+    content = path.read
+    if content =~ /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
+      (YAML::load($1) || {}).merge("content" => $')
+    else
+      {"content" => content}
+    end
+  end
+
+  def to_url
+    path = self.rm_ext
+    path = path.dir if path.basename.to_s == 'index'
+    path = path == Path('.') ? Path("") : path
+    path.to_s
+  end
+
+end

data/lib/polygon/core_ext/rack/nocache.rb

@@ -0,0 +1,27 @@
+module Rack
+  class Nocache
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      status, headers, body = @app.call(patch_request_headers(env))
+      [status, patch_response_headers(headers), body]
+    end
+
+  protected
+    CACHE_BUSTER = {
+      "Cache-Control" => "no-cache, no-store, max-age=0, must-revalidate",
+      "Pragma" => "no-cache",
+      "Expires" => "Fri, 29 Aug 1997 02:14:00 EST"
+    }
+
+    def patch_request_headers(env)
+      env.reject{|k,v| k =~ /^HTTP_IF/i }
+    end
+
+    def patch_response_headers(env)
+      env.reject{|k,v| k =~ /^ETag$/i }.merge(CACHE_BUSTER)
+    end
+  end
+end

data/lib/polygon/core_ext.rb

@@ -0,0 +1,2 @@
+require 'polygon/core_ext/path'
+require 'polygon/core_ext/rack/nocache'

data/lib/polygon/database.rb

@@ -0,0 +1,57 @@
+module Polygon
+  class Database < Alf::Environment
+
+    attr_reader :root, :options
+
+    def initialize(root, options = {})
+      @root    = Path(root)
+      @options = default_options.merge(options)
+    end
+
+    def default_options
+      { :extensions => ["yml", "md"] }
+    end
+
+    def dataset(name)
+      if self.respond_to?(name)
+        send(name)
+      else
+        raise Alf::NoSuchDatasetError, "No such dataset `#{name}`"
+      end
+    end
+
+    def entries
+      @entries ||= Entries.new(root, options)
+    end
+
+    def sitemap
+      @sitemap ||= begin
+        Alf.lispy(self).compile do
+          (extend :entries,
+                  :path    => lambda{ entry.relative_path.to_url            },
+                  :lastmod => lambda{ entry.path.mtime.strftime("%Y-%m-%d") })
+        end
+      end
+    end
+
+    class Entries
+      include Alf::Iterator
+
+      def initialize(root, options)
+        @root    = root
+        @options = options
+      end
+
+      def each
+        extensions = @options[:extensions]
+        @root.glob("**/*").each do |file|
+          next unless file.file? and extensions.include?(file.ext)
+          entry = Entry.new(@root, file % @root)
+          yield(:entry => entry)
+        end
+      end
+
+    end # class Entries
+
+  end # class Database
+end # class Polygon

data/lib/polygon/dialect.rb

@@ -0,0 +1,13 @@
+module Polygon
+  class Dialect < WLang::Html
+
+    def tilde(buf, fn)
+      text = evaluate(fn)
+      buf << context.markdown(text)
+    end
+
+    tag '~', :tilde
+
+    Tilt.prefer Tilt::WLangTemplate.with_options(:dialect => Dialect), 'wlang'
+  end
+end

data/lib/polygon/entry.rb

@@ -0,0 +1,101 @@
+module Polygon
+  class Entry
+
+    attr_reader :root, :relative_path, :options
+
+    def initialize(root, relative_path, options = {})
+      @root          = Path(root)
+      @relative_path = Path(relative_path)
+      @options       = options
+    end
+
+    def path
+      root / relative_path
+    end
+
+    def exist?
+      path.exist?
+    end
+
+    def index?
+      path.basename.rm_ext.to_s == "index"
+    end
+
+    def /(path)
+      entry = Entry.new(root, self.relative_path / path, options)
+      if entry.path.inside?(root)
+        entry
+      else
+        nil
+      end
+    end
+
+    def parent
+      @parent ||= begin
+        return nil unless base = self/".."
+        idx = -1
+        if index?
+          idx = index_files.index(path.basename.to_s) - 1
+          base = base/".." if idx == -1
+        end
+        base ? base/index_files[idx] : nil
+      end
+    end
+
+    def ancestors_or_self(filter_unexisting = false)
+      res = _ancestors_or_self
+      filter_unexisting ? res.select{|f| f.path.exist?} : res
+    end
+
+    def to_hash
+      ancestors_or_self(true).inject({}) do |h,entry|
+        merge(h, entry.data)
+      end
+    end
+
+    def ==(other)
+      other.is_a?(Entry) and other.path == path
+    end
+
+    def hash
+      path.hash
+    end
+
+  protected
+
+    def merge(left, right)
+      raise "Unexpected #{left.class} vs. #{right.class}" \
+        unless left.class == right.class
+      case left
+      when Array
+        (right | left).uniq
+      when Hash
+        left.merge(right){|k,l,r| merge(l,r)}
+      else
+        right
+      end
+    end
+
+    def extensions
+      options[:extensions] || ["yml", "md"]
+    end
+
+    def index_files
+      extensions.map{|ext| "index.#{ext}"}
+    end
+
+    def index_file(i = 0)
+      index_files[i]
+    end
+
+    def data
+      path.load
+    end
+
+    def _ancestors_or_self
+      return [ self ] unless parent
+      parent.ancestors_or_self + [ self ]
+    end
+
+  end # class Entry
+end # module Polygon

data/lib/polygon/helpers.rb

@@ -1,20 +1,53 @@
 module Polygon
   module Helpers
 
-    def static;    settings.static;    end
-    def dynamic;   settings.dynamic;   end
-    def templates; settings.templates; end
+    def static
+      settings.static
+    end
+
+    def dynamic
+      settings.dynamic
+    end
+
+    def templates
+      settings.templates
+    end
+
+    def database
+      settings.database
+    end
+
+    def lispy(&bl)
+      @lispy ||= Alf.lispy(database)
+      bl ? @lispy.evaluate(&bl) : @lispy
+    end
+
+    def in_production
+      settings.environment == :production
+    end
+
+    def in_test
+      settings.environment == :test
+    end
+
+    def in_development
+      settings.environment == :development
+    end
 
-    def default_wlang_context
-      { "environment" => settings.environment }
+    def sitemap_locals
+      { :urls => database.sitemap }
     end
 
-    def wlang(tpl, ctx = {})
-      tpl = templates/"#{tpl}.whtml" if tpl.is_a?(Symbol)
-      ctx = (ctx && ctx.to_hash) || {}
-      ctx = default_wlang_context.to_hash.merge(ctx)
-      WLang::file_instantiate tpl, ctx
+    def page_locals(path = "")
+      rel = lispy do
+        (unwrap \
+          (extend (restrict :sitemap, :path => path),
+                  :data => lambda{ entry.to_hash }),
+          :data)
+      end
+      rel && rel.to_a.first
     end
+    alias :index_locals :page_locals
 
   end # module Helpers
 end # module Polygon

data/lib/polygon/loader.rb

@@ -1,4 +1,6 @@
-require "sinatra"
-require "epath"
 require "json"
+require "sinatra"
 require "wlang"
+require "alf"
+require "quickl"
+require "path"

data/lib/polygon/script/gsub.rb

@@ -0,0 +1,59 @@
+module Polygon
+  module Script
+    class Gsub < Polygon::Script(__FILE__, __LINE__)
+
+      attr_accessor :dry_run, :regexp, :folder, :pattern
+
+      options do |opt|
+        self.enable_logging = false
+        opt.on('--[no-]log', "Properly log in a file?") do |value|
+          self.enable_logging = value
+        end
+        self.dry_run = false
+        opt.on('-d', '--dry-run', "Dry-run mode, do not touch files") do
+          self.dry_run = true
+        end
+        self.regexp = false
+        opt.on('-r', '--regexp', "Use `from` as a regular expression") do
+          self.regexp = true
+        end
+        self.pattern = "**/*.*"
+        opt.on('-g', '--glob=PATTERN', "File pattern to use for Path.glob") do |pattern|
+          self.pattern = pattern
+        end
+        self.folder = Path.pwd
+      end
+
+      # Stolen from ptools (https://github.com/djberg96/ptools)
+      def binary?(file)
+        s = (File.read(file, File.stat(file).blksize) || "").split(//)
+        ((s.size - s.grep(" ".."~").size) / s.size.to_f) > 0.30
+      end
+
+      def gsub(file, from, to)
+        gsubbed = file.read.gsub!(from){|m| 
+          msg = "gsub #{m[0, (50 - to.length)]} -> #{to}"
+          msg += " "*(60 - msg.length) + " (#{file})" 
+          info msg 
+          to
+        }
+        file.write(gsubbed) if gsubbed && !dry_run
+      rescue ArgumentError => ex
+        error "Skipping #{file}: #{ex.message}"
+      end
+
+      def execute(args)
+        abort options.to_s unless args.size >= 2
+        from     = args.shift
+        from     = Regexp.compile(regexp ? from : Regexp.escape(from))
+        to       = args.shift
+        files    = args.empty? ? folder.glob(pattern) : args.map(&Path)
+        files.each do |file|
+          next if file.directory? or binary?(file)
+          gsub(file, from, to)
+        end
+      end
+
+    end # class Gsub
+  end # module Script
+end # module Polygon

data/lib/polygon/script/launch.rb

@@ -0,0 +1,75 @@
+module Polygon
+  module Script
+    class Launch < Polygon::Script(__FILE__, __LINE__)
+
+      attr_accessor :mode, :refresh_repo, :open_browser, :try, :max
+
+      def config_ru
+        root/:config/"#{mode}.ru"
+      end
+  
+      # Install the options
+      options do |opt|
+        self.enable_logging = true
+        opt.on('--[no-]log', "Properly log in a file?") do |value|
+          self.enable_logging = value
+        end
+        self.refresh_repo = true
+        opt.on('--[no-]refresh', "Issues a 'git remote update' first?") do |value|
+          self.refresh_repo = value
+        end
+        self.open_browser = true
+        opt.on('--[no-]browser', "Open the browser automatically?") do |value|
+          self.open_browser = value
+        end
+        self.try = 0
+        self.max = 500
+        opt.on('--max=MAX', Integer, "Number of connection attempts") do |value|
+          self.max = Integer(value)
+        end
+      end
+  
+      # Tries to access the website
+      def wait_and_open
+        info "Attempting to connect to the web site..."
+        Http.head "http://127.0.0.1:3000/"
+      rescue Errno::ECONNREFUSED
+        sleep(0.5)
+        retry if (self.try += 1) < max
+        info "Server not found, sorry."
+        raise
+      else
+        Launchy.open("http://127.0.0.1:3000/")
+      end
+  
+      def execute(argv)
+        abort options.to_s unless argv.size <= 1
+        self.mode = (argv.first || "development").to_sym
+        abort "Invalid mode #{mode}" unless config_ru.exist?
+
+        info "Refreshing repository info..." do
+          Process.wait spawn("git remote update")
+        end if refresh_repo
+
+        thinpid = nil
+        info "Starting the web server..." do
+          thinpid = spawn("thin -R #{config_ru} start")
+        end
+
+        info "Waiting for the server to start" do
+          require 'launchy'
+          require 'http'
+          wait_and_open
+        end if open_browser
+
+      rescue => ex
+        info "Lauching failed: #{ex.message}"
+        info ex.backtrace.join("\n")
+        Process.kill("SIGHUP", thinpid) if thinpid
+      ensure
+        Process.wait(thinpid) if thinpid
+      end
+
+    end # class Launch
+  end # module Script
+end # module Polygon

data/lib/polygon/script.rb

@@ -0,0 +1,38 @@
+require 'polygon'
+require 'quickl'
+require 'logger'
+module Polygon
+  module Script
+
+    attr_accessor :enable_logging
+
+    def root
+      Path($0).backfind('.[config.ru]') || Path.pwd.backfind('.[config.ru]')
+    end
+
+    def logger
+      @logger ||= Logger.new(root/:logs/"#{Quickl.command_name(self)}.log") if enable_logging
+    end
+
+    def log(message, severity)
+      puts message
+      logger.send(severity, message) if enable_logging
+      yield if block_given?
+    end
+    def debug(message, &block); log(message, :debug, &block); end
+    def info(message, &block);  log(message, :info,  &block); end
+    def warn(message, &block);  log(message, :warn,  &block); end
+    def error(message, &block); log(message, :error, &block); end
+    def fatal(message, &block); log(message, :fatal, &block); end
+
+  end
+
+  def self.Script(*args)
+    Quickl::Command(*args) do |builder|
+      builder.instance_module Script
+    end
+  end
+
+end
+require 'polygon/script/launch'
+require 'polygon/script/gsub'

data/lib/polygon/version.rb

@@ -2,8 +2,8 @@ module Polygon
   module Version
 
     MAJOR = 0
-    MINOR = 0
-    TINY  = 3
+    MINOR = 9
+    TINY  = 1
 
     def self.to_s
       [ MAJOR, MINOR, TINY ].join('.')

data/lib/polygon.rb

@@ -1,23 +1,14 @@
 require "polygon/version"
 require "polygon/loader"
+require "polygon/core_ext"
 #
 # A web framework powered by sinatra for mostly static websites
 #
 module Polygon
 
-  def default_loader
-    @default_loader ||= ContentLoader.new.enable_all!
-  end
-  module_function :default_loader
-
-  def default_loader=(loader)
-    @default_loader = loader
-  end
-  module_function :default_loader=
-
 end # module Polygon
-require 'polygon/content_loader'
-require 'polygon/content'
+require 'polygon/entry'
+require 'polygon/database'
 require 'polygon/helpers'
 require 'polygon/base'
-
+require 'polygon/dialect'

data/polygon.gemspec

@@ -128,10 +128,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rspec", "~> 2.10")
   s.add_development_dependency("yard", "~> 0.7.2")
   s.add_development_dependency("bluecloth", "~> 2.2")
-  s.add_dependency("sinatra", "~> 1.3")
-  s.add_dependency("epath", "~> 0.2.0")
   s.add_dependency("json", ">= 0")
-  s.add_dependency("wlang", "~> 0.10.2")
+  s.add_dependency("sinatra", "~> 1.3")
+  s.add_dependency("wlang", "~> 2.1.1")
+  s.add_dependency("alf", "~> 0.12.2")
+  s.add_dependency("quickl", "~> 0.4.2")
+  s.add_dependency("path", "~> 1.3.1")
 
   # The version of ruby required by this gem
   #

data/polygon.noespec

@@ -7,7 +7,7 @@ variables:
   upper:
     Polygon
   version:
-    0.0.1
+    0.9.1
   summary: |-
     A web framework powered by sinatra for mostly static websites
   description: |-
@@ -18,10 +18,12 @@ variables:
   links:
     - http://github.com/blambeau/polygon
   dependencies:
-    - {name: sinatra,   version: "~> 1.3",    groups: [runtime]}
-    - {name: epath,     version: "~> 0.2.0",  groups: [runtime]}
     - {name: json,      version: ">= 0",      groups: [runtime]}
-    - {name: wlang,     version: "~> 0.10.2", groups: [runtime]}
+    - {name: sinatra,   version: "~> 1.3",    groups: [runtime]}
+    - {name: wlang,     version: "~> 2.1.1",  groups: [runtime]}
+    - {name: alf,       version: "~> 0.12.2", groups: [runtime]}
+    - {name: quickl,    version: "~> 0.4.2",  groups: [runtime]}
+    - {name: path,      version: "~> 1.3.1",  groups: [runtime]}
     - {name: rake,      version: "~> 0.9.2",  groups: [development]}
     - {name: bundler,   version: "~> 1.0",    groups: [development]}
     - {name: rspec,     version: "~> 2.10",   groups: [development]}