cyborg 0.5.22 → 0.5.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81146b5c5d42c18d82d89720c63b63ae8c03513f
-  data.tar.gz: 355163c3ad9d19551ba974e51f3a42345c892652
+  metadata.gz: f39879ff4f3fd4e28316d8e646c36b2ac90701f3
+  data.tar.gz: 4157d506118a428fbefae2f92ab69dc30d0c66fd
 SHA512:
-  metadata.gz: a1d41793cbb1d1ad9a181c8849842b475cf2a4ddf2e0826646d18b92add2ea19ea12ef488041f8b49ee6eca382520c01b50c37ec64f15a6a456056e720a8dc5c
-  data.tar.gz: d1a046acbe247d15b8838d097fd618809ac903b1bdff5b2fa9924627ba277980682131b2f90552fd5fec919acfc6e8177125ad73eb3b222ced263e8c5787b490
+  metadata.gz: 37d029410fe756af1105607637bd13204781aefc738c70b7ceb681319f6e40df6c83f1c00400d3d9af491b6babb7b82e0163d405207781e08963d932ebcf9195
+  data.tar.gz: 037765fbc3c3f3a45120d1aeac7f1b002c6cb5a930f2e62078ce97dcd4240770a9d702110730bd71a30a4e8a8944fd6e962ca29367e5409c9d21b0eaf3693f58

data/lib/cyborg/helpers/asset_helpers.rb

@@ -54,8 +54,12 @@ module Cyborg
         }.merge!(options.symbolize_keys))
       end
 
-      def sass_data(key)
-        Cyborg.plugin.stylesheets.data[key]
+      def sass_data(key=nil)
+        if key
+          Cyborg.plugin.stylesheets.data[key]
+        else
+          Cyborg.plugin.stylesheets.data
+        end
       end
     end
   end

data/lib/cyborg/plugin/assets/asset.rb

@@ -131,7 +131,7 @@ module Cyborg
         list = files.map { |f| f.sub(base+'/', '') }.join("  \n")
         list = "  \n#{files}" if 1 < files.size
 
-        list 
+        list
       end
 
       def compress(file)

data/lib/cyborg/plugin/assets/stylesheets.rb

@@ -12,7 +12,7 @@ module Cyborg
       def asset_tag(*args)
         stylesheet_link_tag(args)
       end
-      
+
       def build(ext=nil)
         files = find_files
         files = files.reject {|f| !f.match(/\.#{ext}/) } if ext
@@ -67,7 +67,8 @@ module Cyborg
 
           Dir[File.join(base, "**/*.yml")].each do |file|
             key = file.sub(base+"/", '').sub(/^_/,'').sub('.yml','')
-            data[key] = YAML.load(IO.read(file))
+
+            data[key] = SassParser.parse(file)
           end
 
           @data = data if Cyborg.production?

data/lib/cyborg/sass/engine.rb

@@ -12,8 +12,10 @@ class Sass::Engine
     yaml_importer = self.options[:load_paths].find {|lp| lp.is_a?(Cyborg::Importer) }
 
     unless yaml_importer
-      root = File.dirname(options[:filename] || ".")
+      root        = File.dirname(options[:filename] || ".")
+      plugin_root = Cyborg.plugin.stylesheets.base
       self.options[:load_paths] << Cyborg::Importer.new(root)
+      self.options[:load_paths] << Cyborg::Importer.new(plugin_root)
     end
   end
 end

data/lib/cyborg/sass/importer.rb

@@ -2,6 +2,49 @@ require 'sass'
 require 'yaml'
 
 module Cyborg
+  module SassParser
+    extend self
+
+    # Global vars beginning with underscore will have their children promoted to globals
+    # and will be assigned without the underscore
+    #
+    # For example: _colors: { yellow: '#fco' }
+    #     becomes: colors: { yellow: '#fco'}, yellow: '#fco'
+    #
+    #
+    def load_yaml(data)
+      promote_globals YAML.load(data)
+    end
+
+    def read_file(file)
+      IO.read(file)
+    end
+
+    def promote_globals( data )
+      data.keys.select{|k| k.start_with?('_') }.each do |key|
+        data[key.sub(/^_/,'')] = data[key]
+        data = data.delete(key).merge(data)
+      end
+
+      data
+    end
+
+    def expand_vars(file)
+      content   = read_file(file)
+      file_data = load_yaml(content)
+
+      content = content.gsub(/\$(?<var>\w+)/) do
+        file_data[$~[:var]].inspect
+      end
+
+      load_yaml content
+    end
+
+    def parse(file)
+      expand_vars file
+    end
+  end
+
   class Importer < Sass::Importers::Filesystem
 
     def watched_file?(uri)
@@ -27,7 +70,7 @@ module Cyborg
       full_filename, syntax = Sass::Util.destructure(find_real_file(dir, name, options))
       return unless full_filename && File.readable?(full_filename)
 
-      yaml       = YAML.load(IO.read(full_filename))
+      yaml       = SassParser.parse(full_filename)
       variables  = yaml.map { |key, value| "$#{key}: #{_convert_to_sass(value)};" }.join("\n")
 
       Sass::Engine.new(variables, options.merge(

data/lib/cyborg/version.rb

@@ -1,3 +1,3 @@
 module Cyborg
-  VERSION = "0.5.22"
+  VERSION = "0.5.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyborg
 version: !ruby/object:Gem::Version
-  version: 0.5.22
+  version: 0.5.23
 platform: ruby
 authors:
 - Brandon Mathis