livingstyleguide 2.0.0.alpha.5 → 2.0.0.alpha.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54f48cd7f49da48fb013eb94ef814c352b0b36d8
-  data.tar.gz: 708b10793c5522b1ce06c4b44b9b88130b410d09
+  metadata.gz: 99011854cea04c29122a5e4014eca155e1972da2
+  data.tar.gz: 324abacc9ef03fa22b0fa570b8fee64f686c5312
 SHA512:
-  metadata.gz: 4db4eee6c6208f7887ebc193b8e878dbd73f0a464206e0ebd3e31fdab7a176073217f06f293035534442c9b9039fe8c19cde309cf30c801ad8a75d46cdc245a3
-  data.tar.gz: 168434570778b35daa37373c6827e2d1a86166c2da1123d72d0608586a6eeb0d2b52b27f26541d5663a0f142a1638255241a285f086904adf34c5f2fc25fa41b
+  metadata.gz: 201d20433e57bce205aa2fc8086678e49455b33c97fadacded15fc9538d8b2be1d24876c005bb671662cdb2918ad0bb0ee460ee7a06773c9e2bcba03e7312e67
+  data.tar.gz: 4c8f285365e917fd882f173c03827a195dc66df295a9f5051264c4b0368ba6c679beda37212dc16c96b291054110fd39f568c8f04aa27dcce344737586c64832

data/lib/livingstyleguide/document.rb

@@ -8,6 +8,7 @@ class LivingStyleGuide::Document < ::Tilt::Template
   attr_accessor :source, :type, :filters, :template, :classes, :html
   attr_accessor :css, :id, :locals
   attr_accessor :title
+  attr_accessor :defaults
   attr_reader :scope
 
   %w(scss head header footer).each do |attr|
@@ -36,10 +37,10 @@ class LivingStyleGuide::Document < ::Tilt::Template
     @scss = ''
     @css = ''
     @locals = {}
-  end
-
-  def source
-    @source ||= erb.gsub(/<%.*?%>\n?/, '').strip
+    @defaults = { global: {} }
+    @head = ""
+    @header = ""
+    @footer = ""
   end
 
   def highlighted_source
@@ -64,13 +65,15 @@ class LivingStyleGuide::Document < ::Tilt::Template
 
   def erb
     @erb ||= parse_filters do |name, arguments, options, block|
-      "<%= #{name}(#{arguments.inspect}, #{options.inspect}, #{block.inspect}) %>\n"
+      options = %Q(document.defaults[:global].merge(document.defaults[:@#{name}] || {}).merge(#{options.inspect}))
+      "<%= #{name}(#{arguments.inspect}, #{options}, #{block.inspect}) %>\n"
     end
   end
 
   def evaluate(scope, locals, &block)
     @scope = scope
     result = ERB.new(erb).result(@filters.get_binding)
+    @source = result
     @html = render_html(result, locals)
     @classes.unshift "livingstyleguide--#{@type}-example"
     @classes.unshift "livingstyleguide--example"
@@ -170,7 +173,7 @@ class LivingStyleGuide::Document < ::Tilt::Template
   def parse_filters
     data.gsub('<%', '<%%').gsub(/\G(.*?)((```.+?```)|\Z)/m) do
       content, code_block = $1, $2
-      content.gsub(/^@([\w\d_-]+)(?: ([^\n]*[^\{\n:]))?(?: *\{\n((?:.|\n)*?)\n\}|\n((?:  .*(?:\n|\Z))+)| *:\n((?:.|\n)*?)(?:\n\n|\Z))?/) do
+      content.gsub(/^@([\w\d_-]+)(?: ([^\n]*[^\{\n:]))?(?: *\{\n((?:.|\n)*?)\n\}|((?:\n+  .*)+(?=\n|\Z))| *:\n((?:.|\n)*?)(?:\n\n|\Z))?/) do
         name, arguments_string, block = $1, $2 || '', $3 || $4 || $5
         options = {
           block_type: $3 ? :braces : $4 ? :indented : $5 ? :block : :none
@@ -178,7 +181,7 @@ class LivingStyleGuide::Document < ::Tilt::Template
         name = name.gsub('-', '_').to_sym
         arguments = parse_arguments(arguments_string, options)
         if options[:block_type] == :indented
-          block.gsub!(/\A(\s*)((?:.|\n)+)\Z/){ $2.gsub(/^#{$1}/, '') }
+          block.gsub!(/\A\n(\s*)((?:.|\n)+)\Z/){ $2.gsub(/^#{$1}/, '') }
         end
         yield name, arguments, options, block
       end + code_block

data/lib/livingstyleguide/filters/css.rb

@@ -7,6 +7,9 @@ LivingStyleGuide.add_filter :css, :scss do |arguments, options, source|
     document.depend_on file
     document.scss << %Q(@import "#{file}";\n)
   else
+    if options[:preprocessor] == "sass"
+      source = Sass::Engine.new(source).to_tree.to_scss
+    end
     document.scss << "##{document.id.gsub('/', '\\/')} {\n#{source}\n}\n"
   end
   nil

data/lib/livingstyleguide/filters/data.rb

@@ -1,6 +1,11 @@
 require 'json'
+require 'yaml'
 
 LivingStyleGuide.add_filter :data do |arguments, options, data|
-  document.locals.merge! JSON.parse("{#{data}}")
+  if options[:format] == "yaml"
+    document.locals.merge! Psych.load("{#{data}}")
+  else
+    document.locals.merge! JSON.parse("{#{data}}")
+  end
   nil
 end

data/lib/livingstyleguide/filters/default.rb

@@ -0,0 +1,6 @@
+LivingStyleGuide.add_filter :default do |arguments, options, block|
+  key = arguments.first ? arguments.first.gsub("-", "_").to_sym : :global
+  document.defaults[key] ||= {}
+  document.defaults[key].merge!(options)
+  nil
+end

data/lib/livingstyleguide/filters/{import.rb → import_and_use.rb}

@@ -1,25 +1,39 @@
 require 'tilt'
 
-LivingStyleGuide.add_filter :import do |arguments, options, data|
-  glob = arguments.first
-  if glob =~ /\.s[ac]ss$/
-    raise "Error: Please use `@css #{glob}` instead of `@import #{glob}` for importing Sass."
-  end
+def map_files(glob, &block)
   glob << '.lsg' unless glob =~ /\.(\w+|\*)$/
   glob.gsub!(/[^\/]+$/, '{_,}\\0')
   if document.file
     glob = File.join(File.dirname(document.file), glob)
   end
 
+  Dir.glob(glob).map do |file|
+    document.depend_on file
+    yield(file)
+  end.join
+end
+
+LivingStyleGuide.add_filter :import do |arguments, options, data|
+  glob = arguments.first
+  if glob =~ /\.s[ac]ss$/
+    raise "Error: Please use `@css #{glob}` instead of `@import #{glob}` for importing Sass."
+  end
+
   if data
     Kernel.require 'json'
     data = JSON.parse("{#{data}}")
   end
 
-  Dir.glob(glob).map do |file|
-    document.depend_on file
+  map_files glob do |file|
     html = ::Tilt.new(file, livingstyleguide: document).render(document.scope, data)
     html.gsub!("\n", "\n  ")
     "\n<div>\n#{html}\n</div>\n"
-  end.join
+  end
+end
+
+LivingStyleGuide.add_filter :use do |arguments, options, data|
+  glob = arguments.first
+  map_files glob do |file|
+    File.read(file)
+  end
 end

data/lib/livingstyleguide/filters/layout.rb

@@ -0,0 +1,33 @@
+LivingStyleGuide.add_filter :title do |arguments, options, block|
+  document.title = arguments.first
+  nil
+end
+
+{ :before => :head, :after => :footer }.each do |name, destination|
+  eval <<-RUBY
+    LivingStyleGuide.add_filter :javascript_#{name} do |arguments, options, block|
+      if src = arguments.first
+        document.#{destination} << %Q(<script src="\#{src}"></script>)
+      else
+        if options[:transpiler] == "coffee-script"
+          block = Tilt["coffee"].new{ block }.render
+        end
+        document.#{destination} << %Q(<script>\\n\#{block}\\n</script>)
+      end
+      nil
+    end
+  RUBY
+end
+
+%w(head header footer).each do |part|
+  eval <<-RUBY
+    LivingStyleGuide.add_filter :#{part} do |arguments, options, block|
+      if template = Tilt[options[:type]]
+        block = template.new{ block }.render
+      end
+      document.#{part} << block + "\n"
+      nil
+    end
+  RUBY
+  nil
+end

data/lib/livingstyleguide/filters/style.rb

@@ -2,6 +2,6 @@ LivingStyleGuide.add_filter :style do |arguments, options, block|
   options.delete :block_type
   options.each do |key, value|
     document.scss << %Q($livingstyleguide--#{key.to_s.gsub("_", "-")}: #{value};\n)
-    nil
   end
+  nil
 end

data/lib/livingstyleguide/filters.rb

@@ -17,7 +17,8 @@ class LivingStyleGuide::Filters
 end
 
 require 'livingstyleguide/filters/options'
-require 'livingstyleguide/filters/import'
+require 'livingstyleguide/filters/default'
+require 'livingstyleguide/filters/import_and_use'
 require 'livingstyleguide/filters/require'
 require 'livingstyleguide/filters/full_width'
 require 'livingstyleguide/filters/haml'
@@ -31,4 +32,4 @@ require 'livingstyleguide/filters/colors'
 require 'livingstyleguide/filters/css'
 require 'livingstyleguide/filters/style'
 require 'livingstyleguide/filters/data'
-require 'livingstyleguide/filters/html_head'
+require 'livingstyleguide/filters/layout'

data/lib/livingstyleguide/templates/layout.html.erb

@@ -1,5 +1,5 @@
 <!doctype html>
-<html>
+<html id="<%= id %>">
 
 <head>
 <meta charset="utf-8">

data/lib/livingstyleguide/version.rb

@@ -1,3 +1,3 @@
 module LivingStyleGuide
-  VERSION = '2.0.0.alpha.5'
+  VERSION = '2.0.0.alpha.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livingstyleguide
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.5
+  version: 2.0.0.alpha.6
 platform: ruby
 authors:
 - Nico Hagenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minisyntax
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: heredoc_unindent
   requirement: !ruby/object:Gem::Requirement
@@ -199,12 +213,13 @@ files:
 - lib/livingstyleguide/filters/colors.rb
 - lib/livingstyleguide/filters/css.rb
 - lib/livingstyleguide/filters/data.rb
+- lib/livingstyleguide/filters/default.rb
 - lib/livingstyleguide/filters/font_example.rb
 - lib/livingstyleguide/filters/full_width.rb
 - lib/livingstyleguide/filters/haml.rb
-- lib/livingstyleguide/filters/html_head.rb
-- lib/livingstyleguide/filters/import.rb
+- lib/livingstyleguide/filters/import_and_use.rb
 - lib/livingstyleguide/filters/javascript.rb
+- lib/livingstyleguide/filters/layout.rb
 - lib/livingstyleguide/filters/markdown.rb
 - lib/livingstyleguide/filters/options.rb
 - lib/livingstyleguide/filters/require.rb

data/lib/livingstyleguide/filters/html_head.rb

@@ -1,4 +0,0 @@
-LivingStyleGuide.add_filter :title do |arguments, options, block|
-  document.title = arguments.first
-  nil
-end