pith 0.2.3 → 0.3.0

data/spec/pith/pathname_ext_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'pith/pathname_ext'
+
+describe Pathname do
+
+  let(:pathname) { Pathname("foo/bar") }
+
+  describe "#in?" do
+
+    it "returns false for siblings" do
+      pathname.in?("foo/baz").should == false
+    end
+
+    it "returns true for ancestors" do
+      pathname.in?("foo").should == true
+    end
+
+    it "returns false for other prefixes" do
+      pathname.in?("fo").should == false
+      pathname.in?("foo/b").should == false
+    end
+
+    it "returns false for itself" do
+      pathname.in?("foo/bar").should == false
+    end
+
+  end
+
+end

data/spec/pith/project_spec.rb

@@ -4,48 +4,41 @@ require 'pith/project'
 describe Pith::Project do
 
   before do
-    $input_dir.mkpath
     @project = Pith::Project.new(:input_dir => $input_dir, :output_dir => $output_dir)
   end
 
   describe "#build" do
-    
+
     before do
       @project.build
     end
-    
+
     it "creates the output directory" do
       $output_dir.should be_directory
     end
-    
+
   end
 
   describe "#input" do
 
-    describe "(with a template input path)" do
+    before do
+      @input_file = $input_dir + "input.html.haml"
+      @input_file.touch
+      @project.sync
+    end
 
-      before do
-        @input_file = $input_dir + "input.html.haml"
-        @input_file.touch
-      end
+    describe "(with a template input path)" do
 
-      it "constructs an Input object" 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
       end
 
-    end
-
-    describe "(with a template output path)" do
-
-      before do
-        @input_file = $input_dir + "input.html.haml"
-        @input_file.touch
-      end
-
-      it "can also be used to locate the Input" do
-        @project.input("input.html").should == @project.input("input.html.haml")
+      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)
       end
 
     end
@@ -60,73 +53,82 @@ describe Pith::Project do
 
   end
 
-  describe "when an input file is unchanged" do
+  describe "#output" do
 
     before do
       @input_file = $input_dir + "input.html.haml"
       @input_file.touch
+      @project.sync
     end
 
-    describe "a second call to #input" do
-      it "returns the same Input object" do
+    describe "(with a template output path)" do
 
-        first_time = @project.input("input.html.haml")
-        first_time.should_not be_nil
+      let(:output) { @project.output("input.html") }
 
-        @project.refresh
-        second_time = @project.input("input.html.haml")
-        second_time.should equal(first_time)
+      it "returns the matching Output" do
+        output.should be_kind_of(Pith::Output)
+        output.file.should == $output_dir + "input.html"
+      end
+
+    end
 
+    describe "(with a bogus output path)" do
+
+      let(:output) { @project.output("bogus.html.haml") }
+
+      it "returns nil" do
+        output.should be_nil
       end
+
     end
 
   end
 
-  describe "when an input file is changed" do
+  describe "when an input file is removed" do
 
     before 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
+      FileUtils.rm(@input_file)
+      @project.sync
     end
 
-    describe "a second call to #input" do
-      it "returns a different Input object" do
-
-        first_time = @project.input("input.html.haml")
-        first_time.should_not be_nil
-
-        @input_file.touch(Time.now)
-
-        @project.refresh
-        second_time = @project.input("input.html.haml")
-        second_time.should_not be_nil
-        second_time.should_not equal(first_time)
+    describe "#input" do
+      it "returns nil" do
+        @project.input("input.html.haml").should be_nil
+      end
+    end
 
+    describe "#output" do
+      it "returns nil" do
+        @project.output("input.html").should be_nil
       end
     end
 
   end
 
-  describe "when an input file is removed" do
+  describe "#ignore_patterns" do
 
-    before do
-      @input_file = $input_dir + "input.html.haml"
-      @input_file.touch(Time.now - 10)
+    it "is a set" do
+      @project.ignore_patterns.should be_kind_of(Set)
     end
 
-    describe "a second call to #input" do
-      it "returns nil" do
-
-        first_time = @project.input("input.html.haml")
-        first_time.should_not be_nil
+    it "includes some sensible defaults" do
+      @project.ignore_patterns.should include("_*")
+      @project.ignore_patterns.should include(".git")
+      @project.ignore_patterns.should include(".svn")
+    end
 
-        FileUtils.rm(@input_file)
+  end
 
-        @project.refresh
-        second_time = @project.input("input.html.haml")
-        second_time.should be_nil
+  describe "#ignore" do
 
-      end
+    it "adds to ignore_patterns" do
+      @project.ignore("foo")
+      @project.ignore_patterns
     end
 
   end

data/spec/pith/server_spec.rb

@@ -0,0 +1,101 @@
+require 'spec_helper'
+require 'pith/server'
+require 'rack/mock'
+
+describe Pith::Server::OutputFinder do
+
+  let(:output_path) { "dir/index.html" }
+  let(:output) { stub(:path => Pathname(output_path), :build => true) }
+
+  let(:project) do
+    stub(:outputs => [output], :sync_every => nil)
+  end
+
+  let(:app) do
+    lambda do |env|
+      [
+        200,
+        { "Location" => env["PATH_INFO"] },
+        ["OKAY"]
+      ]
+    end
+  end
+
+  let(:middleware) do
+    Pith::Server::OutputFinder.new(app, project)
+  end
+
+  let(:request_uri) { "/foo" }
+  let(:request_env) do
+    Rack::MockRequest.env_for(request_uri)
+  end
+
+  let(:result) do
+    middleware.call(request_env)
+  end
+
+  let(:result_status) do
+    result[0]
+  end
+
+  let(:result_headers) do
+    result[1]
+  end
+
+  let(:result_path) do
+    result_headers["Location"]
+  end
+
+  context "request for a non-existant file" do
+
+    let(:request_uri) { "/bogus.html" }
+
+    it "does not build the output" do
+      output.should_not_receive(:build)
+      result_path
+    end
+
+    it "passes on the env unchanged" do
+      result_path.should == "/bogus.html"
+    end
+
+  end
+
+  def self.can_request_output(description, uri)
+
+    context "request for output #{description}" do
+
+      let(:request_uri) { uri }
+
+      it "builds the output" do
+        output.should_receive(:build)
+        result_path
+      end
+
+      it "passes on request" do
+        result_path.should == "/dir/index.html"
+      end
+
+    end
+
+  end
+
+  can_request_output "directly", "/dir/index.html"
+
+  can_request_output "without .html", "/dir/index"
+
+  can_request_output "directory with slash", "/dir/"
+
+  context "request for directory without slash" do
+
+    let(:request_uri) { "/dir" }
+
+    it "redirects" do
+      result_status.should == 302
+      result_headers["Location"].should == "/dir/"
+    end
+
+  end
+
+end
+

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ RSpec.configure do |config|
     [$input_dir, $output_dir].each do |dir|
       dir.rmtree if dir.exist?
     end
+    $input_dir.mkpath
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pith
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000 Z
+date: 2012-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70245266534120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,15 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70245266534120
-- !ruby/object:Gem::Dependency
-  name: adsf
-  requirement: &70245266533620 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70245266533620
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70245266533160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +37,15 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70245266533160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70245266532700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +53,15 @@ dependencies:
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *70245266532700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &70245266532240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +69,12 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70245266532240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 description: ! 'Pith builds static websites, using markup/template languages including
   Haml, Sass, ERb, Liquid, Markdown and Textile.
 
@@ -81,6 +90,7 @@ files:
 - lib/pith/input.rb
 - lib/pith/input.rb~
 - lib/pith/metadata.rb~
+- lib/pith/output.rb
 - lib/pith/pathname_ext.rb
 - lib/pith/pathname_ext.rb~
 - lib/pith/plugins/publication/input.rb
@@ -111,13 +121,11 @@ files:
 - README.markdown
 - Rakefile
 - spec/pith/input_spec.rb
-- spec/pith/metadata_spec.rb~
+- spec/pith/pathname_ext_spec.rb
 - spec/pith/plugins/publication_spec.rb
-- spec/pith/plugins/publication_spec.rb~
 - spec/pith/project_spec.rb
-- spec/pith/project_spec.rb~
+- spec/pith/server_spec.rb
 - spec/spec_helper.rb
-- spec/spec_helper.rb~
 - features/cleanup.feature
 - features/content_for.feature
 - features/content_for.feature~
@@ -141,7 +149,6 @@ files:
 - features/pipeline.feature
 - features/relative_linking.feature
 - features/relative_linking.feature~
-- features/reloading.feature
 - features/resources.feature
 - features/step_definitions/build_steps.rb
 - features/step_definitions/build_steps.rb~
@@ -169,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1675155199732218344
+      hash: -22568693852038165
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -178,23 +185,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1675155199732218344
+      hash: -22568693852038165
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: A static website generator
 test_files:
 - Rakefile
 - spec/pith/input_spec.rb
-- spec/pith/metadata_spec.rb~
+- spec/pith/pathname_ext_spec.rb
 - spec/pith/plugins/publication_spec.rb
-- spec/pith/plugins/publication_spec.rb~
 - spec/pith/project_spec.rb
-- spec/pith/project_spec.rb~
+- spec/pith/server_spec.rb
 - spec/spec_helper.rb
-- spec/spec_helper.rb~
 - features/cleanup.feature
 - features/content_for.feature
 - features/content_for.feature~
@@ -218,7 +223,6 @@ test_files:
 - features/pipeline.feature
 - features/relative_linking.feature
 - features/relative_linking.feature~
-- features/reloading.feature
 - features/resources.feature
 - features/step_definitions/build_steps.rb
 - features/step_definitions/build_steps.rb~