proxy_pac_rb 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d05d71f53826be61244e2e77515be5da29fe969c
-  data.tar.gz: 53df642fa1b82e2a39555c1f64c88eeb190e29e7
+  metadata.gz: 1965713a0aecec2df86db7b6b214469d6b8b19a3
+  data.tar.gz: d74100e8339ad216ee5ab2d2d06036478e56a59d
 SHA512:
-  metadata.gz: ade07d2859ebeb2fa132c91a7151853e2c1d378536cb3343e8c16d81e84e474c31d89210cbefa4fff2a41993ebc9f36e45a2af3fdcc00caeea74ef74d81ca98b
-  data.tar.gz: 9e2368de26bb4e74125025bde77e5d3e8396a7b4aa3f8827a2ad1a29dc5f4c3d6fe48ca9666a65753f75eb3a36050d63610dd6d93cc92a9777865b649d808fc7
+  metadata.gz: e88fc56a91184d502bbfdaa926ec0baba657051d77b788cabbc3d8ca91c893bdec5edeffb8a5ee07f5d6b2062e1e9e639492a1a866b3ec1a5522ad101d101c01
+  data.tar.gz: 64ce7df70bf552e6f5c8702960a35fb7f2f6ef8aaff9911c4f7d4bd97cb6dc8b446ac3277ff4a193ba3db831eef9f463a90867574425114e73e74a1b8e35923c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    proxy_pac_rb (0.3.8)
+    proxy_pac_rb (0.4.1)
       activesupport
       addressable
       uglifier

data/README.md

@@ -91,12 +91,35 @@ pprb lint proxy_pac -p sample.pac
 ```
 
 ### Rack-based servers
+```
 
-*Compressor Middleware*
+*Warning*
 
-```ruby
-require 'proxy_pac_rb/rack/proxy_pac_compressor'
-use ProxyPacRb::Rack::ProxyPacCompressor
+The linter-`rack`-middleware needs to be activated before ANY other
+middleman-extension, `rack`-middleware or whatever framework you are using
+can instantiate the `V8`-runtime! Only the first time the
+`V8`-javascript-engine - aka `therubyracer` - is instantiated, it is possible to
+create a binding to ruby code. Every other `V8`-object created later re-uses
+this binding.
+
+You might an error like this if you ignore this warning!
+
+```bash
+error  build/proxy.pac
+Unexpected token: name (is) (line: 1, col: 10, pos: 10)
+
+Error
+    at new JS_Parse_Error (<eval>:2359:10623)
+    at js_error (<eval>:2359:10842)
+    at croak (<eval>:2359:19086)
+    at token_error (<eval>:2359:19223)
+    at unexpected (<eval>:2359:19311)
+    at semicolon (<eval>:2359:19784)
+    at simple_statement (<eval>:2359:22580)
+    at <eval>:2359:20553
+    at <eval>:2359:19957
+    at <eval>:2359:31968
+There were errors during this build
 ```
 
 *Linter Middleware*
@@ -106,6 +129,12 @@ require 'proxy_pac_rb/rack/proxy_pac_linter'
 use ProxyPacRb::Rack::ProxyPacLinter
 ```
 
+*Compressor Middleware*
+
+```ruby
+require 'proxy_pac_rb/rack/proxy_pac_compressor'
+use ProxyPacRb::Rack::ProxyPacCompressor
+
 ### Ruby
 
 *Load from website*

data/lib/proxy_pac_rb/proxy_pac_js.rb

@@ -24,13 +24,14 @@ module ProxyPacRb
         value = %("#{value}") if value
 
         <<-EOS.strip_heredoc
-        function weekdayRange() {
-            function getDay(weekday) {
-                if (weekday in wdays) {
-                    return wdays[weekday];
-                }
-                return -1;
+        function getDay(weekday) {
+            if (weekday in wdays) {
+                return wdays[weekday];
             }
+            return -1;
+        }
+
+        function weekdayRange() {
             var date = new Date(#{value});
             var argc = arguments.length;
             var wday;
@@ -54,13 +55,14 @@ module ProxyPacRb
         value = %("#{value}") if value
 
         <<-EOS.strip_heredoc
-        function dateRange() {
-            function getMonth(name) {
-                if (name in months) {
-                    return months[name];
-                }
-                return -1;
+        function getMonth(name) {
+            if (name in months) {
+                return months[name];
             }
+            return -1;
+        }
+
+        function dateRange() {
             var date = new Date(#{value});
             var argc = arguments.length;
             if (argc < 1) {

data/lib/proxy_pac_rb/rack/proxy_pac_compressor.rb

@@ -43,7 +43,8 @@ module ProxyPacRb
                                               && %r{application/x-ns-proxy-autoconfig} === headers['Content-Type']
         # rubocop:enable Style/CaseEquality
 
-        content = [body].flatten.each_with_object('') { |e, a| a << e.to_s }
+        content = ''
+        body.each { |part| content << part }
 
         begin
           proxy_pac = ProxyPacFile.new(source: content)

data/lib/proxy_pac_rb/rack/proxy_pac_linter.rb

@@ -42,16 +42,15 @@ module ProxyPacRb
                                               && %r{application/x-ns-proxy-autoconfig} === headers['Content-Type']
         # rubocop:enable Style/CaseEquality
 
-        content = [body].flatten.each_with_object('') { |e, a| a << e.to_s }
+        content = ''
+        body.each { |part| content << part }
 
         proxy_pac = ProxyPacFile.new(source: content)
 
         loader.load(proxy_pac)
         linter.lint(proxy_pac)
 
-        if proxy_pac.valid?
-          content = proxy_pac.content
-        else
+        unless proxy_pac.valid?
           status  = 500
           content = proxy_pac.message
           headers['Content-Length'] = content.bytesize.to_s if headers['Content-Length']

data/lib/proxy_pac_rb/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # ProxyPacRb
 module ProxyPacRb
-  VERSION = '0.4.0'
+  VERSION = '0.4.2'
 end

data/spec/rack/proxy_pac_compressor_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'proxy_pac_rb/rack/proxy_pac_compressor'
+require 'rack/lint'
 
 RSpec.describe ProxyPacRb::Rack::ProxyPacCompressor, type: :rack_test do
   let(:compressed_content) { %(function FindProxyForURL(){return\"DIRECT\"}) }
@@ -23,7 +24,9 @@ RSpec.describe ProxyPacRb::Rack::ProxyPacCompressor, type: :rack_test do
         end
       end
 
+      a.use Rack::Lint
       a.use ProxyPacRb::Rack::ProxyPacCompressor
+      a.use Rack::Lint
 
       a.new
     end
@@ -49,7 +52,9 @@ RSpec.describe ProxyPacRb::Rack::ProxyPacCompressor, type: :rack_test do
         end
       end
 
+      a.use Rack::Lint
       a.use ProxyPacRb::Rack::ProxyPacCompressor
+      a.use Rack::Lint
 
       a.new
     end

data/spec/rack/proxy_pac_linter_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'proxy_pac_rb/rack/proxy_pac_linter'
+require 'rack/lint'
 
 RSpec.describe ProxyPacRb::Rack::ProxyPacLinter, type: :rack_test do
   let(:content) do
@@ -29,7 +30,9 @@ RSpec.describe ProxyPacRb::Rack::ProxyPacLinter, type: :rack_test do
         end
       end
 
+      a.use Rack::Lint
       a.use ProxyPacRb::Rack::ProxyPacLinter
+      a.use Rack::Lint
 
       a.new
     end
@@ -55,7 +58,9 @@ RSpec.describe ProxyPacRb::Rack::ProxyPacLinter, type: :rack_test do
         end
       end
 
+      a.use Rack::Lint
       a.use ProxyPacRb::Rack::ProxyPacLinter
+      a.use Rack::Lint
 
       a.new
     end

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ SimpleCov.start
 
 # Pull in all of the gems including those in the `test` group
 require 'bundler'
-Bundler.require :default, :test, :development
+Bundler.require :default, :test, :development, :debug
 
 # Loading support files
 Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require_relative f }

data/spec/support/rack_test.rb

@@ -1 +1,5 @@
 require 'rack/test'
+
+RSpec.configure do |config|
+  config.include Rack::Test::Methods, type: :rack_test
+end

data/spec/support/rspec.rb

@@ -17,6 +17,4 @@ RSpec.configure do |config|
     mocks.syntax = :expect
     mocks.verify_partial_doubles = true
   end
-
-  config.include Rack::Test::Methods, type: :rack_test
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proxy_pac_rb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Dennis Günnewig