Merge pull request #44 from kenchan0130/fix-43

digitalsparky · web-flow · commit c0056c484686 · 2018-12-02T21:19:09.000+08:00
Fix #43
diff --git a/lib/jekyll-minifier.rb b/lib/jekyll-minifier.rb
@@ -39,7 +39,7 @@ def output_html(path, content)
         if ( !opts.nil? )
           # Javascript Arguments
           js_args                                += opts[:uglifier_args]               if opts.has_key?(:uglifier_args)
-          
+
           # HTML Arguments
           html_args[:remove_spaces_inside_tags]   = opts['remove_spaces_inside_tags']  if opts.has_key?('remove_spaces_inside_tags')
           html_args[:remove_multi_spaces]         = opts['remove_multi_spaces']        if opts.has_key?('remove_multi_spaces')
@@ -63,7 +63,7 @@ def output_html(path, content)
           html_args[:preserve_patterns]          += [/<\?php.*?\?>/im]                 if opts['preserve_php'] == true
           html_args[:preserve_patterns]          += opts[:preserve_patterns].map { |pattern| Regexp.new(pattern)} if opts.has_key?(:preserve_patterns)
         end
-        
+
         html_args[:css_compressor]              = CSSminify2.new()
 
         if ( !js_args.nil? )
@@ -95,7 +95,7 @@ def output_js(path, content)
             compressor = Uglifier.new()
           end
 
-          output_file(path, compressed.compile(content))
+          output_file(path, compressor.compile(content))
         else
           output_file(path, content)
         end
diff --git a/spec/fixtures/_layouts/default.html b/spec/fixtures/_layouts/default.html
@@ -19,7 +19,7 @@
         <!--[if lt IE 9]><script src="//cdn.jsdelivr.net/g/html5shiv@3.7.3,respond@1.4.2" crossorigin="anonymous"></script><![endif]-->
         <link rel="stylesheet" href="{{ site.baseurl | prepend: site.url }}/assets/css/style.css">
         <link rel="alternate" type="application/atom+xml" title="Example.com" href="{{ site.baseurl | prepend: site.url }}/atom.xml">
-
+        <script type="text/javascript" src="{{ site.baseurl | prepend: site.url }}/assets/js/script.js"></script>
     </head>
     <body class="layout-reverse sidebar-overlay">
         {% include sidebar.html %}
diff --git a/spec/fixtures/assets/js/script.js b/spec/fixtures/assets/js/script.js
@@ -0,0 +1,4 @@
+var sampleFunction = function() {
+  console.log('This is sample.');
+};
+sampleFunction();
diff --git a/spec/jekyll-minifier_spec.rb b/spec/jekyll-minifier_spec.rb
@@ -22,6 +22,8 @@
   let(:site)     { Jekyll::Site.new(config) }
   let(:context)  { make_context(site: site) }
   before(:each) do
+    allow(ENV).to receive(:[]).and_call_original
+    allow(ENV).to receive(:[]).with('JEKYLL_ENV').and_return('production')
     site.process
   end
 
