modular-jekyll 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2f39305bf891e0d72997031a89a97f683ef5114
-  data.tar.gz: a6b30234305b9ef840eef7469cc3b1f4499815f3
+  metadata.gz: 27efccd404954392ff95873e31578316088a9c91
+  data.tar.gz: a90d7d366996026cf06baead95412e845c102396
 SHA512:
-  metadata.gz: 298837c8146588fe3eaec1e9d7a438b9fef9ac55c2a6f22813c42190ab2b4b18918bb957400ba00f47eab598ccc8dcca18ff41c76db5f190853ce0d9937ceb7b
-  data.tar.gz: 9b40d5e6bacf710a65bbd58bceefb84d0772db705a11c1056efedffd47da0c2cf7bcdd2f1b881d9a0b6452bc85397783930a1253311d1cdcbcbb47c8441820f1
+  metadata.gz: 57db14eaeff18f098bcade37755ec8f922c9f0e22f242c538bf8548d2df7a69c40138863131c02234252923c76897c2894cce16be2f8d3dcf33cdf88ee2b4393
+  data.tar.gz: f93629c4a5af9d94aa3f7a34f8be3edfe6fadc9631471e7d57bd436a5f5eef1acb22bb8c0ada7ebac40a50973a4e20fd7d2b56506098c9f066132e50c1221fb2

data/lib/modular/jekyll.rb

@@ -1,50 +1,55 @@
 require "modular/jekyll/version"
 
 module Modular
-  module Jekyll < Jekyll::Generator
-    def create_modular_content(page, modules, modules_dir)
-        content = ''
-
-        modules.each do | mod |
-            module_html = '';
-            params = Hash.new
-
-            if mod.is_a? String
-                # If we've a string, just load the file
-                module_html = File.read File.join Dir.pwd, modules_dir, "#{mod}.html"
-            else
-                # Otherwise, we have params. Load the file and inject the params
-                mod.select do |modName, modParams|
-                    module_html = File.read File.join Dir.pwd, modules_dir, "#{modName}.html"
-                    params['include'] = modParams
+    module Jekyll
+        class Generator < Jekyll::Generator
+            def create_modular_content(page, modules, modules_dir)
+                content = ''
+
+                modules.each do | mod |
+                    module_html = '';
+                    params = Hash.new
+
+                    if mod.is_a? String
+                        # If we've a string, just load the file
+                        module_html = File.read File.join Dir.pwd, modules_dir, "#{mod}.html"
+                    else
+                        # Otherwise, we have params. Load the file and inject the params
+                        mod.select do |modName, modParams|
+                            module_html = File.read File.join Dir.pwd, modules_dir, "#{modName}.html"
+                            params['include'] = modParams
+                        end
+                    end
+
+                    # Pass page into our partial
+                    params['page'] = page
+                    tmpl = Liquid::Template.parse(module_html).render(params)
+
+                    # Append it to the content
+                    content += tmpl
                 end
-            end
 
-            # Pass page into our partial
-            params['page'] = page
-            tmpl = Liquid::Template.parse(module_html).render(params)
+                content
+            end
 
-            # Append it to the content
-            content += tmpl
-        end
+            def generate(site)
+                modules_dir = '_includes/modules'
+                if site.config['modules']
+                    modules_dir = site.config['modules']
+                end
 
-        content
-    end
+                site.pages.map do | page |
+                    if page.data['modules']
+                        page.data['moduleContent'] = create_modular_content(
+                            page,
+                            page.data['modules'],
+                            modules_dir
+                        )
+                    end
 
-    def generate(site)
-        modules_dir = site.config['modules']
-        modules_dir = '_includes/modules' if not modules_dir else modules_dir
-
-        site.pages.map do | page |
-            if (page.data['modules'])
-                page.data['moduleContent'] = create_modular_content(
-                    page,
-                    page.data['modules'],
-                    modules_dir
-                )
+                    page
+                end
             end
-            page
         end
     end
-  end
 end

data/lib/modular/jekyll/version.rb

@@ -1,5 +1,5 @@
 module Modular
   module Jekyll
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modular-jekyll
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Scott Dover