inert 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f79a5379e8bc3c2efef1112aa3594a0d21c5ebd2
-  data.tar.gz: dac79be86b3228b75c50344d97a1af2131efa962
+SHA256:
+  metadata.gz: 8de98e13138a538909b6d856ff7f4a4762d1a37223c75b6cfbe68b5f4bd46f5e
+  data.tar.gz: 9100c98bbd9f506a34d6ca5ae01c2155d2d0242bb250eafb18b7480ebd8ea9e7
 SHA512:
-  metadata.gz: 958d318d85847d81d45b76d7e2a42f2e6b8d437b0dc1fa896676ddd0e4ae4603fa9aac2bdf575fd53cc02f2751276d5374bb3aebfdbaae83165c9c79ef4a3194
-  data.tar.gz: 96b3d288ead98c0e282eddec337bcd01de90d32a8c1eff0ad11b86ea09d5860c6dd28fe01b4eb621e47b6c2b6cd24ffe0e472248a254e82102d0b5761bcf5552
+  metadata.gz: ca5acf9848a8bc84bfc1fb98d6f2ec21be80b5488f8640e033d9f42dd52d2bbe3fc2daaf95eee10368d91d3009c96461c898e60a4f9667270d9aca22c90e7ad7
+  data.tar.gz: e3f092cf3c2cf05eaa97895de13292a4b43303cd818fc2fc4fdfb9a73052204ff91ea8ea482ba7b2f67411e841aa19bd4955557ae75099afdda0bf52e05422bb

data/README.md

@@ -46,11 +46,11 @@ Inert.config do |inert|
        "Inert v#{Inert::VERSION}"
      end
    end
-  
+
   inert.app do
     plugin :h
   end
-  
+
   inert.routes do |r|
     r.on "employees.html" do
       @employees = [] # Read in actual data here
@@ -84,6 +84,36 @@ in `static/` wherever you'd just use the filename itself:
 <img src="<%= timestamp_path "some_image_in_static_folder.png" %>">
 ```
 
+## Asset Minification
+
+Use asset minification to compile and compress all your CSS and JS assets into
+a single file.
+
+```ruby
+# Inertfile
+
+Inert.config do |inert|
+  inert.app do
+    plugin :assets, css: %w"text.css layout.css"
+    compile_assets if Inert.building?
+  end
+
+  inert.routes do |r|
+    r.assets
+  end
+end
+```
+
+And inside your layout, use the `assets` helper with the name of the asset group:
+
+```ruby
+<%= assets(:css) %>
+```
+
+Make sure you put your assets in `assets/group`. For the example above, you'd have
+`assets/css/text.css` and `assets/css/layout.css`.
+
+
 ## Live Reloads
 
 Use the `roda-live_reload` gem to enable live reloads:
@@ -98,11 +128,11 @@ gem "puma" # Webrick wont' currently work with roda-live_reload
 # Inertfile
 Inert.config do |inert|
   inert.app do
-    plugin :live_reload if ENV["RACK_ENV"] == "development"
+    plugin :live_reload if Inert.development?
   end
 
   inert.routes do |r|
-    r.live_reload if ENV["RACK_ENV"] == "development"
+    r.live_reload if Inert.development?
   end
 end
 ```

data/exe/inert

@@ -6,13 +6,5 @@ if File.exist?(inertfile)
   load inertfile
 end
 
-case ARGV[0]
-when "build"
-  ENV["RACK_ENV"] = "production"
-  require "inert"
-  Inert.build
-else
-  ENV["RACK_ENV"] = "development"
-  require "inert"
-  Inert.start
-end
+require "inert"
+Inert::CLI.start

data/lib/inert.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
+require_relative "inert/version"
 require_relative "inert/config"
+require_relative "inert/cli"
 
 module Inert
   module_function
 
-  def start
+  def start(server: nil, host: nil, port: nil)
     app = Rack::Builder.app do
-      if ENV["RACK_ENV"] != "production"
+      if Inert.development?
         use Rack::ShowExceptions
         use Rack::CommonLogger
       end
@@ -14,7 +16,12 @@ module Inert
       run Inert::Middleware
     end
 
-    Rack::Server.start(app: app)
+    Rack::Server.start({
+      app: app,
+      server: server,
+      "Host": host,
+      "Port": port
+    })
   end
 
   def build
@@ -24,6 +31,14 @@ module Inert
   def view_path
     File.expand_path(Inert.config.views, Dir.pwd)
   end
+
+  def development?
+    ENV["RACK_ENV"] == "development"
+  end
+
+  def building?
+    !development?
+  end
 end
 
 require_relative "inert/page"

data/lib/inert/builder.rb

@@ -17,10 +17,13 @@ module Inert
     end
 
     def call(starting_url)
+      copy_static
+
       save(starting_url)
+      history.add(starting_url)
 
       while (url = queue.pop)
-        next if history.include?(url) || url == "#"
+        next if already_visited?(url) || is_anchor?(url) || is_remote?(url)
 
         save(url)
         history.add(url)
@@ -59,5 +62,21 @@ module Inert
         end
       end
     end
+
+    def copy_static
+      FileUtils.cp_r(app.opts[:public_root]+"/.", build_path)
+    end
+
+    def already_visited?(url)
+      history.include?(url)
+    end
+
+    def is_anchor?(url)
+      url.start_with?("#")
+    end
+
+    def is_remote?(url)
+      url =~ /\A(\w+):/ || url.start_with?("//")
+    end
   end
 end

data/lib/inert/cli.rb

@@ -0,0 +1,24 @@
+# frozen-string-literal: true
+
+require "thor"
+
+module Inert
+  class CLI < Thor
+    default_command :server
+
+    desc "build", "Build site"
+    def build
+      ENV["RACK_ENV"] = "production"
+      Inert.build
+    end
+
+    desc "server", "Run server"
+    method_option :port, aliases: "-p", desc: "port to listen on", type: :numeric, default: 3000
+    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
+end

data/lib/inert/middleware.rb

@@ -4,7 +4,7 @@ require "roda"
 module Inert
   class Middleware < Roda
     plugin :render,
-      cache: ENV["RACK_ENV"] == "production",
+      cache: Inert.building?,
       views: Inert.config.views
 
     plugin :partials
@@ -13,20 +13,18 @@ module Inert
 
     class_exec &Inert.config.app
 
-    attr_reader :page
-
     route do |r|
       r.public
 
-      Inert.config.routes.call(r)
+      instance_exec(r, &Inert.config.routes)
 
       view_file = r.remaining_path.dup
-      view_file << "index.html" if view_file.end_with?("/")
+      view_file << "index" if view_file.end_with?("/")
 
       begin
         page = Page.load_from_file(File.join(Inert.view_path, view_file))
       rescue Errno::ENOENT
-        r.halt([404, {}, ["Not found"]])
+        r.halt([404, {}, ["#{view_file} Not found"]])
       end
 
       @page = page.frontmatter
@@ -39,6 +37,10 @@ module Inert
     def inline(file)
       File.read(File.join(Inert.view_path, file))
     end
+
+    def page
+      @page ||= OpenStruct.new
+    end
   end
 end
 

data/lib/inert/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inert
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Adam Daniels
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2019-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda
@@ -50,6 +50,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: oga
   requirement: !ruby/object:Gem::Requirement
@@ -81,9 +95,11 @@ files:
 - exe/inert
 - lib/inert.rb
 - lib/inert/builder.rb
+- lib/inert/cli.rb
 - lib/inert/config.rb
 - lib/inert/middleware.rb
 - lib/inert/page.rb
+- lib/inert/version.rb
 homepage: https://github.com/adam12/inert
 licenses:
 - MIT
@@ -103,8 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: An experimental static site builder with unambitious goals