benoit 0.2.2 → 0.4.0

data/spec/lib/filters/markdown_filter_spec.rb

@@ -16,6 +16,14 @@ describe Benoit::Filters::MarkdownFilter do
     EOS
   }
 
+  let(:markdown_extends_input) {
+    <<-EOS.unindent
+    {% extends "_layout.html" %}
+
+    [some link](http://www.example.com)
+    EOS
+  }
+
   let(:expected_output) {
     <<-EOS.unindent
     <p><a href="http://www.example.com">some link</a></p>
@@ -25,19 +33,27 @@ describe Benoit::Filters::MarkdownFilter do
     EOS
   }
 
+  let(:expected_extends_output) {
+    <<-EOS
+{% extends "_layout.html" %}
+
+<p><a href="http://www.example.com">some link</a></p>
+EOS
+  }
+
   def input_file(name, content)
-    MemoryFileWrapper.new("/path/to/input", name, "UTF-8", Set.new([]), content)
+    MemoryFileWrapper.new("/path/to/input", name, "UTF-8", content)
   end
 
   def output_file(name)
-    MemoryFileWrapper.new("/path/to/output", name, "UTF-8", Set.new([]))
+    MemoryFileWrapper.new("/path/to/output", name, "UTF-8")
   end
 
-  def setup_filter(filter, input_filename='page.markdown')
+  def setup_filter(filter, input_filename='page.markdown', content=markdown_input)
     filter.file_wrapper_class = MemoryFileWrapper
     filter.manifest = MemoryManifest.new
     filter.last_manifest = MemoryManifest.new
-    filter.input_files = [input_file(input_filename, markdown_input)]
+    filter.input_files = [input_file(input_filename, content)]
     filter.output_root= "/path/to/output"
     filter.rake_application = Rake::Application.new
     filter
@@ -49,9 +65,6 @@ describe Benoit::Filters::MarkdownFilter do
     input_file = filter.input_files.first
     output_file = output_file("page.html")
 
-    page = { "content" => markdown_input }
-    filter.current_site = { input_file.path => page, output_file.path => page }
-
     expect(filter.output_files).to eq([output_file])
 
     tasks = filter.generate_rake_tasks
@@ -59,7 +72,17 @@ describe Benoit::Filters::MarkdownFilter do
 
     file = MemoryFileWrapper.files["/path/to/output/page.html"]
     expect(file.body).to eq(expected_output)
+  end
+
+  it "keeps extends tag in place" do
+    filter = setup_filter described_class.new, 'page.markdown', markdown_extends_input
+
+    input_file = filter.input_files.first
 
-    expect(page["content"]).to eq(expected_output)
+    tasks = filter.generate_rake_tasks
+    tasks.each(&:invoke)
+
+    file = MemoryFileWrapper.files["/path/to/output/page.html"]
+    expect(file.body).to eq(expected_extends_output)
   end
 end

data/spec/lib/filters/sass_filter_spec.rb

@@ -24,11 +24,11 @@ describe Benoit::Filters::SassFilter do
 
   def input_file
     path = scss_input_path
-    FileWrapper.new(File.dirname(path), File.basename(path), "UTF-8", Set.new([]))
+    FileWrapper.new(File.dirname(path), File.basename(path), "UTF-8")
   end
 
   def output_file(name)
-    MemoryFileWrapper.new("/path/to/output", name, "UTF-8", Set.new([]))
+    MemoryFileWrapper.new("/path/to/output", name, "UTF-8")
   end
 
   def setup_filter(filter)

data/spec/lib/site_context_spec.rb

@@ -61,8 +61,8 @@ describe SiteContext::ContextObject do
 
   describe "for non-existant collections" do
     subject { context.blah }
-    it "raises an error" do
-      expect(->{subject}).to raise_error(NoMethodError)
+    it "returns an empty array" do
+      expect(subject).to eq([])
     end
   end
 

data/spec/steps/staticly_steps.rb

@@ -90,7 +90,7 @@ module BenoitSteps
   end
 
   step "a cache directory should exist for that site" do
-    path = File.expand_path(File.join("~", ".benoit", "tmpcache", @site.name))
+    path = File.expand_path(File.join("/tmp", ".benoit", "tmpcache", @site.name))
     step 'a directory named "%s" should exist' % path
   end
 

data/spec/support/spec_helpers/memory_file_wrapper.rb

@@ -1,6 +1,6 @@
 class Rake::Pipeline
   module SpecHelpers
-    class MemoryFileWrapper < Struct.new(:root, :path, :encoding, :original_inputs, :body)
+    class MemoryFileWrapper < Struct.new(:root, :path, :encoding, :body)
 
       @@files = {}
       @@data = {}
@@ -14,11 +14,7 @@ class Rake::Pipeline
       end
 
       def with_encoding(new_encoding)
-        self.class.new(root, path, new_encoding, original_inputs, body)
-      end
-
-      def original_inputs
-        Set.new([])
+        self.class.new(root, path, new_encoding, body)
       end
 
       def fullpath

data/vendor/rake-pipeline/GETTING_STARTED.md

@@ -36,6 +36,9 @@ and 2 files are outputs. The `source` directory is input and the output
 will go into `compiled`. Here's the `Assetfile` to do just that:
 
 ```ruby
+# Set the Pipeline's output directory
+output "compiled"
+
 # input defines operations on a set of files. All files processed in
 # this block go into the output directory
 input "source" do
@@ -53,9 +56,6 @@ input "source" do
     concat "application.js"
   end
 end
-
-# Set the Pipeline's output directory
-output "compiled"
 ```
 
 Now run `rakep build` from the project root to compile everything.
@@ -93,6 +93,9 @@ different location. In short, `concat` is aliased to `copy` as well.
 Here's the updated `Assetfile`:
 
 ```ruby
+# Set the Pipeline's output directory
+output "compiled"
+
 # input defines operations on a set of files. All files processed in
 # this block go into the output directory
 input "source" do
@@ -119,9 +122,6 @@ input "source" do
     copy
   end
 end
-
-# Set the Pipeline's output directory
-output "compiled"
 ```
 
 Now we can run `rakep server` inside the projects root. You'll see some
@@ -160,13 +160,13 @@ file. You can overide this or do much more fancy things. This is covered
 in a different file. We could use this filter like this:
 
 ```ruby
+output "compiled"
+
 input "source" do
   match "**/*.coffee" do
     filter CoffeeScript
   end
 end
-
-output "compiled"
 ```
 
 Now this filter doesn't do anything at the moment besides copy the
@@ -205,7 +205,7 @@ require "coffee-script"
 
 class CoffeeScriptFilter < Rake::Pipeline::Filter
   def initialize(&block)
-    &block ||= proc { |input| input.path.gsub(/\.coffee, ".js")
+    &block ||= proc { |input| input.path.gsub(/\.coffee/, ".js")
     super(&block)
   end
 
@@ -220,6 +220,8 @@ end
 Let's take a fresh look at the `Assetfile` now.
 
 ```ruby
+output "compiled"
+
 input "source" do
   match "javascript/**/*.coffee" do
     # Compile all .coffee files into.js
@@ -239,8 +241,6 @@ input "source" do
     copy
   end
 end
-
-output "compiled"
 ```
 
 Calling the filter without a block uses the default block in the filter.

data/vendor/rake-pipeline/bin/rakep

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
-require "rake-pipeline/cli"
+require "rake-pipeline"
 Rake::Pipeline::CLI.start

data/vendor/rake-pipeline/lib/rake-pipeline.rb

@@ -10,6 +10,7 @@ require "rake-pipeline/reject_matcher"
 require "rake-pipeline/sorted_pipeline"
 require "rake-pipeline/error"
 require "rake-pipeline/project"
+require "rake-pipeline/cli"
 require "rake-pipeline/graph"
 
 if defined?(Rails::Railtie)
@@ -118,8 +119,6 @@ module Rake
       end
     end
 
-    ALLOWED_HOOKS = [:before_pipeline, :before_filter, :before_task, :after_task, :after_filter, :after_pipeline, :filters_ready, :rake_tasks_ready]
-
     # @return [Hash[String, String]] the directory paths for the input files
     #   and their matching globs.
     attr_accessor :inputs
@@ -147,9 +146,6 @@ module Rake
     # @return [Project] the Project that created this pipeline
     attr_accessor :project
 
-    attr_accessor :before_invoke
-    attr_accessor :after_invoke
-
     # @param [Hash] options
     # @option options [Hash] :inputs
     #   set the pipeline's {#inputs}.
@@ -212,23 +208,6 @@ module Rake
       self
     end
 
-    def call_hook(hook, *args)
-      if self.hooks[hook].respond_to? :call
-        args = [self].concat(args)
-        self.hooks[hook].call(*args)
-      end
-    end
-
-    def register_invocation_hook(name, hook=nil, &block)
-      return unless ALLOWED_HOOKS.include? name
-      self.hooks ||= {}
-      self.hooks[name] = hook || block
-    end
-
-    def hooks
-      @hooks ||= {}
-    end
-
     # Copy the current pipeline's attributes over.
     #
     # @param [Class] target_class the class to create a new
@@ -346,32 +325,8 @@ module Rake
 
         setup
 
-        self.call_hook(:before_pipeline)
-        filters.each do |filter|
-          invoke_filter_tasks(filter)
-        end
-        self.call_hook(:after_pipeline)
-      end
-    end
-
-    def invoke_filter_tasks(filter)
-      if filter.respond_to? :filters
-        filter.filters.each do |filter|
-          invoke_tasks(filter)
-        end
-      else
-        invoke_tasks(filter)
-      end
-    end
-
-    def invoke_tasks(filter)
-      self.call_hook :before_filter, filter
-      filter.rake_tasks.each do |task|
-        self.call_hook(:before_task, task)
-        task.invoke
-        self.call_hook(:after_task, task)
+        @rake_tasks.each { |task| task.invoke }
       end
-      self.call_hook :after_filter, filter
     end
 
     # Set up the filters and generate rake tasks. In general, this method
@@ -381,9 +336,7 @@ module Rake
     # @api private
     def setup
       setup_filters
-      call_hook :filters_ready
       generate_rake_tasks
-      call_hook :rake_tasks_ready
       record_input_files
     end
 

data/vendor/rake-pipeline/lib/rake-pipeline/cli.rb

@@ -1,5 +1,4 @@
 require "thor"
-require "rake-pipeline"
 
 module Rake
   class Pipeline

data/vendor/rake-pipeline/lib/rake-pipeline/file_wrapper.rb

@@ -23,16 +23,13 @@ module Rake
       #   +BINARY+ if they are declared as processing binary data.
       attr_accessor :encoding
 
-      attr_accessor :original_inputs
-
       # Create a new {FileWrapper}, passing in optional root, path, and
       # encoding. Any of the parameters can be ommitted and supplied later.
       #
       # @return [void]
-      def initialize(root=nil, path=nil, encoding="UTF-8", original_inputs=nil)
+      def initialize(root=nil, path=nil, encoding="UTF-8")
         @root, @path, @encoding = root, path, encoding
         @created_file = nil
-        @original_inputs = original_inputs
       end
 
       # Create a new {FileWrapper FileWrapper} with the same root and
@@ -42,11 +39,7 @@ module Rake
       # @param [String] encoding the encoding for the new object
       # @return [FileWrapper]
       def with_encoding(encoding)
-        self.class.new(@root, @path, encoding, original_inputs)
-      end
-
-      def original_inputs
-        @original_inputs ||= Set.new([self])
+        self.class.new(@root, @path, encoding)
       end
 
       # A {FileWrapper} is equal to another {FileWrapper} for hashing purposes

data/vendor/rake-pipeline/lib/rake-pipeline/filter.rb

@@ -235,28 +235,10 @@ module Rake
 
       def output_wrappers(input)
         output_paths(input).map do |path|
-          if collected_wrappers.key? path
-            collected_wrappers[path].tap do |wrapper|
-              original_inputs =
-                if input.original_inputs.any?
-                  input.original_inputs
-                else
-                  [input]
-                end
-              wrapper.original_inputs.merge original_inputs
-            end
-          else
-            wrapper = file_wrapper_class.new(output_root, path, encoding,
-                                             input.original_inputs)
-            collected_wrappers[path] = wrapper
-          end
+          file_wrapper_class.new(output_root, path, encoding)
         end
       end
 
-      def collected_wrappers
-        @collected_wrappers ||= {}
-      end
-
       def output_paths(input)
         args = [ input.path ]
         args << input if output_name_generator.arity == 2

data/vendor/rake-pipeline/lib/rake-pipeline/manifest.rb

@@ -59,6 +59,10 @@ module Rake
         @entries[key] = value
       end
 
+      def clear
+        entries.clear
+      end
+
       def empty?
         entries.empty?
       end

data/vendor/rake-pipeline/lib/rake-pipeline/middleware.rb

@@ -65,8 +65,7 @@ module Rake
 
       def headers_for(path)
         mime = Rack::Mime.mime_type(File.extname(path), "text/plain")
-        size = File.size(path)
-        { "Content-Type" => mime, "Content-Length" => size }
+        { "Content-Type" => mime }
       end
     end
   end

data/vendor/rake-pipeline/lib/rake-pipeline/project.rb

@@ -133,6 +133,7 @@ module Rake
 
       # Remove the project's temporary and output files.
       def clean
+        last_manifest.clear
         files_to_clean.each { |file| FileUtils.rm_rf(file) }
       end
 
@@ -277,7 +278,7 @@ module Rake
       end
 
       def dirty?
-        assetfile_dirty? || files_dirty? || files_deleted?
+        assetfile_dirty? || files_deleted? || files_dirty? 
       end
 
       def assetfile_dirty?
@@ -311,7 +312,7 @@ module Rake
       end
 
       def files_deleted?
-        manifest.files.each_key do |input_file|
+        last_manifest.files.each_key do |input_file|
           return true if !File.exists?(input_file)
         end
 

data/vendor/rake-pipeline/rake-pipeline.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Rake::Pipeline::VERSION
 
-  gem.add_dependency "rake", "~> 0.9.0"
+  gem.add_dependency "rake", "~> 10.0.0"
   gem.add_dependency "thor"
   gem.add_dependency "json"
 

data/vendor/rake-pipeline/spec/cli_spec.rb

@@ -1,5 +1,3 @@
-require "rake-pipeline/cli"
-
 describe "Rake::Pipeline::CLI" do
   attr_reader :project, :pipeline
 

data/vendor/rake-pipeline/spec/concat_filter_spec.rb

@@ -4,8 +4,8 @@ describe "ConcatFilter" do
 
   let(:input_files) {
     [
-      MemoryFileWrapper.new("/path/to/input", "javascripts/jquery.js", "UTF-8", [], "jQuery = {};"),
-      MemoryFileWrapper.new("/path/to/input", "javascripts/sproutcore.js", "UTF-8", [], "SC = {};")
+      MemoryFileWrapper.new("/path/to/input", "javascripts/jquery.js", "UTF-8", "jQuery = {};"),
+      MemoryFileWrapper.new("/path/to/input", "javascripts/sproutcore.js", "UTF-8", "SC = {};")
     ]
   }
 
@@ -17,7 +17,7 @@ describe "ConcatFilter" do
     filter.output_root = "/path/to/output"
     filter.input_files = input_files
 
-    filter.output_files.should == [MemoryFileWrapper.new("/path/to/output", "application.js", "BINARY", [])]
+    filter.output_files.should == [MemoryFileWrapper.new("/path/to/output", "application.js", "BINARY")]
 
     tasks = filter.generate_rake_tasks
     tasks.each(&:invoke)
@@ -32,6 +32,6 @@ describe "ConcatFilter" do
     filter.file_wrapper_class = MemoryFileWrapper
     filter.output_root = "/path/to/output"
     filter.input_files = input_files
-    filter.output_files.should == [MemoryFileWrapper.new("/path/to/output", "app.js", "BINARY", [])]
+    filter.output_files.should == [MemoryFileWrapper.new("/path/to/output", "app.js", "BINARY")]
   end
 end