constructor gets config, not site

Author: benbalter

lib/jekyll-relative-links/generator.rb

@@ -2,7 +2,7 @@
 
 module JekyllRelativeLinks
   class Generator < Jekyll::Generator
-    attr_accessor :site
+    attr_accessor :site, :config
 
     # Use Jekyll's native relative_url filter
     include Jekyll::Filters::URLFilters
@@ -16,20 +16,20 @@ class Generator < Jekyll::Generator
     CONFIG_KEY = "relative_links"
     ENABLED_KEY = "enabled"
     COLLECTIONS_KEY = "collections"
-    LOG_KEY = "JekyllRelativeLinks:"
+    LOG_KEY = "Relative Links:"
 
     safe true
     priority :lowest
 
-    def initialize(site)
-      @site    = site
-      @context = context
+    def initialize(config)
+      @config = config
     end
 
     def generate(site)
+      return if disabled?
+
       @site    = site
       @context = context
-      return if disabled?
 
       documents = site.pages
       documents = site.pages + site.docs_to_write if collections?
@@ -124,7 +124,7 @@ def fragment?(string)
     end
 
     def option(key)
-      site.config[CONFIG_KEY] && site.config[CONFIG_KEY][key]
+      config[CONFIG_KEY] && config[CONFIG_KEY][key]
     end
 
     def disabled?
@@ -150,7 +150,7 @@ def excluded?(document)
     end
 
     def global_entry_filter
-      @global_entry_filter ||= Jekyll::EntryFilter.new(@site)
+      @global_entry_filter ||= Jekyll::EntryFilter.new(site)
     end
   end
 end

spec/jekyll-relative-links/generator_spec.rb

@@ -17,18 +17,20 @@
   let(:item) { doc_by_path(site, "_items/some-item.md") }
   let(:item_2) { doc_by_path(site, "_items/some-subdir/another-item.md") }
 
-  subject { described_class.new(site) }
+  subject { described_class.new(site.config) }
 
   before(:each) do
     site.reset
     site.read
   end
 
-  it "saves the site" do
-    expect(subject.site).to eql(site)
+  it "saves the config" do
+    expect(subject.config).to eql(site.config)
   end
 
   context "detecting markdown" do
+    before { subject.instance_variable_set "@site", site }
+
     it "knows when an extension is markdown" do
       expect(subject.send(:markdown_extension?, ".md")).to eql(true)
     end