livingstyleguide 2.0.0.alpha.6 → 2.0.0.alpha.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99011854cea04c29122a5e4014eca155e1972da2
-  data.tar.gz: 324abacc9ef03fa22b0fa570b8fee64f686c5312
+  metadata.gz: 438f69eb3ec2f4eb23b292b249efdb90c1717626
+  data.tar.gz: c756e5fde9db9cca59a375b44476f75f81ca71d3
 SHA512:
-  metadata.gz: 201d20433e57bce205aa2fc8086678e49455b33c97fadacded15fc9538d8b2be1d24876c005bb671662cdb2918ad0bb0ee460ee7a06773c9e2bcba03e7312e67
-  data.tar.gz: 4c8f285365e917fd882f173c03827a195dc66df295a9f5051264c4b0368ba6c679beda37212dc16c96b291054110fd39f568c8f04aa27dcce344737586c64832
+  metadata.gz: faf35f680b14f27dd18da04a9700a8bce0ff8fe3397a08f1c5cd38372b1c0a3630b4937e193b5a2eab9dfd8ca4fefd0c81728fd31e0155957438a64f814b8e92
+  data.tar.gz: eb1c5979afdcfd392e66bd0f220106d86911e66c2ea0e7d963b63a26434c005a84f37486682d9b752bbbe1ce86c412d7a15a6b7cc7d9e1dd962ae38221f7b177

data/lib/livingstyleguide/document.rb

@@ -8,10 +8,10 @@ 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_accessor :syntax
   attr_reader :scope
 
-  %w(scss head header footer).each do |attr|
+  %w(scss head header footer defaults).each do |attr|
     define_method attr do
       if options.has_key?(:livingstyleguide)
         options[:livingstyleguide].send(attr)
@@ -48,8 +48,9 @@ class LivingStyleGuide::Document < ::Tilt::Template
       if type == :plain
         without_highlights
       else
-        without_highlights = ERB::Util.h(without_highlights) if type == :html
-        ::MiniSyntax.highlight(without_highlights, type)
+        @syntax ||= type
+        without_highlights = ERB::Util.h(without_highlights) if @syntax == :html
+        ::MiniSyntax.highlight(without_highlights, @syntax || type)
       end
     end.gsub("\n", "<br>")
   end
@@ -95,7 +96,10 @@ class LivingStyleGuide::Document < ::Tilt::Template
         require "tilt/#{template_name}"
       rescue LoadError
       end
-      engine.new{ remove_highlights(result) }.render(@scope, @locals.merge(locals))
+      template = engine.new{ remove_highlights(result) }
+      (@locals.is_a?(Array) ? @locals : [@locals]).map do |current_locals|
+        template.render(@scope || Object.new, current_locals.merge(locals))
+      end.join("\n")
     elsif @type == :escaped
       ERB::Util.h(remove_highlights(result))
     else
@@ -249,7 +253,7 @@ class LivingStyleGuide::Document < ::Tilt::Template
         sass_options[:load_paths] << path
       end
     end
-    scss_template.new(file, sass_options){ scss }.render(@scope)
+    scss_template.new(file, sass_options){ scss }.render(@scope || Object.new)
   end
 end
 

data/lib/livingstyleguide/filters/data.rb

@@ -3,9 +3,17 @@ require 'yaml'
 
 LivingStyleGuide.add_filter :data do |arguments, options, data|
   if options[:format] == "yaml"
-    document.locals.merge! Psych.load("{#{data}}")
+    data = Psych.load(data)
   else
-    document.locals.merge! JSON.parse("{#{data}}")
+    data = "{#{data}}" unless data.strip =~ /^[\[\{]/
+    data = JSON.parse(data)
+  end
+  if data.is_a?(Array)
+    document.locals = [] unless document.locals.is_a?(Array)
+    document.locals.push(*data)
+  else
+    document.locals = {} unless document.locals.is_a?(Hash)
+    document.locals.merge! data
   end
   nil
 end

data/lib/livingstyleguide/filters/syntax.rb

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

data/lib/livingstyleguide/filters.rb

@@ -33,3 +33,4 @@ require 'livingstyleguide/filters/css'
 require 'livingstyleguide/filters/style'
 require 'livingstyleguide/filters/data'
 require 'livingstyleguide/filters/layout'
+require 'livingstyleguide/filters/syntax'

data/lib/livingstyleguide/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livingstyleguide
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.6
+  version: 2.0.0.alpha.7
 platform: ruby
 authors:
 - Nico Hagenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-02 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minisyntax
@@ -224,6 +224,7 @@ files:
 - lib/livingstyleguide/filters/options.rb
 - lib/livingstyleguide/filters/require.rb
 - lib/livingstyleguide/filters/style.rb
+- lib/livingstyleguide/filters/syntax.rb
 - lib/livingstyleguide/filters/type.rb
 - lib/livingstyleguide/integration.rb
 - lib/livingstyleguide/integration/compass.rb
@@ -265,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Generate beautiful front-end style guides