emcee 1.0.3 → 1.0.4

data/test/dummy_app_integration_test.rb

@@ -1,5 +1,7 @@
 require 'test_helper'
 require 'action_controller'
+require 'coffee-rails'
+require 'sass'
 
 class DummyAppIntegrationTest < ActionController::TestCase
   tests DummyController
@@ -35,9 +37,12 @@ class DummyAppIntegrationTest < ActionController::TestCase
       <p>test1</p>
       <polymer-element name="test6" attributes="source">
         <template>
+          <p hidden?="{{ hidden }}">hidden</p>
           <img src="{{ source }}">
         </template>
       </polymer-element>
+      <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+      <p>External script</p>
     EOS
   end
 end

data/test/{post_processors_test.rb → processors_test.rb}

@@ -1,50 +1,48 @@
 require 'test_helper'
-require 'emcee/post_processors/import_processor'
-require 'emcee/post_processors/script_processor'
-require 'emcee/post_processors/stylesheet_processor'
+require 'emcee/processors/import_processor'
+require 'emcee/processors/script_processor'
+require 'emcee/processors/stylesheet_processor'
+require 'emcee/document'
 
-require 'coffee-rails'
-require 'sass'
+# Create a stub of our asset resolver, so we can test if we're sending the
+# correct messages to it.
+class ResolverStub
+  attr_reader :asset_required
 
-# Create a stub of Sprocket's Context class, so we can test if we're sending
-# the correct messages to it.
-class ContextStub
-  attr_reader :assets
-
-  def initialize
-    @assets = []
-  end
-
-  def pathname
+  def directory
     "/"
   end
 
   def require_asset(asset)
-    @assets << asset
+    @asset_required = true
   end
 
-  def evaluate(path, options = {})
+  def evaluate(path)
     "/* contents */"
   end
+
+  def should_inline?(path)
+    true
+  end
 end
 
-class PostProcessorsTest < ActiveSupport::TestCase
+class ProcessorsTest < ActiveSupport::TestCase
   setup do
-    @context = ContextStub.new
+    @resolver = ResolverStub.new
     @body = <<-EOS.strip_heredoc
       <link rel="import" href="test.html">
       <link rel="stylesheet" href="test.css">
       <script src="test.js"></script>
       <p>test</p>
     EOS
+    @doc = Emcee::Document.new(@body)
   end
 
   test "processing imports should work" do
-    processor = Emcee::PostProcessors::ImportProcessor.new(@context)
-    processed = processor.process(@body)
+    processor = Emcee::Processors::ImportProcessor.new(@resolver)
+    processed = processor.process(@doc).to_s
 
-    assert_equal 1, @context.assets.length
-    assert_equal "/test.html", @context.assets[0]
+    assert @resolver.asset_required
     assert_equal processed, <<-EOS.strip_heredoc
       <link rel="stylesheet" href="test.css">
       <script src="test.js"></script>
@@ -53,8 +51,8 @@ class PostProcessorsTest < ActiveSupport::TestCase
   end
 
   test "processing stylesheets should work" do
-    processor = Emcee::PostProcessors::StylesheetProcessor.new(@context)
-    processed = processor.process(@body)
+    processor = Emcee::Processors::StylesheetProcessor.new(@resolver)
+    processed = processor.process(@doc).to_s
 
     assert_equal processed, <<-EOS.strip_heredoc
       <link rel="import" href="test.html">
@@ -65,8 +63,8 @@ class PostProcessorsTest < ActiveSupport::TestCase
   end
 
   test "processing scripts should work" do
-    processor = Emcee::PostProcessors::ScriptProcessor.new(@context)
-    processed = processor.process(@body)
+    processor = Emcee::Processors::ScriptProcessor.new(@resolver)
+    processed = processor.process(@doc).to_s
 
     assert_equal processed, <<-EOS.strip_heredoc
       <link rel="import" href="test.html">

data/test/resolver_test.rb

@@ -0,0 +1,53 @@
+require 'test_helper'
+require 'emcee/resolver.rb'
+
+# Create a stub of Sprocket's Context class, so we can test if we're sending
+# the correct messages to it.
+class ContextStub
+  attr_reader :assets
+
+  def initialize
+    @assets = []
+  end
+
+  def pathname
+    "/"
+  end
+
+  def require_asset(asset)
+    @assets << asset
+  end
+
+  def evaluate(path, options = {})
+    "/* contents */"
+  end
+end
+
+class ResolverTest < ActiveSupport::TestCase
+  setup do
+    @context = ContextStub.new
+    @resolver = Emcee::Resolver.new(@context)
+  end
+
+  test "should have directory" do
+    assert_equal @resolver.directory, "/"
+  end
+
+  test "should require assets" do
+    assert_difference "@context.assets.length" do
+      @resolver.require_asset("/asset1")
+    end
+  end
+
+  test "should evaluate an asset" do
+    assert_equal @resolver.evaluate("/test"), "/* contents */"
+  end
+
+  test "should indicate if asset should be inlined" do
+    assert @resolver.should_inline?("test.css")
+    assert @resolver.should_inline?("/vendor/assets/test.js")
+
+    assert_not @resolver.should_inline?("//fonts.googleapis.com/css?family=RobotoDraft:regular,bold,italic,thin,light,bolditalic,black,medium&lang=en")
+    assert_not @resolver.should_inline?("//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emcee
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Andrew Huth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.9
 description: Add web components to the Rails asset pipeline
 email:
 - andrew@huth.me
@@ -91,20 +91,23 @@ files:
 - Rakefile
 - lib/emcee.rb
 - lib/emcee/compressors/html_compressor.rb
+- lib/emcee/directive_processor.rb
+- lib/emcee/document.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/post_processors/import_processor.rb
-- lib/emcee/post_processors/script_processor.rb
-- lib/emcee/post_processors/stylesheet_processor.rb
-- lib/emcee/pre_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/resolver.rb
 - lib/emcee/version.rb
 - lib/generators/emcee/install/install_generator.rb
 - lib/generators/emcee/install/templates/application.html
 - lib/generators/emcee/install/templates/template.bowerrc
 - test/compressors_test.rb
+- test/document_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/components/application.html
@@ -116,6 +119,7 @@ files:
 - test/dummy/app/assets/components/test/test3.html
 - test/dummy/app/assets/components/test1.html
 - test/dummy/app/assets/components/test6.html
+- test/dummy/app/assets/components/test7.html
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -171,13 +175,16 @@ files:
 - test/dummy/tmp/cache/assets/test/sprockets/ea6d25feb3cd8cc19f7982458443f784
 - test/dummy/tmp/cache/assets/test/sprockets/ef2c9664b54fb0d162127bdea23cb7d9
 - test/dummy/tmp/cache/assets/test/sprockets/f16d30b33e206690649697e498a2f1a8
+- test/dummy/tmp/cache/assets/test/sprockets/f60c4ca381dbca97bfacc058e847695f
+- test/dummy/tmp/cache/assets/test/sprockets/f70ad5f62d58f65f05f09c8cc1d3165b
 - test/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
 - test/dummy/tmp/cache/assets/test/sprockets/fadf553480495a92d11dade99298bf7e
 - test/dummy/vendor/assets/components/test4.html
 - test/dummy/vendor/assets/components/test4.js
 - test/dummy_app_integration_test.rb
 - test/helpers_test.rb
-- test/post_processors_test.rb
+- test/processors_test.rb
+- test/resolver_test.rb
 - test/test_helper.rb
 homepage: https://github.com/ahuth/emcee
 licenses:
@@ -205,6 +212,7 @@ specification_version: 4
 summary: Add web components to the Rails asset pipeline.
 test_files:
 - test/compressors_test.rb
+- test/document_test.rb
 - test/dummy/app/assets/components/application.html
 - test/dummy/app/assets/components/compile/test5.css.scss
 - test/dummy/app/assets/components/compile/test5.html
@@ -214,6 +222,7 @@ test_files:
 - test/dummy/app/assets/components/test/test3.html
 - test/dummy/app/assets/components/test1.html
 - test/dummy/app/assets/components/test6.html
+- test/dummy/app/assets/components/test7.html
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -271,12 +280,15 @@ test_files:
 - test/dummy/tmp/cache/assets/test/sprockets/ea6d25feb3cd8cc19f7982458443f784
 - test/dummy/tmp/cache/assets/test/sprockets/ef2c9664b54fb0d162127bdea23cb7d9
 - test/dummy/tmp/cache/assets/test/sprockets/f16d30b33e206690649697e498a2f1a8
+- test/dummy/tmp/cache/assets/test/sprockets/f60c4ca381dbca97bfacc058e847695f
+- test/dummy/tmp/cache/assets/test/sprockets/f70ad5f62d58f65f05f09c8cc1d3165b
 - test/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
 - test/dummy/tmp/cache/assets/test/sprockets/fadf553480495a92d11dade99298bf7e
 - test/dummy/vendor/assets/components/test4.html
 - test/dummy/vendor/assets/components/test4.js
 - test/dummy_app_integration_test.rb
 - test/helpers_test.rb
-- test/post_processors_test.rb
+- test/processors_test.rb
+- test/resolver_test.rb
 - test/test_helper.rb
 has_rdoc: 

data/lib/emcee/post_processors/script_processor.rb

@@ -1,42 +0,0 @@
-require 'nokogiri'
-require 'uri'
-
-module Emcee
-  module PostProcessors
-    # ScriptProcessor scans a document for external script references and inlines
-    # them into the current document.
-    class ScriptProcessor
-      def initialize(context)
-        @context = context
-        @directory = File.dirname(context.pathname)
-      end
-
-      def process(data)
-        doc = Nokogiri::HTML.fragment(data)
-        inline_scripts(doc)
-        URI.unescape(doc.to_s)
-      end
-
-      private
-
-      def inline_scripts(doc)
-        doc.css("script[src]").each do |node|
-          path = absolute_path(node.attribute("src"))
-          content = @context.evaluate(path)
-          script = create_script(doc, content)
-          node.replace(script)
-        end
-      end
-
-      def absolute_path(path)
-        File.absolute_path(path, @directory)
-      end
-
-      def create_script(doc, content)
-        node = Nokogiri::XML::Node.new("script", doc)
-        node.content = content
-        node
-      end
-    end
-  end
-end

data/lib/emcee/post_processors/stylesheet_processor.rb

@@ -1,42 +0,0 @@
-require 'nokogiri'
-require 'uri'
-
-module Emcee
-  module PostProcessors
-    # StylesheetProcessor scans a document for external stylesheet references and
-    # inlines them into the current document.
-    class StylesheetProcessor
-      def initialize(context)
-        @context = context
-        @directory = File.dirname(context.pathname)
-      end
-
-      def process(data)
-        doc = Nokogiri::HTML.fragment(data)
-        inline_styles(doc)
-        URI.unescape(doc.to_s)
-      end
-
-      private
-
-      def inline_styles(doc)
-        doc.css("link[rel='stylesheet']").each do |node|
-          path = absolute_path(node.attribute("href"))
-          content = @context.evaluate(path)
-          style = create_style(doc, content)
-          node.replace(style)
-        end
-      end
-
-      def absolute_path(path)
-        File.absolute_path(path, @directory)
-      end
-
-      def create_style(doc, content)
-        node = Nokogiri::XML::Node.new("style", doc)
-        node.content = content
-        node
-      end
-    end
-  end
-end

data/lib/emcee/pre_processors/directive_processor.rb

@@ -1,35 +0,0 @@
-module Emcee
-  module PreProcessors
-    # The `DirectiveProcessor` is responsible for parsing and evaluating
-    # directive comments in a source file.
-    class DirectiveProcessor < Sprockets::DirectiveProcessor
-      # Matches the entire header/directive block. This is everything from the
-      # top of the file, enclosed in html comments.
-      HEADER_PATTERN = /\A((?m:\s*)(<!--(?m:.*?)-->))+/
-
-      # Implement `render` so that it uses our own header pattern.
-      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
-        process_source
-
-        @result
-      end
-    end
-  end
-end