sitebuilder 0.0.5 → 0.0.6

data/CHANGELOG.rdoc

@@ -1,3 +1,5 @@
+== 0.0.6  
+     2011-02-09: fixed fence-post error in Array#each_until
 == 0.0.5
      2010-01-28: refactored use of procs into explicit actions
      2009-12-19:simplified initiation of sitebuilder - just call "generate" method on a sitebuilder object

data/README.rdoc

@@ -27,4 +27,4 @@ This is open source software and comes with no warranty. See COPYING for details
  
 http://www.greenbarsoft.co.uk
 
-Copyright 2009 Green Bar Software Limited, UK
+Copyright 2009-2011 Green Bar Software Limited, UK

data/doc/demo.rdoc

@@ -2,69 +2,62 @@
 
 If using sitebuilder from a gem, remember to "require 'rubygems'"...
 
-    demo.script(main):001:0> require 'sitebuilder'
+    >> require 'sitebuilder'
     => true
-    demo.script(main):002:0> require 'rubygems'
+    >> require 'rubygems'
+    => false
+    >> require 'erb'
     => true
-    demo.script(main):003:0> require 'erb'
-    => true
-    demo.script(main):004:0> 
-    demo.script(main):005:0* class Document
-    demo.script(main):006:1>   attr_reader :content
-    demo.script(main):007:1>   def initialize(c)
-    demo.script(main):008:2>     @content=c
-    demo.script(main):009:2>   end
-    demo.script(main):010:1> end
+    >> 
+    ?> class Document
+    >>   attr_reader :content
+    >>   def initialize(c)
+    >>     @content=c
+    >>   end
+    >> end
     => nil
-    demo.script(main):011:0> 
-    demo.script(main):012:0* @templatepath = 
-    demo.script(main):013:0* swapout = File.join(ENV['SANDBOX'],'sitebuilder','examples','homepage','source')
-    => "/Users/daf/macbook/workspace/sitebuilder/examples/homepage/source"
-    demo.script(main):014:0> replace = File.join(ENV['SANDBOX'],'sitebuilder','examples','homepage','dest')
-    => "/Users/daf/macbook/workspace/sitebuilder/examples/homepage/dest"
-    demo.script(main):015:0> 
-    demo.script(main):016:0* #This is just a templating action - for real use, you'd need to process markup from "content" as well...
-    demo.script(main):017:0* class TemplateAction < SiteBuilder::Action
-    demo.script(main):018:1>   def mapit(src, tmpl, dst)
-    demo.script(main):019:2>     template = ''
-    demo.script(main):020:2>     File.open(tmpl) do |f|
-    demo.script(main):021:3*       f.readlines.each {|l| template += l }
-    demo.script(main):022:3>     end
-    demo.script(main):023:2>     content = ''
-    demo.script(main):024:2>     File.open(src) do |c|
-    demo.script(main):025:3*       c.readlines.each {|l| content += l }
-    demo.script(main):026:3>     end
-    demo.script(main):027:2>     e = ERB.new template
-    demo.script(main):028:2>     document = Document.new(content)
-    demo.script(main):029:2>     File.open(dst,'w') do |f|
-    demo.script(main):030:3*       f.puts e.result(binding)
-    demo.script(main):031:3>     end
-    demo.script(main):032:2>   end
-    demo.script(main):033:1>   
-    demo.script(main):034:1*   def convert(s, r)
-    demo.script(main):035:2>     templatepath = File.join(ENV['SANDBOX'],'sitebuilder','examples','homepage','template.rhtml')
-    demo.script(main):036:2>     mapit(s.path, templatepath, File.join(r,s.extnless+'.html'))    
-    demo.script(main):037:2>   end
-    demo.script(main):038:1> end
+    >> 
+    ?> @templatepath = 
+    ?> swapout = File.join(ENV['SANDBOX'],'sitebuilder','examples','homepage','source')
+    => "/Users/dev/sitebuilder/examples/homepage/source"
+    >> replace = File.join(ENV['SANDBOX'],'sitebuilder','examples','homepage','dest')
+    => "/Users/dev/sitebuilder/examples/homepage/dest"
+    >> 
+    ?> #This is just a templating action - for real use, you'd need to process markup from "content" as well...
+    ?> class TemplateAction < SiteBuilder::Action
+    >>   def mapit(src, tmpl, dst)
+    >>     template = ''
+    >>     File.open(tmpl) do |f|
+    ?>       f.readlines.each {|l| template += l }
+    >>     end
+    >>     content = ''
+    >>     File.open(src) do |c|
+    ?>       c.readlines.each {|l| content += l }
+    >>     end
+    >>     e = ERB.new template
+    >>     document = Document.new(content)
+    >>     File.open(dst,'w') do |f|
+    ?>       f.puts e.result(binding)
+    >>     end
+    >>   end
+    >>   
+    ?>   def convert(s, r)
+    >>     templatepath = File.join(ENV['SANDBOX'],'sitebuilder','examples','homepage','template.rhtml')
+    >>     mapit(s.path, templatepath, File.join(r,s.extnless+'.html'))    
+    >>   end
+    >> end
     => nil
-    demo.script(main):039:0> 
-    demo.script(main):040:0* s = SiteBuilder::SiteGenerator.new(swapout,replace)
-    => #<SiteBuilder::SiteGenerator:0x63c61c @swapout="/Users/daf/macbook/workspace/sitebuilder/examples/homepage/source", @actions={}, @replace="/Users/daf/macbook/workspace/sitebuilder/examples/homepage/dest">
-    demo.script(main):041:0> s.add_action('.art', TemplateAction.new)
-    => #<TemplateAction:0x6336e8>
-    demo.script(main):042:0> 
-    demo.script(main):043:0* s.add_action('.idx', SiteBuilder::CopyAction.new)
-    => #<SiteBuilder::CopyAction:0x627938>
-    demo.script(main):044:0> s.add_action('.png', SiteBuilder::CopyAction.new)
-    => #<SiteBuilder::CopyAction:0x620994>
-    demo.script(main):045:0> s.add_action('.css', SiteBuilder::CopyAction.new)
-    => #<SiteBuilder::CopyAction:0x618384>
-    demo.script(main):046:0> s.generate
-    cp /Users/daf/macbook/workspace/sitebuilder/examples/homepage/source/homepage.css /Users/daf/macbook/workspace/sitebuilder/examples/homepage/dest
-    => #<Dir:0x615a94>
-    demo.script(main):047:0> 
-    demo.script(main):048:0* demo.script(main):048:0> 
-
+    >> 
+    ?> s = SiteBuilder::SiteGenerator.new(swapout,replace)
+    => #<SiteBuilder::SiteGenerator:0x1015af760 @actions={}, @replace="/Users/dev/sitebuilder/examples/homepage/dest", @swapout="/Users/dev/sitebuilder/examples/homepage/source">
+    >> s.add_action('.art', TemplateAction.new)
+    => #<TemplateAction:0x1015ab048>
+    >> # CopyAction.new is the default value for unrecognised file extensions
+    ?> s.generate
+    cp /Users/dev/sitebuilder/examples/homepage/source/homepage.css /Users/dev/sitebuilder/examples/homepage/dest
+    => #<Dir:/Users/dev/sitebuilder/examples/homepage/source>
+    >> 
+    ?> >> 
 
- Sitebuilder 0.0.4
 
+ Sitebuilder 0.0.6

data/doc/demo.script

@@ -39,9 +39,6 @@ end
 
 s = SiteBuilder::SiteGenerator.new(swapout,replace)
 s.add_action('.art', TemplateAction.new)
-
-s.add_action('.idx', SiteBuilder::CopyAction.new)
-s.add_action('.png', SiteBuilder::CopyAction.new)
-s.add_action('.css', SiteBuilder::CopyAction.new)
+# CopyAction.new is the default value for unrecognised file extensions
 s.generate
 

data/lib/sitebuilder/array.rb

@@ -4,7 +4,7 @@ class Array
   # parameter until the block returns true
   def each_until(&block)
     return false if empty?
-    for i in 0..size 
+    for i in 0..size-1
       result_true = block.call(self[i]) 
       break if result_true
     end

data/lib/sitebuilder/sitegenerator.rb

@@ -11,7 +11,7 @@ module SiteBuilder
   class SiteGenerator < Traverser
     
     # I set up the source website directory and the destination website directory.
-    def initialize(source, destination, default_action=NullAction.new) 
+    def initialize(source, destination, default_action=CopyAction.new) 
       @swapout = source
       @replace = destination
       @actions = {}

data/test/array_test.rb

@@ -29,7 +29,7 @@ def test_each_until_not_found
   pass_count = 0
   result = unit.each_until {|i| pass_count=pass_count+1; true if i==3}
   assert_equal(false, result, 'should return false')
-  assert_equal(unit.length+1, pass_count,'should have traversed elements 1, 2 and 33')
+  assert_equal(unit.length, pass_count,'should have traversed all elements')
 end
 
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sitebuilder
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Dafydd Rees
@@ -9,39 +15,57 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-28 00:00:00 +00:00
+date: 2011-02-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: semantictext
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 2
+        - 2
         version: 0.2.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 9
+        - 8
         version: 0.9.8
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rcov
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 9
+        - 6
         version: 0.9.6
-    version: 
+  type: :development
+  version_requirements: *id003
 description: Static website generator using rule-based translation.
 email: os@greenbarsoft.co.uk
 executables: []
@@ -67,6 +91,10 @@ files:
 - test/filesystem_test.rb
 - test/sitegenerator_test.rb
 - test/string_test.rb
+- ./test/array_test.rb
+- ./test/filesystem_test.rb
+- ./test/sitegenerator_test.rb
+- ./test/string_test.rb
 - CHANGELOG.rdoc
 - COPYING
 - README.rdoc
@@ -82,21 +110,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Static site generator