benoit 0.2.2 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGI5ODI4OTYwYWE3MmExY2U1ODUwZWI3Nzg3MmUyMzE4NTk1ZjJjYg==
+    MjFlM2RiMGE0N2VlNzNjYzA3YTcwYmMxMzZiNGU3NjAzN2U2MzViYQ==
   data.tar.gz: !binary |-
-    ZGM5NTEyY2M3NzRlMTQyZTNmM2E2NDk4ZjhlM2IzMDk5MmYxZmI4MQ==
+    YmZkZjFiNDZlMTgwY2UxZDdhZTVlNmJiMTA4Y2I4YmIyYTQxODM1YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjVkMDA0YTg0YzY5NWNmZmI4YWY3NzQzYWIxMmNlOWM1YWE4ZjRlYjRiZDQ4
-    MzIwYTRiNmU5YTIwNGYwZTI2YjhlN2NmYjY4MDA3NjI1MjY2ZjhjY2JkZGI1
-    OTU3M2VkYzE2ZTBmODZiMzI4ZTE0MDJlNmZkNjg4MTVkNDU2NzM=
+    ZWMyOGQwMTk4NGYwZjllNTMwZmY4M2RhNTJhYWRkMGQwMTRmYzY0NjE1YTcw
+    ZGM1MTg5ZDQzZDkyNzMzYTA3N2U1ZDUzMWRlZGRiYjBhNWE4OGMyZDFmMzdi
+    ZDFmNGU2ZjJkNzMyZTQ0MzE4NDVjMmNhNDU1NDhkYzYwNWNlZjc=
   data.tar.gz: !binary |-
-    MTFhZjIzOTNlZjZlYWEyMGJjMWVlMjNhODNkM2JhNmM1ZTViODZkOWI3MDA5
-    MjUxMTZjOGY5MGJjNDVkMjllN2U2NmIyOTI5NWRmZTE3MTk2YjZmZjVlMDk1
-    NzI4ODVhMTZiMWZhM2FlMWExNTlhYWU0YjkyOGY2OTMwOWMyODA=
+    ODdjMjU4Njg0Y2E4MzFjNjczOTYxY2U2MDM4YTM3MDFmYjhhZTUwNjVlOTJl
+    NDgwYjY1ZThkZjBhMzI3NDRlZWMxNjFhZDQwOWM5MjE4MTA0ZmJlODZjNjg5
+    MjU4OWVhNTk1N2QxNzcyOTI5ZDAzOWU1NDExN2ZmYzA2MGNlYjY=

data/.gitignore

@@ -1,4 +1,3 @@
 .bundle
-bundle/ruby/1.9.1/gems/compass-*/examples
-bundle/ruby/1.9.1/gems/compass-*/test
+bundle
 tmp

data/.rspec

@@ -1 +1 @@
--I ./lib/benoit -I ./spec/support -I ./vendor/rake-pipeline/lib -fd
+-I ./lib -I ./spec/support -I ./vendor/rake-pipeline/lib -fd

data/Assetfile

@@ -1,6 +1,23 @@
 require 'benoit/pipeline/dsl_extensions'
 
-before_filter Benoit::Filters::MetadataCleaner
+# before_filter Benoit::Filters::MetadataCleaner
+
+class EverythingElse < Rake::Pipeline::Filter
+
+  processes_binary_files
+
+  PROCESSED = %w(js html css scss)
+
+  def generate_output(inputs, output)
+    inputs.each do |input|
+      unless PROCESSED.include?(File.extname(input.path))
+        output.write input.read
+      end
+    end
+  end
+end
+
+after_filter EverythingElse
 
 input Dir.pwd do
 
@@ -52,10 +69,8 @@ input Dir.pwd do
     filter Benoit::Filters::SassFilter, additional_load_paths: ["styles", "css"]
   end
 
-  needs_pagination "*.html"
-
   match "**/*.html" do
-    filter Benoit::Filters::ContentPageFilter
+    # filter Benoit::Filters::ContentPageFilter
     filter Benoit::Filters::CadenzaFilter
   end
 

data/Gemfile.lock

@@ -1,18 +1,20 @@
 PATH
   remote: .
   specs:
-    benoit (0.2.2)
+    benoit (0.4.0)
       cadenza (~> 0.8.0)
       chunky_png (~> 1.2.0)
       compass (~> 0.13.alpha)
       gli (~> 2.5.3)
       inflecto (~> 0.0.2)
+      kramdown (~> 1.1.0)
       kronic (~> 1.1.3)
       multi_json (~> 1.5.0)
       rake-pipeline-web-filters (~> 0.7.0)
       redcarpet (~> 2.2.2)
       sass (~> 3.2.0)
       stamp (~> 0.5.0)
+      thin (~> 1.5.1)
 
 PATH
   remote: vendor/frontmatter
@@ -24,7 +26,7 @@ PATH
   specs:
     rake-pipeline (0.8.0)
       json
-      rake (~> 0.9.0)
+      rake (~> 10.0.0)
       thor
 
 GEM
@@ -50,15 +52,29 @@ GEM
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.11.7)
       multi_json (~> 1.3)
+    daemons (1.1.9)
     diff-lcs (1.2.4)
+    eventmachine (1.0.3)
     ffi (1.7.0)
+    formatador (0.2.4)
     gherkin (2.11.8)
       multi_json (~> 1.3)
     gli (2.5.6)
+    guard (1.7.0)
+      formatador (>= 0.2.4)
+      listen (>= 0.6.0)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      thor (>= 0.14.6)
+    guard-rspec (2.5.4)
+      guard (>= 1.1)
+      rspec (~> 2.11)
     inflecto (0.0.2)
-    json (1.7.7)
+    json (1.8.0)
+    kramdown (1.1.0)
     kronic (1.1.3)
     listen (0.7.3)
+    lumberjack (1.0.4)
     method_source (0.8.1)
     multi_json (1.5.1)
     pry (0.9.12)
@@ -71,10 +87,11 @@ GEM
       pry (~> 0.9)
       slop (~> 3.0)
     rack (1.5.2)
-    rake (0.9.6)
+    rake (10.0.4)
     rake-pipeline-web-filters (0.7.0)
       rack
       rake-pipeline (~> 0.6)
+    rb-fsevent (0.9.3)
     redcarpet (2.2.2)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
@@ -84,9 +101,13 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    sass (3.2.7)
+    sass (3.2.9)
     slop (3.4.4)
     stamp (0.5.0)
+    thin (1.5.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
     thor (0.18.1)
     turnip (1.1.0)
       gherkin (>= 2.5)
@@ -101,10 +122,13 @@ DEPENDENCIES
   aruba
   benoit!
   frontmatter!
+  guard
+  guard-rspec
   pry
   pry-nav
   pry-remote
   rake-pipeline!
+  rb-fsevent (~> 0.9)
   rspec
   turnip (~> 1.1.0)
   turnip-kanban

data/Guardfile

@@ -0,0 +1,28 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+group 'acceptance-tests' do
+  guard 'rspec', cli: '-O .rspec-turnip', turnip: true, spec_paths: ['spec/features'] do
+
+    watch('spec/turnip_helper.rb')  { "spec/features" }
+
+    watch(%r{^lib/(.+)\.rb$})     { "spec/features" }
+
+    watch('Assetfile') { 'spec/features' }
+
+    # Turnip features and steps
+    watch(%r{^spec/features/(.+)\.feature$})
+    watch(%r{^spec/support/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/features' }
+  end
+end
+
+group 'unit-tests' do
+  guard 'rspec' do
+    watch(%r{^spec/.+_spec\.rb$})
+    watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+    watch('spec/spec_helper.rb')  { "spec" }
+
+    watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+
+  end
+end

data/Rakefile

@@ -1,3 +1,5 @@
+require "bundler/gem_tasks"
+
 task :features do
   exec "rspec -O .rspec-turnip spec/features"
 end

data/benoit.gemspec

@@ -30,6 +30,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency "sass", "~> 3.2.0"
   s.add_dependency "multi_json", "~> 1.5.0"
   s.add_dependency "redcarpet", "~> 2.2.2"
+  s.add_dependency "kramdown", "~> 1.1.0"
   s.add_dependency "compass", "~> 0.13.alpha"
   s.add_dependency "chunky_png", "~> 1.2.0"
   s.add_dependency "inflecto", "~> 0.0.2"
@@ -37,6 +38,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency "rake-pipeline-web-filters", "~> 0.7.0"
   s.add_dependency "kronic", "~> 1.1.3"
   s.add_dependency "stamp", "~> 0.5.0"
+  s.add_dependency "thin", "~> 1.5.1"
 
 
   s.add_development_dependency "rspec"
@@ -46,5 +48,8 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency "pry"
   s.add_development_dependency "pry-nav"
   s.add_development_dependency "pry-remote"
+  s.add_development_dependency "guard"
+  s.add_development_dependency "guard-rspec"
+  s.add_development_dependency "rb-fsevent", '~> 0.9'
 
 end

data/bin/benoit

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
-$:.unshift File.expand_path("../../bundle", __FILE__)
-$:.unshift File.expand_path("../../lib", __FILE__)
 $:.unshift File.expand_path("../../vendor/frontmatter/lib", __FILE__)
 $:.unshift File.expand_path("../../vendor/rake-pipeline/lib", __FILE__)
+require 'bundler/setup'
 
 require 'benoit'
 require 'gli'
@@ -65,11 +64,30 @@ command :build do |c|
   end
 end
 
-desc 'Describe rebuild here'
-arg_name 'Describe arguments to rebuild here'
-command :rebuild do |c|
+command :server do |c|
+
+  c.desc 'Name of file containing files that should not be copied or processed to output directory'
+  c.default_value '.benoitignore'
+  c.flag [:g, :"ignorefile"]
+
   c.action do |global_options,options,args|
-    puts "rebuild command ran"
+
+    STDOUT.sync = true
+    STDERR.sync = true
+
+    Benoit::Logger.notice "starting server.."
+
+    site_path = global_options[:"input-path"] || Dir.pwd
+    assetfile_path = File.join(File.expand_path("../../", __FILE__), "Assetfile")
+    Dir.chdir(site_path) do
+      Benoit.configure do |config|
+        puts "specified ignorefile: #{options[:"ignorefile"].inspect}"
+        config.ignorefile = options[:"ignorefile"]
+      end
+      require 'benoit/server'
+      project = Benoit::PipelineProject.new(assetfile_path, Benoit.config.output_path, Benoit.config.cache_path)
+      Benoit::Server.new(project, daemonize: false, server: 'thin').start
+    end
   end
 end
 
@@ -106,7 +124,7 @@ def default_output_path
 end
 
 def default_cache_path(site_name)
-  File.expand_path("~/.benoit/tmpcache/#{site_name}")
+  File.expand_path("/tmp/.benoit/tmpcache/#{site_name}")
 end
 
 post do |global,command,options,args|

data/lib/benoit/cadenza.rb

@@ -1,10 +1,12 @@
 require 'stamp'
+require 'cadenza'
 
 module Benoit
   module Cadenza
 
     def self.load_output_filters!
       ::Cadenza::BaseContext.instance_eval File.read(File.join(File.dirname(__FILE__), 'cadenza', 'output_filters.rb'))
+      ::Cadenza::BaseContext.instance_eval File.read(File.join(File.dirname(__FILE__), 'cadenza', 'blocks.rb'))
     end
 
   end

data/lib/benoit/cadenza/blocks.rb

@@ -0,0 +1,18 @@
+define_block :times do |context, nodes, parameters|
+  from, to, *rest = parameters.map(&:value).map(&:to_i)
+
+  from, to = 1, from unless to
+
+  result = ""
+
+  from.upto(to) do |idx|
+    context.push(:counter => idx)
+    context.push(:counter0 => idx - from)
+    context.push(:first => idx == from)
+    context.push(:last => idx == to)
+    nodes.each {|child| result << ::Cadenza::TextRenderer.render(child, context) }
+    context.pop
+  end
+
+  result
+end

data/lib/benoit/compiler_error.rb

@@ -9,7 +9,7 @@
 class StandardError
 
   def message
-    @message || "Staticly has encountered an internal error. Please contact @staticlyapp on Twitter to resolve this problem."
+    @message# || "Staticly has encountered an internal error. Please contact @staticlyapp on Twitter to resolve this problem."
   end
 
   def type
@@ -31,6 +31,10 @@ module Benoit
             @original_error = original_error
         end
 
+        def message
+          @message || (@original_error && @original_error.message)
+        end
+
         def to_json
           { line_no: @line, message: @message, path: @file_path, original_error: @original_error, type: "error" }.to_json
         end

data/lib/benoit/filters/base_filter.rb

@@ -27,16 +27,15 @@ module Benoit
 
       def generate_output(inputs, output)
         inputs.each do |input|
-          page = current_site[input.path]
-          content = build_output(page, input) if builder
-          output.write(content || page["content"])
+          content = build_output(input) if builder
+          output.write(content || input.read)
         end
       end
 
       private
 
-      def build_output(page, input)
-        builder.(page, input)
+      def build_output(input)
+        builder.(input)
       end
 
     end

data/lib/benoit/filters/cadenza_filter.rb

@@ -13,7 +13,7 @@ class Benoit::Filters::CadenzaFilter < Rake::Pipeline::Filter
 
     def generate_output(inputs, output)
 
-      site_context = current_site.to_context
+      # site_context = current_site.to_context
 
         inputs.each do |input|
             load_paths = [input.root, Dir.pwd, "#{Dir.pwd}/_layouts"]
@@ -24,20 +24,21 @@ class Benoit::Filters::CadenzaFilter < Rake::Pipeline::Filter
               ::Cadenza::BaseContext.add_load_path load_path
             end
 
-            page = current_site[input.path].to_hash
+            # page = current_site[input.path].to_hash
 
             # Leave the original page for paginated pages blank
             #  otherwise we will get an "iteration reached an end" error
             #  from trying to iterate past the end of the enumerator
-            if input.path !~ /\d+.html/ && page.keys.any? { |key| key =~ /\w+_per_page/ }
-              output.write("")
-              next
-            end
+            # if input.path !~ /\d+.html/ && page.keys.any? { |key| key =~ /\w+_per_page/ }
+            #   output.write("")
+            #   next
+            # end
 
-            context_hash = {
-                "site" => site_context,
-                "page" => page
-            }
+            # context_hash = {
+            #     "site" => site_context,
+            #     "page" => page
+            # }
+            context_hash = {}
 
             begin
               compiled = ::Cadenza.render_template input.path, context_hash
@@ -45,11 +46,15 @@ class Benoit::Filters::CadenzaFilter < Rake::Pipeline::Filter
               error = Benoit::FileMissingError.new(ex.message, nil, input.path, ex)
               raise error
             rescue ::Cadenza::FilterNotDefinedError => ex
-              missing_filter = ex.message.scan(/undefined filter '([\w\-_]*)'/).flatten.first
+              missing_filter = ex.to_s.scan(/undefined filter '([\w\-]*)'/).flatten.first
               error = Benoit::CompilerError.new(nil, input.path, ex)
               error.message = "You used a filter named #{missing_filter.inspect}, but I could not find it. Maybe it's misspelled?"
               raise error
-            rescue ::Cadenza::Error => ex
+            rescue ::Cadenza::BlockNotDefinedError => ex
+              missing_block = ex.to_s.scan(/undefined block '([\w\-]*)'/).flatten.first
+              error = Benoit::CompilerError.new(nil, input.path, ex)
+              error.message = "You used a block named #{missing_block.inspect}, but I could not find it. Maybe it's misspelled?"
+              raise error
             end
 
             output.write compiled
@@ -59,14 +64,12 @@ class Benoit::Filters::CadenzaFilter < Rake::Pipeline::Filter
 
       def page_layouts_for_input(input)
           @page_layouts[input.path] ||=
-              FindsLayoutsForTemplate(input.path, root: input.root, load_paths: ["_layouts"])
+              FindsLayoutsForTemplate(input, root: input.root, load_paths: ["_layouts"])
       end
 
       def additional_dependencies(input=nil)
           if input
-              Dir["**/*.markdown"].map do |f|
-                  f.gsub input.root, ""
-              end
+             page_layouts_for_input(input)
           else
               []
           end

data/lib/benoit/filters/markdown_filter.rb

@@ -1,4 +1,6 @@
 require 'redcarpet'
+require 'kramdown'
+require 'benoit/utils/finds_layouts_for_template'
 
 module Benoit::Filters
   class MarkdownFilter < BaseFilter
@@ -7,12 +9,42 @@ module Benoit::Filters
       path.sub(/\.(md|mdown|mkdown|markdown)$/, '.html')
     end
 
-    build_output do |page|
+    build_output do |input|
+      input_content = input.read
+      layout = Benoit::Utils::FindsLayoutsForTemplate.first_layout(input_content)
+      preserving_layout(layout, input_content) do |content|
+        render_markdown(:redcarpet, content)
+      end
+    end
+
+    def self.preserving_layout(layout, content, &block)
+      content = extract_layout(content) if layout
+      output = block.call(content)
+      output = prepend_layout(output, layout) if layout
+      output
+    end
 
-      markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, fenced_code_blocks: true)
-      rendered = markdown.render(page["content"])
+    def self.extract_layout(content)
+      first_nonblank_line =
+        content.lines.find_index do |line|
+          line !~ /extends/ and line.strip != ""
+        end
+      content.lines.to_a[first_nonblank_line..-1].join("")
+    end
+
+    def self.prepend_layout(final_content, layout)
+      extends_line = %{{% extends "#{layout}" %}\n\n}
+      %{#{extends_line}#{final_content}}
+    end
 
-      page["content"] = rendered
+    def self.render_markdown(engine, content, options={})
+      case engine
+      when :redcarpet
+        markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, fenced_code_blocks: true, filter_html: true)
+        markdown.render(content)
+      when :kramdown
+        Kramdown::Document.new(content).to_html
+      end
     end
 
   end