pith 0.4.0 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d871b90920e2e14c3f174e171c276de29b9c090c
+  data.tar.gz: aaf52a3fc9e117cd939d9790d47527ae096e8739
+SHA512:
+  metadata.gz: '0679d8de13b5441f57b275a5b91b167bc20fa06abddfaa5cefd1bcedb2926764b60dcd03add3175b315b749c0c6017f2fd7eff053f1cf0e5dfc92a6f0e2818a9'
+  data.tar.gz: b3e6e3e839e1e5cca899654aa841b57b454c91dc6b8b5642fd0d00bb7c3cb9f10c1d4ca5ccebbcf5e76b15eee1aa209619a073b7e1577c2d2fd4344f4da5f169

data/README.markdown

@@ -214,7 +214,7 @@ For even quicker prototyping, Pith includes a simple HTTP server.  Start it by u
 
 Pith will incrementally re-build the site as you browse -- that is, if you alter any input files, Pith will regenerate the affected outputs.
 
-Add the "`--live`" option to "`serve`" to enable [Live.js][livejs]), for live-reloading of HTML, CSS and Javascript.
+Add the "`--live`" option to "`serve`" to enable [Live.js][livejs], for live-reloading of HTML, CSS and Javascript.
 
 Plugins
 -------

data/cucumber.yml

@@ -1,2 +1,2 @@
-default: --tags ~@wip features
+default: --tags 'not @wip' features
 wip: --tags @wip:3 --wip features

data/features/layouts.feature

@@ -10,13 +10,13 @@ Scenario: Haml template with a layout
     = inside "layouts/_simple.haml" do
       blah blah
     """
-  And input file "layouts/_simple.haml" contains 
+  And input file "layouts/_simple.haml" contains
     """
     %p= yield
     """
-   
+
   When I build the site
-  Then output file "index.html" should contain 
+  Then output file "index.html" should contain
     """
     <p>blah blah</p>
     """
@@ -34,7 +34,7 @@ Scenario: instance variable assigned within the layed-out block
     %h1= @title
     = yield
     """
-   
+
   When I build the site
   Then output file "index.html" should contain
     """
@@ -51,13 +51,13 @@ Scenario: Layout specified in meta-data
     ...
     blah blah
     """
-  And input file "layouts/_simple.haml" contains 
+  And input file "layouts/_simple.haml" contains
     """
     %p= yield
     """
-   
+
   When I build the site
-  Then output file "index.html" should contain 
+  Then output file "index.html" should contain
     """
     <p>blah blah</p>
     """

data/features/relative_linking.feature

@@ -68,7 +68,7 @@ Scenario: link to an image
   When I build the site
   Then output file "subdir/page.html" should contain
     """
-    <img src='../logo.png' />
+    <img src='../logo.png'>
     """
 
 Scenario: links within a layout block
@@ -109,7 +109,7 @@ Scenario: links included from a partial
   When I build the site
   Then output file "subdir/page.html" should contain
     """
-    <link href='../stylesheets/app.css' rel='stylesheet' type='text/css' />
+    <link href='../stylesheets/app.css' rel='stylesheet' type='text/css'>
     """
 
 Scenario: use "title" meta-data attribute in link

data/features/step_definitions/build_steps.rb

@@ -41,7 +41,7 @@ end
 
 class String
   def clean
-    strip.gsub(/\s+/, ' ')
+    strip.gsub(/\s+/, ' ').gsub(' <', '<')
   end
 end
 

data/features/textile.feature

@@ -2,22 +2,28 @@ Feature: support for Textile markup
 
   I want to use Textile fragments in pages
   So that I can express content succintly
-  
+
 Scenario: Haml page with embedded Textile
 
+  Given input file "_pith/config.rb" contains
+    """
+    require 'haml'
+    require 'haml/filters/textile'
+    """
+
   Given input file "page.html.haml" contains
     """
     :textile
 
       A paragraph.
-      
+
       * one
       * two
-      * three    
+      * three
     """
-    
+
   When I build the site
-  
+
   Then output file "page.html" should contain
     """
     <p>A paragraph.</p>

data/lib/pith/input.rb

@@ -153,6 +153,7 @@ module Pith
       while remaining_path =~ /^(.+)(\..+)$/
         extension = $2
         break if extension == ".html" # ignore Tilt::PlainTemplate
+        break if extension == ".rb" # ignore Opal::Processor
         if handler = Tilt[extension]
           remaining_path = $1
           @pipeline << handler

data/lib/pith/plugins/compass.rb

@@ -1,5 +1,5 @@
 require "compass"
-require "tilt/css"
+require "tilt/sass"
 
 module Pith
   module Compass

data/lib/pith/render_context.rb

@@ -2,14 +2,11 @@ require "ostruct"
 require "pathname"
 require "pith/reference_error"
 require "set"
-require "tilt"
 
 module Pith
 
   class RenderContext
 
-    include Tilt::CompileSite
-
     def initialize(output)
       @output = output
       @page = @output.input

data/lib/pith/version.rb

@@ -1,3 +1,3 @@
 module Pith
-  VERSION = "0.4.0".freeze
+  VERSION = "0.5.0".freeze
 end

data/spec/pith/config_spec.rb

@@ -8,13 +8,13 @@ describe Pith::Config do
   describe "#ignore_patterns" do
 
     it "is a set" do
-      config.ignore_patterns.should be_kind_of(Set)
+      expect(config.ignore_patterns).to be_kind_of(Set)
     end
 
     it "includes some sensible defaults" do
-      config.ignore_patterns.should include("_*")
-      config.ignore_patterns.should include(".git")
-      config.ignore_patterns.should include(".svn")
+      expect(config.ignore_patterns).to include("_*")
+      expect(config.ignore_patterns).to include(".git")
+      expect(config.ignore_patterns).to include(".svn")
     end
 
   end
@@ -23,19 +23,19 @@ describe Pith::Config do
 
     it "adds to ignore_patterns" do
       config.ignore("foo")
-      config.ignore_patterns.should be_member('foo')
+      expect(config.ignore_patterns).to be_member('foo')
     end
 
     it "adds multiple patterns to ignore_patterns (when passed multiple arguments)" do
       config.ignore("foo", "bar")
-      config.ignore_patterns.should be_member('foo')
-      config.ignore_patterns.should be_member('bar')
+      expect(config.ignore_patterns).to be_member('foo')
+      expect(config.ignore_patterns).to be_member('bar')
     end
 
     it "adds multiple patterns to ignore_patterns (when passed an array)" do
       config.ignore(["foo", "bar"])
-      config.ignore_patterns.should be_member('foo')
-      config.ignore_patterns.should be_member('bar')
+      expect(config.ignore_patterns).to be_member('foo')
+      expect(config.ignore_patterns).to be_member('bar')
     end
 
   end

data/spec/pith/input_spec.rb

@@ -24,12 +24,12 @@ describe Pith::Input do
       make_input("dir/some_page.html.md.erb")
     end
 
-    it { should be_template }
+    it { is_expected.to be_template }
 
     describe "#title" do
 
       it "is based on last component of filename" do
-        subject.title.should == "Some page"
+        expect(subject.title).to eq("Some page")
       end
 
       it "can be over-ridden in metadata" do
@@ -38,7 +38,7 @@ describe Pith::Input do
           i.puts "title: Blah blah"
           i.puts "..."
         end
-        input.title.should == "Blah blah"
+        expect(input.title).to eq("Blah blah")
       end
 
     end
@@ -46,7 +46,7 @@ describe Pith::Input do
     describe "#output" do
 
       it "returns an Output" do
-        subject.output.should_not be_nil
+        expect(subject.output).not_to be_nil
       end
 
     end
@@ -54,7 +54,7 @@ describe Pith::Input do
     describe "#output_path" do
 
       it "excludes the template-type extensions" do
-        subject.output_path.should == Pathname("dir/some_page.html")
+        expect(subject.output_path).to eq(Pathname("dir/some_page.html"))
       end
 
     end
@@ -62,7 +62,7 @@ describe Pith::Input do
     describe "#pipeline" do
 
       it "is a list of Tilt processors" do
-        subject.pipeline.should == [Tilt["erb"], Tilt["md"]]
+        expect(subject.pipeline).to eq([Tilt["erb"], Tilt["md"]])
       end
 
     end
@@ -75,9 +75,13 @@ describe Pith::Input do
       make_input("dir/some_image.gif")
     end
 
-    it { should_not be_template }
+    it { is_expected.not_to be_template }
 
-    its(:pipeline) { should be_empty }
+    describe "pipeline" do
+      it "should be empty" do
+        expect(subject.pipeline).to be_empty
+      end
+    end
 
   end
 
@@ -87,7 +91,11 @@ describe Pith::Input do
       make_input("_blah/blah.de")
     end
 
-    its(:output) { should be_nil }
+    describe "output" do
+      it "should be nil" do
+        expect(subject.output).to be_nil
+      end
+    end
 
   end
 

data/spec/pith/pathname_ext_spec.rb

@@ -8,20 +8,20 @@ describe Pathname do
   describe "#in?" do
 
     it "returns false for siblings" do
-      pathname.in?("foo/baz").should == false
+      expect(pathname.in?("foo/baz")).to eq(false)
     end
 
     it "returns true for ancestors" do
-      pathname.in?("foo").should == true
+      expect(pathname.in?("foo")).to eq(true)
     end
 
     it "returns false for other prefixes" do
-      pathname.in?("fo").should == false
-      pathname.in?("foo/b").should == false
+      expect(pathname.in?("fo")).to eq(false)
+      expect(pathname.in?("foo/b")).to eq(false)
     end
 
     it "returns false for itself" do
-      pathname.in?("foo/bar").should == false
+      expect(pathname.in?("foo/bar")).to eq(false)
     end
 
   end

data/spec/pith/plugins/publication_spec.rb

@@ -11,22 +11,22 @@ describe Pith::Plugins::Publication::TemplateMethods do
   describe "#published_at" do
 
     it "defaults to nil" do
-      @template.published_at.should be_nil
+      expect(@template.published_at).to be_nil
     end
     
     it "is derived by parsing the 'published' meta-field" do
       @template.meta["published"] = "25 Dec 1999 22:30"
-      @template.published_at.should == Time.local(1999, 12, 25, 22, 30)
+      expect(@template.published_at).to eq(Time.local(1999, 12, 25, 22, 30))
     end
 
     it "honours any parsing (of Time) that yaml may do on the 'published' meta-field" do
       @template.meta["published"] = Time.local(1999, 12, 25, 22, 30)
-      @template.published_at.should == Time.local(1999, 12, 25, 22, 30)
+      expect(@template.published_at).to eq(Time.local(1999, 12, 25, 22, 30))
     end
 
     it "honours any parsing (to Date) of time that yaml may do on the 'published' meta-field" do
       @template.meta["published"] = Date.new(1999, 12, 25)
-      @template.published_at.should == Time.local(1999, 12, 25)
+      expect(@template.published_at).to eq(Time.local(1999, 12, 25))
     end
 
   end
@@ -35,18 +35,18 @@ describe Pith::Plugins::Publication::TemplateMethods do
 
     it "defaults to #published_at" do
       @template.meta["published"] = "25 Dec 1999 22:30"
-      @template.updated_at.should == Time.local(1999, 12, 25, 22, 30)
+      expect(@template.updated_at).to eq(Time.local(1999, 12, 25, 22, 30))
     end
     
     it "can be overridden with an 'updated' meta-field" do
       @template.meta["published"] = "25 Dec 1999 22:30"
       @template.meta["updated"] = "1 Jan 2000 03:00"
-      @template.updated_at.should == Time.local(2000, 1, 1, 3, 0)
+      expect(@template.updated_at).to eq(Time.local(2000, 1, 1, 3, 0))
     end
     
     it "honours any parsing of time that yaml may do on the 'updated' meta-field" do
       @template.meta["updated"] = Date.new(2000, 1, 1)
-      @template.updated_at.should == Time.local(2000, 1, 1)
+      expect(@template.updated_at).to eq(Time.local(2000, 1, 1))
     end
 
   end

data/spec/pith/project_spec.rb

@@ -14,7 +14,7 @@ describe Pith::Project do
     end
 
     it "creates the output directory" do
-      $output_dir.should be_directory
+      expect($output_dir).to be_directory
     end
 
   end
@@ -31,14 +31,14 @@ describe Pith::Project do
 
       it "returns an Input object" do
         @input = @project.input("input.html.haml")
-        @input.should be_kind_of(Pith::Input)
-        @input.file.should == @input_file
+        expect(@input).to be_kind_of(Pith::Input)
+        expect(@input.file).to eq(@input_file)
       end
 
       it "returns the same object the second time" do
         first_time = @project.input("input.html.haml")
         second_time = @project.input("input.html.haml")
-        second_time.should equal(first_time)
+        expect(second_time).to equal(first_time)
       end
 
     end
@@ -46,7 +46,7 @@ describe Pith::Project do
     describe "(with an invalid input path)" do
 
       it "returns nil" do
-        @project.input("bogus.path").should be_nil
+        expect(@project.input("bogus.path")).to be_nil
       end
 
     end
@@ -66,8 +66,8 @@ describe Pith::Project do
       let(:output) { @project.output("input.html") }
 
       it "returns the matching Output" do
-        output.should be_kind_of(Pith::Output)
-        output.file.should == $output_dir + "input.html"
+        expect(output).to be_kind_of(Pith::Output)
+        expect(output.file).to eq($output_dir + "input.html")
       end
 
     end
@@ -77,7 +77,7 @@ describe Pith::Project do
       let(:output) { @project.output("bogus.html.haml") }
 
       it "returns nil" do
-        output.should be_nil
+        expect(output).to be_nil
       end
 
     end
@@ -90,26 +90,26 @@ describe Pith::Project do
       @input_file = $input_dir + "input.html.haml"
       @input_file.touch(Time.now - 10)
       @project.sync
-      @project.input("input.html.haml").should_not be_nil
-      @project.output("input.html").should_not be_nil
+      expect(@project.input("input.html.haml")).not_to be_nil
+      expect(@project.output("input.html")).not_to be_nil
       FileUtils.rm(@input_file)
       @project.sync
     end
 
     describe "#input" do
       it "returns nil" do
-        @project.input("input.html.haml").should be_nil
+        expect(@project.input("input.html.haml")).to be_nil
       end
     end
 
     describe "#output" do
       it "returns nil" do
-        @project.output("input.html").should be_nil
+        expect(@project.output("input.html")).to be_nil
       end
     end
 
     it "doesn't confuse subsequent calls to #sync" do
-      proc { @project.sync }.should_not raise_error
+      expect { @project.sync }.not_to raise_error
     end
 
   end