flora 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21fb82c2e226124211a5b201ff913c362a2e1c34b7db1cd0c07780a7ee69ba80
-  data.tar.gz: baf9ad09a7fedf4e5595e0632a0b2a87a2dab5f16155456f6e513fb0bdfd9904
+  metadata.gz: f445572c3d4330b5d1e8f3d6ce42ef45cd11053e17cceee1cbcd0d8860430d2b
+  data.tar.gz: a02c49517eed09e56f8fcba6586646f4b566d78405fe78b61157c75aec8feb53
 SHA512:
-  metadata.gz: 32455350f2b42038d4d2cf740b42910e9420724b0ce2d3621aba478f08fc5dfb04de5fa4a866ccb4b7806e5f4f0b9004fc3499fe10b533d919720f5fb1e2a8d1
-  data.tar.gz: 0d9ed7636389873dc59b7d99fb1a3140dabceb94b3fd0b3e8201bb8e4cfd110a4da0f22b2bc38c52b0a6d2635b3c0fa3055c8cd78f96eec407c5a39e9a824d47
+  metadata.gz: 41e4980576a56a14e468b8d63bcf5cc344ca5ae54525c3676f8ec3a08d5049803fd22848cf0bd9b2472da3f87f2b587fc1773833c96d6d9ca3e0cf0070295469
+  data.tar.gz: 55f9466b3b93a5d39021403f9874b65cca0250dc47e68d353de8da7569edd71da9e9883c9b8268206cb3a01563bef161d246792410eb0781e76713e7ac0f8a59

data/README.md

@@ -33,10 +33,10 @@ Lilac is Flora's DSL for writing HTML. Tags are just methods named the same as t
 Looking for a way to make reusable components? Write a function! For example:
 
 ```ruby
-# lib/cool_title.rb
-class CoolTitle
+# lib/my_helpers.rb
+module MyHelpers
 
-  def self.render(text)
+  def cool_title(text)
     div(class: 'title') do
       h1 do
         text
@@ -46,10 +46,13 @@ class CoolTitle
 
 end
 
+# _config.rb
+extend_view(MyHelpers)
+
 # index.rb
 html do
   body do
-    CoolTitle.render('My blog')
+    cool_title('My blog')
   end
 end
 ```

data/lib/flora/config.rb

@@ -8,11 +8,16 @@ class Flora::Config
   end
 
 
-  def plugin(mod)
+  def use(mod)
     @flora.load_plugin(mod)
   end
 
 
+  def extend_view(mod)
+    Kernel.prepend(mod)
+  end
+
+
   private
 
     def load

data/lib/flora/project.rb

@@ -10,19 +10,12 @@ class Flora::Project
   IGNORES = ['.git/*', 'lib/**', '**_*.rb']
 
 
-  def initialize(dir, config)
+  def initialize(dir, loader, config)
     @dir = dir
+    @loader = loader
     @config = config
 
     @blueprints = find_blueprints
-
-    @loader = Zeitwerk::Loader.new
-    if has_supporting_code?
-      @loader.push_dir(@dir.join('lib').to_s)
-    end
-    @loader.enable_reloading
-    @loader.setup
-    @loader.eager_load
   end
 
 
@@ -55,7 +48,6 @@ class Flora::Project
 
 
     def has_supporting_code?
-      @dir.join('lib').exist?
     end
 
 end

data/lib/flora/version.rb

@@ -1,3 +1,3 @@
 class Flora
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/lib/flora.rb

@@ -1,6 +1,7 @@
 require 'zeitwerk'
 require 'nokogiri'
 require 'kramdown'
+require 'fileutils'
 
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.setup
@@ -23,8 +24,16 @@ class Flora
     @project_class = Class.new(Project)
     @factory_class = Class.new(Factory)
 
+    # This has to be loaded before Config so Config can reference lib/ code.
+    @project_loader = Zeitwerk::Loader.new
+    if dir.join('lib').exist?
+      @project_loader.push_dir(dir.join('lib'))
+    end
+    @project_loader.enable_reloading
+    @project_loader.setup
+
     @config = @config_class.new(dir.join('_config.rb'), self)
-    @project = @project_class.new(dir, @config)
+    @project = @project_class.new(dir, @project_loader, @config)
     @factory = @factory_class.new(@project, @config)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flora
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Nick Vladimiroff