isola 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae141ebf3510995229e7bc854c3c43a566deb7f74b47f5c28c64840c1f25db18
-  data.tar.gz: 458948286fb8f457a77e5a7d9e9ed7805258ea53a9c6cb5ee3e4640a35d9f41e
+  metadata.gz: 2bb22047ab87f7c563e5970881ccb38fc9efd2a2f6330dacdb6d59f7d8b45692
+  data.tar.gz: 361457eac4fe0368b586258f36b02a9a7748e64be5f31f6cc83acb4ed7bf6ee1
 SHA512:
-  metadata.gz: 7909154b135a3667a4289d5e9e91ddcf3e79029801e17b103ddebe906789561ea6a11499de3cb7e090bb83e38339c166786f8b05f1053a536464f3ec6f6843fa
-  data.tar.gz: '083de5dffb0186058bd30f4edf7d41e7b9a3472ea09b5b661654a4456585b74062cbf5ab11069af43c4994cf16e80626b5b5a90834effa2f59854c6091e0b246'
+  metadata.gz: e4bc2dada021f9fddda63594d32fccbe2d9d25040340344632c1efedf9319fd13113049b95e04f29d1c1f81dee39489bbd2ea4221119af2e7f28414cb4d724a0
+  data.tar.gz: b19a681a05704dd1223e6914cdede398229e6f4b6e727169557a19ecea77f49aff0e7ea59f12718a7954e8013ec02410eb5ad8dbea0b59d5bad30d8879aef6ce

data/lib/isola/context.rb

@@ -3,9 +3,9 @@ require "tilt"
 module Isola
   class Context
     attr_reader :site, :content, :layout
-    def initialize(page, site)
-      @page_source = page
-      @meta = {lang: site[:lang]}.merge(page.meta).freeze
+    def initialize(source, site)
+      @source = source
+      @meta = {lang: site[:lang]}.merge(source.meta).freeze
       @site = site
       @content = ""
       @layout = {}
@@ -22,8 +22,8 @@ module Isola
     end
 
     def render
-      @current = @page_source
-      @content, path = @page_source.render(self, @site)
+      @current = @source
+      @content, path = @source.render(self, @site)
       while @current.meta[:layout]
         layout = site.layout(@current.meta[:layout])
         raise "#{@current.meta[:layout]} not found for #{@current.filepath}" unless layout

data/lib/isola/file_handler.rb

@@ -1,19 +1,20 @@
 module Isola
   class FileHandler
-    attr_reader :pages, :layouts, :includes, :root_dir
+    attr_reader :entries, :layouts, :includes, :root_dir
     DEFAULT_EXCLUDES = [
       ".sass-cache", "gemfiles",
       "Gemfile", "Gemfile.lock", "node_modules",
       "vendor/bundle/", "vendor/cache/",
       "vendor/gems/", "vendor/ruby/"
     ]
-    def initialize(root_dir, excludes: [])
+    def initialize(root_dir, output_path_func: nil, excludes: [])
       @excludes = DEFAULT_EXCLUDES.union(excludes)
       @rejects = Regexp.union(%r{(?:^|/)[._]}, %r{~$})
       @root_dir = File.absolute_path(root_dir)
-      @pages = {}
+      @entries = {}
       @layouts = {}
       @includes = {}
+      @output_path_func = output_path_func || method(:remove_exts)
       collect(@root_dir)
     end
 
@@ -36,7 +37,7 @@ module Isola
           elsif path.start_with?("_includes/")
             @includes[remove_exts(path).delete_prefix("_includes/")] = path
           else
-            @pages[remove_exts(path)] = path
+            @entries[@output_path_func.call(path)] = path
           end
         end
       end

data/lib/isola/site.rb

@@ -9,8 +9,8 @@ module Isola
                       default_language: "en",
                       host: "127.0.0.1",
                       port: 4444}.freeze
-    SUPPORTED_TILT_EXT = [".erb", ".md", ".markdown", ".mkd"]
-    EXT_MAP = {".md" => ".html", ".mkd" => ".html", ".markdown" => ".html", "" => ".html"}
+    SUPPORTED_TILT_EXT = [".erb", ".md", ".markdown", ".mkd", ".html"]
+    EXT_MAP = {".md" => ".html", ".mkd" => ".html", ".markdown" => ".html", ".html" => ".html", "" => ".html"}
     def initialize(config)
       @config = DEFAULT_CONFIG.merge(YAML.safe_load(config, symbolize_names: true) || {})
       @config[:root_dir] ||= Dir.pwd
@@ -25,24 +25,30 @@ module Isola
       @config[key]
     end
 
-    def supported_ext? ext
+    def ext_to_process_with_tilt? ext
       SUPPORTED_TILT_EXT.include? ext
     end
 
-    def result_ext_for ext
-      EXT_MAP[ext]
+    def process_extensions(path)
+      path = path.dup
+      last_ext = nil
+      while ext_to_process_with_tilt?(ext = File.extname(path))
+        yield(path, ext) if block_given?
+        path.delete_suffix!(ext)
+        last_ext = ext
+      end
+      ext.empty? ? path + result_ext_for(last_ext) : path
+    end
+
+    def output_path_for path
+      process_extensions path
     end
 
     def build
-      dest_dir = File.join(@file_handler.root_dir, @config[:destination])
       FileUtils.rm_rf(dest_dir)
-      @file_handler.pages.each do |name, path|
-        page = Source.new(path, read_in_site(path))
-        puts "building #{path}..."
-        rendered, path = Context.new(page, self).render
-        dest_path = File.join(dest_dir, path)
-        FileUtils.mkdir_p(File.dirname(dest_path))
-        File.write(dest_path, rendered)
+      entries.each do |name, entry|
+        puts "building #{name}..."
+        render_to_dest entry
       end
       puts "done."
     end
@@ -57,27 +63,70 @@ module Isola
     end
 
     def layout name
-      find_source(name, @parsed_layouts, @file_handler.layouts)
+      find_entry(name, @parsed_layouts, @file_handler.layouts)
     end
 
     def include name
-      find_source(name, @parsed_includes, @file_handler.includes)
+      find_entry(name, @parsed_includes, @file_handler.includes)
+    end
+
+    def entry name
+      find_entry(name, @parsed_entries, @file_handler.entries)
+    end
+
+    def entries
+      Enumerator.new do |yielder|
+        @file_handler.entries.each_key do |name|
+          yielder.yield name, entry(name)
+        end
+      end
     end
 
     private
 
+    def dest_dir
+      File.join(@file_handler.root_dir, @config[:destination])
+    end
+
+    def render_to_dest entry
+      if entry.instance_of? Source
+        rendered, path = Context.new(entry, self).render
+        dest_path = File.join(dest_dir, path)
+        FileUtils.mkdir_p(File.dirname(dest_path))
+        File.write(dest_path, rendered)
+      elsif entry.instance_of? StaticFile
+        path = entry.path
+        src_path = File.join(config[:root_dir], path)
+        dest_path = File.join(dest_dir, path)
+        FileUtils.mkdir_p(File.dirname(dest_path))
+        FileUtils.copy(src_path, dest_path)
+      else
+        raise "can't render class #{entry.class}"
+      end
+    end
+
+    def result_ext_for ext
+      return "" if ext.nil?
+      EXT_MAP[ext]
+    end
+
     def collect_files
-      @file_handler = FileHandler.new(config[:root_dir], excludes: @config[:excludes])
+      @file_handler = FileHandler.new(config[:root_dir], output_path_func: method(:output_path_for), excludes: @config[:excludes])
       @parsed_layouts = {}
       @parsed_includes = {}
+      @parsed_entries = {}
     end
 
-    def find_source(name, cache, store)
+    def find_entry(name, cache, store)
       cache[name] ||=
         begin
           p = store[name]
           return nil unless p
-          Source.new(p, read_in_site(p))
+          if ext_to_process_with_tilt?(File.extname(p))
+            Source.new(p, read_in_site(p))
+          else
+            StaticFile.new(p)
+          end
         end
     end
 

data/lib/isola/source.rb

@@ -17,20 +17,11 @@ module Isola
     end
 
     def render(context, site, params = {})
-      path = @filepath.dup
       rendered = @content.dup
-      last_ext = ""
-      while !(ext = File.extname(path)).empty? && site.supported_ext?(ext)
-        rendered = Tilt.new(path) { rendered }.render(context, params)
-        path.delete_suffix! ext
-        last_ext = ext
-      end
-
-      if ext.empty?
-        [rendered, path + site.result_ext_for(last_ext)]
-      else
-        [rendered, path]
+      output_path = site.process_extensions(@filepath) do |current_path, _ext|
+        rendered = Tilt.new(current_path) { rendered }.render(context, params)
       end
+      [rendered, output_path]
     end
   end
 end

data/lib/isola/static_file.rb

@@ -0,0 +1,8 @@
+module Isola
+  class StaticFile
+    attr_reader :path
+    def initialize(path)
+      @path = path
+    end
+  end
+end

data/lib/isola/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Isola
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/isola.rb

@@ -4,6 +4,7 @@ require_relative "isola/version"
 require_relative "isola/site"
 require_relative "isola/file_handler"
 require_relative "isola/source"
+require_relative "isola/static_file"
 require_relative "isola/context"
 require_relative "isola/watcher"
 require_relative "isola/dev_server"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isola
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Satoshi Kojima
@@ -99,6 +99,7 @@ files:
 - lib/isola/file_handler.rb
 - lib/isola/site.rb
 - lib/isola/source.rb
+- lib/isola/static_file.rb
 - lib/isola/version.rb
 - lib/isola/watcher.rb
 homepage: https://github.com/skoji/isola
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: very simple static site generator using ERB
 test_files: []