sprockets-iife 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9054960a6ef80b43a4d1c456cdb5c8bbb5d8a9d9
-  data.tar.gz: b19de6947d03fedc86186bc391c5049eb6c5d21e
+  metadata.gz: dc9c42d81e929c3447ccd9d074e7359dec690652
+  data.tar.gz: 36c33c227d7493971368b18078ca0bd5f44c2da4
 SHA512:
-  metadata.gz: 048f6a8ea56c515e51a30e7f2ee40519315df7da21b83da343b8050f24601324f41ca5ba42a8bf0b73ce5e21dedfead6fe83cc088c51598e5910699292b09144
-  data.tar.gz: 6bbc62993e0efd4ed04a5e08253936f43ec8f944957687e031051071dfe2667c1ff20bd28ab929ab56a5062216eb067450fa5dd5ff53ff5258ac65e1e27e1d87
+  metadata.gz: 1438e7d82e2a29efcfacb889e67b60efed30a4045734e407e131af506ac359ab8f034c518dc75956bc5acd1ca3f9d0355c85bcfb65dc196f85115f6dce3ffbe4
+  data.tar.gz: c25d1c3bfff8429fe6254f50608308ff3840e52ec4807295b35d3de9956978dbab14913b8b1c30a9887167dc407f75f7227e1daa24e0b23275703c0a63289169

data/lib/sprockets-iife.rb

@@ -3,5 +3,8 @@
 
 require 'sprockets'
 require 'sprockets-iife/wrap'
-require 'sprockets-iife/processor'
-require 'sprockets-iife/railtie' if defined?(Rails)
+require 'sprockets-iife/template'
+require 'sprockets-iife/utils'
+require 'sprockets-iife/item_processor'
+require 'sprockets-iife/bundle_processor'
+require 'sprockets-iife/railtie'

data/lib/sprockets-iife/bundle_processor.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module SprocketsIIFE
+  class BundleProcessor
+    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)
+        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)
+        script_iife_path = SprocketsIIFE::Utils.build_iife_path(script_path)
+
+        if File.readable?(script_iife_path) && SprocketsIIFE::Utils.bundle?(script_path)
+          SprocketsIIFE::Template.new(script_iife_path, script_source).result
+        else
+          script_source
+        end
+      end
+    end
+  end
+end

data/lib/sprockets-iife/item_processor.rb

@@ -0,0 +1,79 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module SprocketsIIFE
+  class ItemProcessor
+    def initialize(script_path, &block)
+      @script_path   = script_path
+      @script_source = block.call
+    end
+
+    def render(script_context, _)
+      script_path      = @script_path
+      script_source    = @script_source
+      script_iife_path = SprocketsIIFE::Utils.build_iife_path(script_path)
+
+      if File.readable?(script_iife_path) && !SprocketsIIFE::Utils.bundle?(script_path)
+        script_context.depend_on(script_iife_path)
+
+        # noinspection RubyResolve
+        script_requires        = script_context._required_paths.to_a
+        script_source_included = false
+
+        script_assets = script_requires.map do |path|
+          if path.include?(script_path)
+            script_source_included = true
+            script_source
+          else
+            script_context.environment.find_asset(path)
+          end
+        end
+
+        script_assets << script_source unless script_source_included
+
+        script_source = script_assets.map(&:to_s).join('')
+
+        script_context._required_paths.clear
+
+        SprocketsIIFE.wrap(script_path, script_source)
+      else
+        script_source
+      end
+    end
+
+    class << self
+      def call(input)
+        script_path      = input[:filename]
+        script_source    = input[:data]
+        script_iife_path = SprocketsIIFE::Utils.build_iife_path(script_path)
+        script_context   = input[:environment].context_class.new(input)
+
+        if File.readable?(script_iife_path) && !SprocketsIIFE::Utils.bundle?(script_path)
+          script_context.depend_on(script_iife_path)
+
+          script_requires        = script_context.metadata[:required]
+          script_source_included = false
+
+          script_assets = script_requires.map do |uri|
+            if uri.include?(script_path)
+              script_source_included = true
+              script_source
+            else
+              # noinspection RubyResolve
+              script_context.environment.load(uri)
+            end
+          end
+
+          script_assets << script_source unless script_source_included
+
+          script_source = script_assets.map(&:to_s).join('')
+
+          script_context.metadata.merge(required: [].to_set,
+                                        data:     SprocketsIIFE.wrap(script_path, script_source))
+        else
+          script_context.metadata.merge(data: script_source)
+        end
+      end
+    end
+  end
+end

data/lib/sprockets-iife/railtie.rb

@@ -7,7 +7,7 @@ module SprocketsIIFE
   class Railtie < Rails::Railtie
     def configure_assets(app)
       if config.respond_to?(:assets) && config.assets.respond_to?(:configure)
-        # Rails 4.x
+        # Rails 4.x 5.x
         config.assets.configure { |env| yield(env) }
       else
         # Rails 3.2
@@ -19,7 +19,6 @@ module SprocketsIIFE
       configure_assets(app) do |env|
         # Sprockets 2, 3, and 4
         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

data/lib/sprockets-iife/utils.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module SprocketsIIFE
+  module Utils
+    class << self
+      def bundle?(script_name_or_path)
+        script_name = "#{File.basename(script_name_or_path, '.*')}.js"
+        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
+      end
+
+      def build_iife_path(script_path)
+        File.join(File.dirname(script_path), "#{File.basename(script_path, '.*')}-iife.js.erb")
+      end
+    end
+  end
+end

data/lib/sprockets-iife/version.rb

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

data/lib/sprockets-iife/wrap.rb

@@ -1,18 +1,11 @@
 # 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
+      script_iife_path = SprocketsIIFE::Utils.build_iife_path(script_path)
+      SprocketsIIFE::Template.new(script_iife_path, script_source).result
     end
   end
 end

data/test/fixtures/javascripts/mixedbundle.coffee

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

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

@@ -1 +1,4 @@
+#= require_self
+#= require ./baz
+
 bar.coffee()

data/test/test-sprockets-iife.rb

@@ -50,13 +50,19 @@ class SprocketsIIFETest < Test::Unit::TestCase
     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();
+          (function() { 
+            bar.coffee(); 
+          }).call(this);
+
+          (function(/* baz-iife */) { 
+            baz.js(); 
+          }).call(this);
         }).call(this);
+
       }).call(this);
     JAVASCRIPT
     assert_equal expected, app.assets['mixedbundle.js'].to_s.squish

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-iife
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -117,9 +117,11 @@ files:
 - gemfiles/rails_4_with_sprockets_3.gemfile
 - gemfiles/rails_5.gemfile
 - lib/sprockets-iife.rb
-- lib/sprockets-iife/processor.rb
+- lib/sprockets-iife/bundle_processor.rb
+- lib/sprockets-iife/item_processor.rb
 - lib/sprockets-iife/railtie.rb
 - lib/sprockets-iife/template.rb
+- lib/sprockets-iife/utils.rb
 - lib/sprockets-iife/version.rb
 - lib/sprockets-iife/wrap.rb
 - sprockets-iife.gemspec

data/lib/sprockets-iife/processor.rb

@@ -1,57 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-module SprocketsIIFE
-  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)
-        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
-
-  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
-
-  class BundleProcessor < AbstractProcessor
-    class << self
-      def wrap(script_path, script_source)
-        SprocketsIIFE.wrap(script_path, script_source)
-      end
-    end
-  end
-end