pith 0.2.0 → 0.2.1

data/lib/pith/version.rb

@@ -1,3 +1,3 @@
 module Pith
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

data/spec/pith/{input/template_spec.rb~ → input_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
-require "pith/input/abstract"
+require "pith/input"
 require "pith/project"
 
-describe Pith::Input::Template do
+describe Pith::Input do
 
   before do
     $input_dir.mkpath
@@ -17,31 +17,9 @@ describe Pith::Input::Template do
     end
     @project.input(path)
   end
-  
-  describe ".can_handle?" do
-    
-    it "returns true for template paths" do
-      Pith::Input::Template.can_handle?("xyz.html.haml").should be_true
-      Pith::Input::Template.can_handle?("xyz.html.md").should be_true
-    end
-
-    it "handles directories" do
-      Pith::Input::Template.can_handle?("dir/xyz.haml").should be_true
-    end
-
-    it "accepts Pathname objects" do
-      Pith::Input::Template.can_handle?(Pathname("xyz.html.haml")).should be_true
-    end
 
-    it "returns false for non-template paths" do
-      Pith::Input::Template.can_handle?("foo.html").should be_false
-      Pith::Input::Template.can_handle?("foo").should be_false
-    end
-    
-  end
-  
   describe "#title" do
-    
+
     it "is based on last component of filename" do
       @input = make_input("dir/some_page.html.haml")
       @input.title.should == "Some page"
@@ -55,16 +33,25 @@ describe Pith::Input::Template do
       end
       @input.title.should == "Blah blah"
     end
-  
+
   end
 
   describe "#output_path" do
-    
+
     it "excludes the template-type extension" do
       @input = make_input("dir/some_page.html.haml")
       @input.output_path.should == Pathname("dir/some_page.html")
     end
-    
+
+  end
+
+  describe "#pipeline" do
+
+    it "is a list of Tilt processors" do
+      @input = make_input("dir/some_page.html.haml")
+      @input.pipeline.should == [Tilt["haml"]]
+    end
+
   end
 
 end

data/spec/pith/project_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'pith/project'
 
 describe Pith::Project do
-  
+
   before do
     $input_dir.mkpath
     @project = Pith::Project.new(:input_dir => $input_dir)
@@ -10,21 +10,6 @@ describe Pith::Project do
 
   describe "#input" do
 
-    describe "(with a non-template input path)" do
-
-      before do
-        @input_file = $input_dir + "input.txt"
-        @input_file.touch
-      end
-
-      it "constructs an Resource object" do
-        @input = @project.input("input.txt")
-        @input.should be_kind_of(Pith::Input::Resource)
-        @input.file.should == @input_file
-      end
-      
-    end
-
     describe "(with a template input path)" do
 
       before do
@@ -32,37 +17,37 @@ describe Pith::Project do
         @input_file.touch
       end
 
-      it "constructs an Template object" do
+      it "constructs an Input object" do
         @input = @project.input("input.html.haml")
-        @input.should be_kind_of(Pith::Input::Template)
+        @input.should be_kind_of(Pith::Input)
         @input.file.should == @input_file
       end
-      
+
     end
 
-    describe "(with a template ouput path)" do
-      
+    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 Template" do
+      it "can also be used to locate the Input" do
         @project.input("input.html").should == @project.input("input.html.haml")
       end
-      
+
     end
 
     describe "(with an invalid input path)" do
-      
+
       it "returns nil" do
         @project.input("bogus.path").should be_nil
       end
-      
+
     end
-    
+
   end
-  
+
   describe "when an input file is unchanged" do
 
     before do
@@ -92,7 +77,7 @@ describe Pith::Project do
       @input_file.touch(Time.now - 10)
     end
 
-    describe "a second call to #input" do 
+    describe "a second call to #input" do
       it "returns a different Input object" do
 
         first_time = @project.input("input.html.haml")
@@ -117,7 +102,7 @@ describe Pith::Project do
       @input_file.touch(Time.now - 10)
     end
 
-    describe "a second call to #input" do 
+    describe "a second call to #input" do
       it "returns nil" do
 
         first_time = @project.input("input.html.haml")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pith
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-06 00:00:00.000000000Z
+date: 2011-10-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70100992669820 !ruby/object:Gem::Requirement
+  requirement: &70152548570880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70100992669820
+  version_requirements: *70152548570880
 - !ruby/object:Gem::Dependency
   name: adsf
-  requirement: &70100992665860 !ruby/object:Gem::Requirement
+  requirement: &70152548570160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70100992665860
+  version_requirements: *70152548570160
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70100992659140 !ruby/object:Gem::Requirement
+  requirement: &70152548569500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70100992659140
+  version_requirements: *70152548569500
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70100992656080 !ruby/object:Gem::Requirement
+  requirement: &70152548568780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *70100992656080
+  version_requirements: *70152548568780
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &70100992634020 !ruby/object:Gem::Requirement
+  requirement: &70152548568040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70100992634020
+  version_requirements: *70152548568040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70100992621940 !ruby/object:Gem::Requirement
+  requirement: &70152548567460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100992621940
+  version_requirements: *70152548567460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70100992611420 !ruby/object:Gem::Requirement
+  requirement: &70152548551340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *70100992611420
+  version_requirements: *70152548551340
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70100992606220 !ruby/object:Gem::Requirement
+  requirement: &70152548550740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *70100992606220
+  version_requirements: *70152548550740
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70100992599740 !ruby/object:Gem::Requirement
+  requirement: &70152548550260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100992599740
+  version_requirements: *70152548550260
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70100992582600 !ruby/object:Gem::Requirement
+  requirement: &70152548549740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100992582600
+  version_requirements: *70152548549740
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70100992575120 !ruby/object:Gem::Requirement
+  requirement: &70152548549320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100992575120
+  version_requirements: *70152548549320
 description: ! 'Pith builds static websites, using markup/template languages including
   Haml, Sass, ERb, Liquid, Markdown and Textile.
 
@@ -144,15 +144,6 @@ extra_rdoc_files: []
 files:
 - lib/pith/console_logger.rb
 - lib/pith/console_logger.rb~
-- lib/pith/exception_ext.rb
-- lib/pith/input/abstract.rb
-- lib/pith/input/abstract.rb~
-- lib/pith/input/base.rb~
-- lib/pith/input/resource.rb
-- lib/pith/input/resource.rb~
-- lib/pith/input/template.rb
-- lib/pith/input/template.rb~
-- lib/pith/input/verbatim.rb~
 - lib/pith/input.rb
 - lib/pith/input.rb~
 - lib/pith/metadata.rb~
@@ -185,9 +176,7 @@ files:
 - sample/stylesheets/app.css.sass
 - README.markdown
 - Rakefile
-- spec/pith/input/abstract_spec.rb~
-- spec/pith/input/template_spec.rb
-- spec/pith/input/template_spec.rb~
+- spec/pith/input_spec.rb
 - spec/pith/metadata_spec.rb~
 - spec/pith/plugins/publication_spec.rb
 - spec/pith/plugins/publication_spec.rb~
@@ -244,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2050158771651431666
+      hash: -3377947525028361057
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -253,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2050158771651431666
+      hash: -3377947525028361057
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -262,9 +251,7 @@ specification_version: 3
 summary: A static website generator
 test_files:
 - Rakefile
-- spec/pith/input/abstract_spec.rb~
-- spec/pith/input/template_spec.rb
-- spec/pith/input/template_spec.rb~
+- spec/pith/input_spec.rb
 - spec/pith/metadata_spec.rb~
 - spec/pith/plugins/publication_spec.rb
 - spec/pith/plugins/publication_spec.rb~

data/lib/pith/exception_ext.rb

@@ -1,9 +0,0 @@
-class Exception
-  
-  def summary(options = {})
-    max_backtrace = options[:max_backtrace] || 999
-    trimmed_backtrace = self.backtrace[0, max_backtrace]
-    (["#{self.class}: #{self.message}"] + trimmed_backtrace).join("\n    ") + "\n"
-  end
-  
-end

data/lib/pith/input/abstract.rb

@@ -1,78 +0,0 @@
-require "pathname"
-
-module Pith
-  module Input
-
-    class Abstract
-
-      def initialize(project, path)
-        @project = project
-        @path = path
-      end
-
-      attr_reader :project, :path
-
-      # Public: Get the file-system location of this input.
-      #
-      # Returns a fully-qualified Pathname.
-      #
-      def file
-        project.input_dir + path
-      end
-
-      # Public: Get the file-system location of the corresponding output file.
-      #
-      # Returns a fully-qualified Pathname.
-      #
-      def output_file
-        project.output_dir + output_path
-      end
-
-      # Public: Generate an output file.
-      #
-      def build
-        return false if ignorable? || uptodate?
-        logger.info("--> #{output_path}")
-        generate_output
-      end
-
-      # Public: Resolve a reference relative to this input.
-      #
-      # ref - a String referencing another asset
-      #
-      # A ref starting with "/" is resolved relative to the project root;
-      # anything else is resolved relative to this input.
-      #
-      # Returns a fully-qualified Pathname of the asset.
-      #
-      def resolve_path(ref)
-        ref = ref.to_s
-        if ref[0,1] == "/"
-          Pathname(ref[1..-1])
-        else
-          path.parent + ref
-        end
-      end
-
-      # Consider whether this input can be ignored.
-      #
-      # Returns true if it can.
-      #
-      def ignorable?
-        path.each_filename do |path_component|
-          project.ignore_patterns.each do |pattern|
-            return true if File.fnmatch(pattern, path_component)
-          end
-        end
-      end
-
-      protected
-
-      def logger
-        project.logger
-      end
-
-    end
-
-  end
-end