laydown 0.6.2 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.7.0

data/laydown.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{laydown}
-  s.version = "0.6.2"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jbe"]

data/lib/laydown.rb

@@ -9,43 +9,67 @@ module Laydown
 
   DEFAULTS = {
     :charset      => 'utf-8',
-    :title        => nil,
+    :title        => '#{@title}',
     :description  => nil,
     :favicon      => nil,
-    :keywords     => [],
-    :css          => [],
-    :js           => [],
-    :inline_js    => [],
+    :keywords     => [:@keywords],
+    :css          => [:@css, :@stylesheets],
+    :js           => [:@javascripts, :@js],
+    :inline_js    => [:@inline_js],
     :head         => [],
     :body_class   => [],
     :body         => :yield,
     :ga_code      => :@ga_code
   }
 
-  ARRAY_PROPS = [:keywords, :css, :js, :inline_js, :head, :body_class]
+  class << self
 
-  def self.compile(template={})
+    def properties
+      DEFAULTS.keys
+    end
 
-    template = DEFAULTS.merge(template)
+    def plural_properties
+      properties.select {|name| DEFAULTS[name].is_a?(Array) }
+    end
 
-    ARRAY_PROPS.each do |k|
-      template[k] = Array(template[k]).flatten.compact
+    def compile(values={})
+      process(values)
+      validate(values)
+      make_template_from(values)
     end
 
-    TEMPLATE.gsub(/data\[:([a-zA-Z0-9_]+)\]/) do |m|
-      literalize template[:"#{$1}"]
+    def process(values)
+      DEFAULTS.each {|k,v| values[k] ||= v }
+      plural_properties.each do |k|
+        values[k] = Array(values[k]).flatten.compact
+      end
+    end
+
+    def validate(values)
+      values.keys.each do |value|
+        unless DEFAULTS.keys.include?(value)
+          raise "no Laydown property called #{value.inspect}"
+        end
+      end
+    end
+
+    def make_template_from(values)
+      TEMPLATE.gsub(/data\[:([a-zA-Z0-9_]+)\]/) do |m|
+        literalize values[:"#{$1}"]
+      end
     end
-  end
 
-  def self.literalize(obj)
-    case obj
-      when String then obj.inspect.gsub(/\\#\{/, '#{') + "+''"
-      when Symbol then obj.to_s
-      when nil    then 'nil'
-      when Array
-        '[' + obj.map {|o| literalize(o) }.join(', ') + ']'
-      else obj.to_s.inspect
+    def literalize(obj)
+      case obj
+        when String then obj.inspect.gsub(/\\#\{/, '#{') + "+''"
+        when Symbol then obj.to_s
+        when nil    then 'nil'
+        when Array
+          '[' + obj.map {|o| literalize(o) }.join(', ') + ']'
+        else obj.to_s.inspect
+      end
     end
+
   end
 
   class Template < Tilt::Template

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 2
-  version: 0.6.2
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - jbe