inert 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8de98e13138a538909b6d856ff7f4a4762d1a37223c75b6cfbe68b5f4bd46f5e
-  data.tar.gz: 9100c98bbd9f506a34d6ca5ae01c2155d2d0242bb250eafb18b7480ebd8ea9e7
+  metadata.gz: 249dee2f97dfd03ef27c640fe86bbeb93df44d281b2de5d8ded5c42922b21761
+  data.tar.gz: d9459ba71fc85a5021c275267c8d12823783c0112573a1cc628051d1ea002311
 SHA512:
-  metadata.gz: ca5acf9848a8bc84bfc1fb98d6f2ec21be80b5488f8640e033d9f42dd52d2bbe3fc2daaf95eee10368d91d3009c96461c898e60a4f9667270d9aca22c90e7ad7
-  data.tar.gz: e3f092cf3c2cf05eaa97895de13292a4b43303cd818fc2fc4fdfb9a73052204ff91ea8ea482ba7b2f67411e841aa19bd4955557ae75099afdda0bf52e05422bb
+  metadata.gz: e439eddbee4a90c722670cdce5861b99cd873a8c10c5545c9c67eb84c26d37c03bc44d1511cdb2bf6a54455e66783d7be0cfc1bef50be15fe4f340ebfe83c8e7
+  data.tar.gz: 3f45d74a98b1d3ed566a4c116d083f5b76b0a9d92048d84520c1eaddef75b4f93a22ba858aa25fc83779863756caced4dcc8cfd64bb040bf10f89380fd76d760

data/exe/inert

@@ -2,9 +2,7 @@
 require "inert/config"
 
 inertfile = File.join(Dir.pwd, "Inertfile")
-if File.exist?(inertfile)
-  load inertfile
-end
+Inert::Config.load(inertfile)
 
 require "inert"
 Inert::CLI.start

data/lib/inert/{middleware.rb → app.rb}

@@ -2,7 +2,7 @@
 require "roda"
 
 module Inert
-  class Middleware < Roda
+  class App < Roda
     plugin :render,
       cache: Inert.building?,
       views: Inert.config.views
@@ -11,7 +11,15 @@ module Inert
     plugin :public, root: "static"
     plugin :content_for
 
-    class_exec &Inert.config.app
+    if Inert.development?
+      plugin :common_logger
+      plugin :exception_page
+      plugin :error_handler do |e|
+        next exception_page(e)
+      end
+    end
+
+    class_exec(&Inert.config.app)
 
     route do |r|
       r.public
@@ -32,7 +40,7 @@ module Inert
       view(inline: page.body, layout: page.layout, template_class: Tilt[page.filename])
     end
 
-    class_exec &Inert.config.helpers
+    class_exec(&Inert.config.helpers)
 
     def inline(file)
       File.read(File.join(Inert.view_path, file))

data/lib/inert/builder.rb

@@ -1,19 +1,25 @@
 # frozen_string_literal: true
 require "fileutils"
-require "set"
 require "oga"
 require "uri"
+require "rack"
+require_relative "history"
+require_relative "logger"
 
 module Inert
   class Builder
-    attr_accessor :app, :build_path
+    attr_accessor :app, :build_destination
     attr_reader :queue, :history
 
-    def initialize(app)
+    attr_accessor :logger
+
+    def initialize(app, build_destination: "./build")
       @app = app
       @queue = []
-      @history = Set.new
-      @build_path = "./build"
+      @history = History.new
+      @build_destination = build_destination
+
+      Logger.configure(self)
     end
 
     def call(starting_url)
@@ -23,7 +29,7 @@ module Inert
       history.add(starting_url)
 
       while (url = queue.pop)
-        next if already_visited?(url) || is_anchor?(url) || is_remote?(url)
+        next if history.include?(url) || is_anchor?(url) || is_remote?(url)
 
         save(url)
         history.add(url)
@@ -31,13 +37,13 @@ module Inert
     end
 
     def save(url)
-      warn "Saving #{url}"
+      logger.info { "Saving #{url}" }
       request = Rack::MockRequest.new(app)
 
       dest = URI(url.dup).path
       dest << "index.html"  if dest.end_with?("/")
       dest << ".html"       unless dest =~ /\.\w+$/
-      dest = File.expand_path(dest[1..-1], build_path)
+      dest = File.expand_path(dest[1..-1], build_destination)
 
       FileUtils.mkdir_p(File.dirname(dest))
 
@@ -64,11 +70,7 @@ module Inert
     end
 
     def copy_static
-      FileUtils.cp_r(app.opts[:public_root]+"/.", build_path)
-    end
-
-    def already_visited?(url)
-      history.include?(url)
+      FileUtils.cp_r(app.opts[:public_root]+"/.", build_destination)
     end
 
     def is_anchor?(url)

data/lib/inert/cli.rb

@@ -8,7 +8,6 @@ module Inert
 
     desc "build", "Build site"
     def build
-      ENV["RACK_ENV"] = "production"
       Inert.build
     end
 
@@ -17,7 +16,6 @@ module Inert
     method_option :bind, aliases: "-b", desc: "address to listen on", type: :string, default: "localhost"
     method_option :server, aliases: "-s", desc: "server to use", type: :string
     def server
-      ENV["RACK_ENV"] = "development"
       Inert.start(server: options.server, host: options.bind, port: options.port)
     end
   end

data/lib/inert/config.rb

@@ -56,10 +56,15 @@ module Inert
       return @routes unless block_given?
       @routes = block
     end
+
+    def self.load(filename)
+      if File.exist?(filename)
+        Kernel.load filename
+      end
+    end
   end
 
-  module_function
-  def config
+  def self.config
     @config ||= Config.new
     yield @config if block_given?
     @config

data/lib/inert/history.rb

@@ -0,0 +1,18 @@
+# frozen-string-literal: true
+
+require "set"
+require "forwardable"
+
+module Inert
+  class History
+    extend Forwardable
+
+    def initialize
+      @entries = Set.new
+    end
+
+    def_delegator :@entries, :add
+    def_delegator :@entries, :include?
+    def_delegator :@entries, :length
+  end
+end

data/lib/inert/logger.rb

@@ -0,0 +1,13 @@
+# frozen-string-literal: true
+
+require "logger"
+
+module Inert
+  class Logger < ::Logger
+    def self.configure(receiver, attr_meth = :logger)
+      instance = new($stdout)
+      receiver.public_send("#{attr_meth}=", instance)
+      instance
+    end
+  end
+end

data/lib/inert/page.rb

@@ -21,6 +21,15 @@ module Inert
       raise Errno::ENOENT if filename.nil?
 
       body = File.read(filename)
+      body, frontmatter = extract_frontmatter(body)
+      new(body: body, frontmatter: frontmatter, filename: filename)
+    end
+
+    def self.find_file(filename)
+      Dir[filename + ".*"].first
+    end
+
+    def self.extract_frontmatter(body)
       frontmatter = {}
 
       body = body.gsub(/---(.*)---/m) do |m|
@@ -28,11 +37,7 @@ module Inert
         ""
       end.lstrip
 
-      new(body: body, frontmatter: frontmatter, filename: filename)
-    end
-
-    def self.find_file(filename)
-      Dir[filename + ".*"].first
+      [body, frontmatter]
     end
   end
 end

data/lib/inert/version.rb

@@ -1,3 +1,3 @@
 module Inert
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

data/lib/inert.rb

@@ -7,25 +7,25 @@ module Inert
   module_function
 
   def start(server: nil, host: nil, port: nil)
-    app = Rack::Builder.app do
-      if Inert.development?
-        use Rack::ShowExceptions
-        use Rack::CommonLogger
-      end
+    ENV["RACK_ENV"] = "development"
+    require_relative "inert/app"
 
-      run Inert::Middleware
-    end
+    require "rackup/server"
 
-    Rack::Server.start({
-      app: app,
+    Rackup::Server.start({
+      app: Inert::App,
       server: server,
-      "Host": host,
-      "Port": port
+      Host: host,
+      Port: port,
+      AccessLog: []
     })
   end
 
   def build
-    Inert::Builder.new(Inert::Middleware).call("/")
+    ENV["RACK_ENV"] = "production"
+    require_relative "inert/app"
+
+    Inert::Builder.new(Inert::App).call("/")
   end
 
   def view_path
@@ -43,4 +43,3 @@ end
 
 require_relative "inert/page"
 require_relative "inert/builder"
-require_relative "inert/middleware"

metadata

@@ -1,22 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: inert
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Adam Daniels
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rackup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: roda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.13'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -26,7 +87,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.13'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -54,16 +115,22 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: oga
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +151,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 email: adam@mediadrive.ca
 executables:
 - inert
@@ -94,17 +180,18 @@ files:
 - README.md
 - exe/inert
 - lib/inert.rb
+- lib/inert/app.rb
 - lib/inert/builder.rb
 - lib/inert/cli.rb
 - lib/inert/config.rb
-- lib/inert/middleware.rb
+- lib/inert/history.rb
+- lib/inert/logger.rb
 - lib/inert/page.rb
 - lib/inert/version.rb
 homepage: https://github.com/adam12/inert
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -119,8 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: An experimental static site builder with unambitious goals
 test_files: []