livingstyleguide 2.0.0.alpha.4 → 2.0.0.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09fd1db6eea766e1fc9ce49ea9093fcba7cb5cf0
-  data.tar.gz: 9e677d67f85cea4e8067e25af350057599fb7b74
+  metadata.gz: 54f48cd7f49da48fb013eb94ef814c352b0b36d8
+  data.tar.gz: 708b10793c5522b1ce06c4b44b9b88130b410d09
 SHA512:
-  metadata.gz: 23abb326faa5c71f9432c9e44d677f12bcc29510e9ce9d13df4d316b1032e43d693798bd03c30be56eb70a573ea3e2f690499ac75303a6aa01e7d02f4af8e963
-  data.tar.gz: 197222fd5eb577683377373f5d0a1034d06c2874851076c0e7a7d494a594aa3de5ee05d34e3efec64dcb726a718d692659aa52cd8f7a95d8b7aee09399d95f9c
+  metadata.gz: 4db4eee6c6208f7887ebc193b8e878dbd73f0a464206e0ebd3e31fdab7a176073217f06f293035534442c9b9039fe8c19cde309cf30c801ad8a75d46cdc245a3
+  data.tar.gz: 168434570778b35daa37373c6827e2d1a86166c2da1123d72d0608586a6eeb0d2b52b27f26541d5663a0f142a1638255241a285f086904adf34c5f2fc25fa41b

data/lib/livingstyleguide/document.rb

@@ -29,7 +29,7 @@ class LivingStyleGuide::Document < ::Tilt::Template
   end
 
   def prepare
-    @type = :markdown
+    @type = :lsg
     @filters = LivingStyleGuide::Filters.new(self)
     @template = options.has_key?(:livingstyleguide) ? :default : :layout
     @classes = []
@@ -63,28 +63,15 @@ class LivingStyleGuide::Document < ::Tilt::Template
   end
 
   def erb
-    @erb ||= parse_filters do |name, arguments|
-      arguments = arguments.map do |argument|
-        %Q("#{argument.gsub('"', '\\"').gsub("\n", '\\n')}")
-      end
-      "<%= #{name}(#{arguments.join(', ')}) %>"
+    @erb ||= parse_filters do |name, arguments, options, block|
+      "<%= #{name}(#{arguments.inspect}, #{options.inspect}, #{block.inspect}) %>\n"
     end
   end
 
   def evaluate(scope, locals, &block)
     @scope = scope
     result = ERB.new(erb).result(@filters.get_binding)
-    @html = case @type
-    when :plain, :example, :html, :javascript
-      remove_highlights(result)
-    when :markdown
-      renderer = LivingStyleGuide::RedcarpetHTML.new(LivingStyleGuide.default_options, self)
-      redcarpet = ::Redcarpet::Markdown.new(renderer, LivingStyleGuide::REDCARPET_RENDER_OPTIONS)
-      remove_highlights(redcarpet.render(result))
-    else
-      require "tilt/#{@type}"
-      template_class.new{ remove_highlights(result) }.render(@scope, @locals.merge(locals))
-    end
+    @html = render_html(result, locals)
     @classes.unshift "livingstyleguide--#{@type}-example"
     @classes.unshift "livingstyleguide--example"
     ERB.new(template_erb).result(binding).gsub(/\n\n+/, "\n")
@@ -94,6 +81,25 @@ class LivingStyleGuide::Document < ::Tilt::Template
     @scope.depend_on(File.expand_path(file)) if @scope.respond_to?(:depend_on)
   end
 
+  private
+  def render_html(result, locals)
+    if @type == :lsg
+      renderer = LivingStyleGuide::RedcarpetHTML.new(LivingStyleGuide.default_options, self)
+      redcarpet = ::Redcarpet::Markdown.new(renderer, LivingStyleGuide::REDCARPET_RENDER_OPTIONS)
+      redcarpet.render(result)
+    elsif engine = Tilt[@type]
+      begin
+        require "tilt/#{template_name}"
+      rescue LoadError
+      end
+      engine.new{ remove_highlights(result) }.render(@scope, @locals.merge(locals))
+    elsif @type == :escaped
+      ERB::Util.h(remove_highlights(result))
+    else
+      remove_highlights(result)
+    end
+  end
+
   private
   def set_highlights(code, &block)
     code, positions = remove_highlight_marker_and_save_positions(code)
@@ -164,21 +170,45 @@ 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|\Z))+))?/) do
-        name, arguments, block = $1, $2 || '', $3 || $4
+      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
+        }
         name = name.gsub('-', '_').to_sym
-        arguments = arguments.split(',').map(&:strip)
-        if block
-          arguments << block.gsub(/\A(\s*)((?:.|\n)+)\Z/){ $2.gsub(/^#{$1}/, '') }
+        arguments = parse_arguments(arguments_string, options)
+        if options[:block_type] == :indented
+          block.gsub!(/\A(\s*)((?:.|\n)+)\Z/){ $2.gsub(/^#{$1}/, '') }
         end
-        yield name, arguments
+        yield name, arguments, options, block
       end + code_block
     end
   end
 
+  private
+  def parse_arguments(arguments_string, options)
+    arguments = arguments_string.split(/(?<!\\);/)
+    arguments.map! do |argument|
+      argument.strip!
+      argument.gsub! "\\;", ";"
+      if /^(?<key>[a-zA-Z0-9_\-]+):(?<value>.+)$/ =~ argument
+        options[key.downcase.gsub('-', '_').to_sym] = remove_quots(value.strip)
+        nil
+      else
+        remove_quots(argument)
+      end
+    end
+    arguments.compact
+  end
+
+  private
+  def remove_quots(string)
+    string.sub(/^"(.*)"$|^'(.*)'$|^(.*)$/, '\\1\\2\\3').gsub(/\\("|')/, "\\1")
+  end
+
   private
   def gsub_content(regexp, &block)
-    if @type == :markdown
+    if @type == :lsg
       data.gsub(/\G(.+?)((```.+?```)|\Z)/m) do
         content, code_block = $1, $2
         content.to_s.gsub(regexp, &block) + code_block
@@ -190,16 +220,7 @@ class LivingStyleGuide::Document < ::Tilt::Template
 
   private
   def template_name
-    @type == :markdown ? :redcarpet : @type
-  end
-
-  private
-  def template_class
-    case @type
-    when :coffee then Tilt::CoffeeScriptTemplate
-    when :erb    then Tilt::ERBTemplate
-    else Tilt.const_get(@type.to_s.capitalize + 'Template')
-    end
+    (@type == :lsg or @type == :markdown) ? :redcarpet : @type
   end
 
   private

data/lib/livingstyleguide/filters.rb

@@ -21,6 +21,7 @@ require 'livingstyleguide/filters/import'
 require 'livingstyleguide/filters/require'
 require 'livingstyleguide/filters/full_width'
 require 'livingstyleguide/filters/haml'
+require 'livingstyleguide/filters/type'
 require 'livingstyleguide/filters/markdown'
 require 'livingstyleguide/filters/javascript'
 require 'livingstyleguide/filters/coffee_script'
@@ -28,5 +29,6 @@ require 'livingstyleguide/filters/add_wrapper_class'
 require 'livingstyleguide/filters/font_example'
 require 'livingstyleguide/filters/colors'
 require 'livingstyleguide/filters/css'
+require 'livingstyleguide/filters/style'
 require 'livingstyleguide/filters/data'
 require 'livingstyleguide/filters/html_head'

data/lib/livingstyleguide/filters/add_wrapper_class.rb

@@ -1,4 +1,4 @@
-LivingStyleGuide.add_filter :add_wrapper_class do |css_class|
-  document.classes << css_class
+LivingStyleGuide.add_filter :add_wrapper_class do |arguments, options, block|
+  document.classes << arguments.first
   nil
 end

data/lib/livingstyleguide/filters/coffee_script.rb

@@ -1,4 +1,4 @@
-LivingStyleGuide.add_filter :coffee_script, :coffee do
+LivingStyleGuide.add_filter :coffee_script, :coffee do |arguments, options, block|
   document.type = :coffee
   document.template = :javascript
   nil

data/lib/livingstyleguide/filters/colors.rb

@@ -1,5 +1,5 @@
-LivingStyleGuide.add_filter :colors do |content|
-  colors = content.split(/\n+/).map{ |l| l.split(/\s+/) }
+LivingStyleGuide.add_filter :colors do |arguments, options, content|
+  colors = content.split(/\n+/).map{ |l| l.strip.split(/\s+/) }
   columns = colors.map{ |l| l.size }.max
   colors = colors.flatten
   document.scss << <<-SCSS

data/lib/livingstyleguide/filters/css.rb

@@ -1,10 +1,11 @@
-LivingStyleGuide.add_filter :css, :scss do |source|
-  if source =~ /\.(css|scss|sass)$/
+LivingStyleGuide.add_filter :css, :scss do |arguments, options, source|
+  file = arguments.first
+  if file =~ /\.(css|scss|sass)$/
     if document.file
-      source = File.join(File.dirname(document.file), source)
+      file = File.join(File.dirname(document.file), file)
     end
-    document.depend_on source
-    document.scss << %Q(@import "#{source}";\n)
+    document.depend_on file
+    document.scss << %Q(@import "#{file}";\n)
   else
     document.scss << "##{document.id.gsub('/', '\\/')} {\n#{source}\n}\n"
   end

data/lib/livingstyleguide/filters/data.rb

@@ -1,6 +1,6 @@
 require 'json'
 
-LivingStyleGuide.add_filter :data do |data|
+LivingStyleGuide.add_filter :data do |arguments, options, data|
   document.locals.merge! JSON.parse("{#{data}}")
   nil
 end

data/lib/livingstyleguide/filters/font_example.rb

@@ -5,11 +5,11 @@ LivingStyleGuide.default_options[:font_example] = { text: <<-TEXT }
   !&/()$=@;:,.
 TEXT
 
-LivingStyleGuide.add_filter :font_example do |font, text = nil|
+LivingStyleGuide.add_filter :font_example do |arguments, options, text|
   text ||= LivingStyleGuide.default_options[:font_example][:text]
   text = ERB::Util.html_escape(text)
   text.strip!
   text.gsub!(/\n/, "<br>\n")
-  font = ERB::Util.html_escape(font)
+  font = ERB::Util.html_escape(arguments.first)
   ERB.new(File.read("#{File.dirname(__FILE__)}/../templates/font-example.html.erb")).result(binding)
 end

data/lib/livingstyleguide/filters/full_width.rb

@@ -1,4 +1,4 @@
-LivingStyleGuide.add_filter :full_width do
+LivingStyleGuide.add_filter :full_width do |arguments, options, block|
   document.classes << '-lsg-has-full-width'
   nil
 end

data/lib/livingstyleguide/filters/haml.rb

@@ -1,4 +1,4 @@
-LivingStyleGuide.add_filter :haml do
+LivingStyleGuide.add_filter :haml do |arguments, options, block|
   document.type = :haml
   nil
 end

data/lib/livingstyleguide/filters/html_head.rb

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

data/lib/livingstyleguide/filters/import.rb

@@ -1,6 +1,7 @@
 require 'tilt'
 
-LivingStyleGuide.add_filter :import do |glob, data = nil|
+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

data/lib/livingstyleguide/filters/javascript.rb

@@ -1,4 +1,4 @@
-LivingStyleGuide.add_filter :javascript do
+LivingStyleGuide.add_filter :javascript do |arguments, options, block|
   document.type = :javascript
   document.template = :javascript
   nil

data/lib/livingstyleguide/filters/markdown.rb

@@ -1,4 +1,4 @@
-LivingStyleGuide.add_filter :markdown do
+LivingStyleGuide.add_filter :markdown do |arguments, options, block|
   document.type = :markdown
   nil
 end

data/lib/livingstyleguide/filters/options.rb

@@ -1,8 +1,6 @@
-LivingStyleGuide.add_filter :set do |option|
-  if option =~ /^([\w\-]+):\s+(.+)$/
-    key, value = $1, $2
-    key = key.downcase.gsub('-', '_').to_sym
-    value = case value
+LivingStyleGuide.add_filter :set do |arguments, options, block|
+  options.each do |key, value|
+    document.options[key] = case value
     when 'true'
       true
     when 'false'
@@ -12,7 +10,6 @@ LivingStyleGuide.add_filter :set do |option|
     else
       value
     end
-    document.options[key] = value
   end
   nil
 end

data/lib/livingstyleguide/filters/require.rb

@@ -1,4 +1,4 @@
-LivingStyleGuide.add_filter :require do |file|
-  Kernel.require file
+LivingStyleGuide.add_filter :require do |arguments, options, block|
+  Kernel.require arguments.first
   nil
 end

data/lib/livingstyleguide/filters/style.rb

@@ -0,0 +1,7 @@
+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
+end

data/lib/livingstyleguide/filters/type.rb

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

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

@@ -0,0 +1,3 @@
+<section class="<%= classes.join(' ') %>" id="<%= id %>">
+  <pre class="livingstyleguide--code-block"><code class="livingstyleguide--code"><%= highlighted_source %></code></pre>
+</section>

data/lib/livingstyleguide/version.rb

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

data/stylesheets/livingstyleguide/_code.scss

@@ -111,6 +111,8 @@
   background-color: $livingstyleguide--highlight-color;
   border-radius: $livingstyleguide--highlight-border-radius;
   display: inline;
+  font-style: inherit;
+  font-weight: inherit;
   vertical-align: baseline;
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livingstyleguide
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.4
+  version: 2.0.0.alpha.5
 platform: ruby
 authors:
 - Nico Hagenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minisyntax
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +124,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: heredoc_unindent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coffee-script
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -194,12 +208,15 @@ files:
 - lib/livingstyleguide/filters/markdown.rb
 - lib/livingstyleguide/filters/options.rb
 - lib/livingstyleguide/filters/require.rb
+- lib/livingstyleguide/filters/style.rb
+- lib/livingstyleguide/filters/type.rb
 - lib/livingstyleguide/integration.rb
 - lib/livingstyleguide/integration/compass.rb
 - lib/livingstyleguide/integration/rails.rb
 - lib/livingstyleguide/integration/sass.rb
 - lib/livingstyleguide/integration/sprockets.rb
 - lib/livingstyleguide/markdown_extensions.rb
+- lib/livingstyleguide/templates/code.html.erb
 - lib/livingstyleguide/templates/default.html.erb
 - lib/livingstyleguide/templates/example.html.erb
 - lib/livingstyleguide/templates/font-example.html.erb