livingstyleguide 1.2.0.pre.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 055e627e9615c0dfd25421a891676beeeb049e2e
-  data.tar.gz: 1bc6c60bf8257467fe1135fd39111cd5a5af6e70
+  metadata.gz: add867c0ecbabadbf223169e529a20c508f60eb4
+  data.tar.gz: b7fe85a800fa2ec558716575c9395c09c62f7659
 SHA512:
-  metadata.gz: 46805c97d4f2325a687659685208970c0406e6eee12bea6e61a9b2e41aa7e150ba40d6876190621391d3cafc748b51b6df3c2821f075522b5898750f0e7c7dd2
-  data.tar.gz: 3418637902ee95d9342211657fc42ec4d159c3d39078a0f775ef38e84aa0bdc678c449afbad32ec805f156adf90181b9865b1189e33c0e950f191660f7508199
+  metadata.gz: 3a12bd4fd03a7d0a54bdff4173c1c68c524836f41b4739af12c82727d1e9cbb15f761d53a50c0bd04f200c26b6a5a65664a7480b884d7696e10038982d37915d
+  data.tar.gz: 9d9eea18d4aa1fb3472eae0bc6f9c1ea50943706541a75b63be5c07e520e206505366a1eb5199d55d2b19022abad4c6b52a3b039f10dec3ad1561e568ca1c7cf

data/lib/livingstyleguide/engine.rb

@@ -113,16 +113,9 @@ module LivingStyleGuide
       sass_options[:living_style_guide] = self
       @sass_engine = ::Sass::Engine.new(sass, sass_options)
       collect_data
-      @sass_engine.to_tree << output_variables
       @sass_engine
     end
 
-    private
-    def output_variables
-      scss = template('variables.scss.erb')
-      ::Sass::Engine.new(scss, syntax: :scss).to_tree.children
-    end
-
     private
     def style_variables
       return unless @options.has_key?(:style)

data/lib/livingstyleguide/sass_extensions/functions.rb

@@ -10,6 +10,15 @@ module LivingStyleGuide::SassExtensions::Functions
     Sass::Script::List.new(variables, :space)
   end
 
+  def global_variables
+    ruby = environment.global_env.instance_variable_get(:@vars)
+    sass_script = {}
+    ruby.each do |name, value|
+      sass_script[Sass::Script::String.new(name)] = value
+    end
+    Sass::Script::Value::Map.new(sass_script)
+  end
+
   if defined?(::Middleman)
     def asset_url(path, prefix)
       Sass::Script::String.new(options[:sprockets][:context].asset_url(path.value, prefix.value))

data/lib/livingstyleguide/version.rb

@@ -1,3 +1,3 @@
 module LivingStyleGuide
-  VERSION = '1.2.0.pre.2'
+  VERSION = '1.2.0'
 end

data/stylesheets/_livingstyleguide.scss

@@ -80,3 +80,5 @@ $livingstyleguide--highlight-border-radius: 2px;
 @import "livingstyleguide/content";
 @import "livingstyleguide/code";
 @import "livingstyleguide/color-swatches";
+@import "livingstyleguide/variables";
+

data/stylesheets/livingstyleguide/_variables.scss

@@ -0,0 +1,24 @@
+$livingstyleguide--variables: global-variables() !default;
+
+@each $variable, $value in $livingstyleguide--variables {
+  $value: null !default;
+  @if $value != null {
+    .\$#{$variable} {
+      @if type-of($value) == color {
+        @if (lightness($value) < lightness($livingstyleguide--color)) {
+          color: $livingstyleguide--background-color;
+        }
+
+        &:before {
+          background: $value;
+        }
+      }
+
+      &:after {
+        @extend %livingstyleguide--code !optional;
+        content: "#{inspect($value)}";
+      }
+    }
+  }
+}
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livingstyleguide
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Nico Hagenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minisyntax
@@ -212,7 +212,6 @@ files:
 - lib/livingstyleguide/sass_extensions.rb
 - lib/livingstyleguide/sass_extensions/functions.rb
 - lib/livingstyleguide/templates/layout.html.erb
-- lib/livingstyleguide/templates/variables.scss.erb
 - lib/livingstyleguide/tilt_template.rb
 - lib/livingstyleguide/version.rb
 - stylesheets/_livingstyleguide.scss
@@ -220,6 +219,7 @@ files:
 - stylesheets/livingstyleguide/_color-swatches.scss
 - stylesheets/livingstyleguide/_content.scss
 - stylesheets/livingstyleguide/_layout.scss
+- stylesheets/livingstyleguide/_variables.scss
 homepage: http://livingstyleguide.org
 licenses: []
 metadata: {}
@@ -234,9 +234,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2

data/lib/livingstyleguide/templates/variables.scss.erb

@@ -1,28 +0,0 @@
-<% if Sass.version[:major] == 3 and Sass.version[:minor] < 3 %>
-  @function inspect($value) {
-    @return $value;
-  }
-<% end %>
-
-<% variables.values.flatten.each do |variable| %>
-  $<%= variable %>: null !default;
-  @if $<%= variable %> != null {//and type-of($<%= variable %>) != map {
-    .\$<%= variable %> {
-      @if type-of($<%= variable %>) == color {
-        @if (lightness($<%= variable %>) < lightness($livingstyleguide--color)) {
-          color: $livingstyleguide--background-color;
-        }
-
-        &:before {
-          background: $<%= variable %>;
-        }
-      }
-
-      &:after {
-        @extend %livingstyleguide--code !optional;
-        content: "#{inspect($<%= variable %>)}";
-      }
-    }
-  }
-<% end %>
-