laydown 0.1.0 → 0.1.1

data/README

@@ -14,23 +14,35 @@
 #                                         ^
 #                                  $  «« ^¨^ »»  $
 #                                 http://jostein.be
-#  sample:                              '' ''
+#                                       '' ''
+#
+# 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', @keywords
-  favicon 'maninacave.png'
+  keywords 'man, cave, mystery', @keywords
+  favicon '/maninacave.png'
   css '/maninacave/style.css'
   css @css
   js '/maninacave/site.js'
   js @js
 
-  body "<h1>A man in\na cave</h1>"
+  body @body || '<p>Empty</p>'
 end
 
-@css = 'somesheet.css'
 
-puts Layout.render(self) # => beautiful html5
+@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/Rakefile

@@ -6,12 +6,11 @@ begin
   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 stripping.}
+    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.email = "post@jostein.be"
     gem.homepage = "http://github.com/jbe/laydown"
     gem.authors = ["jbe"]
     gem.add_dependency "instant_dsl", ">= 0"
-    gem.add_dependency "markaby", ">= 0"
     gem.add_development_dependency "tenjin", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/laydown.gemspec

@@ -0,0 +1,57 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{laydown}
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["jbe"]
+  s.date = %q{2010-12-09}
+  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"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README",
+     "Rakefile",
+     "VERSION",
+     "laydown.gemspec",
+     "lib/laydown.rb",
+     "lib/templates/default_layout.rb",
+     "templates/default_layout.tenjin.html",
+     "test/rough.rb"
+  ]
+  s.homepage = %q{http://github.com/jbe/laydown}
+  s.rdoc_options = ["--charset=UTF-8"]
+  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"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    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_development_dependency(%q<tenjin>, [">= 0"])
+    else
+      s.add_dependency(%q<instant_dsl>, [">= 0"])
+      s.add_dependency(%q<tenjin>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<instant_dsl>, [">= 0"])
+    s.add_dependency(%q<tenjin>, [">= 0"])
+  end
+end
+

data/lib/laydown.rb

@@ -28,30 +28,19 @@ module Laydown
   class Template
     def initialize(&conf)
       @conf = conf
+      @tpath = File.expand_path('../templates/default_layout.rb', __FILE__)
+      @template = IO.read(@tpath)
     end
 
     def render(source_scope=::Laydown::NoScope.new)
-      dsl_scope = ::Laydown::DSL.new
-      copy_instance_variables(source_scope, dsl_scope)
+      dsl_scope = ::Laydown::DSL.new(source_scope)
+
       dsl_scope.send :instance_eval, &@conf
 
       scope = ::Laydown::TemplateScope.new(dsl_scope.dsl_values)
-
-      tpath = File.expand_path('../templates/default_layout.rb', __FILE__)
-      template = IO.read(tpath)
-
-      scope.send :instance_eval, template, tpath
+      scope.send :instance_eval, @template, @tpath
     end
 
-    private
-      def copy_instance_variables(a, b, destr=false)
-        a.instance_variables.each do |name|
-          if !b.instance_variable_defined?(name) or destr
-            b.instance_variable_set(name, a.instance_variable_get(name))
-          end
-        end
-      end
-
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - jbe
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +01:00
+date: 2010-12-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,23 +30,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: markaby
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: tenjin
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -55,8 +42,8 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
-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 stripping.
+  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.
 email: post@jostein.be
 executables: []
 
@@ -72,6 +59,7 @@ files:
 - README
 - Rakefile
 - VERSION
+- laydown.gemspec
 - lib/laydown.rb
 - lib/templates/default_layout.rb
 - templates/default_layout.tenjin.html