livingstyleguide 2.0.0.alpha.3 → 2.0.0.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a51a7d18383f9d9667786275263bc1b71af49b0
-  data.tar.gz: a6ef46207a4b6add73873de1a2141629f8da8917
+  metadata.gz: 09fd1db6eea766e1fc9ce49ea9093fcba7cb5cf0
+  data.tar.gz: 9e677d67f85cea4e8067e25af350057599fb7b74
 SHA512:
-  metadata.gz: 79e37f2e32f51c8478f69d0f958fc0a19a6dc187854ffd604bb9a6688ee0e14735b08167293bf7aa29b03d55d7c8972ad6243971b3a3b30b34016cfa2aadd14a
-  data.tar.gz: 8b9f37570cecc6ebb507cdb703dee17c401e4761c16bfaa2afd92f325fed36a56614a3ef2e5473383c7f5ae59a961287c6603713ae1a45371cb36d5803eb7d5b
+  metadata.gz: 23abb326faa5c71f9432c9e44d677f12bcc29510e9ce9d13df4d316b1032e43d693798bd03c30be56eb70a573ea3e2f690499ac75303a6aa01e7d02f4af8e963
+  data.tar.gz: 197222fd5eb577683377373f5d0a1034d06c2874851076c0e7a7d494a594aa3de5ee05d34e3efec64dcb726a718d692659aa52cd8f7a95d8b7aee09399d95f9c

data/lib/livingstyleguide/document.rb

@@ -39,7 +39,18 @@ class LivingStyleGuide::Document < ::Tilt::Template
   end
 
   def source
-    @source ||= set_highlights(erb.gsub(/<%.*?%>\n?/, ''))
+    @source ||= erb.gsub(/<%.*?%>\n?/, '').strip
+  end
+
+  def highlighted_source
+    set_highlights(source.strip) do |without_highlights|
+      if type == :plain
+        without_highlights
+      else
+        without_highlights = ERB::Util.h(without_highlights) if type == :html
+        ::MiniSyntax.highlight(without_highlights, type)
+      end
+    end.gsub("\n", "<br>")
   end
 
   def css
@@ -62,7 +73,6 @@ class LivingStyleGuide::Document < ::Tilt::Template
 
   def evaluate(scope, locals, &block)
     @scope = scope
-    depend_on file if file and options.has_key?(:livingstyleguide)
     result = ERB.new(erb).result(@filters.get_binding)
     @html = case @type
     when :plain, :example, :html, :javascript
@@ -85,14 +95,64 @@ class LivingStyleGuide::Document < ::Tilt::Template
   end
 
   private
-  def set_highlights(code)
-    code.gsub!(/^\s*\*\*\*\n(.+?)\n\s*\*\*\*(\n|$)/m, %Q(\n<strong class="livingstyleguide--code-highlight-block">\\1</strong>\n))
-    code.gsub(/\*\*\*(.+?)\*\*\*/, %Q(<strong class="livingstyleguide--code-highlight">\\1</strong>))
+  def set_highlights(code, &block)
+    code, positions = remove_highlight_marker_and_save_positions(code)
+    html = yield(code)
+    insert_html_highlight_marker(html, positions)
+  end
+
+  private
+  def remove_highlight_marker_and_save_positions(code)
+    positions = []
+    index = 0
+    code_without_highlights = code.gsub(/(.*?)\*\*\*/m) do
+      positions << index += $1.length
+      $1
+    end
+    [code_without_highlights, positions]
+  end
+
+  private
+  def insert_html_highlight_marker(html, positions)
+    code_with_highlights = ""
+    index = 0
+    next_position = positions.shift
+    inside_highlight = false
+    inside_character = false
+    inside_html = false
+    html.each_char do |char|
+      if char == "<"
+        inside_html = true
+      elsif char == ">"
+        inside_html = false
+      elsif not inside_html
+        if index == next_position
+          if inside_highlight
+            code_with_highlights << %Q(</strong>)
+            inside_highlight = false
+          else
+            code_with_highlights << %Q(<strong class="livingstyleguide--code-highlight">)
+            inside_highlight = true
+          end
+          next_position = positions.shift
+        end
+        if char == "&"
+          inside_character = true
+        elsif inside_character and char == ";"
+          inside_character = false
+          index += 1
+        elsif not inside_character
+          index += 1
+        end
+      end
+      code_with_highlights << char
+    end
+    code_with_highlights
   end
 
   private
   def remove_highlights(code)
-    code.gsub(/\*\*\*(.+?)\*\*\*/m, '\\1')
+    code.gsub(/\*\*\*/, '')
   end
 
   private
@@ -104,7 +164,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)+))?/) do
+      content.gsub(/^@([\w\d_-]+)(?: ([^\{\n]+))?(?: *\{\n((?:.|\n)*?)\n\}|\n((?:  .*(\n|\Z))+))?/) do
         name, arguments, block = $1, $2 || '', $3 || $4
         name = name.gsub('-', '_').to_sym
         arguments = arguments.split(',').map(&:strip)
@@ -159,6 +219,12 @@ class LivingStyleGuide::Document < ::Tilt::Template
   private
   def render_scss(scss)
     sass_options = options.merge(custom: { sprockets_context: @scope })
+    if defined?(Compass)
+      sass_options[:load_paths] ||= []
+      Compass.sass_engine_options[:load_paths].each do |path|
+        sass_options[:load_paths] << path
+      end
+    end
     scss_template.new(file, sass_options){ scss }.render(@scope)
   end
 end

data/lib/livingstyleguide/filters.rb

@@ -18,6 +18,7 @@ end
 
 require 'livingstyleguide/filters/options'
 require 'livingstyleguide/filters/import'
+require 'livingstyleguide/filters/require'
 require 'livingstyleguide/filters/full_width'
 require 'livingstyleguide/filters/haml'
 require 'livingstyleguide/filters/markdown'
@@ -26,5 +27,6 @@ require 'livingstyleguide/filters/coffee_script'
 require 'livingstyleguide/filters/add_wrapper_class'
 require 'livingstyleguide/filters/font_example'
 require 'livingstyleguide/filters/colors'
-require 'livingstyleguide/filters/scss'
+require 'livingstyleguide/filters/css'
 require 'livingstyleguide/filters/data'
+require 'livingstyleguide/filters/html_head'

data/lib/livingstyleguide/filters/css.rb

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

data/lib/livingstyleguide/filters/html_head.rb

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

data/lib/livingstyleguide/filters/import.rb

@@ -1,6 +1,9 @@
 require 'tilt'
 
 LivingStyleGuide.add_filter :import do |glob, data = nil|
+  if glob =~ /\.s[ac]ss$/
+    raise "Error: Please use `@css #{glob}` instead of `@import #{glob}` for importing Sass."
+  end
   glob << '.lsg' unless glob =~ /\.(\w+|\*)$/
   glob.gsub!(/[^\/]+$/, '{_,}\\0')
   if document.file
@@ -8,17 +11,14 @@ LivingStyleGuide.add_filter :import do |glob, data = nil|
   end
 
   if data
-    require 'json'
+    Kernel.require 'json'
     data = JSON.parse("{#{data}}")
   end
 
   Dir.glob(glob).map do |file|
-    if file =~ /\.s[ac]ss$/
-      document.depend_on file
-      document.scss << %Q(@import "#{file}";\n)
-      nil
-    else
-      ::Tilt.new(file, livingstyleguide: document).render(document.scope, data)
-    end
+    document.depend_on 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

data/lib/livingstyleguide/filters/require.rb

@@ -0,0 +1,4 @@
+LivingStyleGuide.add_filter :require do |file|
+  Kernel.require file
+  nil
+end

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

@@ -2,7 +2,5 @@
   <div class="livingstyleguide--html">
     <%= html %>
   </div>
-  <pre class="livingstyleguide--code-block"><code class="livingstyleguide--code"><%=
-    [:plain].index(type) ? source : ::MiniSyntax.highlight(type == :html ? ERB::Util.h(source) : source, type)
-  %></code></pre>
+  <pre class="livingstyleguide--code-block"><code class="livingstyleguide--code"><%= highlighted_source %></code></pre>
 </section>

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

@@ -1,6 +1,4 @@
 <section class="<%= classes.join(' ') %>" id="<%= id %>">
   <script><%= html %></script>
-  <pre class="livingstyleguide--code-block"><code class="livingstyleguide--code"><%=
-    [:plain].index(type) ? source : ::MiniSyntax.highlight(source, type)
-  %></code></pre>
+  <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.3'
+  VERSION = '2.0.0.alpha.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livingstyleguide
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.3
+  version: 2.0.0.alpha.4
 platform: ruby
 authors:
 - Nico Hagenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minisyntax
@@ -183,15 +183,17 @@ files:
 - lib/livingstyleguide/filters/add_wrapper_class.rb
 - lib/livingstyleguide/filters/coffee_script.rb
 - lib/livingstyleguide/filters/colors.rb
+- lib/livingstyleguide/filters/css.rb
 - lib/livingstyleguide/filters/data.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/javascript.rb
 - lib/livingstyleguide/filters/markdown.rb
 - lib/livingstyleguide/filters/options.rb
-- lib/livingstyleguide/filters/scss.rb
+- lib/livingstyleguide/filters/require.rb
 - lib/livingstyleguide/integration.rb
 - lib/livingstyleguide/integration/compass.rb
 - lib/livingstyleguide/integration/rails.rb
@@ -236,3 +238,4 @@ signing_key:
 specification_version: 4
 summary: Generate beautiful front-end style guides
 test_files: []
+has_rdoc: 

data/lib/livingstyleguide/filters/scss.rb

@@ -1,4 +0,0 @@
-LivingStyleGuide.add_filter :scss do |source|
-  document.scss << "##{document.id.gsub('/', '\\/')} {\n#{source}\n}\n"
-  nil
-end