laydown 0.4.0 → 0.5.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 jbe
+Copyright (c) 2011 jbe
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -14,32 +14,49 @@
     #       | |           | oo     |
     #'''''''''''''''''''''''''''''******
 
-    #   $ gem install laydown
+Bored of writing the same html boilerplate every time you make a new app?
 
-Laydown is a simple template language for defining quick HTML5 layouts in Ruby. Never write the same old boilerplate again.
+How about something like this?
+
+    # $ gem install laydown
+
+ 
 
     require 'laydown'
 
-    layout = Laydown.new do |_|
-      _.charset 'some crazy charset'
-      _.title 'A man in a cave'
-      _.description 'A man is sitting in a cave.'
-      _.keywords 'man, cave, mystery', @keywords
-      _.favicon '/maninacave.png'
-      _.css '/maninacave/style.css'
-      _.css @css, '/site.css'
-      _.js @js
-      _.inline_js 'alert("Grrr");'
-      _.head '<meta generator="FlushFlox Super Deluxe">'
-      _.ga_code 'UA-8079526-5' # google analytics
-      _.body_class @body_class
-    end
-
-    @css        = 'somesheet.css'
-    @body_class = 'front'
-
-    layout.render(self) { '<p>this comes in the body</p>' }
+    layout = Laydown.new(
+      charset:      'utf-8' # default
+      title:        'A man in a #{@where}',
+      description:  'Very interesting',
+      favicon:      'pill.png',
+      keywords:     'man, #{@keywords}',
+
+      css:          ['site.css', '#{@css}'],
+      js:           ['app.js', '#{@js}'],
+      inline_js:    ['alert("#{msg}");'],
+
+      head:         '<meta soundtrack="Piazzolla">',
+      body:         '#{yield}', # default
+      body_class:   'dark',
+      ga_code:      'ga-some-number'
+      )
+
+    # ----------------------------
+
+    @where    = 'cave'
+    @keywords = 'cave, interesting'
+    @css      = 'somesheet.css'
+
+    layout.render(self, :msg => 'hello') { '<p>body text</p>' }
     # => your html5 layout
 
-The block given to `Laydown.new` will be evaluated in the context passed to the `render` method.
+### Features
+
+* Fast
+* Small footprint
+* Built on Temple and Tilt
+
+### Copyright
 
+Copyright (c) 2011 Jostein Berre Eliassen.
+See LICENCE for details. (MIT licence)

data/Rakefile

@@ -5,13 +5,13 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "laydown"
-    gem.summary = %Q{Pure Ruby HTML5 layout DSL for microframeworks.}
-    gem.description = %Q{Provides a simple Ruby DSL for defining HTML5 layouts for web apps. For those of us who has written basically the same html head 200 times and feels like minimalism.}
+    gem.summary = %Q{Make HTML5 layouts quickly with plain Ruby.}
+    gem.description = %Q{Provides a simple Ruby DSL for defining HTML5 layouts for web apps. For those who has written the same layout too many times.}
     gem.email = "post@jostein.be"
     gem.homepage = "http://github.com/jbe/laydown"
     gem.authors = ["jbe"]
-    gem.add_dependency "backports" #, ">= 0"
-    gem.add_development_dependency "tenjin", ">= 0"
+    gem.add_dependency "temple" #, ">= 0"
+    gem.add_development_dependency "slim", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -20,25 +20,15 @@ rescue LoadError
 end
 
 namespace :build do
-  desc 'Builds Tenjin templates'
+  desc 'Builds slim template'
   task :template do
+    require 'slim'
+    src = File.read('template.slim')
+    engine = Slim::Engine.new()
+    compiled = engine.compile(src)
 
-    require 'haml'
-    src = File.read('template/default.haml')
-    compiled = Haml::Engine.new(src).precompiled
-    File.open('lib/laydown/template.rb', 'w') do |f|
-      f.write <<-RUBY
-        require 'haml'
-        #require 'haml/helpers'
-        #require 'haml/util'
-        #require 'haml/buffer'
-        extend Haml::Helpers
-        _hamlout = @haml_buffer = Haml::Buffer.new(@haml_buffer)
-      RUBY
-      f.write(compiled)
-      f.write "@haml_buffer = @haml_buffer.upper"
+    File.open('lib/template.rb', 'w') do |f|
+      f.write compiled
     end
-
-    #sh 'rbtenjin -s templates/default_layout.tenjin.html > lib/templates/default_layout.rb'
   end
 end

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/laydown.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{laydown}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jbe"]
-  s.date = %q{2011-02-03}
-  s.description = %q{Provides a simple Ruby DSL for defining HTML5 layouts for web apps. For those of us who has written basically the same html head 200 times and feels like minimalism.}
+  s.date = %q{2011-02-20}
+  s.description = %q{Provides a simple Ruby DSL for defining HTML5 layouts for web apps. For those who has written the same layout too many times.}
   s.email = %q{post@jostein.be}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -25,12 +25,14 @@ Gem::Specification.new do |s|
     "VERSION",
     "laydown.gemspec",
     "lib/laydown.rb",
-    "spec/laydown_spec.rb"
+    "lib/template.rb",
+    "spec/laydown_spec.rb",
+    "template.slim"
   ]
   s.homepage = %q{http://github.com/jbe/laydown}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Pure Ruby HTML5 layout DSL for microframeworks.}
+  s.summary = %q{Make HTML5 layouts quickly with plain Ruby.}
   s.test_files = [
     "spec/laydown_spec.rb"
   ]
@@ -40,15 +42,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<backports>, [">= 0"])
-      s.add_development_dependency(%q<tenjin>, [">= 0"])
+      s.add_runtime_dependency(%q<temple>, [">= 0"])
+      s.add_development_dependency(%q<slim>, [">= 0"])
     else
-      s.add_dependency(%q<backports>, [">= 0"])
-      s.add_dependency(%q<tenjin>, [">= 0"])
+      s.add_dependency(%q<temple>, [">= 0"])
+      s.add_dependency(%q<slim>, [">= 0"])
     end
   else
-    s.add_dependency(%q<backports>, [">= 0"])
-    s.add_dependency(%q<tenjin>, [">= 0"])
+    s.add_dependency(%q<temple>, [">= 0"])
+    s.add_dependency(%q<slim>, [">= 0"])
   end
 end
 

data/lib/laydown.rb

@@ -1,131 +1,88 @@
 
-require 'backports'
+require 'tilt'
+require 'temple/utils'
 
 
 module Laydown
-  TOPOBJECT = defined?(BasicObject) ? BasicObject : Object
 
-  def self.new(&blk)
-    Template.new(&blk)
-  end
-
-  class Template
-    def initialize(&blk)
-      @layout = blk
+  DEFAULT_TEMPLATE = {
+    :charset      => 'utf-8',
+    :title        => nil,
+    :description  => nil,
+    :favicon      => nil,
+    :keywords     => nil,
+    :css          => [],
+    :js           => [],
+    :inline_js    => [],
+    :head         => [],
+    :body_class   => nil,
+    :body         => '#{yield}',
+    :ga_code      => nil
+  }
+
+  def self.compile(template={})
+
+    template = DEFAULT_TEMPLATE.merge(template)
+
+    [:charset, :title, :description, :favicon,
+    :keywords, :body_class, :body, :ga_code
+    ].each do |k|
+      template[k] = case template[k]
+        when Array  then template[k].join(template[k] == :keywords ? ', ' : '')
+        when String then template[k]
+        else template[k].to_s
+      end
     end
 
-    def render(scope=Object.new, &blk)
-      dsl = ::Laydown::DSL.new
-      scope.instance_exec(dsl, &@layout)
-      Renderer.new(dsl._captured_values, &blk).render
+    [:css, :js, :inline_js, :head].each do |k|
+      template[k] = Array(template[k]).flatten.compact
     end
-  end
-
-  class DSL
-    TARGETS = %w{
-      charset lang title description favicon keywords css js
-      inline_js head body ga_code body_class
-      }
 
-    attr_reader :_captured_values
-
-    def initialize
-      @_captured_values = Hash.new { [] }
-    end
-
-    def _laydown(name, *values)
-      @_captured_values[name] += values
+    compiled = read_raw_template.gsub(/data\[:([a-zA-Z0-9_]+)\]/) do |m|
+      val = template[:"#{$1}"]
+      case val
+        when String then interpolatize(val)
+        when nil    then 'nil'
+        when Array  then interpolatize(
+          val.map {|v| v.to_s }
+          )
+        else val.to_s
+      end
     end
 
-    TARGETS.each do |name|
-      class_eval <<-RUBY
-        def #{name}(*a); _laydown('#{name}', *a); end
-      RUBY
-    end
+    puts compiled
+    compiled
   end
 
-  class Renderer
-
-    def initialize(v)
-
-      @charset      = v['charset'].first || 'utf-8'
-      @lang         = v['lang'].first
-      @title        = v['title'].compact.join(' &ndash; ')
-      @favicon      = v['favicon'].first
-      @description  = v['description'].compact.join(' ') if v['description']
-      @keywords     = v['keywords'].compact.join(', ') if v['keywords']
-      @css          = v['css'].compact
-      @js           = v['js'].compact
-      @inline_js    = v['inline_js'].compact
-      @head         = v['head'].compact.join("\n")
-      @ga_code      = v['ga_code'].first
-      @body_class   = v['body_class'].compact.join(' ') if v['body_class']
-      @body = [block_given? ? yield : nil, v['body']].
-                      flatten.compact.join("\n")
-    end
+  def self.new(hsh={})
+    Template.new(hsh)
+  end
 
-    def render
-      "<!DOCTYPE html>\n" +
-      _(:html, {:lang => @lang},
-        _(:head, {},
-          _(:meta, {:charset => @charset}) +
-          _(:title, {}, @title) +
-          (@favicon ?
-            _(:link, {:rel => 'shortcut icon', :href => @favicon}) : '') +
-          (@description ?
-            _(:meta, {:description => @description}) : '') +
-          (@keywords ?
-            _(:meta, {:keywords => @keywords}) : '') +
-          @css.map do |url|
-            _(:link, {:rel => :stylesheet, :type => 'text/css', :href => url})
-          end.join +
-          @js.map do |url|
-            _(:script, {:type => 'text/javascript', :src => url}, '')
-          end.join +
-          @inline_js.map do |code|
-            _(:script, {:type => 'text/javascript'}, code)
-          end.join +
-          (@ga_code ? google_analytics_js : '') +
-          @head
-        ) +
-        _(:body, {:class => @body_class},
-          @body
-        )
-      )
-    end
+  def self.read_raw_template
+    File.read(File.join(
+      File.dirname(__FILE__), 'template.rb'
+      ))
+  end
 
+  def self.interpolatize(obj)
+    puts obj
+    obj.inspect.gsub(/\\#\{/, '#{')
+  end
 
-    # html helpers
+  class Template < Tilt::Template
 
-    def _(name, props={}, contents=nil)
-      tag_str = name.to_s + prop_str(props)
-      if contents
-        "<#{tag_str}>\n#{contents}\n</#{name}>\n"
-      else
-        "<#{tag_str}/>\n"
-      end
+    def initialize(hsh)
+      super(nil, 1, hsh) { '' } # tilt hack
     end
 
-    def prop_str(hsh)
-      return '' if hsh.values.compact.empty?
-      ' ' + hsh.map do |k,v|
-        "#{k.to_s}='#{v.to_s}'" if v
-      end.compact.join(' ')
+    def prepare
+      @src = Laydown.compile(options)
     end
 
-    def google_analytics_js
-    <<-JS
-var _gaq = _gaq || [];
-_gaq.push(['_setAccount', '#{@ga_code}']);
-_gaq.push(['_trackPageview']);
-(function() {
-var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-})();
-    JS
+    def precompiled_template(locals)
+      @src
     end
-
   end
 end
 
+

data/lib/template.rb

@@ -0,0 +1,46 @@
+_buf = [] ; _temple_pre_tags = /<pre|<textarea/ ; _buf << ("<!DOCTYPE html><html><head>") ; 
+ ; 
+ ; 
+ ; if data[:title] ; 
+ ; _buf << ("<title>#{data[:title]}"\
+""\
+"</title>") ; end ; if data[:favicon] ; 
+ ; _buf << ("<link rel=\"shortcut icon\" url=\"#{Temple::Utils.escape_html((data[:favicon]))}\">"\
+""\
+"") ; end ; if data[:description] ; 
+ ; _buf << ("<meta content=\"#{Temple::Utils.escape_html((data[:description]))}\" name=\"description\">"\
+""\
+"") ; end ; if data[:keywords] ; 
+ ; _buf << ("<meta content=\"#{Temple::Utils.escape_html((data[:keywords]))}\" name=\"keywords\">"\
+""\
+"") ; end ; data[:css].flatten.each do |url| ; 
+ ; unless url == '' ; 
+ ; _buf << ("<link href=\"#{Temple::Utils.escape_html((url))}\" rel=\"stylesheet\" type=\"text/css\">"\
+""\
+"") ; end ; end ; data[:js].flatten.each do |url| ; 
+ ; unless url == '' ; 
+ ; _buf << ("<script src=\"#{Temple::Utils.escape_html((url))}\" type=\"text/javascript\"></script>"\
+""\
+"") ; end ; end ; if data[:inline_js] && !data[:inline_js].empty? ; 
+ ; _buf << ("<script type=\"text/javascript\">") ; 
+ ; data[:inline_js].flatten.each do |code| ; 
+ ; unless code == '' ; 
+ ; _buf << (code) ; 
+ ; 
+ ; end ; end ; _buf << ("</script>") ; end ; if data[:head] ; 
+ ; _buf << (data[:head]) ; 
+ ; 
+ ; end ; _buf << ("</head><body class=\"#{Temple::Utils.escape_html((data[:body_class]))}\">"\
+"#{data[:body]}"\
+""\
+"") ; if data[:ga_code] ; 
+ ; 
+ ; _buf << ("<script type=\"text/javascript\">var _gaq = _gaq || [];\n_gaq.push(['_setAccount', '"\
+"#{Temple::Utils.escape_html((data[:ga_code]))}']);\n_gaq.push(['_trackPageview']);\n(function() {\nvar ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\nga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\nvar s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n})();</script>"\
+""\
+""\
+""\
+""\
+""\
+""\
+"") ; end ; _buf << ("</body></html>") ; _buf = _buf.join

data/spec/laydown_spec.rb

@@ -5,25 +5,27 @@ require 'laydown'
 describe Laydown do
 
   subject do
-    Laydown.new do |_|
-      _.charset 'iso-piso'
-      _.title 'Apple sucks'
-      _.description 'Yes, it does. And so do their fans.'
-      _.favicon 'applesuck.png'
-      _.keywords 'apple suck lol'
-      _.css 'applesuck.css'
-      _.js 'applesuck.js'
-      _.inline_js "alert('#{@msg}');"
-      _.head '<meta generator="Ubuntu">'
-      _.body @body
-      _.ga_code 'GA-UGGABUGGA'
-    end
+    Laydown.new(
+      charset:      'iso-pam-pa-la-la',
+      title:        'Apple sucks #{@reason}',
+      description:  'And so do their fans.',
+      favicon:      'applesuck.png',
+      keywords:     'apple suck lol #{@keywords}',
+
+      css:          ['applesuck.css', '#{@css}'],
+      js:           ['applesuck.js', '#{@js}'],
+      inline_js:    'alert("#{@msg}");',
+
+      head:         '<meta generator="Ubuntu">',
+      body:         '#{yield}',
+      ga_code:      'GA-UGGABUGGA'
+      )
   end
 
   it 'generates properly' do
-    @msg = 'lol @ iPhone'
-    @body = '<p>Seriously.</p>'
-    str = subject.render(self)
+    @reason = 'just because'
+    @msg = 'boo'
+    str = subject.render(self) { 'This is the body.' }
     str.should == nil
 
     #str.match(/lang="en"/).should

data/template.slim

@@ -0,0 +1,45 @@
+! doctype html
+html
+  head
+    - if data[:title]
+      title == data[:title]
+
+    - if data[:favicon]
+      link rel="shortcut icon" url=data[:favicon]
+
+    - if data[:description]
+      meta name="description" content=data[:description]
+
+    - if data[:keywords]
+      meta name="keywords" content=data[:keywords]
+
+    - data[:css].flatten.each do |url|
+      - unless url == ''
+        link rel="stylesheet" type='text/css' href=url
+      
+    - data[:js].flatten.each do |url|
+      - unless url == ''
+        script type="text/javascript" src=url
+
+    - if data[:inline_js] && !data[:inline_js].empty?
+      script type="text/javascript"
+        - data[:inline_js].flatten.each do |code|
+          - unless code == ''
+            == code
+
+    - if data[:head]
+      == data[:head]
+
+  body class=data[:body_class]
+    == data[:body]
+
+    - if data[:ga_code]
+      javascript:
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', '#{data[:ga_code]}']);
+        _gaq.push(['_trackPageview']);
+        (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+        })();

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - jbe
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 +01:00
+date: 2011-02-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: backports
+  name: temple
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -31,7 +31,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: tenjin
+  name: slim
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -43,7 +43,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
-description: Provides a simple Ruby DSL for defining HTML5 layouts for web apps. For those of us who has written basically the same html head 200 times and feels like minimalism.
+description: Provides a simple Ruby DSL for defining HTML5 layouts for web apps. For those who has written the same layout too many times.
 email: post@jostein.be
 executables: []
 
@@ -61,7 +61,9 @@ files:
 - VERSION
 - laydown.gemspec
 - lib/laydown.rb
+- lib/template.rb
 - spec/laydown_spec.rb
+- template.slim
 has_rdoc: true
 homepage: http://github.com/jbe/laydown
 licenses: []
@@ -93,6 +95,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Pure Ruby HTML5 layout DSL for microframeworks.
+summary: Make HTML5 layouts quickly with plain Ruby.
 test_files: 
 - spec/laydown_spec.rb