soxer 0.9.12 → 0.9.13

data/README.markdown

@@ -13,6 +13,7 @@ It's strong points include:
 - There is no relational database back end.
 - It uses and follows standards. The document format is [YAML](http://www.yaml.org)
 - Document model is loose (adaptable "on the fly") and only determined by your views or partials.
+- Final deployment can be dynamic or static.
 - It's a Sinatra modular application, so you can easily incorporate it into existing project.
 
 What Soxer is not (yet)...
@@ -36,11 +37,14 @@ To create a "hello world" type 'empty' application named 'webpage', you can run:
 `$ soxer create empty webpage`
 
 The directory webpage, which you just created has everything you need to run your first soxer application. Just enter it and run soxer in developement mode:  
-<code>
-  $ cd webpage; soxer test
-</code>
+`$ cd webpage; soxer test`
+
+You can even create a static site:  
+`$ soxer generate htmls static`  
+This will generate a set of htmls (ending with .html) a directory called 'static' inside your project directory.
 
 It's that simple.
 
-You can read more about soxer on <http://soxer.mutsu.org>, which hosts a growing list of tutorials. You can also contact the author at **toni at formalibre dot si**.
+You can read more about soxer on <http://soxer.mutsu.org>, which hosts a growing list of tutorials.  
+You can also contact the author at **toni at formalibre dot si**.
 

data/bin/soxer

@@ -5,7 +5,7 @@ def colorize(text, color_code); "\033#{color_code}#{text}\033[0m"; end
 def b(text); colorize(text, "[1m"); end
 
 def h
-  '-'*79+"\n#{b 'Soxer'}, the web publishing tool. | Copyright 2010, Toni Anzlovar.\n"+'-'*79
+  '-'*79+"\n#{b 'Soxer'}, the web publishing tool. | Copyright 2010-11, Toni Anzlovar.\n"+'-'*79
 end
 
 def err message
@@ -37,35 +37,58 @@ def help
     
   Actions:
   
-    #{b 'create'}
+    #{b 'create'} (No defaults)
       Creates a new soxer project directory with default sinatra/soxer layout.
       All aspects can be later customized to suite project's needs.
       
       First parameter:
-        #{b 'empty'}     - Creates an empty project
-        #{b 'blog'}      - Creates a simple blog project
+        #{b 'empty'}     - Creates an empty project.
+        #{b 'blog'}      - Creates a simple blog project.
         More project templates are in the making
         
         Other parameters:
-          #{b '[name]'}  - The name of the project directory
+          #{b '[name]'}  - The name of the project directory.
+          
+          
+    #{b 'generate'} (Default: generate paths static)
+      Generates a static soxer site based on your content.
+      
+      First parameter:
+        #{b 'htmls'}     - Generates a static sate with .html extensions.
+        #{b 'paths'}     - Generates a static sate with directories / indexes.
+        More static site options in the making
         
-    #{b 'test'}
+        Other parameters:
+          #{b '[name]'}  - The name of the static site directory.
+                
+                
+    #{b 'test'} (Default: soxer test 9394)
       Runs the developement server (in the foreground) on your computer.
       Point your browser to #{b 'http://localhost:9394'} to view the result.
       You can exit with standard [ctrl]+c.
       
       Parameters:
         #{b '[int]'} - Port number you wish to run developement on
-      
+        
+        
     #{b 'help'}
       Displays this help.
   
+  
   Examples:
   
   #{b '$ soxer create empty app'}
     This command would create a new project directory 'app' with a mockup empty
     soxer/sinatra application in it. You can tweak the design and parameters to
     acheve the desired experience.
+  
+  #{b '$ soxer generate htmls static'}
+    This command would generate a static set of html files (with .html ending)
+    in directory static in current directory.
+    Option 'htmls' makes the site directory cleaner and easier to understand, but
+    introduces nasty '.html' in page urls.
+    Oprion 'paths' makes every url into a directory with index file. This makes a
+    bunch of directories, but makes urls absent of '.html'
     
   #{b '$ soxer test 8907'}
     This command (when executed within the soxer project directory root) will
@@ -95,6 +118,116 @@ def create template, dir
   end
 end
 
+def generate argv
+  require 'net/http'
+  require 'open3'
+
+  type ||= 'paths'; type = argv[0] if argv[0]
+  dir ||= 'static'; dir = argv[1] if argv[1]
+  
+  return err 'The static site type does not exist.' unless %w[htmls paths].include? type
+  
+  # Fix URLs in html file according to type of static site generated
+  def fixurls path, data, type
+    if type == 'paths'
+      data.gsub!(/(href|src)="\/([^"]*)/) do |s|
+        case true
+          when ( path == '/index' and path.split('/').count == 2 )
+            s = $1 + '="./' + $2
+          when ( path != '/index' )
+            prepath = '../' * (path.split('/').count - 1)
+            s = $1 + '="' + prepath + $2
+          else
+            s = $&
+        end
+      end
+    end
+    
+    if type == 'htmls' then
+      data.gsub!(/(\<[^>]+)(href="|src=")(\/[^"]*)([^>]+\>)/) do |s|
+        if $2 == 'href="' and !( $&.include? 'rel="stylesheet"' )
+          ending = '.html'
+        else ending = '';
+        end
+        case true
+          when path.split('/').count == 2
+            s = $1+$2+'.'+$3+ending+$4
+          when path.split('/').count > 2
+            prepath = '../' * (path.split('/').count - 2)
+            s = $1+$2+prepath[0..-2]+$3+ending+$4
+          else
+            s = $&
+        end
+      end      
+      data.gsub!(/(href="[^"]*\/)(\.html)/, '\1index\2') 
+    end
+    return data
+  end
+  
+  def writefile what, where
+    File.open( where, 'w') do |f|
+      f.puts what
+    end
+  end
+  
+  # Can we sniff out a free port in a better way?
+  s = TCPServer.new('127.0.0.1', 0); port = s.addr[1]; s.close 
+
+  server = 'webrick'
+  ENV['PATH'].split(':').each {|folder| server = 'thin' if File.exists?(folder+'/thin')}
+  
+  i,o,e,w = Open3.popen3 "rackup -s #{server} -p #{port}"
+  sleep 3
+  sitemap = Net::HTTP.get URI.parse("http://localhost:#{port}/sitemap.xml")
+  stylesheets = []
+  out = []
+  
+  # Get all documents listed in sitemap
+  sitemap.scan(/http\:\/\/localhost[^<]+/).each do |url|
+    path = url.sub /http:\/\/localhost:\d+/, '' 
+    html = path+'.html'
+    htm = path+'.htm'
+    data = Net::HTTP.get URI.parse "http://localhost:#{port}#{path}"
+    
+    # Get header and scan for dynamically generated stuff (css mainly)
+    if header = data.scan(/\<head\>.+?\<\/head\>/m)[0] then
+      header.scan(/[^'"=]+\.css/).each {|ss| stylesheets << ss }
+    end
+    
+    # Fix local URLs to relative
+    reldata = fixurls path, data, type
+
+    # Generate paths & files
+    case type
+      when 'paths'
+        d = File.join(dir, path)
+        FileUtils.mkpath d
+        writefile reldata, d + '/index.html'
+        FileUtils.cp dir + '/index/index.html', dir + '/index.html' if File.exist? dir + '/index/index.html'
+      when 'htmls'
+        f = path.split('/').last
+        d = File.join(dir, path.split('/')[0..-2].join('/'))
+        FileUtils.mkpath d
+        writefile reldata, d + '/' + f + '.html'
+    end
+  end
+  
+  # Get stylesheets out of HTML headers
+  stylesheets.uniq.compact.each do |s|
+    d = s.split('/'); d.pop; d.join('/')
+    FileUtils.mkdir_p File.join(dir, d)
+    data = Net::HTTP.get URI.parse "http://localhost:#{port}#{s}"
+    writefile data, File.join(dir, s)
+  end
+  
+  # Copy static files and clean up
+  FileUtils.copy_entry( 'public', dir)
+  e = w.pid
+  Process.kill 9, w.pid
+  
+  return notice "Successfully generated static #{type}."
+end
+
 def test port
   port = 9394 unless port!=nil
   server = 'webrick'
@@ -106,7 +239,7 @@ end
 case $*[0]
   when 'create' then printf create $*[1], $*[2]
   when 'test' then printf test $*[1]
-  when 'prank' then printf prank
+  when 'generate' then printf generate $*[1..-1]
   when 'help' then printf help
   else printf err 'You did not specify an action!'
 end

data/lib/soxer/main.rb

@@ -49,7 +49,7 @@ module Sinatra
         out = YAML.load_file( @f )
         add_date unless out['date']
         add_id unless out['uuid']
-        out['url'] = @f.gsub(/#{@s.origin}\/(.+)\.yaml$/, "\\1" ).gsub(/(.+)\/index$/, "\\1" )
+        out['url'] = @f.gsub(/#{@s.origin}(.+)\.yaml$/, "\\1" ).gsub(/(.+)\/index$/, "\\1" )
         out['mtime'] =  File.mtime( @f )
         Hashie::Mash.new out
       end

data/soxer.gemspec

@@ -4,12 +4,12 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.7'
 
   s.name              = 'soxer'
-  s.version           = '0.9.12'
-  s.date              = '2011-04-30'
+  s.version           = '0.9.13'
+  s.date              = '2011-05-23'
   s.rubyforge_project = 'soxer'
 
   s.summary     = "Dynamic web site generator engine"
-  s.description = "Soxer is a file based dynamic web site creation tool for Sinatra."
+  s.description = "Soxer is a file based static/dynamic web site creation tool for Sinatra."
 
   s.authors  = ["Toni Anzlovar"]
   s.email    = 'toni@formalibre.si'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 12
-  version: 0.9.12
+  - 13
+  version: 0.9.13
 platform: ruby
 authors: 
 - Toni Anzlovar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 +02:00
+date: 2011-05-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,7 +85,7 @@ dependencies:
         version: "0.5"
   type: :runtime
   version_requirements: *id005
-description: Soxer is a file based dynamic web site creation tool for Sinatra.
+description: Soxer is a file based static/dynamic web site creation tool for Sinatra.
 email: toni@formalibre.si
 executables: 
 - soxer