cyborg 0.5.21 → 0.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e39111c9fef46b63f7172aa6f57774a5ce4669ae
-  data.tar.gz: 00fa74b1ba044a4052f148ff45a29f0533ac5700
+  metadata.gz: 81146b5c5d42c18d82d89720c63b63ae8c03513f
+  data.tar.gz: 355163c3ad9d19551ba974e51f3a42345c892652
 SHA512:
-  metadata.gz: e0bc57a862058cfa6f14b3817bde0a8a194a7a5599e657f56b3cd9629931767590fbab2e71e8c8142890f59d2ebd9c9252ed2a07fbe4199989376283ad0d04c4
-  data.tar.gz: 3e85227a72c2764eb62977381c9f869859395a1dbb3b4d353749571decf3411554b7e5e871f3b9ad312bd458a59e90726ee049060ae7d29061003e9a03f49906
+  metadata.gz: a1d41793cbb1d1ad9a181c8849842b475cf2a4ddf2e0826646d18b92add2ea19ea12ef488041f8b49ee6eca382520c01b50c37ec64f15a6a456056e720a8dc5c
+  data.tar.gz: d1a046acbe247d15b8838d097fd618809ac903b1bdff5b2fa9924627ba277980682131b2f90552fd5fec919acfc6e8177125ad73eb3b222ced263e8c5787b490

data/lib/cyborg.rb

@@ -6,6 +6,8 @@ require "cyborg/command"
 require "cyborg/version"
 require "cyborg/plugin"
 require "cyborg/assets"
+require "cyborg/sass/engine"
+require "cyborg/sass/importer"
 
 module Cyborg
   extend self

data/lib/cyborg/helpers/asset_helpers.rb

@@ -53,6 +53,10 @@ module Cyborg
           :href => cyborg_asset_url(source)
         }.merge!(options.symbolize_keys))
       end
+
+      def sass_data(key)
+        Cyborg.plugin.stylesheets.data[key]
+      end
     end
   end
 end

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

@@ -120,8 +120,8 @@ module Cyborg
       end
 
       def change(modified, added, removed)
-        puts "Added: #{file_event(added)}".colorize(:light_green)       unless added.empty?
-        puts "Removed: #{file_event(removed)}".colorize(:light_red)   unless removed.empty?
+        puts "Added: #{file_event(added)}".colorize(:light_green)        unless added.empty?
+        puts "Removed: #{file_event(removed)}".colorize(:light_red)      unless removed.empty?
         puts "Modified: #{file_event(modified)}".colorize(:light_yellow) unless modified.empty?
 
         build

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

@@ -59,6 +59,22 @@ module Cyborg
         compress(dest)
       end
 
+      def data
+        if @data
+          @data
+        else
+          data = {}
+
+          Dir[File.join(base, "**/*.yml")].each do |file|
+            key = file.sub(base+"/", '').sub(/^_/,'').sub('.yml','')
+            data[key] = YAML.load(IO.read(file))
+          end
+
+          @data = data if Cyborg.production?
+          data
+        end
+      end
+
       # Convert extension
       def versioned(file)
         super(file.sub(/(\.css)?\.s[ca]ss$/i,'.css'))

data/lib/cyborg/sass/engine.rb

@@ -0,0 +1,19 @@
+require 'cyborg/sass/importer'
+
+# Taken from https://github.com/chriseppstein/sass-css-importer/blob/master/lib/sass/css_importer/monkey_patches.rb
+# TODO: This feels wrong, surely there must be a better way to handle this
+
+class Sass::Engine
+  alias initialize_without_yaml_importer initialize
+
+  def initialize(template, options={})
+    initialize_without_yaml_importer(template, options)
+
+    yaml_importer = self.options[:load_paths].find {|lp| lp.is_a?(Cyborg::Importer) }
+
+    unless yaml_importer
+      root = File.dirname(options[:filename] || ".")
+      self.options[:load_paths] << Cyborg::Importer.new(root)
+    end
+  end
+end

data/lib/cyborg/sass/importer.rb

@@ -0,0 +1,60 @@
+require 'sass'
+require 'yaml'
+
+module Cyborg
+  class Importer < Sass::Importers::Filesystem
+
+    def watched_file?(uri)
+      !!(uri =~ /\.yml$/ &&
+        uri.start_with?(root + File::SEPARATOR))
+    end
+
+    protected
+
+    def extensions
+      {'yml' => :scss}
+    end
+
+    def yaml?(name)
+      File.extname(name) == '.yml'
+    end
+
+    private
+
+    def _find(dir, name, options)
+      return unless yaml? name
+
+      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))
+      variables  = yaml.map { |key, value| "$#{key}: #{_convert_to_sass(value)};" }.join("\n")
+
+      Sass::Engine.new(variables, options.merge(
+          :filename => full_filename,
+          :importer => self,
+          :syntax   => :scss
+      ))
+    end
+
+    def _convert_to_sass(item)
+      if item.is_a? Array
+        _make_list(item)
+      elsif item.is_a? Hash
+        _make_map(item)
+      else
+        item.to_s
+      end
+    end
+
+    def _make_list(item)
+      '(' + item.map { |i| _convert_to_sass(i) }.join(',') + ')'
+    end
+
+    def _make_map(item)
+      '(' + item.map {|key, value| key.to_s + ':' + _convert_to_sass(value) }.join(',') + ')'
+    end
+  end
+
+end
+

data/lib/cyborg/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyborg
 version: !ruby/object:Gem::Version
-  version: 0.5.21
+  version: 0.5.22
 platform: ruby
 authors:
 - Brandon Mathis
@@ -201,6 +201,8 @@ files:
 - lib/cyborg/plugin/assets/javascripts.rb
 - lib/cyborg/plugin/assets/stylesheets.rb
 - lib/cyborg/plugin/assets/svgs.rb
+- lib/cyborg/sass/engine.rb
+- lib/cyborg/sass/importer.rb
 - lib/cyborg/version.rb
 homepage: https://github.com/compose-ui/cyborg
 licenses: