flutterby 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78586bd3d1eedcc69f7930f0085e70a1fab7ca8d
-  data.tar.gz: d237d120d8ff04886174bea1b3b79c45084f9241
+  metadata.gz: d8ec47d6e879ee1b0b7bc5d36b512d676fabc12c
+  data.tar.gz: 63ba7c9c302c8819b928792fb688b919fda9ed6a
 SHA512:
-  metadata.gz: 4915a538cea2c6ee6ba35f44d4f35cad2377df0541c99a461e65867a5f51f3801c4995c01d41618dd8ae8850f19cea33845932e0ed718b8f870c43e81fcb85d1
-  data.tar.gz: '069bb50722079b73986c60d54f316a313b6fe3bae2f26531864ef949b06c76090c6a03ab447e310f4f5be0ab47ed2686b1e3ae9be9671f2dee60089381f227c7'
+  metadata.gz: 5887dcc9beb924087c15df334529cb9661c43765236f3dcb40e449ef2911d2e703ce67e5a8d639373a3c214d7a868f57be1402c784d3b2db24f03630aeb62a19
+  data.tar.gz: a7f3da8b6b221501271352a7ed9cc1ab18583c68c6dc404349c64fe9b0cb65808e595ba795e9b3b1dc565e42bd5bf0043c0b38388800bc84c799c46421aff007

data/.travis.yml

@@ -1,7 +1,6 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.6
   - 2.3.3
   - 2.4.0
 before_install: gem install bundler -v 1.13.6

data/lib/flutterby.rb

@@ -17,18 +17,6 @@ module Flutterby
 
   attr_writer :logger
 
-  def from(fs_path, name: nil, parent: nil)
-    name ||= ::File.basename(fs_path)
-
-    if ::File.exist?(fs_path)
-      Node.new(name, fs_path: fs_path, parent: parent).tap do |node|
-        node.preprocess!
-      end
-    else
-      raise "Path #{fs_path} could not be found."
-    end
-  end
-
   def logger
     @logger ||= Logger.new(STDOUT)
   end

data/lib/flutterby/cli.rb

@@ -30,7 +30,8 @@ Commander.configure do
       time = Benchmark.realtime do
         # Import site
         say color("📚  Importing site...", :bold)
-        root = Flutterby.from(options.in, name: "/")
+        root = Flutterby::Node.new("/", fs_path: options.in)
+        root.preprocess!
         say color("🌲  Read #{root.tree_size} nodes.", :green, :bold)
 
         # Export site
@@ -54,7 +55,8 @@ Commander.configure do
       options.default in: "./site/", port: 4004
 
       say color("📚  Importing site...", :bold)
-      root = Flutterby.from(options.in, name: "/")
+      root = Flutterby::Node.new("/", fs_path: options.in)
+      root.preprocess!
       say color("🌲  Read #{root.tree_size} nodes.", :green, :bold)
 
       say color("🌤  Serving your site on port #{options.port}. Enjoy!", :bold)

data/lib/flutterby/filters.rb

@@ -1,6 +1,6 @@
 module Flutterby
   module Filters
-    def apply!(node)
+    def self.apply!(node)
       node.body = node.source
 
       # Apply all filters
@@ -13,34 +13,34 @@ module Flutterby
       end
     end
 
-    def process_rb!(node)
-      # extend the node
-      mod = Module.new
-      mod.class_eval(node.body)
-      node.extend(mod)
-      node.filter! if node.respond_to?(:filter!)
+    def self.add(fmts, &blk)
+      Array(fmts).each do |fmt|
+        define_singleton_method("process_#{fmt}!", &blk)
+      end
     end
 
-    def process_erb!(node)
-      node.body = tilt("erb", node.body).render(node.view)
+    def self.tilt(format, body)
+      Tilt[format].new { body }
     end
+  end
+end
 
-    def process_slim!(node)
-      node.body = tilt("slim", node.body).render(node.view)
-    end
+Flutterby::Filters.add("rb") do |node|
+  node.instance_eval(node.body)
+end
 
-    def process_md!(node)
-      node.body = Slodown::Formatter.new(node.body).complete.to_s
-    end
+Flutterby::Filters.add("erb") do |node|
+  node.body = tilt("erb", node.body).render(node.view)
+end
 
-    def process_scss!(node)
-      node.body = Sass::Engine.new(node.body, syntax: :scss).render
-    end
+Flutterby::Filters.add("slim") do |node|
+  node.body = tilt("slim", node.body).render(node.view)
+end
 
-    def tilt(format, body)
-      Tilt[format].new { body }
-    end
+Flutterby::Filters.add(["md", "markdown"]) do |node|
+  node.body = Slodown::Formatter.new(node.body).complete.to_s
+end
 
-    extend self
-  end
+Flutterby::Filters.add("scss") do |node|
+  node.body = Sass::Engine.new(node.body, syntax: :scss).render
 end

data/lib/flutterby/node.rb

@@ -27,8 +27,8 @@ module Flutterby
     # Children
     #
 
-    def register!
-      if file?
+    def register_url!
+      if file? && should_publish?
         root.paths[url] = self
       end
     end
@@ -168,7 +168,7 @@ module Flutterby
       #
       walk_tree do |node|
         node.render_body! if node.should_prerender?
-        node.register! if node.should_publish?
+        node.register_url! if node.should_publish?
       end
     end
 
@@ -195,7 +195,7 @@ module Flutterby
 
       # Extract date from name
       if name =~ %r{^(\d\d\d\d\-\d\d?\-\d\d?)\-}
-        @data['date'] = Time.parse($1)
+        @data['date'] = Date.parse($1)
       end
 
       # Read remaining data from frontmatter. Data in frontmatter
@@ -209,9 +209,7 @@ module Flutterby
 
     def load_extension!
       if extension = sibling("_node.rb")
-        mod = Module.new
-        mod.class_eval(extension.body)
-        extend mod
+        instance_eval(extension.body)
       end
     end
 

data/lib/flutterby/version.rb

@@ -1,3 +1,3 @@
 module Flutterby
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/lib/flutterby/view.rb

@@ -29,9 +29,7 @@ module Flutterby
           if view_node = e.sibling("_view.rb")
             case view_node.ext
             when "rb" then
-              mod = Module.new
-              mod.class_eval(view_node.source)
-              view.extend mod
+              view.instance_eval(view_node.source)
             else
               raise "Unknown view extension #{view_node.full_name}"
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flutterby
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Hendrik Mans
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler