soxer 0.9.0 → 0.9.4

data/bin/soxer

@@ -0,0 +1,124 @@
+#!/usr/bin/ruby
+require 'fileutils'
+
+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
+end
+
+def err message
+<<END
+#{h}
+#{b message}
+Type #{b 'soxer help'} to get help.
+
+Soxer usage:
+  #{b "soxer [action] [parameters]"}
+  
+END
+end
+
+def notice message
+<<END
+#{h}
+#{b message}
+
+END
+end
+
+@help = <<END
+#{h}
+
+Soxer usage:
+  #{b "soxer [action] [parameters]"}
+  
+Actions:
+
+  #{b 'create'}
+    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
+      More project templates are in the making
+      
+      Other parameters:
+        #{b '[name]'}  - The name of the project directory
+      
+  #{b 'test'}
+    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 blog myblog'}
+  This command would create a new project directory 'myblog' with a mockup blog
+  soxer/sinatra application in it. You can tweak the design and parameters to
+  acheve the desired experience.
+  
+#{b '$ soxer test 8907'}
+  This command (when executed within the soxer project directory root) will
+  run the developement server on local machine on port 8907.
+  
+END
+
+def create
+  template = $*[1]
+  # Define skeleton parent directory
+  skel = File.dirname(__FILE__)+"/../lib/soxer/skel"
+  # Define destination or default
+  dir = $*[2] ? $*[2] : 'soxer-app'
+  # Copy skeleton to destination or fail if nonexistent
+  if template!=nil and File.exist?(skel+'/'+template) and !File.exist?(dir)
+    src = skel+'/'+template
+    # Check for destination existance
+    if !File.exist?(dir)
+      FileUtils.mkdir(dir)
+      FileUtils.cp_r(src+"/.", dir)
+      return notice "Successfuly created '"+dir+"' Directory."
+      #return Dir.glob(src+"/**/*").to_s
+    else
+      return err 'The destination directory exists.'
+    end
+  else
+    return err 'The project skeleton directory does not exist.'
+  end
+end
+
+def test
+  port = $*[1]!=nil ? $*[1] : '9394'
+  server = false
+  servers = %w[webrick mongrel thin]
+  servers.each do |s|
+    ENV['PATH'].split(':').each {|folder| server = s if File.exists?(folder+'/'+s)}
+  end
+  if server!=false
+    system("rackup -s #{server} -p #{port}")
+    return notice "End of developement mode."
+  else
+    return err "Please install a sinatra compatible web server (thin, mongrel or webrick.)"
+  end
+end
+
+case $*[0]
+  when 'create' then printf create
+  when 'test' then printf test
+  when 'help' then printf @help
+  else printf err 'You did not specify an action!'
+end
+
+
+x = <<END
+      #{b 'corporate'} - Creates a corporate web page mockup
+      #{b 'blog'}      - Creates a blog mockup
+      #{b 'gallery'}   - Creates an image gallery mockup
+END

data/lib/soxer/main.rb

@@ -165,7 +165,6 @@ module Sinatra
       out << haml( template, :layout => false, :locals => { :page=>get_page, :feed=>output, :author=>author } )
     end
     
-
     def google_ads options={}
       template = File.read File.join( File.dirname(__FILE__), 'views', 'google_ads.haml' )
       pattern = File.join( settings.root, settings.origin, "**", "*.yaml" )
@@ -182,11 +181,6 @@ module Sinatra
       haml( template, options.merge!( :layout => false ) )
     end
 
-    def recaptcha options={}
-      template = File.read File.join( File.dirname(__FILE__), 'views', 'recaptcha.haml' )
-      haml( template, options.merge!( :layout => false ) )
-    end
-
     #=== "partial" rails like partial generator
     #
     # This funnction accepts a string and matches it to a haml layout (with a

data/lib/soxer/skel/empty/app.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+require "rubygems"
+require "sinatra"
+require "soxer"
+
+not_found { 'The document does not exist' }
+
+get("/sitemap.xml") { sitemap }
+
+get "/css/:sheet.css" do
+  content_type "text/css", :charset => "utf-8"
+  sass params[:sheet].to_sym 
+end
+
+get '*.*' do
+  file = File.join( settings.root, settings.origin, params[:splat].join('.') )
+  case params[:splat][1]
+    when /[jpg|png|pdf|doc|xls|pdf]/ then send_file(file, :disposition => nil)
+  end
+end
+
+post '*/?' do
+  content_type "text/html", :charset => "utf-8"
+  page = get_page
+  page['layout'] ||= 'layout'
+  haml page['content'], :layout => page['layout'].to_sym, :locals => { :page => page }
+end
+
+get '*/?' do
+  content_type "text/html", :charset => "utf-8"
+
+  if params[:splat][0] =~ /-atom$/ then
+    set :haml, { :format => :xhtml }
+    content_type "application/atom+xml", :charset => "utf-8"
+  end
+
+  page = get_page
+  page['layout'] ||= 'layout'
+  haml page['content'], :layout => page['layout'].to_sym, :locals => { :page => page }
+end

data/lib/soxer/skel/empty/config.ru

@@ -0,0 +1,22 @@
+require "rubygems"
+require "sinatra/base"
+require "app"
+
+disable :run
+set :server, %w[thin mongrel webrick]
+set :origin, "content"
+set :haml, {:encoding => 'utf-8',
+            :format => :html5, 
+            :attr_wrapper => '"' }
+
+configure :development do
+  require 'sinatra/reloader'
+  set :port, 9394
+end
+
+configure :production do
+  set :port, 55500
+end
+
+set :environment, :production
+run Sinatra::Application

data/lib/soxer/skel/empty/config.yml

@@ -0,0 +1,14 @@
+---
+  environment: production
+  chdir: /path/to/your/application/home/dir
+  address: 0.0.0.0
+  user: toni
+  group: toni
+  port: 55500
+  pid: /path/to/your/application/home/dir/log/thin.pid
+  log: /path/to/your/application/home/dir/log/thin.log
+  rackup: /path/to/your/application/home/dir/config.ru
+  max_conns: 1024
+  timeout: 30
+  max_persistent_conns: 512
+  daemonize: true

data/lib/soxer/skel/empty/content/index.yaml

@@ -0,0 +1,6 @@
+uuid: 151af640-c35a-012d-f6b7-001e378a2988
+date: 2010-10-26T20:03:43+02:00
+title: Congratulations!
+content: |
+  %h1= page['title']
+  %p You have just created your first #{link_to 'soxer', 'http://soxer.mutsu.org'} application.

data/lib/soxer/skel/empty/views/css.sass

@@ -0,0 +1,7 @@
+$white = #ffffff
+body
+  color: $white
+  background: #800000
+  
+  a
+    color: $white

data/lib/soxer/skel/empty/views/layout.haml

@@ -0,0 +1,8 @@
+!!! 5
+%html( lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" )
+  %head
+    %title= "Title page: "+page['title']
+    %meta(charset="utf-8")
+    %link( href="/css/css.css" media="screen" rel="stylesheet" type="text/css" )
+  %body
+    = yield

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.0'
-  s.date              = '2010-10-25'
+  s.version           = '0.9.4'
+  s.date              = '2010-10-27'
   s.rubyforge_project = 'soxer'
 
-  s.summary     = "Dynamic web site engine"
-  s.description = "Soxer is a file based dynamic web creation tool for Sinatra."
+  s.summary     = "Dynamic web site generator engine"
+  s.description = "Soxer is a file based dynamic web site creation tool for Sinatra."
 
   s.authors  = ["Toni Anzlovar"]
   s.email    = 'toni@formalibre.si'
@@ -27,16 +27,13 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     soxer.gemspec
+    bin/soxer
     lib/soxer.rb
     lib/soxer/main.rb
-    lib/soxer/views/sitemap.haml
-    lib/soxer/views/recaptcha.haml
-    lib/soxer/views/google_analytics.haml
-    lib/soxer/views/google_ads.haml
-    lib/soxer/views/disqus.haml
-    lib/soxer/views/atom.haml
-  ]
+  ] + Dir.glob("{lib/soxer/views,lib/soxer/skel}/**/*")
   # = MANIFEST =
+  
+  s.executables = ['soxer']
 
   s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soxer
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Toni Anzlovar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 +02:00
+date: 2010-10-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,24 +60,30 @@ dependencies:
         version: "2"
   type: :runtime
   version_requirements: *id003
-description: Soxer is a file based dynamic web creation tool for Sinatra.
+description: Soxer is a file based dynamic web site creation tool for Sinatra.
 email: toni@formalibre.si
-executables: []
-
+executables: 
+- soxer
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - soxer.gemspec
+- bin/soxer
 - lib/soxer.rb
 - lib/soxer/main.rb
+- lib/soxer/views/atom.haml
 - lib/soxer/views/sitemap.haml
-- lib/soxer/views/recaptcha.haml
+- lib/soxer/views/disqus.haml
 - lib/soxer/views/google_analytics.haml
 - lib/soxer/views/google_ads.haml
-- lib/soxer/views/disqus.haml
-- lib/soxer/views/atom.haml
+- lib/soxer/skel/empty/content/index.yaml
+- lib/soxer/skel/empty/config.yml
+- lib/soxer/skel/empty/config.ru
+- lib/soxer/skel/empty/views/layout.haml
+- lib/soxer/skel/empty/views/css.sass
+- lib/soxer/skel/empty/app.rb
 has_rdoc: true
 homepage: http://soxer.mutsu.org
 licenses: []
@@ -111,6 +117,6 @@ rubyforge_project: soxer
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
-summary: Dynamic web site engine
+summary: Dynamic web site generator engine
 test_files: []
 

data/lib/soxer/views/recaptcha.haml

@@ -1,19 +0,0 @@
-:ruby
-  width ||= 500;
-  height ||= 300;
-  theme ||= 'white'
-  lang ||= 'en'
-  
-%script(type="text/javascript" src="http://www.google.com/recaptcha/api/js/recaptcha_ajax.js")
-:javascript
-  Recaptcha.create("#{key}", "recaptcha", {
-      theme: "#{theme}",
-      callback: Recaptcha.focus_response_field }
-  );
-%noscript
-  %iframe(src="http://www.google.com/recaptcha/api/noscript?k=#{key}" height="#{height}" width="#{width}" frameborder="0")
-  %br
-  %textarea(name="recaptcha_challenge_field" rows="3" cols="40")
-  %input(type="hidden" name="recaptcha_response_field" value="manual_challenge")
-
-#recaptcha