ruhoh 2.3 → 2.4

data/Gemfile

@@ -3,7 +3,6 @@ gemspec
 
 gem 'rack', "~> 1.4"
 gem 'directory_watcher', "~> 1.4.0"
-#gem 'psych', "~> 1.3", :platforms => [:ruby_18, :mingw_18]
 gem 'redcarpet', "~> 2.1"
 gem 'nokogiri', "~> 1.5"
 

data/features/base_path.feature

@@ -0,0 +1,26 @@
+Feature: base_path
+  As a content publisher
+  I want to configure base_path
+  so I can publish content relative to arbitrary webhost file structure requirements.
+
+  Scenario: Setting base_path
+    Given some files with values:
+      | file       | body |
+      | config.yml | base_path: '/hello/world' |
+      | _root/index.html | |
+      | essays/water.md | <span>{{ page.url }}</span> |
+    When I compile my site
+    Then my compiled site should have the file "hello/world/index.html"
+      And my compiled site should have the file "hello/world/essays/water/index.html"
+      And this file should contain the content node "span|/hello/world/essays/water"
+
+  Scenario: Setting base_path with compile_as_root
+    Given some files with values:
+      | file       | body |
+      | config.yml | base_path: '/hello/world' \ncompile_as_root: true  |
+      | _root/index.html | |
+      | essays/water.md | <span>{{ page.url }}</span> |
+    When I compile my site
+    Then my compiled site should have the file "index.html"
+      And my compiled site should have the file "essays/water/index.html"
+      And this file should contain the content node "span|/hello/world/essays/water"

data/features/data.feature

@@ -30,3 +30,34 @@ Feature: Data
       And this file should contain the content node "city|alhambra"
       And this file should contain the content node "li|mango"
       And this file should contain the content node "li|kiwi"
+
+  Scenario: Defining a basic data structure in data.json
+    Given the file "data.json" with body:
+      """
+      {
+        "address": {
+          "city": "alhambra"
+        }, 
+        "name": "jade", 
+        "fruits": [
+          "mango", 
+          "kiwi"
+        ]
+      }
+      """
+      And the file "_root/index.html" with body:
+        """
+        <name>{{ data.name }}</name>
+        <city>{{ data.address.city }}</city>
+        <ul>
+        {{# data.fruits }}
+          <li>{{ . }}</li>
+        {{/ data.fruits }}
+        </ul>
+        """
+    When I compile my site
+    Then my compiled site should have the file "index.html"
+      And this file should contain the content node "name|jade"
+      And this file should contain the content node "city|alhambra"
+      And this file should contain the content node "li|mango"
+      And this file should contain the content node "li|kiwi"

data/features/json.feature

@@ -0,0 +1,33 @@
+Feature: Config
+  As a content publisher
+  I want the option to configure my site in JSON
+  because JSON is the preferred data format for modern web-technologies
+  and it benefits me to learn and get used to it, not to mention YAML is more
+  problematic than it's worth.
+
+  Scenario: Setting configuration in JSON
+    Given some files with values:
+      | file       | body |
+      | config.json | { "production_url" : "http://hello-world.com" } |
+      | _root/index.html | <span>{{ urls.production_url }}</span> |
+    When I compile my site
+    Then my compiled site should have the file "index.html"
+      And this file should contain the content node "span|http://hello-world.com"
+
+  Scenario: Setting Top Metadata in JSON
+    Given the file "_root/index.html" with body:
+      """
+      {
+        "title" : "Hello World",
+        "author" : "Isosceles",
+        "tags" : ["apple", "orange"]
+      }
+
+      <title>{{ page.title }}</title>
+
+      <author>{{ page.author }}</author>
+      """
+    When I compile my site
+    Then my compiled site should have the file "index.html"
+      And this file should contain the content node "title|Hello World"
+      And this file should contain the content node "author|Isosceles"

data/features/layouts.feature

@@ -39,3 +39,18 @@ Feature: Layouts
     Then my compiled site should have the file "essays/hello/index.html"
       And this file should contain the content node "div#minimal-layout|cookie dough"
       And this file should contain the content node "div#minimal-sub-layout|cookie dough"
+
+  Scenario: Defining more than two layouts.
+    Given some files with values:
+      | file               | body                                                           | layout  |
+      | layouts/outer.md | <div id="minimal-outer-layout">outer {{{ content }}}</div>                 |         |
+      | layouts/inner.md   | <div id="minimal-inner-layout">inner {{{ content }}}</div>           | outer |
+      | layouts/essays.md  | <div id="minimal-layout">{{{ content }}}</div>             | inner   |
+      | essays/hello.md    | cookie dough                                                   | essays  |
+    When I compile my site
+    Then my compiled site should have the file "essays/hello/index.html"
+      And this file should contain the content node "div#minimal-outer-layout|inner"
+      And this file should contain the content node "div#minimal-inner-layout|cookie dough"
+      And this file should NOT contain the content node "div#minimal-inner-layout|outer"
+      And this file should NOT contain the content node "div#minimal-layout|outer"
+      And this file should NOT contain the content node "div#minimal-layout|inner"

data/features/support/helpers.rb

@@ -40,11 +40,17 @@ def make_file(opts)
   metadata = data.empty? ? '' : data.to_yaml.to_s + "\n---\n"
 
   File.open(path, "w+") { |file|
-    file.puts <<-TEXT
+    if metadata.empty?
+      file.puts <<-TEXT
+#{ opts[:body] }
+TEXT
+    else
+      file.puts <<-TEXT
 #{ metadata }
 
 #{ opts[:body] }
 TEXT
+    end
   }
 end
 

data/history.json

@@ -1,4 +1,26 @@
 [
+  {
+    "version" : "2.4",
+    "date" : "10.09.2013",
+    "changes" : [
+      "(Internal) Add Ruhoh::Parse service to parse various file formats.",
+      "Remove psych gem dependency for yaml parsing. Native yaml lib should still work for ruby 1.9.2+"
+    ],
+    "features" : [
+      "@stebalien exposes total_pages in pagination view.",
+      "@stebalien adds spport for unlimited nested sub-layouts.",
+      "Support JSON data-type in config, data, and page metadata.",
+      "Add 'compile_as_root' configuration setting to automated hosting on sub-directory style web-hosts."
+    ],
+    "bugs" : [
+      "Don't choke on 'theme' check if them config not formatted correctly.",
+      "Ensure base_path is well-formed with leading and trailing slash.",
+      "Expose urls.production and urls.production_url in the view.",
+      "data.yml/data.json should be discoverable on every cascade level.",
+      "Allow collections to be discoverable from all cascade levels."
+    ]
+  }
+  ,
   {
     "version" : "2.3",
     "date" : "25.08.2013",

data/lib/ruhoh.rb

@@ -1,8 +1,5 @@
 # encoding: UTF-8
 Encoding.default_internal = 'UTF-8'
-require 'yaml'
-require 'psych'
-YAML::ENGINE.yamler = 'psych'
 require 'json'
 require 'time'
 require 'cgi'
@@ -11,12 +8,14 @@ require 'ostruct'
 require 'delegate'
 require 'digest'
 require 'observer'
+require 'set'
 
 require 'mustache'
 
 require 'ruhoh/logger'
 require 'ruhoh/utils'
 require 'ruhoh/friend'
+require 'ruhoh/parse'
 
 require 'ruhoh/converter'
 require 'ruhoh/views/master_view'
@@ -65,7 +64,7 @@ class Ruhoh
   def config(reload=false)
     return @config unless (reload or @config.nil?)
 
-    config = Ruhoh::Utils.parse_yaml_file(@base, "config.yml") || {}
+    config = Ruhoh::Parse.data_file(@base, "config") || {}
     config['compiled'] = config['compiled'] ? File.expand_path(config['compiled']) : "compiled"
 
     config['_root'] ||= {}
@@ -92,7 +91,7 @@ class Ruhoh
     @paths.system = File.join(Ruhoh::Root, "system")
     @paths.compiled = @config["compiled"]
 
-    theme = @config.find{ |resource, data| data['use'] == "theme" }
+    theme = @config.find { |resource, data| data.is_a?(Hash) && data['use'] == "theme" }
     if theme
       Ruhoh::Friend.say { plain "Using theme: \"#{theme[0]}\""}
       @paths.theme = File.join(@base, theme[0])
@@ -140,9 +139,20 @@ class Ruhoh
   end
 
   def base_path
-    (env == 'production') ?
-      config['base_path'] :
-      '/'
+    return '/' unless (env == 'production')
+
+    string = config['base_path'].chomp('/').reverse.chomp('/').reverse
+    return '/' if string.empty? || string == '/'
+    "/#{ string }/"
+  end
+
+  def compiled_path(url)
+    if config['compile_as_root']
+      url = url.gsub(/^#{ base_path.chomp('/') }\/?/, '')
+    end
+
+    path = File.expand_path(File.join(paths.compiled, url)).gsub(/\/{2,}/, '/')
+    CGI.unescape(path)
   end
 
   # @config['base_path'] is assumed to be well-formed.

data/lib/ruhoh/base/collection.rb

@@ -81,7 +81,7 @@ module Ruhoh::Base
     def config
       config = @ruhoh.config[resource_name] || {}
       unless config.is_a?(Hash)
-        Ruhoh.log.error("'#{resource_name}' config key in config.yml" +
+        Ruhoh.log.error("'#{resource_name}' config key in config" +
                         " is a #{config.class}; it needs to be a Hash (object).")
       end
       config
@@ -237,6 +237,10 @@ module Ruhoh::Base
       File.open(pointer['realpath'], 'r:UTF-8') { |f| f.read }
     end
 
+    def compiled_path
+      @compiled_path ||= @ruhoh.compiled_path(@ruhoh.to_url(url_endpoint))
+    end
+
     protected
 
     # Load the registered resource else default to Pages if not configured.
@@ -251,7 +255,7 @@ module Ruhoh::Base
         else
           klass = camelize(type)
           Friend.say {
-            red "#{resource_name} resource set to use:'#{type}' in config.yml" +
+            red "#{resource_name} resource set to use:'#{type}' in config" +
                 " but Ruhoh::Resources::#{klass} does not exist."
           }
           abort

data/lib/ruhoh/base/compiler.rb

@@ -9,6 +9,26 @@ module Ruhoh::Base
       @ruhoh = collection.ruhoh
       @collection = collection
     end
+
+    def setup_compilable
+      return false unless collection_exists?
+
+      compile_collection_path
+    end
+
+    def compile_collection_path
+      FileUtils.mkdir_p(@collection.compiled_path)
+    end
+
+    def collection_exists?
+      collection = @collection
+      unless @collection.paths?
+        Ruhoh::Friend.say { yellow "#{ collection.resource_name.capitalize }: directory not found - skipping." }
+        return false
+      end
+      Ruhoh::Friend.say { cyan "#{ collection.resource_name.capitalize }: (copying valid files)" }
+      true
+    end
   end
 
   module CompilableAsset
@@ -22,24 +42,15 @@ module Ruhoh::Base
     #
     # @returns Nothing.
     def run
-      collection = @collection
-
-      unless @collection.paths?
-        Ruhoh::Friend.say { yellow "#{collection.resource_name.capitalize}: directory not found - skipping." }
-        return
-      end
-      Ruhoh::Friend.say { cyan "#{collection.resource_name.capitalize}: (copying valid files)" }
+      return unless setup_compilable
 
-      compiled_path = Ruhoh::Utils.url_to_path(@ruhoh.to_url(@collection.url_endpoint), @ruhoh.paths.compiled)
-      FileUtils.mkdir_p compiled_path
-      
       manifest = {}
       @collection.files.values.each do |pointer|
         digest = Digest::MD5.file(pointer['realpath']).hexdigest
         digest_file = pointer['id'].sub(/\.(\w+)$/) { |ext| "-#{digest}#{ext}" }
         manifest[pointer['id']] = digest_file
 
-        compiled_file = File.join(compiled_path, digest_file)
+        compiled_file = File.join(@collection.compiled_path, digest_file)
         FileUtils.mkdir_p File.dirname(compiled_file)
         FileUtils.cp_r pointer['realpath'], compiled_file
         Ruhoh::Friend.say { green "  > #{pointer['id']}" }

data/lib/ruhoh/base/model.rb

@@ -47,7 +47,6 @@ module Ruhoh::Base
   module PageLike
     include Modelable
 
-    FMregex = /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
     DateMatcher = /^(.+\/)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$/
     Matcher = /^(.+\/)*(.*)(\.[^.]+)$/
 
@@ -88,44 +87,17 @@ module Ruhoh::Base
       !!@pointer['realpath']
     end
 
-    # Primary method to parse the file as a page-like object.
-    # File API is currently defines:
-    #   1. Top YAML meta-data
-    #   2. Page Body
-    #
+    # See Ruhoh::Parse.page_file
     # @returns[Hash Object] processed top meta-data, raw (unconverted) content body
     def parse_page_file
       raise "File not found: #{@pointer['realpath']}" unless File.exist?(@pointer['realpath'])
-
-      page = File.open(@pointer['realpath'], 'r:UTF-8') {|f| f.read }
-
-      begin
-        front_matter = page.match(FMregex)
-      rescue => e
-        raise "Error trying to read meta-data from #{@pointer['realpath']}." +
-        " Check your folder configuration.  Error details: #{e}"
-      end
-        
-      data = front_matter ?
-        (YAML.load(front_matter[0].gsub(/---\n/, "")) || {}) :
-        {}
-
-      result = {
-        "data" => data,
-        "content" => page.gsub(FMregex, '')
-      }
+      result = Ruhoh::Parse.page_file(@pointer['realpath'])
 
       # variable cache
-      @data = data
+      @data = result["data"]
       @content = result['content']
 
       result
-    rescue Psych::SyntaxError => e
-      Ruhoh.log.error("Psych::SyntaxError while parsing top YAML Metadata in #{ @pointer['realpath'] }\n" +
-        "#{ e.message }\n" +
-        "Try validating the YAML metadata using http://yamllint.com"
-      )
-      nil
     end
 
     def parse_page_filename(filename)

data/lib/ruhoh/base/model_view.rb

@@ -1,4 +1,3 @@
-require 'set'
 require 'ruhoh/summarizer'
 
 module Ruhoh::Base

data/lib/ruhoh/collections.rb

@@ -47,7 +47,7 @@ class Ruhoh
     end
 
     def all
-      (discover + registered).uniq
+      (discover + registered).to_a
     end
 
     def base
@@ -67,12 +67,19 @@ class Ruhoh
     end
 
     # discover all the resource mappings
+    # @return[Set]
     def discover
-      FileUtils.cd(@ruhoh.base) {
-        return Dir['*'].select { |x| 
-          File.directory?(x) && !["plugins", 'compiled'].include?(x)
-        }
-      }
+      results = Set.new
+
+      @ruhoh.cascade.each do |h|
+        FileUtils.cd(h["path"]) do
+          results += Dir['*'].select { |x|
+            File.directory?(x) && !["plugins", 'compiled'].include?(x)
+          }
+        end
+      end
+
+      results
     end
 
     def acting_as_pages
@@ -146,7 +153,7 @@ class Ruhoh
         else
           klass = camelize(type)
           Friend.say {
-            red "#{resource} resource set to use:'#{type}' in config.yml but Ruhoh::Resources::#{klass} does not exist."
+            red "#{resource} resource set to use:'#{type}' in config but Ruhoh::Resources::#{klass} does not exist."
           }
           abort
         end

data/lib/ruhoh/parse.rb

@@ -0,0 +1,85 @@
+class Ruhoh
+  module Parse
+    TopYAMLregex = /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
+    TopJSONregex = /^({\s*\n.*?\n?)^(}\s*$\n?)/m
+
+    # Primary method to parse the file as a page-like object.
+    # File API is currently defines:
+    #   1. Top meta-data
+    #   2. Page Body
+    #
+    # @returns[Hash Object] processed top meta-data, raw (unconverted) content body
+    def self.page_file(filepath)
+      result = {}
+      front_matter = nil
+      format = nil
+      page = File.open(filepath, 'r:UTF-8') { |f| f.read }
+      first_line = page.lines.first
+
+      begin
+        if (first_line.strip == '---')
+          front_matter = page.match(TopYAMLregex)
+          format = 'yaml'
+       elsif (first_line.strip == '{')
+          front_matter = page.match(TopJSONregex)
+          format = 'json'
+        end
+      rescue => e
+        raise "Error trying to read meta-data from #{ filepath }." +
+        " Check your folder configuration.  Error details: #{e}"
+      end
+
+      if format == 'yaml'
+        data = yaml_for_pages(front_matter, filepath)
+        result["content"] = page.gsub(TopYAMLregex, '')
+      else
+        data = json_for_pages(front_matter, filepath)
+        result["content"] = page.gsub(TopJSONregex, '')
+      end
+
+      result["data"] = data
+      result
+    end
+
+    def self.data_file(*args)
+      base = File.__send__(:join, args)
+
+      filepath = nil
+      ["#{ base }.json", "#{ base }.yml", "#{ base }.yaml"].each do |result|
+        filepath = result and break if File.exist?(result)
+      end
+      return nil unless filepath
+
+      file = File.open(filepath, 'r:UTF-8') { |f| f.read }
+
+      File.extname(filepath) == ".json" ? json(file) : yaml(file)
+    end
+
+    def self.yaml(file)
+      YAML.load(file) || {}
+    rescue Psych::SyntaxError => e
+      Ruhoh.log.error("ERROR in #{filepath}: #{e.message}")
+      nil
+    end
+
+    def self.json(file)
+      JSON.load(file) || {}
+    end
+
+    def self.yaml_for_pages(front_matter, filepath)
+      return {} unless front_matter
+      YAML.load(front_matter[0].gsub(/---\n/, "")) || {}
+    rescue Psych::SyntaxError => e
+      Ruhoh.log.error("Psych::SyntaxError while parsing top YAML Metadata in #{ filepath }\n" +
+        "#{ e.message }\n" +
+        "Try validating the YAML metadata using http://yamllint.com"
+      )
+      nil
+    end
+
+    def self.json_for_pages(front_matter, filepath)
+      return {} unless front_matter
+      JSON.load(front_matter[0]) || {}
+    end
+  end
+end

data/lib/ruhoh/programs/watch.rb

@@ -27,7 +27,7 @@ class Ruhoh
             yellow "Watch [#{Time.now.strftime("%H:%M:%S")}] [Update #{path}] : #{args.size} files changed"
           }
 
-          if path == "config.yml"
+          if %w{ config.json config.yml config.yaml }.include?(path)
             ruhoh.config true
           else
             separator = File::ALT_SEPARATOR ?
@@ -38,10 +38,7 @@ class Ruhoh
             ruhoh.cache.delete(ruhoh.collection(resource).files_cache_key)
             ruhoh.cache.delete("#{ resource }-all")
 
-            puts("HERE", resource)
-
             ruhoh.collection(resource).load_watcher.update(path)
-            puts(ruhoh.collection(resource))
           end
         end
       end

data/lib/ruhoh/resources/data/collection.rb

@@ -2,8 +2,24 @@ module Ruhoh::Resources::Data
   class Collection
     include Ruhoh::Base::Collectable
 
+    # TODO: This is ugly but it works. 
+    # Should handle data extensions in the cascade more elegantly
     def dictionary
-      Ruhoh::Utils.parse_yaml_file(@ruhoh.paths.base, "#{resource_name}.yml") || {}
+      found_path_prefix = nil
+
+      @ruhoh.cascade.reverse.map do |h|
+        path_prefix = File.join(h["path"], resource_name)
+
+        ["#{ path_prefix }.json", "#{ path_prefix }.yml", "#{ path_prefix }.yaml"].each do |file|
+          found_path_prefix = path_prefix and break if File.exist?(file)
+        end
+
+        break if found_path_prefix
+      end
+
+      return {} unless found_path_prefix
+
+      Ruhoh::Parse.data_file(found_path_prefix) || {}
     end
   end
 end

data/lib/ruhoh/resources/media/compiler.rb

@@ -6,18 +6,10 @@ module Ruhoh::Resources::Media
     # We can't use it now because there is automatic digest support
     # but currently no way to dynamically update all media links in views with digest path.
     def run
-      collection = @collection
-      unless @collection.paths?
-        Ruhoh::Friend.say { yellow "#{collection.resource_name.capitalize}: directory not found - skipping." }
-        return
-      end
-      Ruhoh::Friend.say { cyan "#{collection.resource_name.capitalize}: (copying valid files)" }
+      return unless setup_compilable
 
-      compiled_path = Ruhoh::Utils.url_to_path(@ruhoh.to_url(@collection.url_endpoint), @ruhoh.paths.compiled)
-      FileUtils.mkdir_p compiled_path
-      
       @collection.files.values.each do |pointer|
-        compiled_file = File.join(compiled_path, pointer['id'])
+        compiled_file = File.join(@collection.compiled_path, pointer['id'])
         FileUtils.mkdir_p File.dirname(compiled_file)
         FileUtils.cp_r pointer['realpath'], compiled_file
         Ruhoh::Friend.say { green "  > #{pointer['id']}" }

data/lib/ruhoh/resources/pages/compiler.rb

@@ -7,17 +7,16 @@ module Ruhoh::Resources::Pages
       pages = @collection.all
       resource_name = @collection.resource_name
       Ruhoh::Friend.say { cyan "#{resource_name.capitalize}: (#{pages.count} #{resource_name})" }
-      
-      FileUtils.cd(@ruhoh.paths.compiled) {
-        pages.each do |data|
-          view = @ruhoh.master_view(data['pointer'])
 
-          FileUtils.mkdir_p File.dirname(view.compiled_path)
-          File.open(view.compiled_path, 'w:UTF-8') { |p| p.puts view.render_full }
+      pages.each do |data|
+        view = @ruhoh.master_view(data['pointer'])
+
+        FileUtils.mkdir_p File.dirname(view.compiled_path)
+        File.open(view.compiled_path, 'w:UTF-8') { |p| p.puts view.render_full }
+
+        Ruhoh::Friend.say { green "  > #{data['id']}" }
+      end
 
-          Ruhoh::Friend.say { green "  > #{data['id']}" }
-        end
-      }
 
       pagination
       rss
@@ -35,23 +34,22 @@ module Ruhoh::Resources::Pages
       total_pages = (pages_count.to_f/config["per_page"]).ceil
 
       Ruhoh::Friend.say { cyan "#{resource_name} paginator: (#{total_pages} pages)" }
-      
-      FileUtils.cd(@ruhoh.paths.compiled) {
-        total_pages.times.map { |i| 
-          # if a root page is defined we assume it's getting compiled elsewhere.
-          next if (i.zero? && config["root_page"])
-
-          url = "#{config["url"]}/#{i+1}"
-          view = @ruhoh.master_view({"resource" => resource_name})
-          view.page_data = {
-            "layout" => config["layout"],
-            "current_page" => (i+1),
-            "url" => @ruhoh.to_url(url)
-          }
-          FileUtils.mkdir_p File.dirname(view.compiled_path)
-          File.open(view.compiled_path, 'w:UTF-8') { |p| p.puts view.render_full }
-          Ruhoh::Friend.say { green "  > #{view.page_data['url']}" }
+
+      total_pages.times.map { |i| 
+        # if a root page is defined we assume it's getting compiled elsewhere.
+        next if (i.zero? && config["root_page"])
+
+        url = "#{config["url"]}/#{i+1}"
+        view = @ruhoh.master_view({"resource" => resource_name})
+        view.page_data = {
+          "layout" => config["layout"],
+          "current_page" => (i+1),
+          "total_pages" => total_pages,
+          "url" => @ruhoh.to_url(url)
         }
+        FileUtils.mkdir_p File.dirname(view.compiled_path)
+        File.open(view.compiled_path, 'w:UTF-8') { |p| p.puts view.render_full }
+        Ruhoh::Friend.say { green "  > #{view.page_data['url']}" }
       }
     end
 
@@ -88,15 +86,12 @@ module Ruhoh::Resources::Pages
        }
       end
 
-      FileUtils.cd(@ruhoh.paths.compiled) {
-        compiled_path = CGI.unescape(@ruhoh.to_url(config['url'], "rss.xml"))
-        compiled_path = compiled_path.gsub(/^\//, '')
+      compiled_path = @ruhoh.compiled_path(@ruhoh.to_url(config['url'], "rss.xml"))
 
-        FileUtils.mkdir_p File.dirname(compiled_path)
-        File.open(compiled_path, 'w'){ |p| p.puts feed.to_xml }
+      FileUtils.mkdir_p File.dirname(compiled_path)
+      File.open(compiled_path, 'w'){ |p| p.puts feed.to_xml }
 
-        Ruhoh::Friend.say { green "  > #{compiled_path}" }
-      }
+      Ruhoh::Friend.say { green "  > #{compiled_path}" }
     end
   end
 end

data/lib/ruhoh/resources/static/compiler.rb

@@ -9,19 +9,10 @@ module Ruhoh::Resources::Static
     #
     # @returns Nothing.
     def run
-      collection = @collection
-
-      unless @collection.paths?
-        Ruhoh::Friend.say { yellow "#{collection.resource_name.capitalize}: directory not found - skipping." }
-        return
-      end
-      Ruhoh::Friend.say { cyan "#{collection.resource_name.capitalize}: (copying valid files)" }
-
-      compiled_path = Ruhoh::Utils.url_to_path(@ruhoh.to_url(@collection.url_endpoint), @ruhoh.paths.compiled)
-      FileUtils.mkdir_p compiled_path
+      return unless setup_compilable
 
       @collection.files.values.each do |pointer|
-        compiled_file = File.join(compiled_path, pointer['id'])
+        compiled_file = File.join(@collection.compiled_path, pointer['id'])
 
         FileUtils.mkdir_p File.dirname(compiled_file)
         FileUtils.cp_r pointer['realpath'], compiled_file

data/lib/ruhoh/resources/theme/compiler.rb

@@ -2,27 +2,14 @@ module Ruhoh::Resources::Theme
   class Compiler
     include Ruhoh::Base::Compilable
 
-    def run
-      copy
-    end
-
     # Copies all assets over to the compiled site.
     # Note the compiled assets are namespaced at /assets/
-    def copy
-      collection = @collection
-      unless @collection.paths?
-        Ruhoh::Friend.say { yellow "#{collection.resource_name.capitalize}: directory not found - skipping." }
-        return
-      end
-
-      Ruhoh::Friend.say { cyan "Theme: ('#{collection.resource_name}' copying non-resource files)" }
-
-      theme = Ruhoh::Utils.url_to_path(@collection.url_endpoint, @ruhoh.paths.compiled)
-      FileUtils.mkdir_p theme
+    def run
+      return unless setup_compilable
 
       self.files.each do |file|
         original_file = File.join(@ruhoh.paths.theme, file)
-        compiled_file = File.join(theme, file)
+        compiled_file = File.join(@collection.compiled_path, file)
         FileUtils.mkdir_p File.dirname(compiled_file)
         FileUtils.cp_r original_file, compiled_file
         Ruhoh::Friend.say { green "  > #{file}" }
@@ -39,7 +26,7 @@ module Ruhoh::Resources::Theme
       }
     end
 
-    # Checks a given asset filepath against any user-defined exclusion rules in theme.yml
+    # Checks a given asset filepath against any user-defined exclusion rules in config
     # Omit layouts, stylesheets, javascripts, media as they are handled by their respective resources.
     # @returns[Boolean]
     def is_valid_asset?(filepath)

data/lib/ruhoh/resources/widgets/collection_view.rb

@@ -9,7 +9,7 @@ module Ruhoh::Resources::Widgets
       model = find("#{ name }/#{ (widget_config['use'] || "default") }")
       return '' unless model
 
-      # merge the config.yml data into the inline layout data.
+      # merge the config data into the inline layout data.
       # Note this is reversing the normal hierarchy 
       # in that inline should always override config level.
       # However the inline in this case is set as implementation defaults 

data/lib/ruhoh/resources/widgets/compiler.rb

@@ -3,21 +3,13 @@ module Ruhoh::Resources::Widgets
     include Ruhoh::Base::Compilable
 
     def run
-      collection = @collection
-      unless @collection.paths?
-        Ruhoh::Friend.say { yellow "#{collection.resource_name.capitalize}: directory not found - skipping." }
-        return
-      end
-      Ruhoh::Friend.say { cyan "#{collection.resource_name.capitalize}: (copying valid files)" }
-
-      compiled_path = Ruhoh::Utils.url_to_path(@ruhoh.to_url(@collection.url_endpoint), @ruhoh.paths.compiled)
-      FileUtils.mkdir_p compiled_path
+      return unless setup_compilable
 
-      files = collection.files.values
+      files = @collection.files.values
       files.delete_if { |p| !is_valid_file? (p['id']) }
 
       files.each do |pointer|
-        compiled_file = File.join(compiled_path, pointer['id'])
+        compiled_file = File.join(@collection.compiled_path, pointer['id'])
         FileUtils.mkdir_p File.dirname(compiled_file)
         FileUtils.cp_r pointer['realpath'], compiled_file
         Ruhoh::Friend.say { green "  > #{pointer['id']}" }

data/lib/ruhoh/utils.rb

@@ -1,26 +1,5 @@
 class Ruhoh
   module Utils
-    
-    FMregex = /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
-    
-    def self.parse_yaml_file(*args)
-      filepath = File.__send__ :join, args
-      return nil unless File.exist? filepath
-
-      file = File.open(filepath, 'r:UTF-8') {|f| f.read }
-      yaml = YAML.load(file) || {}
-      yaml
-    rescue Psych::SyntaxError => e
-      Ruhoh.log.error("ERROR in #{filepath}: #{e.message}")
-      nil
-    end
-    
-    def self.url_to_path(url, base=nil)
-      url = url.gsub(/^\//, '')
-      parts = url.split('/')
-      parts = parts.unshift(base) if base
-      File.__send__(:join, parts)
-    end    
 
     def self.report(name, collection, invalid)
       output = "#{collection.count}/#{collection.count + invalid.count} #{name} processed."

data/lib/ruhoh/version.rb

@@ -1,4 +1,4 @@
 class Ruhoh
-  Version = VERSION = '2.3'
+  Version = VERSION = '2.4'
   RuhohSpec = '2.1'
 end

data/lib/ruhoh/views/master_view.rb

@@ -3,7 +3,6 @@ require 'ruhoh/views/rmustache'
 module Ruhoh::Views
   module Helpers ; end
   class MasterView < RMustache
-    attr_reader :sub_layout, :master_layout
     attr_accessor :page_data
     
     def initialize(ruhoh, pointer_or_data)
@@ -27,8 +26,13 @@ module Ruhoh::Views
     end
 
     def render_full
-      process_layouts
-      render(expand_layouts)
+      if page_layouts.empty?
+        render_content
+      else
+        page_layouts.drop(1).reduce(render(page_layouts.first.content)) do |c, l|
+          render(l.content, :content => c)
+        end
+      end
     end
 
     def render_content
@@ -104,7 +108,7 @@ module Ruhoh::Views
     #
     # Returns: [String] The relative path to the compiled file for this page.
     def compiled_path
-      path = CGI.unescape(@page_data['url']).gsub(/^\//, '') #strip leading slash.
+      path = @ruhoh.compiled_path(@page_data['url'])
       path = "index.html" if path.empty?
       path += '/index.html' unless path =~ /\.\w+$/
       path
@@ -112,38 +116,31 @@ module Ruhoh::Views
 
     protected
 
-    def process_layouts
-      if @page_data['layout']
-        @sub_layout = layouts.find(@page_data['layout'], :all => true)
-        raise "Layout does not exist: #{@page_data['layout']}" unless @sub_layout
+    def page_layouts
+      return @page_layouts unless @page_layouts.nil?
+
+      layout = if @page_data['layout']
+        layouts.find(@page_data['layout'], :all => true) or raise "Layout does not exist: #{@page_data['layout']}"
       elsif @page_data['layout'] != false
         # try default
-        @sub_layout = layouts.find(@pointer["resource"], :all => true)
+        layouts.find(@pointer['resource'], :all => true)
       end
 
-      if @sub_layout && @sub_layout.layout
-        @master_layout = layouts.find(@sub_layout.layout)
-        raise "Layout does not exist: #{ @sub_layout.layout }" unless @master_layout
-      end
-    end
+      @page_layouts = if layout.nil?
+        []
+      else
+        page_layouts = [layout]
+        until layout.layout.nil?
+          layout = layouts.find(layout.layout) or raise "Layout does not exist: #{layout.layout}"
 
-    # Expand the layout(s).
-    # Pages may have a single master_layout, a master_layout + sub_layout, or no layout.
-    def expand_layouts
-      if @sub_layout
-        layout = @sub_layout.content
+          raise "Layout cycle detected when rendering #{@pointer}: \n #{
+            (page_layouts<<layout).map{|l| l.pointer["realpath"]}.join("\n")
+          }" if page_layouts.include?(layout)
 
-        # If a master_layout is found we need to process the sub_layout
-        # into the master_layout using mustache.
-        if @master_layout && @master_layout.content
-          layout = render(@master_layout.content, {"content" => layout})
+          page_layouts << layout
         end
-      else
-        # Minimum layout if no layout defined.
-        layout = page ? '{{{ page.content }}}' : '{{{ content }}}'
+        page_layouts
       end
-
-      layout
     end
 
     private
@@ -184,4 +181,4 @@ module Ruhoh::Views
       }.compact
     end
   end
-end
+end

data/system/plugins/sprockets/compiler.rb

@@ -21,10 +21,9 @@ module Ruhoh::SprocketsPlugin
         env.append_path(path)
       end
 
-      compiled_path = Ruhoh::Utils.url_to_path(@ruhoh.to_url(collection.url_endpoint), @ruhoh.paths.compiled)
-      FileUtils.mkdir_p compiled_path
+      compile_collection_path
 
-      manifest = Sprockets::Manifest.new(env, compiled_path)
+      manifest = Sprockets::Manifest.new(env, @collection.compiled_path)
       assets = collection.files.values.map{ |p|
         Ruhoh::Friend.say { green "  > #{p['id']}" }
         p["id"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruhoh
 version: !ruby/object:Gem::Version
-  version: '2.3'
+  version: '2.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-25 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -151,6 +151,7 @@ files:
 - Rakefile
 - bin/ruhoh
 - cucumber.yml
+- features/base_path.feature
 - features/categories.feature
 - features/config.feature
 - features/conversion.feature
@@ -158,6 +159,7 @@ files:
 - features/drafts.feature
 - features/ignore.feature
 - features/javascripts.feature
+- features/json.feature
 - features/layouts.feature
 - features/pagination.feature
 - features/partials.feature
@@ -188,6 +190,7 @@ files:
 - lib/ruhoh/converters/markdown.rb
 - lib/ruhoh/friend.rb
 - lib/ruhoh/logger.rb
+- lib/ruhoh/parse.rb
 - lib/ruhoh/programs/compile.rb
 - lib/ruhoh/programs/preview.rb
 - lib/ruhoh/programs/watch.rb
@@ -274,18 +277,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 897888631782695949
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 897888631782695949
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24