condenser 1.2 → 1.3

data/lib/condenser/transformers/sass_transformer.rb

@@ -1,309 +1,152 @@
-class Condenser
-  # Transformer engine class for the SASS/SCSS compiler. Depends on the `sass`
-  # gem.
-  #
-  # For more infomation see:
-  #
-  #   https://github.com/sass/sass
-  #   https://github.com/rails/sass-rails
+# Transformer engine class for the SASS/SCSS compiler. Depends on the `sass`
+# gem.
+#
+# For more infomation see:
+#
+#   https://github.com/sass/sass
+#   https://github.com/rails/sass-rails
+#
+class Condenser::SassTransformer
+
+  attr_accessor :options
+  
+  # Internal: Defines default sass syntax to use. Exposed so the ScssProcessor
+  # may override it.
+  def self.syntax
+    :sass
+  end
+
+  def self.setup(environment)
+    require "sassc" unless defined?(::SassC::Engine)
+  end
+  
+  # Public: Return singleton instance with default options.
   #
-  class SassTransformer
-    autoload :Importer, 'condenser/transformers/sass_transformer/importer'
+  # Returns SassProcessor object.
+  def self.instance
+    @instance ||= new
+  end
 
-    attr_accessor :options
-    
-    # Internal: Defines default sass syntax to use. Exposed so the ScssProcessor
-    # may override it.
-    def self.syntax
-      :sass
-    end
+  def self.call(environment, input)
+    instance.call(environment, input)
+  end
 
-    def self.setup(environment)
-      require "sassc" unless defined?(::SassC::Engine)
-    end
-    
-    # Public: Return singleton instance with default options.
-    #
-    # Returns SassProcessor object.
-    def self.instance
-      @instance ||= new
-    end
+  def self.cache_key
+    instance.cache_key
+  end
 
-    def self.call(environment, input)
-      instance.call(environment, input)
-    end
+  attr_reader :cache_key
 
-    def self.cache_key
-      instance.cache_key
+  def name
+    self.class.name
+  end
+  
+  # Public: Initialize template with custom options.
+  #
+  # options - Hash
+  # cache_version - String custom cache version. Used to force a cache
+  #                 change after code changes are made to Sass Functions.
+  #
+  def initialize(options = {}, &block)
+    @options = options
+    @cache_version = options[:cache_version]
+    # @cache_key = "#{self.class.name}:#{VERSION}:#{Autoload::Sass::VERSION}:#{@cache_version}".freeze
+    @importer_class = options[:importer] || Condenser::Sass::Importer
+    
+    @sass_config = options[:sass_config] || {}
+    @functions = Module.new do
+      include Functions
+      include options[:functions] if options[:functions]
+      class_eval(&block) if block_given?
     end
+  end
 
-    attr_reader :cache_key
+  def call(environment, input)
+    context = environment.new_context_class
+    engine_options = merge_options({
+      syntax:       self.class.syntax,
+      filename:     input[:filename],
+      source_map_file: "#{input[:filename]}.map",
+      source_map_contents: true,
+      # cache_store:  Cache.new(environment.cache),
+      load_paths:   environment.path,
+      importer:     @importer_class,
+      condenser: { context: context, environment: environment },
+      asset: input
+    })
+    
+    engine = SassC::Engine.new(input[:source], engine_options)
 
-    def name
-      self.class.name
+    css = Condenser::Utils.module_include(SassC::Script::Functions, @functions) do
+      engine.render
     end
+    css.delete_suffix!("\n/*# sourceMappingURL=#{File.basename(input[:filename])}.map */")
+    # engine.source_map
+    # css = css.delete_suffix!("\n/*# sourceMappingURL= */\n")
     
-    # Public: Initialize template with custom options.
-    #
-    # options - Hash
-    # cache_version - String custom cache version. Used to force a cache
-    #                 change after code changes are made to Sass Functions.
-    #
-    def initialize(options = {}, &block)
-      @options = options
-      @cache_version = options[:cache_version]
-      # @cache_key = "#{self.class.name}:#{VERSION}:#{Autoload::Sass::VERSION}:#{@cache_version}".freeze
-      @importer_class = options[:importer] || Condenser::SassTransformer::Importer
-      
-      @sass_config = options[:sass_config] || {}
-      @functions = Module.new do
-        include Functions
-        include options[:functions] if options[:functions]
-        class_eval(&block) if block_given?
-      end
-      # puts @functions.method(:asset_path).source_location
-    end
+    input[:source] = css
+    # input[:map] = map.to_json({})
+    input[:linked_assets]         += context.links
+    input[:process_dependencies]  += context.dependencies
+  end
 
-    def call(environment, input)
-      # context = input[:environment].context_class.new(input)
-      engine_options = merge_options({
-        syntax:       self.class.syntax,
-        filename:     input[:filename],
-        source_map_file: "#{input[:filename]}.map",
-        source_map_contents: true,
-        # cache_store:  Cache.new(environment.cache),
-        load_paths:   environment.path,
-        importer:     @importer_class,
-        condenser: {
-          context: environment.new_context_class,
-          environment: environment
-        },
-        asset: input
-      })
+  private
 
-      engine = SassC::Engine.new(input[:source], engine_options)
-      
-      css = Utils.module_include(SassC::Script::Functions, @functions) do
-        engine.render
-      end
-      css.delete_suffix!("\n/*# sourceMappingURL=#{File.basename(input[:filename])}.map */")
-      # engine.source_map
-      # css = css.delete_suffix!("\n/*# sourceMappingURL= */\n")
+  # Public: Build the cache store to be used by the Sass engine.
+  #
+  # input - the input hash.
+  # version - the cache version.
+  #
+  # Override this method if you need to use a different cache than the
+  # Condenser cache.
+  def build_cache_store(input, version)
+    CacheStore.new(input[:cache], version)
+  end
 
+  def merge_options(options)
+    defaults = @sass_config.dup
 
-      input[:source] = css
-      # input[:map] = map.to_json({})
+    if load_paths = defaults.delete(:load_paths)
+      options[:load_paths] += load_paths
     end
 
-    private
-
-    # Public: Build the cache store to be used by the Sass engine.
-    #
-    # input - the input hash.
-    # version - the cache version.
-    #
-    # Override this method if you need to use a different cache than the
-    # Condenser cache.
-    def build_cache_store(input, version)
-      CacheStore.new(input[:cache], version)
-    end
+    options.merge!(defaults)
+    options
+  end
 
-    def merge_options(options)
-      defaults = @sass_config.dup
+  # Functions injected into Sass context during Condenser evaluation.
+  module Functions
+    include Condenser::Sass::Functions
 
-      if load_paths = defaults.delete(:load_paths)
-        options[:load_paths] += load_paths
-      end
+    # Returns a Sass::Script::String.
+    def asset_path(path, options = {})
+      condenser_context.link_asset(path.value)
 
-      options.merge!(defaults)
-      options
+      path = condenser_context.asset_path(path.value, options)
+      query    = "?#{query}" if query
+      fragment = "##{fragment}" if fragment
+      SassC::Script::Value::String.new("#{path}#{query}#{fragment}", :string)
     end
 
-    # Public: Functions injected into Sass context during Condenser evaluation.
-    #
-    # This module may be extended to add global functionality to all Condenser
-    # Sass environments. Though, scoping your functions to just your environment
-    # is preferred.
-    #
-    # module Condenser::SassProcessor::Functions
-    #   def asset_path(path, options = {})
-    #   end
-    # end
-    #
-    module Functions
-      # Public: Generate a url for asset path.
-      #
-      # Default implementation is deprecated. Currently defaults to
-      # Context#asset_path.
-      #
-      # Will raise NotImplementedError in the future. Users should provide their
-      # own base implementation.
-      #
-      # Returns a Sass::Script::String.
-      def asset_path(path, options = {})
-        path = path.value
-
-        path, _, query, fragment = URI.split(path)[5..8]
-        asset = condenser_environment.find!(path)
-        condenser_context.link_asset(path)
-        path = condenser_context.asset_path(asset.path, options)
-        query    = "?#{query}" if query
-        fragment = "##{fragment}" if fragment
-        SassC::Script::Value::String.new("#{path}#{query}#{fragment}", :string)
-      end
-
-      # Public: Generate a asset url() link.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def asset_url(path, options = {})
-        SassC::Script::Value::String.new("url(#{asset_path(path, options).value})")
-      end
-
-      # Public: Generate url for image path.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def image_path(path)
-        asset_path(path, type: :image)
-      end
-
-      # Public: Generate a image url() link.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def image_url(path)
-        asset_url(path, type: :image)
-      end
-
-      # Public: Generate url for video path.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def video_path(path)
-        asset_path(path, type: :video)
-      end
-
-      # Public: Generate a video url() link.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def video_url(path)
-        asset_url(path, type: :video)
-      end
-
-      # Public: Generate url for audio path.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def audio_path(path)
-        asset_path(path, type: :audio)
-      end
-
-      # Public: Generate a audio url() link.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def audio_url(path)
-        asset_url(path, type: :audio)
-      end
-
-      # Public: Generate url for font path.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def font_path(path)
-        asset_path(path, type: :font)
-      end
-
-      # Public: Generate a font url() link.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def font_url(path)
-        asset_url(path, type: :font)
-      end
-
-      # Public: Generate url for javascript path.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def javascript_path(path)
-        asset_path(path, type: :javascript)
-      end
-
-      # Public: Generate a javascript url() link.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def javascript_url(path)
-        asset_url(path, type: :javascript)
-      end
-
-      # Public: Generate url for stylesheet path.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def stylesheet_path(path)
-        asset_path(path, type: :stylesheet)
-      end
-
-      # Public: Generate a stylesheet url() link.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def stylesheet_url(path)
-        asset_url(path, type: :stylesheet)
-      end
-
-      # Public: Generate a data URI for asset path.
-      #
-      # path - Sass::Script::String logical asset path
-      #
-      # Returns a Sass::Script::String.
-      def asset_data_url(path)
-        url = condenser_environment.asset_data_uri(path.value)
-        Sass::Script::String.new("url(" + url + ")")
-      end
-
-      protected
-        # Public: The Environment.
-        #
-        # Returns Condenser::Environment.
-        def condenser_context
-          options[:condenser][:context]
-        end
-        
-        def condenser_environment
-          options[:condenser][:environment]
-        end
+    # Returns a Sass::Script::String.
+    def asset_url(path, options = {})
+      SassC::Script::Value::String.new("url(#{asset_path(path, options).value})")
+    end
 
-        # Public: Mutatable set of dependencies.
-        #
-        # Returns a Set.
-        def condenser_dependencies
-          options[:condenser][:process_dependencies]
-        end
+    protected
 
+    def condenser_context
+      options[:condenser][:context]
+    end
+    
+    def condenser_environment
+      options[:condenser][:environment]
     end
   end
+end
 
-  class ScssTransformer < SassTransformer
-    def self.syntax
-      :scss
-    end
+class Condenser::ScssTransformer < Condenser::SassTransformer
+  def self.syntax
+    :scss
   end
 end

data/lib/condenser/transformers/svg_transformer/base.rb

@@ -0,0 +1,26 @@
+class Condenser::SVGTransformer::Base
+  
+  attr_accessor :children
+
+  def initialize(escape: nil)
+    @children = []
+  end
+
+  def to_module()
+    var_generator = Condenser::SVGTransformer::VarGenerator.new
+
+    <<~JS
+      export default function (svgAttributes) {
+      #{@children.last.to_js(var_generator: var_generator)}
+          if (svgAttributes) {
+              Object.keys(svgAttributes).forEach(function (key) {
+                  __a.setAttribute(key, svgAttributes[key]);
+              });
+          }
+
+          return __a;
+      }
+    JS
+  end
+
+end

data/lib/condenser/transformers/svg_transformer/tag.rb

@@ -0,0 +1,54 @@
+class Condenser::SVGTransformer::Tag
+
+  attr_accessor :tag_name, :attrs, :children, :namespace
+
+  def initialize(name)
+    @tag_name = name
+    @attrs = []
+    @children = []
+  end
+
+  def to_s
+    @value
+  end
+
+  def inspect
+    "#<SVG::Tag:#{self.object_id} @tag_name=#{tag_name}>"
+  end
+
+  def to_js(append: nil, var_generator:, indentation: 4, namespace: nil)
+    namespace ||= self.namespace
+    
+    output_var = var_generator.next
+    js = "#{' '*indentation}var #{output_var} = document.createElement"
+    js << if namespace
+      "NS(#{namespace.to_js}, #{JSON.generate(tag_name)});\n"
+    else
+      "(#{JSON.generate(tag_name)});\n"
+    end
+
+    @attrs.each do |attr|
+      if attr.is_a?(Hash)
+        attr.each do |k, v|
+          js << "#{' '*indentation}#{output_var}.setAttribute(#{JSON.generate(k)}, #{v.is_a?(String) ? v : v.to_js});\n"
+        end
+      else
+        js << "#{' '*indentation}#{output_var}.setAttribute(#{JSON.generate(attr)}, \"\");\n"
+      end
+    end
+
+    @children.each do |child|
+      js << if child.is_a?(Condenser::SVGTransformer::Tag)
+        child.to_js(var_generator: var_generator, indentation: indentation, append: output_var, namespace: namespace)
+      else
+        child.to_js(var_generator: var_generator, indentation: indentation, append: output_var)
+      end
+    end
+
+    js << "#{' '*indentation}#{append}.append(#{output_var});\n" if append
+
+    js
+  end
+  
+end
+

data/lib/condenser/transformers/svg_transformer/template.rb

@@ -0,0 +1,151 @@
+class Condenser::SVGTransformer::Template
+  
+  include Condenser::ParseHelpers
+
+  attr_accessor :source
+
+  START_TAGS = ['<']
+  CLOSE_TAGS = ['/>', '>']
+  VOID_ELEMENTS = ['!DOCTYPE', '?xml']
+  
+  def initialize(source)
+    @source = source.strip
+    process
+  end
+
+  def process
+    seek(0)
+    @tree =   [Condenser::SVGTransformer::Base.new]
+    @stack =  [:str]
+    
+    while !eos?
+      case @stack.last
+      when :str
+        scan_until(Regexp.new("(#{START_TAGS.map{|s| Regexp.escape(s) }.join('|')}|\\z)"))
+        if !matched.nil? && START_TAGS.include?(matched)
+          @stack << :tag
+        end
+      when :tag
+        scan_until(Regexp.new("(\\/|[^\\s>]+)"))
+        if matched == '/'
+          @stack.pop
+          @stack << :close_tag
+        else
+          @tree << Condenser::SVGTransformer::Tag.new(matched)
+          @stack << :tag_attr_key
+        end
+      when :close_tag
+        scan_until(Regexp.new("([^\\s>]+)"))
+
+        el = @tree.pop
+        if el.tag_name != matched
+          raise Condenser::SVGTransformer::TemplateError.new("Expected to close #{el.tag_name.inspect} tag, instead closed #{matched.inspect}\n#{cursor}")
+        end
+        if !['!DOCTYPE', '?xml'].include?(el.tag_name)
+          @tree.last.children << el
+          scan_until(Regexp.new("(#{CLOSE_TAGS.map{|s| Regexp.escape(s) }.join('|')})"))
+          @stack.pop
+        end
+      when :tag_attr_key
+        scan_until(Regexp.new("(#{CLOSE_TAGS.map{|s| Regexp.escape(s) }.join('|')}|[^\\s=>]+)"))
+        if CLOSE_TAGS.include?(matched)
+          if matched == '/>' || VOID_ELEMENTS.include?(@tree.last.tag_name)
+            el = @tree.pop
+            @tree.last.children << el
+            @stack.pop
+            @stack.pop
+          else
+            @stack << :str
+          end
+        else
+          key = if matched.start_with?('"') && matched.end_with?('"')
+            matched[1..-2]
+          elsif matched.start_with?('"') && matched.end_with?('"')
+            matched[1..-2]
+          else
+            matched
+          end
+          @tree.last.attrs << key
+          @stack << :tag_attr_value_tx
+        end
+      when :tag_attr_value_tx
+        scan_until(Regexp.new("(#{(CLOSE_TAGS).map{|s| Regexp.escape(s) }.join('|')}|=|\\S)"))
+        tag_key = @tree.last.attrs.pop
+        if CLOSE_TAGS.include?(matched)
+          el = @tree.last
+          el.attrs << tag_key
+          if VOID_ELEMENTS.include?(el.tag_name)
+            @tree.pop
+            @tree.last.children << el
+          end
+          @stack.pop
+          @stack.pop
+          @stack.pop
+        elsif matched == '='
+          @stack.pop
+          @tree.last.attrs << tag_key
+          @stack << :tag_attr_value
+        else
+          @stack.pop
+          @tree.last.attrs << tag_key
+          rewind(1)
+        end
+
+      when :tag_attr_value
+        scan_until(Regexp.new("(#{CLOSE_TAGS.map{|s| Regexp.escape(s) }.join('|')}|'|\"|\\S+)"))
+
+        if matched == '"'
+          @stack.pop
+          @stack << :tag_attr_value_double_quoted
+        elsif matched == "'"
+          @stack.pop
+          @stack << :tag_attr_value_single_quoted
+        else
+          @stack.pop
+          key = @tree.last.attrs.pop
+          @tree.last.namespace = matched if key == 'xmlns'
+          @tree.last.attrs << { key => matched }
+        end
+      when :tag_attr_value_double_quoted
+        quoted_value = ''
+        scan_until(/"/)
+        quoted_value << pre_match if !pre_match.strip.empty?
+        rewind(1)
+
+        quoted_value = Condenser::SVGTransformer::Value.new(quoted_value)
+
+        key = @tree.last.attrs.pop
+        @tree.last.namespace = quoted_value if key == 'xmlns'
+        if @tree.last.attrs.last.is_a?(Hash) && !@tree.last.attrs.last.has_key?(key)
+          @tree.last.attrs.last[key] = quoted_value
+        else
+          @tree.last.attrs << { key => quoted_value }
+        end
+        scan_until(/\"/)
+        @stack.pop
+      when :tag_attr_value_single_quoted
+        quoted_value = ''
+        scan_until(/(')/)
+        quoted_value << pre_match if !pre_match.strip.empty?
+        rewind(1)
+
+        quoted_value = Condenser::SVGTransformer::Value.new(quoted_value)
+
+        key = @tree.last.attrs.pop
+        @tree.last.namespace = quoted_value if key == 'xmlns'
+        if @tree.last.attrs.last.is_a?(Hash) && !@tree.last.attrs.last.has_key?(key)
+          @tree.last.attrs.last[key] = quoted_value
+        else
+          @tree.last.attrs << { key => quoted_value }
+        end
+        scan_until(/\'/)
+        @stack.pop
+      end
+    end
+  end
+
+  def to_module
+    @tree.first.to_module
+  end
+
+end

data/lib/condenser/transformers/svg_transformer/template_error.rb

@@ -0,0 +1,2 @@
+class Condenser::SVGTransformer::TemplateError < StandardError
+end

data/lib/condenser/transformers/svg_transformer/value.rb

@@ -0,0 +1,13 @@
+require 'json'
+
+class Condenser::SVGTransformer::Value
+
+  def initialize(value)
+    @value = value
+  end
+
+  def to_js
+    JSON.generate(@value)
+  end
+  
+end

data/lib/condenser/transformers/svg_transformer/var_generator.rb

@@ -0,0 +1,10 @@
+class Condenser::SVGTransformer::VarGenerator
+  def initialize
+    @current = nil
+  end
+  
+  def next
+    @current = @current.nil? ? '__a' : @current.next
+    @current
+  end
+end