flora 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cda53926c0506b06a0b7cca0ebcdb2864bd7a12ccc8975c4cc2dc4ff0338b6c
-  data.tar.gz: b0e0583176436b230c4bf48bf17f6a8c038f0ce16384e40e90ca53a5b10c8f6c
+  metadata.gz: 84a83e09611588abf3ede492aa734a168aa8d611eb7b33e503243df4bbe13d89
+  data.tar.gz: 5aeb14cbae18ad40c725c8fcf88c814daf150a48491ff3594708b843cb80f200
 SHA512:
-  metadata.gz: 6dc9df7c9b65062f47a2c38bd2af801d2bf54f074e98e64a1cc4ca424116a2ae1cf72745620d479cca937eef561e5747e93f5cd786996678c3b39698020e6402
-  data.tar.gz: 710c07c6e3dcbee42606a571c74006ec02c26eb134c090268bdf84016097312da0daa1fab0ef08d3155ef620ebffc2570c0bbee4d0c46322c5b0aa20cf20a84d
+  metadata.gz: 14084b4863fe3223d99ac2da8f3b1281ad6649f23501f150a13b73add8b451112a8f15607734b2750dd872214e40f579c51e46bf7aff2ba22f91a11e1db24c77
+  data.tar.gz: 155da839cd37104784aea6da12760c8d342b6d25c8b4eda9f6dfb2a5d192a76f9e29c0dd4f5c8f6470ee9ba3eb8bdccd9f16189a3f20e5a9bf74ca90aa5649a2

data/lib/flora/blueprint/page.rb

@@ -1,7 +1,7 @@
-# A page is something can be turned into HTML.
+# A page is something can be turned into an HTML file.
 class Flora::Blueprint::Page
 
-  attr_reader(:blueprint, :file, :route)
+  attr_reader(:file)
 
 
   def self.for(file)
@@ -16,10 +16,10 @@ class Flora::Blueprint::Page
   end
 
 
-  def initialize(blueprint, file, route)
-    @blueprint = blueprint
+  def initialize(file, blueprint)
     @file = file
-    @route = route
+    @blueprint = blueprint
+
     @layout = find_layouts
   end
 

data/lib/flora/blueprint.rb

@@ -42,8 +42,7 @@ class Flora::Blueprint
         next if file.directory?
         next unless supported_file_type?(file)
 
-        route = file.relative_path_from(@dir).sub_ext('.html').to_s
-        page = Page.for(file).new(self, file, route)
+        page = Page.for(file).new(file, self)
         @page_modules.each { |mod| page.extend(mod) }
         pages << page
       end
@@ -52,6 +51,7 @@ class Flora::Blueprint
     end
 
 
+    # TODO: this is duplicating logic from Page::for.
     def supported_file_type?(file)
       file.extname == '.rb' || file.extname == '.md'
     end

data/lib/flora/factory.rb

@@ -11,7 +11,8 @@ class Flora::Factory
     out_dir.mkdir unless out_dir.exist?
 
     @blueprint.each_page do |page|
-      out_filename = out_dir.join(page.route)
+      relative_path = page.file.relative_path_from(@blueprint.dir)
+      out_filename = out_dir.join(relative_path).sub_ext('.html')
       out_filename.dirname.mkdir unless out_filename.dirname.exist?
       out_filename.write(page.render)
     end

data/lib/flora/plugins/blog.rb

@@ -1,9 +1,18 @@
 module Flora::Plugins::Blog
 
+  module BlueprintMethods
+
+    def posts
+      @dir.glob('posts/**').map { Post.new(it, @dir) }
+    end
+
+  end
+
+
   module PageMethods
 
     def posts
-      @blueprint.dir.glob('posts/**').map { Post.new(it, @blueprint.dir) }
+      @blueprint.posts
     end
 
   end

data/lib/flora/version.rb

@@ -1,3 +1,3 @@
 class Flora
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/lib/flora.rb

@@ -20,13 +20,14 @@ class Flora
     # with other instances of Flora in the same process. This is mostly for the
     # unit tests. Maybe one day we can use Ruby::Box or something here instead.
     @config_class = Class.new(Config)
+    @blueprint_class = Class.new(Blueprint)
     @factory_class = Class.new(Factory)
 
     # Page plugins get mixed in directly to the page instances by Blueprint.
     @page_modules = []
 
     @config = @config_class.new(dir.join('_config.rb'), self)
-    @blueprint = Blueprint.new(dir, @config, @page_modules)
+    @blueprint = @blueprint_class.new(dir, @config, @page_modules)
     @factory = @factory_class.new(@blueprint, @config)
   end
 
@@ -43,8 +44,9 @@ class Flora
 
   # TODO: it would be nice if this wasn't exposed here. It's just for Config#plugin.
   def load_plugin(mod)
-    @factory_class.include(mod::FactoryMethods) if defined?(mod::FactoryMethods)
     @config_class.include(mod::Config) if defined?(mod::Config)
+    @blueprint_class.include(mod::BlueprintMethods) if defined?(mod::BlueprintMethods)
+    @factory_class.include(mod::FactoryMethods) if defined?(mod::FactoryMethods)
 
     @page_modules << mod::PageMethods if defined?(mod::PageMethods)
   end

metadata

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