TOC now works with locale

Author: alexch

app.rb

@@ -26,7 +26,7 @@ def initialize
     super
     @here = File.expand_path(File.dirname(__FILE__))
     @default_sites = {en: "docs", es: "hola"}
-    @default_locale = "en"   # nil for English   # todo: make a cleaner way to switch default locales
+    @default_locale = "en"
   end
 
   attr_reader :here, :default_locale

lib/contents.rb

@@ -3,19 +3,19 @@
 class Contents < Erector::Widget
   attr_accessor :site_dir
   attr_accessor :page_name
-  needs :page_name, :site_name, :site_dir => nil
+  # todo: replace site_name, locale, site_dir with Site object
+  needs :page_name, :site_name, :locale => nil, :site_dir => nil
 
   def initialize options
     super options
 
     self.page_name = options[:page_name]
 
-    if options.include? :site_dir
-      self.site_dir = options[:site_dir]
+    if options.include? :site_dir  # used in tests
+      @site_dir = options[:site_dir]
     else
-      here = File.expand_path File.dirname(__FILE__)
-      top = File.expand_path "#{here}/.."
-      self.site_dir = "#{top}/sites/#{@site_name}"
+      site = Site.named(@site_name, @locale)
+      @site_dir = site.dir if site
     end
   end
 

lib/doc_page.rb

@@ -107,7 +107,7 @@ def body_content
       }
     }
 
-    widget Contents, site_name: site_name, page_name: page_name
+    widget Contents, locale: @locale, site_name: site_name, page_name: page_name
 
     main {
       h1 doc_title, class: "doc_title"

lib/site.rb

@@ -1,7 +1,7 @@
 class Site
   @@here = File.expand_path(File.dirname(__FILE__))
   @@project_root = File.dirname(@@here)
-  
+
   def self.sites_dir locale = "en"
     sites_dir = File.join(["sites", locale].compact)
     File.expand_path(sites_dir, @@project_root)
@@ -10,25 +10,27 @@ def self.sites_dir locale = "en"
   def self.all locale = "en"
     Dir["#{sites_dir(locale)}/*"].map{|dir| Site.new(dir)}
   end
-  
-  def self.named name
-    all.detect{|site| site.name == name }
+
+  def self.named name, locale = "en"
+    all(locale).detect{|site| site.name == name }
   end
-  
+
   DOC_TYPES = %w{step md deck.md mw}
-  
+
+  attr_reader :dir
+
   def initialize dir
     @dir = dir
   end
-  
+
   def name
     @dir.split('/').last
   end
 
   def docs
     Dir["#{@dir}/*.{#{DOC_TYPES.join(',')}}"].map{|path| Doc.new(path)}
   end
-  
+
   class Doc
     attr_reader :path
 
@@ -39,10 +41,10 @@ def initialize path
     def filename
       @path.split('/').last
     end
-    
+
     def name
       filename.split('.').first
     end
-    
+
   end
 end

spec/markdown_spec.rb

@@ -24,6 +24,10 @@
       doc_path: "/tmp/hello.step",
       locale: "en"
     )
+
+    # this is a hack to make the TOC work in the absence of a real site
+    Site.should_receive(:named).and_return(mock(dir: "/tmp"))
+
     html_doc = Nokogiri.parse(page.to_html)
     main_html = html_doc.css("main").first.serialize(:save_with => 0).chomp
 

spec/step_page_spec.rb

@@ -16,6 +16,10 @@
       doc_path: "/tmp/hello.step",
       locale: "en"
     )
+
+    # this is a hack to make the TOC work in the absence of a real site
+    Site.should_receive(:named).and_return(mock(dir: "/tmp"))
+
     html_doc = Nokogiri.parse(page.to_html)
     main_html = html_doc.css("main").first.serialize(:save_with => 0).chomp
     checkbox_html = %q{<input class="big_checkbox" id="big_checkbox_1" name="big_checkbox_1" type="checkbox" value="valuable"><label for="big_checkbox_1"></label>}