laydown 0.3.0 → 0.4.0

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format progress
+spec

data/README.md

@@ -0,0 +1,45 @@
+    #
+    #                            «=»
+    #                             ^
+    #                      $  «« ^¨^ »»  $
+    #                           '' ''
+    #        .
+    #       «=»
+    #        ^
+    #    «« ^¨^ »»
+    #     LAYDOWN
+    #     ''|'|''
+    #       | |                  |>
+    #       | |            ______|_
+    #       | |           | oo     |
+    #'''''''''''''''''''''''''''''******
+
+    #   $ gem install laydown
+
+Laydown is a simple template language for defining quick HTML5 layouts in Ruby. Never write the same old boilerplate again.
+
+    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>' }
+    # => your html5 layout
+
+The block given to `Laydown.new` will be evaluated in the context passed to the `render` method.
+

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "post@jostein.be"
     gem.homepage = "http://github.com/jbe/laydown"
     gem.authors = ["jbe"]
-    gem.add_dependency "instant_dsl", ">= 0"
+    gem.add_dependency "backports" #, ">= 0"
     gem.add_development_dependency "tenjin", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
@@ -21,7 +21,24 @@ end
 
 namespace :build do
   desc 'Builds Tenjin templates'
-  task :templates do
-    sh 'rbtenjin -s templates/default_layout.tenjin.html > lib/templates/default_layout.rb'
+  task :template do
+
+    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"
+    end
+
+    #sh 'rbtenjin -s templates/default_layout.tenjin.html > lib/templates/default_layout.rb'
   end
 end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/laydown.gemspec

@@ -5,35 +5,34 @@
 
 Gem::Specification.new do |s|
   s.name = %q{laydown}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jbe"]
-  s.date = %q{2011-02-01}
+  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.email = %q{post@jostein.be}
   s.extra_rdoc_files = [
     "LICENSE",
-    "README"
+    "README.md"
   ]
   s.files = [
     ".document",
+    ".rspec",
     "LICENSE",
-    "README",
+    "README.md",
     "Rakefile",
     "VERSION",
     "laydown.gemspec",
     "lib/laydown.rb",
-    "lib/templates/default_layout.rb",
-    "templates/default_layout.tenjin.html",
-    "test/rough.rb"
+    "spec/laydown_spec.rb"
   ]
   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.test_files = [
-    "test/rough.rb"
+    "spec/laydown_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -41,14 +40,14 @@ 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<instant_dsl>, [">= 0"])
+      s.add_runtime_dependency(%q<backports>, [">= 0"])
       s.add_development_dependency(%q<tenjin>, [">= 0"])
     else
-      s.add_dependency(%q<instant_dsl>, [">= 0"])
+      s.add_dependency(%q<backports>, [">= 0"])
       s.add_dependency(%q<tenjin>, [">= 0"])
     end
   else
-    s.add_dependency(%q<instant_dsl>, [">= 0"])
+    s.add_dependency(%q<backports>, [">= 0"])
     s.add_dependency(%q<tenjin>, [">= 0"])
   end
 end

data/lib/laydown.rb

@@ -1,51 +1,131 @@
 
-require 'instant_dsl'
+require 'backports'
+
 
 module Laydown
+  TOPOBJECT = defined?(BasicObject) ? BasicObject : Object
 
-  DSL_WORDS = [:title, :description, :favicon, :keywords, :css, :js, :head, :body]
-  DSL = InstantDSL[*DSL_WORDS]
+  def self.new(&blk)
+    Template.new(&blk)
+  end
 
-  class NoScope < Object; end
+  class Template
+    def initialize(&blk)
+      @layout = blk
+    end
 
-  class TemplateScope
-    def initialize(v)
-      @title        = v[:title].join
-      @description  = v[:description].join
-      @favicon      = v[:favicon].first
-      @keywords     = v[:keywords].join(', ')
-      @stylesheets  = v[:css].compact
-      @javascripts  = v[:js].compact
-      @head         = v[:head].join("\n")
-      @body         = v[:body].join("\n")
+    def render(scope=Object.new, &blk)
+      dsl = ::Laydown::DSL.new
+      scope.instance_exec(dsl, &@layout)
+      Renderer.new(dsl._captured_values, &blk).render
     end
   end
 
-  def self.layout(&conf)
-    Template.new(&conf)
-  end
+  class DSL
+    TARGETS = %w{
+      charset lang title description favicon keywords css js
+      inline_js head body ga_code body_class
+      }
 
-  class Template
-    def initialize(&conf)
-      @conf = conf
-      @tpath = File.expand_path('../templates/default_layout.rb', __FILE__)
-      @template = IO.read(@tpath)
+    attr_reader :_captured_values
+
+    def initialize
+      @_captured_values = Hash.new { [] }
+    end
+
+    def _laydown(name, *values)
+      @_captured_values[name] += values
     end
 
-    def render(source_scope=::Laydown::NoScope.new)
-      dsl_scope = ::Laydown::DSL.new(source_scope)
+    TARGETS.each do |name|
+      class_eval <<-RUBY
+        def #{name}(*a); _laydown('#{name}', *a); end
+      RUBY
+    end
+  end
 
-      dsl_scope.send :instance_eval, &@conf
+  class Renderer
 
-      scope = ::Laydown::TemplateScope.new(dsl_scope.dsl_values)
-      scope.send :instance_eval, @template, @tpath
+    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
 
-  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
 
-end
 
+    # html helpers
 
+    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
+    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(' ')
+    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
+    end
 
+  end
+end
 

data/spec/laydown_spec.rb

@@ -0,0 +1,36 @@
+
+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
+  end
+
+  it 'generates properly' do
+    @msg = 'lol @ iPhone'
+    @body = '<p>Seriously.</p>'
+    str = subject.render(self)
+    str.should == nil
+
+    #str.match(/lang="en"/).should
+    #str.match(/charset="iso-piso"/)
+    #str.match(/GA-UGGABUGGA/)
+  end
+
+end
+
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - jbe
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +01:00
+date: 2011-02-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: instant_dsl
+  name: backports
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -51,18 +51,17 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README
+- README.md
 files: 
 - .document
+- .rspec
 - LICENSE
-- README
+- README.md
 - Rakefile
 - VERSION
 - laydown.gemspec
 - lib/laydown.rb
-- lib/templates/default_layout.rb
-- templates/default_layout.tenjin.html
-- test/rough.rb
+- spec/laydown_spec.rb
 has_rdoc: true
 homepage: http://github.com/jbe/laydown
 licenses: []
@@ -96,4 +95,4 @@ signing_key:
 specification_version: 3
 summary: Pure Ruby HTML5 layout DSL for microframeworks.
 test_files: 
-- test/rough.rb
+- spec/laydown_spec.rb

data/README

@@ -1,48 +0,0 @@
-#
-#        .
-#       «=»                         ☺
-#        ^
-#    «« ^¨^ »»
-#     LAYDOWN
-#     ''|'|''
-#       | |
-#       | |
-#       | |
-#'''''''''''''''''''''''''''''
-#   $ gem install laydown
-#                                        «=»
-#                                         ^
-#                                  $  «« ^¨^ »»  $
-#                                 http://jostein.be
-#                                       '' ''
-#
-# 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 want to streamline it.
-
-require 'laydown'
-
-layout = Laydown.layout do
-  title 'A man in a cave'
-  description 'A man is sitting in a cave. What will he do?'
-  keywords 'man, cave, mystery', @keywords
-  favicon '/maninacave.png'
-  css '/maninacave/style.css'
-  css @css
-  js '/maninacave/site.js'
-  js @js
-
-  body @body || '<p>Empty</p>'
-end
-
-
-@css  = 'somesheet.css'
-@body = '<h1>A man in a cave</h1>'
-
-puts layout.render(self) # => beautiful html5
-
-# Note the binding passed to render (in this case self)
-# -- its instance variables are made accessible to the
-# layout block.
-
-

data/lib/templates/default_layout.rb

@@ -1,30 +0,0 @@
-_buf = '';  _buf << %Q`<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>#{@title}</title>\n`
-    if @description
- _buf << %Q`    <meta name="description" content="#{@description}">\n`
-    end
-    if @keywords
- _buf << %Q`    <meta name="keywords" content="#{@keywords}">\n`
-    end
-    if @favicon
- _buf << %Q`    <link rel="shortcun icon" href="#{@favicon}">\n`
-    end
- _buf << %Q`\n`
-    @stylesheets.each do |sheet|
- _buf << %Q`    <link rel="stylesheet" type="text/css" href="#{sheet}">\n`
-    end
- _buf << %Q`\n`
-    @javascripts.each do |script|
- _buf << %Q`    <script src="#{script}" ></script>\n`
-    end
- _buf << %Q`    #{ @head }
-  </head>
-
-<body>
-#{ @body }
-</body>
-</html>\n`
-_buf.to_s

data/templates/default_layout.tenjin.html

@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>#{@title}</title>
-    <?rb if @description ?>
-    <meta name="description" content="#{@description}">
-    <?rb end ?>
-    <?rb if @keywords ?>
-    <meta name="keywords" content="#{@keywords}">
-    <?rb end ?>
-    <?rb if @favicon ?>
-    <link rel="shortcun icon" href="#{@favicon}">
-    <?rb end ?>
-
-    <?rb @stylesheets.each do |sheet| ?>
-    <link rel="stylesheet" type="text/css" href="#{sheet}">
-    <?rb end ?>
-
-    <?rb @javascripts.each do |script| ?>
-    <script src="#{script}" ></script>
-    <?rb end ?>
-    #{ @head }
-  </head>
-
-<body>
-#{ @body }
-</body>
-</html>

data/test/rough.rb

@@ -1,19 +0,0 @@
-require './lib/laydown'
-
-
-Layout = Laydown.layout do
-  title 'A man in a cave'
-  description 'A man is sitting in a cave. What will he do?'
-  keywords 'man, cave, mystery'
-  favicon 'maninacave.png'
-  css '/maninacave/style.css'
-  css @css
-  js '/maninacave/site.js'
-  js @js
-
-  body "<h1>A man in\na cave</h1>"
-end
-
-@css = 'somesheet.css'
-
-puts Layout.render(self)