sprockets-iife 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8442e14e04c5b085230235237caeef6cbf47360
-  data.tar.gz: 04c772680c6c6f04a98c1d75c12a7d8bd501fe71
+  metadata.gz: 9054960a6ef80b43a4d1c456cdb5c8bbb5d8a9d9
+  data.tar.gz: b19de6947d03fedc86186bc391c5049eb6c5d21e
 SHA512:
-  metadata.gz: 77008f7d66dfaa1dfd4ed1b3623d5c5b7528dd38fb72a30cb842d3e07856a63359e87c780b73f219921aa89545e4258ba411c2a0ac0be55b4e93bbac44a14adf
-  data.tar.gz: c384c12ba12111cd6398cc4a98c7a706edfd3dac091ee834ffb4ee89f6bd747420321fbdae16d18be9e58ee76f37f89b025ace6e6a4cd71f09430595dc733f86
+  metadata.gz: 048f6a8ea56c515e51a30e7f2ee40519315df7da21b83da343b8050f24601324f41ca5ba42a8bf0b73ce5e21dedfead6fe83cc088c51598e5910699292b09144
+  data.tar.gz: 6bbc62993e0efd4ed04a5e08253936f43ec8f944957687e031051071dfe2667c1ff20bd28ab929ab56a5062216eb067450fa5dd5ff53ff5258ac65e1e27e1d87

data/.travis.yml

@@ -0,0 +1,22 @@
+language: ruby
+
+rvm:
+  - 2.0.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
+
+cache: bundler
+
+gemfile:
+  - gemfiles/rails_3.gemfile
+  - gemfiles/rails_4_with_sprockets_2.gemfile
+  - gemfiles/rails_4_with_sprockets_3.gemfile
+  - gemfiles/rails_5.gemfile
+
+matrix:
+  exclude:
+  - rvm: 2.0.0
+    gemfile: gemfiles/rails_5.gemfile
+  - rvm: 2.1.10
+    gemfile: gemfiles/rails_5.gemfile

data/Appraisals

@@ -0,0 +1,18 @@
+appraise 'rails-3' do
+  gem 'rails', '~> 3'
+  gem 'sprockets', '~> 2'
+end
+
+appraise 'rails-4-with-sprockets-2' do
+  gem 'rails', '~> 4'
+  gem 'sprockets', '~> 3'
+end
+
+appraise 'rails-4-with-sprockets-3' do
+  gem 'rails', '~> 4'
+  gem 'sprockets', '~> 3'
+end
+
+appraise 'rails-5' do
+  gem 'rails', '~> 5'
+end

data/Gemfile

@@ -0,0 +1,9 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+gemspec
+
+gem 'rails', '~> 4'
+gem 'sprockets', '~> 3'
+gem 'pry-byebug'

data/Rakefile

@@ -0,0 +1,11 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+require 'bundler'
+require 'bundler/setup'
+require 'json'
+require 'rake/testtask'
+
+Rake::TestTask.new { |t| t.libs << 'test' }
+
+task default: :test

data/gemfiles/rails_3.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3"
+gem "sprockets", "~> 2"
+gem "pry-byebug"
+
+gemspec :path => "../"

data/gemfiles/rails_4_with_sprockets_2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4"
+gem "sprockets", "~> 3"
+gem "pry-byebug"
+
+gemspec :path => "../"

data/gemfiles/rails_4_with_sprockets_3.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4"
+gem "sprockets", "~> 3"
+gem "pry-byebug"
+
+gemspec :path => "../"

data/gemfiles/rails_5.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5"
+gem "sprockets", "~> 3"
+gem "pry-byebug"
+
+gemspec :path => "../"

data/lib/sprockets-iife/processor.rb

@@ -2,24 +2,56 @@
 # frozen_string_literal: true
 
 module SprocketsIIFE
-  class Processor
-    include Singleton
+  class AbstractProcessor
+    def initialize(script_path, &block)
+      @script_path   = script_path
+      @script_source = block.call
+    end
+
+    def render(_, _)
+      self.class.wrap(@script_path, @script_source)
+    end
 
     class << self
       def call(input)
-        instance.call(input)
+        script_path   = input[:filename]
+        script_source = input[:data]
+        context       = input[:environment].context_class.new(input)
+        context.metadata.merge(data: wrap(script_path, script_source))
+      end
+
+      def wrap(script_path, script_source)
+        raise NotImplementedError
       end
     end
+  end
 
-    def call(input)
-      @input      = input
-      source_path = @input[:filename]
-      iife_path   = File.join(File.dirname(source_path), "#{File.basename(source_path, '.*')}-iife.js.erb")
-      File.readable?(iife_path) ? ERB.new(File.read(iife_path)).result(binding) : input[:data]
+  class ItemProcessor < AbstractProcessor
+    class << self
+      def wrap(script_path, script_source)
+        script_name = "#{File.basename(script_path, '.*')}.js"
+        seems_to_be_a_bundle = Rails.application.config.assets.precompile.any? do |x|
+          case x
+            when String then x == script_name
+            when Regexp then x =~ script_name
+            else false
+          end
+        end
+
+        if seems_to_be_a_bundle
+          script_source
+        else
+          SprocketsIIFE.wrap(script_path, script_source)
+        end
+      end
     end
+  end
 
-    def source
-      @input[:data]
+  class BundleProcessor < AbstractProcessor
+    class << self
+      def wrap(script_path, script_source)
+        SprocketsIIFE.wrap(script_path, script_source)
+      end
     end
   end
 end

data/lib/sprockets-iife/railtie.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
+require 'rails/railtie'
+
 module SprocketsIIFE
   class Railtie < Rails::Railtie
     def configure_assets(app)
@@ -13,10 +15,12 @@ module SprocketsIIFE
       end
     end
 
-    initializer 'sprockets.iife', group: :all, after: 'sprockets.environment' do |app|
+    initializer 'sprockets.iife', after: 'sprockets.environment' do |app|
       configure_assets(app) do |env|
         # Sprockets 2, 3, and 4
-        env.register_bundle_processor 'application/javascript', SprocketsIIFE::Processor
+        env.register_bundle_processor 'application/javascript', SprocketsIIFE::BundleProcessor
+        env.register_mime_type 'application/javascript', extensions: ['.js']
+        env.register_postprocessor 'application/javascript', SprocketsIIFE::ItemProcessor
       end
     end
   end

data/lib/sprockets-iife/template.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+require 'erb'
+
+module SprocketsIIFE
+  class Template < ERB
+    def initialize(script_iife_path, script_source)
+      @script_source = script_source
+      super(File.read(script_iife_path))
+    end
+
+    def source
+      @script_source
+    end
+
+    def result
+      super(binding)
+    end
+  end
+end

data/lib/sprockets-iife/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module SprocketsIIFE
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/lib/sprockets-iife/wrap.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+require 'sprockets-iife/template'
+
+module SprocketsIIFE
+  class << self
+    def wrap(script_path, script_source)
+      script_iife_path = File.join(File.dirname(script_path), "#{File.basename(script_path, '.*')}-iife.js.erb")
+
+      if File.readable?(script_iife_path)
+        Template.new(script_iife_path, script_source).result
+      else
+        script_source
+      end
+    end
+  end
+end

data/lib/sprockets-iife.rb

@@ -2,12 +2,6 @@
 # frozen_string_literal: true
 
 require 'sprockets'
-
-Sprockets::VERSION =~ /\A\d/
-if $&.to_i > 2
-  require 'sprockets-iife/processor'
-else
-  require 'sprockets-iife/legacy-processor'
-end
-
+require 'sprockets-iife/wrap'
+require 'sprockets-iife/processor'
 require 'sprockets-iife/railtie' if defined?(Rails)

data/sprockets-iife.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.author          = 'Yaroslav Konoplov'
   s.email           = 'eahome00@gmail.com'
   s.summary         = 'IIFE wrapper generator for Sprockets'
-  s.description     = 'Generates IIFE wrapper for Sprockets JavaScript bundles'
+  s.description     = 'Generates IIFE wrapper for Sprockets JavaScript files'
   s.homepage        = 'https://github.com/yivo/sprockets-iife'
   s.license         = 'MIT'
 
@@ -19,4 +19,9 @@ Gem::Specification.new do |s|
   s.require_paths   = ['lib']
 
   s.add_dependency 'sprockets', '>= 2.0', '< 5.0'
+  s.add_development_dependency 'bundler', '~> 1.7'
+  s.add_development_dependency 'rake', '~> 10.0'
+  s.add_development_dependency 'appraisal', '~> 2.1'
+  s.add_development_dependency 'test-unit', '~> 3.1'
+  s.add_development_dependency 'coffee-rails'
 end

data/test/fixtures/javascripts/coffeebundle/bar-iife.js.erb

@@ -0,0 +1,3 @@
+(function(/* bar-iife */) {
+  <%= source %>
+}).call(this);

data/test/fixtures/javascripts/coffeebundle/bar.coffee

@@ -0,0 +1 @@
+bar.coffee()

data/test/fixtures/javascripts/coffeebundle/foo.coffee

@@ -0,0 +1 @@
+foo.coffee()

data/test/fixtures/javascripts/coffeebundle-iife.js.erb

@@ -0,0 +1,3 @@
+(function(/* coffeebundle-iife */) {
+  <%= source %>
+}).call(this);

data/test/fixtures/javascripts/coffeebundle.coffee

@@ -0,0 +1,5 @@
+#= require_self
+#= require coffeebundle/foo
+#= require coffeebundle/bar
+
+coffeebundle.coffee()

data/test/fixtures/javascripts/jsbundle/bar-iife.js.erb

@@ -0,0 +1,3 @@
+(function(/* bar-iife */) {
+  <%= source %>
+}).call(this);

data/test/fixtures/javascripts/jsbundle/bar.js

@@ -0,0 +1 @@
+bar.js();

data/test/fixtures/javascripts/jsbundle/foo.js

@@ -0,0 +1 @@
+foo.js();

data/test/fixtures/javascripts/jsbundle-iife.js.erb

@@ -0,0 +1,3 @@
+(function(/* jsbundle-iife */) {
+  <%= source %>
+}).call(this);

data/test/fixtures/javascripts/jsbundle.js

@@ -0,0 +1,5 @@
+// =require_self
+// =require ./jsbundle/foo
+// =require ./jsbundle/bar
+
+jsbundle.js();

data/test/fixtures/javascripts/mixedbundle/bar-iife.js.erb

@@ -0,0 +1,3 @@
+(function(/* bar-iife */) {
+  <%= source %>
+}).call(this);

data/test/fixtures/javascripts/mixedbundle/bar.coffee

@@ -0,0 +1 @@
+bar.coffee()

data/test/fixtures/javascripts/mixedbundle/baz-iife.js.erb

@@ -0,0 +1,3 @@
+(function(/* baz-iife */) {
+  <%= source %>
+}).call(this);

data/test/fixtures/javascripts/mixedbundle/baz.js

@@ -0,0 +1 @@
+baz.js();

data/test/fixtures/javascripts/mixedbundle/foo.js

@@ -0,0 +1 @@
+foo.js();

data/test/fixtures/javascripts/mixedbundle-iife.js.erb

@@ -0,0 +1,3 @@
+(function(/* mixedbundle-iife */) {
+  <%= source %>
+}).call(this);

data/test/fixtures/javascripts/mixedbundle.coffee

@@ -0,0 +1,6 @@
+#= require_self
+#= require ./mixedbundle/foo
+#= require ./mixedbundle/bar
+#= require ./mixedbundle/baz
+
+mixedbundle.coffee()

data/test/test-sprockets-iife.rb

@@ -0,0 +1,119 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+require 'sprockets-iife'
+require 'test/unit'
+require 'fileutils'
+
+class SprocketsIIFETest < Test::Unit::TestCase
+  def test_registration
+    app = create_rails_application
+    app.initialize!
+
+    assert app.assets.bundle_processors.key?('application/javascript')
+    assert Array === app.assets.bundle_processors['application/javascript']
+    assert app.assets.bundle_processors['application/javascript'].include?(SprocketsIIFE::BundleProcessor)
+
+    assert app.assets.postprocessors.key?('application/javascript')
+    assert Array === app.assets.postprocessors['application/javascript']
+    assert app.assets.postprocessors['application/javascript'].include?(SprocketsIIFE::ItemProcessor)
+  end
+
+  def test_compilation
+    app = create_rails_application
+    app.initialize!
+    task = create_sprockets_task(app)
+    task.instance_exec { manifest.compile(assets) }
+
+    expected = <<-JAVASCRIPT.squish
+      (function(/* jsbundle-iife */) {
+        jsbundle.js();
+        foo.js();
+        (function(/* bar-iife */) {
+          bar.js();
+        }).call(this); 
+      }).call(this);
+    JAVASCRIPT
+    assert_equal expected, app.assets['jsbundle.js'].to_s.squish
+
+    expected = <<-JAVASCRIPT.squish
+      (function(/* coffeebundle-iife */) {
+        (function() { coffeebundle.coffee(); }).call(this);
+        (function() { foo.coffee(); }).call(this);
+        (function(/* bar-iife */) {
+          (function() { bar.coffee(); }).call(this);
+        }).call(this);
+      }).call(this);
+    JAVASCRIPT
+    assert_equal expected, app.assets['coffeebundle.js'].to_s.squish
+
+    expected = <<-JAVASCRIPT.squish
+      (function(/* mixedbundle-iife */) {
+        (function() { mixedbundle.coffee(); }).call(this);
+        foo.js();
+        (function(/* bar-iife */) {
+          (function() { bar.coffee(); }).call(this);
+        }).call(this);
+        (function(/* baz-iife */) {
+          baz.js();
+        }).call(this);
+      }).call(this);
+    JAVASCRIPT
+    assert_equal expected, app.assets['mixedbundle.js'].to_s.squish
+  end
+
+  def setup
+    super
+    clear_tmp
+    clear_logs
+  end
+
+  def teardown
+    super
+    clear_tmp
+    if defined?(Rails) && Rails.respond_to?(:application=)
+      Rails.application = nil
+    end
+  end
+
+private
+  def create_rails_application
+    require 'rails'
+    require 'sprockets/railtie'
+    require 'sprockets-iife/railtie'
+
+    Class.new(Rails::Application) do
+      config.eager_load = false
+      config.assets.enabled = true
+      config.assets.gzip = false
+      config.assets.paths = [Rails.root.join('test/fixtures/javascripts').to_s]
+      config.assets.precompile = %w( jsbundle.js coffeebundle.js mixedbundle.js )
+      config.paths['public'] = [Rails.root.join('tmp').to_s]
+      config.active_support.deprecation = :stderr
+    end
+  end
+
+  def create_sprockets_task(app)
+    require 'sprockets/version' # Fix for sprockets 2.x
+
+    if Sprockets::VERSION.start_with?('2')
+      require 'rake/sprocketstask'
+      Rake::SprocketsTask.new do |t|
+        t.environment = app.assets
+        t.output      = "#{app.config.paths['public'][0]}#{app.config.assets.prefix}"
+        t.assets      = app.config.assets.precompile
+      end
+    else
+      require 'sprockets/rails/task'
+      Sprockets::Rails::Task.new(app)
+    end
+  end
+
+  def clear_tmp
+    FileUtils.rm_rf(File.expand_path('../../tmp', __FILE__))
+  end
+
+  def clear_logs
+    FileUtils.rm_rf(File.expand_path('../../log', __FILE__))
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-iife
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-23 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -30,20 +30,117 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: Generates IIFE wrapper for Sprockets JavaScript bundles
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Generates IIFE wrapper for Sprockets JavaScript files
 email: eahome00@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
+- Appraisals
+- Gemfile
 - README.md
+- Rakefile
+- gemfiles/rails_3.gemfile
+- gemfiles/rails_4_with_sprockets_2.gemfile
+- gemfiles/rails_4_with_sprockets_3.gemfile
+- gemfiles/rails_5.gemfile
 - lib/sprockets-iife.rb
-- lib/sprockets-iife/legacy-processor.rb
 - lib/sprockets-iife/processor.rb
 - lib/sprockets-iife/railtie.rb
+- lib/sprockets-iife/template.rb
 - lib/sprockets-iife/version.rb
+- lib/sprockets-iife/wrap.rb
 - sprockets-iife.gemspec
+- test/fixtures/javascripts/coffeebundle-iife.js.erb
+- test/fixtures/javascripts/coffeebundle.coffee
+- test/fixtures/javascripts/coffeebundle/bar-iife.js.erb
+- test/fixtures/javascripts/coffeebundle/bar.coffee
+- test/fixtures/javascripts/coffeebundle/foo.coffee
+- test/fixtures/javascripts/jsbundle-iife.js.erb
+- test/fixtures/javascripts/jsbundle.js
+- test/fixtures/javascripts/jsbundle/bar-iife.js.erb
+- test/fixtures/javascripts/jsbundle/bar.js
+- test/fixtures/javascripts/jsbundle/foo.js
+- test/fixtures/javascripts/mixedbundle-iife.js.erb
+- test/fixtures/javascripts/mixedbundle.coffee
+- test/fixtures/javascripts/mixedbundle/bar-iife.js.erb
+- test/fixtures/javascripts/mixedbundle/bar.coffee
+- test/fixtures/javascripts/mixedbundle/baz-iife.js.erb
+- test/fixtures/javascripts/mixedbundle/baz.js
+- test/fixtures/javascripts/mixedbundle/foo.js
+- test/test-sprockets-iife.rb
 homepage: https://github.com/yivo/sprockets-iife
 licenses:
 - MIT
@@ -68,4 +165,22 @@ rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: IIFE wrapper generator for Sprockets
-test_files: []
+test_files:
+- test/fixtures/javascripts/coffeebundle-iife.js.erb
+- test/fixtures/javascripts/coffeebundle.coffee
+- test/fixtures/javascripts/coffeebundle/bar-iife.js.erb
+- test/fixtures/javascripts/coffeebundle/bar.coffee
+- test/fixtures/javascripts/coffeebundle/foo.coffee
+- test/fixtures/javascripts/jsbundle-iife.js.erb
+- test/fixtures/javascripts/jsbundle.js
+- test/fixtures/javascripts/jsbundle/bar-iife.js.erb
+- test/fixtures/javascripts/jsbundle/bar.js
+- test/fixtures/javascripts/jsbundle/foo.js
+- test/fixtures/javascripts/mixedbundle-iife.js.erb
+- test/fixtures/javascripts/mixedbundle.coffee
+- test/fixtures/javascripts/mixedbundle/bar-iife.js.erb
+- test/fixtures/javascripts/mixedbundle/bar.coffee
+- test/fixtures/javascripts/mixedbundle/baz-iife.js.erb
+- test/fixtures/javascripts/mixedbundle/baz.js
+- test/fixtures/javascripts/mixedbundle/foo.js
+- test/test-sprockets-iife.rb

data/lib/sprockets-iife/legacy-processor.rb

@@ -1,20 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-require 'tilt'
-
-module SprocketsIIFE
-  class Processor < Tilt::Template
-    def prepare
-    end
-
-    # Call processor block with `context` and `data`.
-    def evaluate(context, locals, &block)
-      source_file = file
-      iife_file   = File.join(File.dirname(source_file), "#{File.basename(source_file, '.*')}-iife.js.erb")
-      File.readable?(iife_file) ? ERB.new(File.read(iife_file)).result(binding) : data
-    end
-
-    alias source data
-  end
-end