emcee 0.1.6 → 0.2.0

data/test/{controllers_test.rb → dummy_app_integration_test.rb}

@@ -1,10 +1,10 @@
 require 'test_helper'
 require 'action_controller'
 
-class ControllersTest < ActionController::TestCase
+class DummyAppIntegrationTest < ActionController::TestCase
   tests DummyController
 
-  test "should get index" do
+  test "should succesfully load the app and show index" do
     get :index
     assert_response :success
   end
@@ -22,13 +22,16 @@ class ControllersTest < ActionController::TestCase
   # To test the contents of our compiled application.html, we have a custom route
   # and controller action. The controller action renders the compiled file as a
   # json response, which we can test against here.
-  test "the test files should get compiled and concatenated" do
+  test "the test files should get concatenated" do
     get :assets
-    assert_response :success
     assert_equal @response.body, <<-EOS
 <script>var life = "is good";
 </script>
 <p>test4</p>
+<style>p {
+  color: red; }
+</style>
+<p>compiled scss</p>
 <style>p {
   color: pink;
 }

data/test/processors_test.rb

@@ -1,17 +1,34 @@
 require 'test_helper'
+require 'emcee/processors/import_processor'
+require 'emcee/processors/script_processor'
+require 'emcee/processors/stylesheet_processor'
 
-# Testing a class that inherits from Sprockets::DirectiveProcessor is difficult,
-# so we've split out the methods we want to test into a module, and we'll include
-# them here in a stub class.
-class ProcessorStub
-  include Emcee::Processors::Includes
+class ScriptProcessorStub < Emcee::ScriptProcessor
+  def read_file(path)
+    "/* contents */"
+  end
+end
 
-  private
+class StylesheetProcessorStub < Emcee::StylesheetProcessor
   def read_file(path)
     "/* contents */"
   end
 end
 
+class StylesheetSassProcessorStub < Emcee::StylesheetProcessor
+  def read_file(path)
+    "$color: red; p { color: $color; }"
+  end
+
+  def sass?(path)
+    true
+  end
+
+  def get_sass_content(path)
+    super(path).gsub(/\n\s?/, "")
+  end
+end
+
 # Create a stub of Sprocket's Context class, so we can test if we're 'requiring'
 # assets correctly.
 class ContextStub
@@ -28,7 +45,6 @@ end
 
 class ProcessorsTest < ActiveSupport::TestCase
   setup do
-    @processor = ProcessorStub.new
     @context = ContextStub.new
     @directory = "/dir"
     @body = %q{
@@ -40,10 +56,11 @@ class ProcessorsTest < ActiveSupport::TestCase
   end
 
   test "processing imports should work" do
-    processed = @processor.process_imports(@body, @context, @directory)
+    processor = Emcee::ImportProcessor.new
+    processed = processor.process(@context, @body, @directory)
+
     assert_equal 1, @context.assets.length
     assert_equal "/dir/test.html", @context.assets[0]
-
     assert_equal processed, %q{
       <link rel="stylesheet" href="test.css">
       <script src="test.js"></script>
@@ -52,7 +69,9 @@ class ProcessorsTest < ActiveSupport::TestCase
   end
 
   test "processing stylesheets should work" do
-    processed = @processor.process_stylesheets(@body, @directory)
+    processor = StylesheetProcessorStub.new
+    processed = processor.process(@context, @body, @directory)
+
     assert_equal processed, %q{
       <link rel="import" href="test.html">
       <style>/* contents */
@@ -63,7 +82,9 @@ class ProcessorsTest < ActiveSupport::TestCase
   end
 
   test "processing scripts should work" do
-    processed = @processor.process_scripts(@body, @directory)
+    processor = ScriptProcessorStub.new
+    processed = processor.process(@context, @body, @directory)
+
     assert_equal processed, %q{
       <link rel="import" href="test.html">
       <link rel="stylesheet" href="test.css">
@@ -72,4 +93,17 @@ class ProcessorsTest < ActiveSupport::TestCase
       <p>test</p>
     }
   end
+
+  test "processing sass stylesheets should work" do
+    processor = StylesheetSassProcessorStub.new
+    processed = processor.process(@context, @body, @directory)
+
+    assert_equal processed, %q{
+      <link rel="import" href="test.html">
+      <style>p { color: red; }
+      </style>
+      <script src="test.js"></script>
+      <p>test</p>
+    }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emcee
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Huth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -49,21 +63,24 @@ files:
 - Rakefile
 - lib/emcee.rb
 - lib/emcee/compressors/html_compressor.rb
-- lib/emcee/helpers/action_view/asset_tag_helper.rb
-- lib/emcee/helpers/action_view/asset_url_helper.rb
-- lib/emcee/helpers/sprockets/compressing_helpers.rb
-- lib/emcee/helpers/sprockets/view_helpers.rb
-- lib/emcee/processors/html_processor.rb
-- lib/emcee/processors/processor_includes.rb
+- lib/emcee/helpers/asset_tag_helper.rb
+- lib/emcee/helpers/asset_url_helper.rb
+- lib/emcee/helpers/sprockets_helper.rb
+- lib/emcee/loose_assets.rb
+- lib/emcee/processors/directive_processor.rb
+- lib/emcee/processors/import_processor.rb
+- lib/emcee/processors/script_processor.rb
+- lib/emcee/processors/stylesheet_processor.rb
 - lib/emcee/railtie.rb
 - lib/emcee/version.rb
 - lib/generators/emcee/install/install_generator.rb
 - lib/generators/emcee/install/templates/application.html
 - test/compressors_test.rb
-- test/controllers_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/elements/application.html
+- test/dummy/app/assets/elements/compile/test5.css.scss
+- test/dummy/app/assets/elements/compile/test5.html
 - test/dummy/app/assets/elements/test/test2.html
 - test/dummy/app/assets/elements/test/test3.css
 - test/dummy/app/assets/elements/test/test3.html
@@ -104,9 +121,11 @@ files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705
+- test/dummy/tmp/cache/assets/test/sprockets/1b8013559a887e8b8d91472ef246fef9
 - test/dummy/tmp/cache/assets/test/sprockets/1e24025f59396708b3bb44543bed32fc
 - test/dummy/tmp/cache/assets/test/sprockets/219d0afb67879a67bae32b4fe4c708ac
 - test/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af
+- test/dummy/tmp/cache/assets/test/sprockets/2f90dac85033dad7b068860c3f6b7b27
 - test/dummy/tmp/cache/assets/test/sprockets/32cae461a9446107294c8a0230f5080c
 - test/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953
 - test/dummy/tmp/cache/assets/test/sprockets/4fd1effec4d6579ba9d4f03ed156a15b
@@ -122,7 +141,7 @@ files:
 - test/dummy/tmp/cache/assets/test/sprockets/ffd4adb86602a60c7fcedd5d472166d3
 - test/dummy/vendor/assets/elements/test4.html
 - test/dummy/vendor/assets/elements/test4.js
-- test/emcee_test.rb
+- test/dummy_app_integration_test.rb
 - test/helpers_test.rb
 - test/processors_test.rb
 - test/test_helper.rb
@@ -152,8 +171,9 @@ specification_version: 4
 summary: Add web components to the asset pipeline.
 test_files:
 - test/compressors_test.rb
-- test/controllers_test.rb
 - test/dummy/app/assets/elements/application.html
+- test/dummy/app/assets/elements/compile/test5.css.scss
+- test/dummy/app/assets/elements/compile/test5.html
 - test/dummy/app/assets/elements/test/test2.html
 - test/dummy/app/assets/elements/test/test3.css
 - test/dummy/app/assets/elements/test/test3.html
@@ -196,9 +216,11 @@ test_files:
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705
+- test/dummy/tmp/cache/assets/test/sprockets/1b8013559a887e8b8d91472ef246fef9
 - test/dummy/tmp/cache/assets/test/sprockets/1e24025f59396708b3bb44543bed32fc
 - test/dummy/tmp/cache/assets/test/sprockets/219d0afb67879a67bae32b4fe4c708ac
 - test/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af
+- test/dummy/tmp/cache/assets/test/sprockets/2f90dac85033dad7b068860c3f6b7b27
 - test/dummy/tmp/cache/assets/test/sprockets/32cae461a9446107294c8a0230f5080c
 - test/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953
 - test/dummy/tmp/cache/assets/test/sprockets/4fd1effec4d6579ba9d4f03ed156a15b
@@ -214,7 +236,7 @@ test_files:
 - test/dummy/tmp/cache/assets/test/sprockets/ffd4adb86602a60c7fcedd5d472166d3
 - test/dummy/vendor/assets/elements/test4.html
 - test/dummy/vendor/assets/elements/test4.js
-- test/emcee_test.rb
+- test/dummy_app_integration_test.rb
 - test/helpers_test.rb
 - test/processors_test.rb
 - test/test_helper.rb

data/lib/emcee/helpers/sprockets/compressing_helpers.rb

@@ -1,35 +0,0 @@
-module Sprockets
-  module Compressing
-    # Modify Sprocket's Compressing module to allow us to set and retrieve html
-    # compressors
-
-    def html_compressor
-      @html_compressor if defined? @html_compressor
-    end
-
-    # Assign a compressor to run on 'text/html' assets.
-    #
-    # The compressor object must respond to 'compress'.
-    def html_compressor=(compressor)
-      unregister_bundle_processor 'text/html', html_compressor if html_compressor
-      @html_compressor = nil
-      return unless compressor
-
-      if compressor.is_a?(Symbol)
-        compressor = compressors['text/html'][compressor] || raise(Error, "unknown compressor: #{compressor}")
-      end
-
-      if compressor.respond_to?(:compress)
-        klass = Class.new(::Sprockets::Processor) do
-          @name = "html_compressor"
-          @processor = proc { |context, data| compressor.compress(data) }
-        end
-        @html_compressor = :html_compressor
-      else
-        @html_compressor = klass = compressor
-      end
-
-      register_bundle_processor "text/html", klass
-    end
-  end
-end

data/lib/emcee/processors/html_processor.rb

@@ -1,84 +0,0 @@
-require "emcee/processors/processor_includes"
-
-module Emcee
-  module Processors
-    # HtmlProcessor processes html files by doing 4 things:
-    #
-    # 1. Stripping out asset pipeline directives and processing the associated
-    #    files.
-    # 2. Stripping out html imports and processing those files.
-    # 3. Stripping out external stylesheet includes, and inlining those sheets
-    #    where they were called.
-    # 4. Stripping out external script tags, and inlining those scripts where
-    #    they were called.
-    #
-    # It inherits from Sprocket::DirectiveProcessor, which does most of the
-    # work for us.
-    #
-    class HtmlProcessor < Sprockets::DirectiveProcessor
-      # Include methods to process different parts of the html file. These are
-      # split out to make unit testing easier.
-      include Emcee::Processors::Includes
-      protected :process_imports
-      protected :process_stylesheets
-      protected :process_scripts
-      private   :read_file
-
-      # Matches the entire header/directive block. This is everything from the
-      # top of the file, enclosed in html comments.
-      #
-      # ---
-      #
-      # \A                matches the beginning of the string
-      # (?m:\s*)          matches whitespace, including \n
-      # (<!--(?m:.*?)-->) matches html comments and their content
-      #
-      HEADER_PATTERN = /\A((?m:\s*)(<!--(?m:.*?)-->))+/
-
-      # Matches the an asset pipeline directive.
-      #
-      #   *= require_tree .
-      #
-      # ---
-      #
-      # ^         matches the beginning of the line
-      # \W*       matches any non-word character, zero or more times
-      # =         matches =, obviously
-      # \s*       matches any whitespace character, zero or more times
-      # (\w+.*?)  matches a group of characters, starting with a letter or number
-      # $         matches the end of the line
-      #
-      DIRECTIVE_PATTERN = /^\W*=\s*(\w+.*?)$/
-
-      # Render takes the actual text of the file and does our processing to it.
-      # This is based on the standard render method on Sprockets's
-      # DirectiveProcessor.
-      #
-      def render(context, locals)
-        @context = context
-        @pathname = context.pathname
-        @directory = File.dirname(@pathname)
-
-        @header  = data[HEADER_PATTERN, 0] || ""
-        @body    = $' || data
-        # Ensure body ends in a new line
-        @body += "\n" if @body != "" && @body !~ /\n\Z/m
-
-        @included_pathnames = []
-
-        @result = ""
-        @result.force_encoding(body.encoding)
-
-        @has_written_body = false
-
-        process_directives
-        @body = process_imports(@body, @context, @directory)
-        @body = process_stylesheets(@body, @directory)
-        @body = process_scripts(@body, @directory)
-        process_source
-
-        @result
-      end
-    end
-  end
-end

data/lib/emcee/processors/processor_includes.rb

@@ -1,111 +0,0 @@
-module Emcee
-  module Processors
-    # This module defines methods that we will include into HtmlProcessor.
-    #
-    # Testing a class that inherits from Sprockets::DirectiveProcessor, which
-    # HtmlProcessor does, is difficult. Seperating out these methods makes them
-    # easy to unit test.
-    #
-    module Includes
-      # Match an html import tag.
-      #
-      #   <link rel="import" href="assets/example.html">
-      #
-      IMPORT_PATTERN = /^\s*<link .*rel=["']import["'].*>$/
-
-      # Match a stylesheet link tag.
-      #
-      #   <link rel="stylesheet" href="assets/example.css">
-      #
-      STYLESHEET_PATTERN = /^\s*<link .*rel=["']stylesheet["'].*>$/
-
-      # Match a script tag.
-      #
-      #   <script src="assets/example.js"></script>
-      #
-      SCRIPT_PATTERN = /^\s*<script .*src=["'].+\.js["']><\/script>$/
-
-      # Match the path from the href attribute of an html import or stylesheet
-      # include tag. Captures the actual path.
-      #
-      #   href="/assets/example.css"
-      #
-      HREF_PATH_PATTERN = /href=["'](?<path>[\w\.\/-]+)["']/
-
-      # Match the source path from a script tag. Captures the actual path.
-      #
-      #   src="/assets/example.js"
-      #
-      SRC_PATH_PATTERN = /src=["'](?<path>[\w\.\/-]+)["']/
-
-      # Match the indentation whitespace of a line
-      #
-      INDENT_PATTERN = /^(?<indent>\s*)/
-
-      # Return a file's contents as text. This is split out as a method so that
-      # we can test the other methods in this module without actually reading from
-      # the filesystem.
-      def read_file(path)
-        File.read(path)
-      end
-
-      # Scan the body for html imports. If any are found, tell sprockets to
-      # require their files like we would for a directive. Then remove the
-      # imports and return the new body.
-      def process_imports(body, context, directory)
-        body.scan(IMPORT_PATTERN) do |import_tag|
-          if path = import_tag[HREF_PATH_PATTERN, :path]
-            absolute_path = File.absolute_path(path, directory)
-            context.require_asset(absolute_path)
-          end
-        end
-
-        body.gsub(IMPORT_PATTERN, "")
-      end
-
-      # Scan the body for external script references. If any are found, inline
-      # the files in place of the references and return the new body.
-      def process_scripts(body, directory)
-        to_inline = []
-
-        body.scan(SCRIPT_PATTERN) do |script_tag|
-          if path = script_tag[SRC_PATH_PATTERN, :path]
-
-            indent = script_tag[INDENT_PATTERN, :indent] || ""
-
-            absolute_path = File.absolute_path(path, directory)
-            script_contents = read_file(absolute_path)
-
-            to_inline << [script_tag, "#{indent}<script>#{script_contents}\n#{indent}</script>"]
-          end
-        end
-
-        to_inline.reduce(body) do |output, (tag, contents)|
-          output.gsub(tag, contents)
-        end
-      end
-
-      # Scan the body for external stylesheet references. If any are found,
-      # inline the files in place of the references and return the new body.
-      def process_stylesheets(body, directory)
-        to_inline = []
-
-        body.scan(STYLESHEET_PATTERN) do |stylesheet_tag|
-          if path = stylesheet_tag[HREF_PATH_PATTERN, :path]
-
-            indent = stylesheet_tag[INDENT_PATTERN, :indent] || ""
-
-            absolute_path = File.absolute_path(path, directory)
-            stylesheet_contents = read_file(absolute_path)
-
-            to_inline << [stylesheet_tag, "#{indent}<style>#{stylesheet_contents}\n#{indent}</style>"]
-          end
-        end
-
-        to_inline.reduce(body) do |output, (tag, contents)|
-          output.gsub(tag, contents)
-        end
-      end
-    end
-  end
-end