proxy_pac_rb 0.8.2 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecdd75967c91ea19b1ceba679284915f6cb3a0bb
-  data.tar.gz: b132a3f2b7a92c68c68dab8d0a432fcb26481532
+  metadata.gz: 9c609f5450ae3c5d31bde4b270ab0a72c53f7ab9
+  data.tar.gz: 33697253051d84fcdafbeffbd5fcdba85e1314f9
 SHA512:
-  metadata.gz: 1a032ec25c9f63e82d97abf66aaccb3d6251d00fde0eafc0d9d1f3c10cdef9ad5a2af2e6b61ed439c803503b7e5d37fc13fd0ba8e061d47155a91526393b57fd
-  data.tar.gz: 504bdf54c11c337171b2a8dc457e9f1719096d4ad2facf99b91086e691e6e284da0f28840d41866b442576a93cfb0d0b91843de9b119cc735b7882e7db0c6ab7
+  metadata.gz: b2cff58a27319e27abe84babaa3248d616ce823e56603ddc7ec4021f68ed95affa495b3e83de04387e0b9372f02e2c99e0604322bac95b03b22e1802d4abc4c1
+  data.tar.gz: a5cf9842df03b58684e6da48dbf6f697602a1043a242c02b1da8f7e2c9ddace76e12ae80ae5cae0e4a794cd28e81571dfee809417e570cdee0b6f6cbcaa96afd

data/.travis.yml

@@ -1,8 +1,9 @@
+sudo: false
 env:
   - CI=1
 language: ruby
 bundler_args: --without development debug profile
 rvm:
-  - 2.1.5
-  - 2.2.1
+  - 2.1.7
+  - 2.2.3
 script: script/test

data/Gemfile

@@ -15,7 +15,7 @@ group :debug do
 end
 
 group :development, :test do
-  gem 'aruba', require: false, git: 'https://github.com/cucumber/aruba'
+  gem 'aruba', '~>0.10.0', require: false
   gem 'awesome_print', require: 'ap'
   gem 'bundler', '~> 1.3', require: false
   gem 'command_exec', require: false

data/History.md

@@ -0,0 +1,2 @@
+0.9.0:
+  * Don't mangle the variable names to make testing reproducible

data/Rakefile

@@ -42,10 +42,12 @@ namespace :test do
   desc 'Setup test environment'
   task :before do
     @web_server = Process.spawn 'rackup -p 65535 script/config.ru'
+    puts "Started webserver with PID #{@web_server}."
   end
 
   desc 'Teardown test environment'
   task :after do
+    puts "Stopping webserver with PID #{@web_server}."
     sh "kill -9 #{@web_server}"
   end
 end

data/features/compress_proxy_pac.feature

@@ -15,7 +15,7 @@ Feature: Compress proxy pac
     When I successfully run `pprb compress pac_file -p proxy.pac.in`
     Then the file "proxy.pac" should contain:
     """
-    function FindProxyForURL() {
+    function FindProxyForURL(url, host) {
         return "PROXY localhost:3128";
     }
     """
@@ -31,7 +31,7 @@ Feature: Compress proxy pac
     When I successfully run `pprb compress pac_file -p proxy.pac`
     Then the file "proxy.pac.out" should contain:
     """
-    function FindProxyForURL() {
+    function FindProxyForURL(url, host) {
         return "PROXY localhost:3128";
     }
     """
@@ -75,19 +75,19 @@ Feature: Compress proxy pac
     When I successfully run `pprb compress pac_file -p proxy1.pac.in proxy2.pac.in proxy3.pac`
     Then the file "proxy1.pac" should contain:
     """
-    function FindProxyForURL() {
+    function FindProxyForURL(url, host) {
         return "PROXY localhost:3128";
     }
     """
     And the file "proxy2.pac" should contain:
     """
-    function FindProxyForURL() {
+    function FindProxyForURL(url, host) {
         return "PROXY localhost:3128";
     }
     """
     And the file "proxy3.pac.out" should contain:
     """
-    function FindProxyForURL() {
+    function FindProxyForURL(url, host) {
         return "PROXY localhost:3128";
     }
     """

data/features/support/aruba.rb

@@ -1,13 +1,6 @@
 # encoding: utf-8
 require 'aruba/cucumber'
 
-module FeatureHelper
-  # Helpers for aruba
-  module Aruba
-    def dirs
-      @dirs ||= %w(tmp cucumber)
-    end
-  end
+Aruba.configure do |config|
+  config.working_directory = 'tmp/cucumber'
 end
-
-World(FeatureHelper::Aruba)

data/lib/proxy_pac_rb/cli/find_proxy.rb

@@ -26,7 +26,6 @@ module ProxyPacRb
         remove_proxy_environment_variables unless options[:use_proxy]
 
         file = ProxyPacRb::Parser.new(environment: environment).parse(options[:proxy_pac])
-
         return if file.blank?
 
         $stderr.printf("%30s: %-s\n", 'url', 'result')

data/lib/proxy_pac_rb/proxy_pac_compressor.rb

@@ -16,24 +16,19 @@ module ProxyPacRb
           # inline_script: false,    # Escape occurrences of </script in strings
           # quote_keys: false,       # Quote keys in object literals
           # max_line_len: 32 * 1024, # Maximum line length in minified code
-          max_line_len: 1024,        # Maximum line length in minified code
+          max_line_len: 1024, # Maximum line length in minified code
           # bracketize: true,       # Bracketize if, for, do, while or with statements, even if their body is a single statement
           # semicolons: true,        # Separate statements with semicolons
           # preserve_line: false,    # Preserve line numbers in outputs
           # beautify: false,         # Beautify output
-          beautify: true,         # Beautify output
+          beautify: true, # Beautify output
           # indent_level: 4,         # Indent level in spaces
           # indent_start: 0,         # Starting indent level
           # space_colon: false,      # Insert space before colons (only with beautifier)
           # width: 80,               # Specify line width when beautifier is used (only with beautifier)
           # preamble: nil            # Preamble for the generated JS file. Can be used to insert any code or comment.
         },
-        mangle: {
-          # eval: false,             # Mangle names when eval of when is used in scope
-          # except: ["$super"],      # Argument names to be excluded from mangling
-          # sort: false,             # Assign shorter names to most frequently used variables. Often results in bigger output after gzip.
-          # toplevel: false          # Mangle names declared in the toplevel scope
-        },
+        mangle: false,
         compress: {
           # sequences: false,      # Allow statements to be joined by commas
           # properties: true,     # Rewrite property access using the dot notation
@@ -50,7 +45,7 @@ module ProxyPacRb
           # hoist_vars: false,    # Hoist var declarations
           # if_return: true,      # Optimizations for if/return and if/continue
           # join_vars: true,      # Join consecutive var statements
-          join_vars: false,      # Join consecutive var statements
+          join_vars: false, # Join consecutive var statements
           # cascade: true,        # Cascade sequences
           # negate_iife: true,    # Negate immediately invoked function expressions to avoid extra parens
           # pure_getters: false,  # Assume that object property access does not have any side-effects

data/lib/proxy_pac_rb/proxy_pac_loader.rb

@@ -53,7 +53,7 @@ module ProxyPacRb
   # Handle proxy pac == nil
   class ProxyPacNullLoader
     def load(proxy_pac)
-      proxy_pac.type    = :null
+      proxy_pac.type = :null
 
       fail StandardError
     end

data/lib/proxy_pac_rb/rack/proxy_pac_compressor.rb

@@ -45,10 +45,8 @@ module ProxyPacRb
         status, headers, body = @app.call(env)
 
         return [status, headers, body] if enabled == false
-        # rubocop:disable Style/SpaceAroundOperators
         return [status, headers, body] unless headers.key?('Content-Type') \
           && %r{application/x-ns-proxy-autoconfig} === headers['Content-Type']
-        # rubocop:enabled Style/SpaceAroundOperators
 
         content = ''
         body.each { |part| content << part }

data/lib/proxy_pac_rb/rack/proxy_pac_linter.rb

@@ -37,10 +37,8 @@ module ProxyPacRb
         status, headers, body = @app.call(env)
 
         return [status, headers, body] if enabled == false
-        # rubocop:disable Style/SpaceAroundOperators
         return [status, headers, body] unless headers.key?('Content-Type') \
           && %r{application/x-ns-proxy-autoconfig} === headers['Content-Type']
-        # rubocop:enabled Style/SpaceAroundOperators
 
         content = ''
         body.each { |part| content << part }

data/lib/proxy_pac_rb/rspec/helpers.rb

@@ -27,7 +27,7 @@ module ProxyPacRb
       private
 
       def _proxy_pac_source
-        url_host =  begin
+        url_host = begin
                       Addressable::URI.parse(subject).host
                     rescue
                       nil

data/lib/proxy_pac_rb/version.rb

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

data/proxy_pac_rb.gemspec

@@ -29,5 +29,5 @@ DESC
   spec.add_runtime_dependency 'contracts', '~> 0.9'
   spec.add_runtime_dependency 'thor', '~> 0.19'
 
-  spec.required_ruby_version = '~> 2.0'
+  spec.required_ruby_version = '~> 2.1'
 end

data/spec/api/proxy_pac_compressor_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe ProxyPacCompressor do
   subject(:proxy_pac) { instance_double('ProxyPac::ProxyPacFile') }
 
   let(:compressor) { described_class.new }
-  let(:modified_content) { %(function FindProxyForURL() {\n    return \"DIRECT\";\n}) }
+  let(:modified_content) { %(function FindProxyForURL(url, host) {\n    return \"DIRECT\";\n}) }
 
   let(:content) do
     <<-EOS.strip_heredoc.chomp

data/spec/api/proxy_pac_dumper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe ProxyPacDumper do
+RSpec.describe ProxyPacDumper, type: :aruba do
   subject(:proxy_pac) { instance_double('ProxyPac::ProxyPacFile') }
 
   let(:content) do
@@ -34,7 +34,7 @@ RSpec.describe ProxyPacDumper do
 
     context 'when proxy pac is string' do
       before :each do
-        in_current_directory do
+        cd('.') do
           dumper.dump(proxy_pac, type: :string)
         end
       end
@@ -51,13 +51,13 @@ RSpec.describe ProxyPacDumper do
       end
 
       before :each do
-        in_current_directory do
+        cd('.') do
           dumper.dump(proxy_pac, type: :template)
         end
       end
 
       around :example do |example|
-        in_current_directory { example.call }
+        cd('.') { example.call }
       end
 
       it { expect(destination).to be_existing_file }

data/spec/api/proxy_pac_linter_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe ProxyPacLinter do
   end
 
   describe '#lint' do
-    let(:linter) {  ProxyPacLinter.new(silent: true) }
+    let(:linter) { ProxyPacLinter.new(silent: true) }
     let(:result) { true }
 
     before(:each) do

data/spec/api/proxy_pac_loader_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe ProxyPacLoader do
+RSpec.describe ProxyPacLoader, type: :aruba do
   subject(:proxy_pac) { instance_double('ProxyPac::ProxyPacFile') }
 
   let(:content) do

data/spec/code_configuration_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe ProxyPacRb::CodeConfiguration do
       end
 
       context 'when invalid value' do
-        it { expect {  config.use_proxy = '' }.to raise_error ArgumentError }
+        it { expect { config.use_proxy = '' }.to raise_error ArgumentError }
       end
     end
   end

data/spec/parser_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-RSpec.describe ProxyPacRb::Parser do
+RSpec.describe ProxyPacRb::Parser, type: :aruba do
   subject(:proxy_pac) { Parser.new(environment: environment).parse(source) }
 
   let(:environment) { Environment.new }

data/spec/rack/proxy_pac_compressor_spec.rb

@@ -3,7 +3,7 @@ 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() {\n    return \"DIRECT\";\n}) }
+  let(:compressed_content) { %(function FindProxyForURL(url, host) {\n    return \"DIRECT\";\n}) }
 
   before(:each) { get '/' }
   subject(:body) { last_response.body }

data/spec/rspec/readability_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'proxy_pac_rb/rspec'
 
-RSpec.describe 'Readability', type: :proxy_pac do
+RSpec.describe 'Readability', type: [:proxy_pac, :aruba] do
   let(:content) do
     <<-EOS.strip_heredoc.chomp
       function FindProxyForURL(url, host) {
@@ -11,7 +11,7 @@ RSpec.describe 'Readability', type: :proxy_pac do
   end
 
   context 'when is file' do
-    let(:root_path) { current_directory }
+    let(:root_path) { expand_path('.') }
 
     subject { 'proxy.pac' }
 

data/spec/support/aruba.rb

@@ -1,23 +1,6 @@
 # encoding: utf-8
-require 'aruba/api'
-require 'aruba/reporting'
+require 'aruba/rspec'
 
-# Spec Helpers
-module SpecHelper
-  # Helpers for aruba
-  module Aruba
-    include ::Aruba::Api
-
-    def dirs
-      @dirs ||= %w(tmp rspec)
-    end
-  end
-end
-
-RSpec.configure do |c|
-  c.include SpecHelper::Aruba
-  c.before :each do
-    clean_current_directory
-    restore_env
-  end
+Aruba.configure do |config|
+  config.working_directory = 'tmp/rspec'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxy_pac_rb
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.1
 platform: ruby
 authors:
 - Dennis Günnewig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -94,14 +94,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-description: '"proxy_pac_rb" is a gem to compress, lint and parse proxy auto-config
-  files. It comes with a cli program, some rack middlewares and can be used from within
-  ruby scripts as well. "proxy_pac_rb" uses a JavaScript runtime to evaulate a proxy
-  auto-config file the same way a browser does to determine what proxy (if any at
-  all) should a program use to connect to a server. You must install on of the supported
-  JavaScript runtimes: therubyracer or therubyrhino
-
-'
+description: |
+  "proxy_pac_rb" is a gem to compress, lint and parse proxy auto-config files. It comes with a cli program, some rack middlewares and can be used from within ruby scripts as well. "proxy_pac_rb" uses a JavaScript runtime to evaulate a proxy auto-config file the same way a browser does to determine what proxy (if any at all) should a program use to connect to a server. You must install on of the supported JavaScript runtimes: therubyracer or therubyrhino
 email:
 - dg1@vrnetze.de
 executables:
@@ -118,6 +112,7 @@ files:
 - ".yardopts"
 - CONTRIBUTING.md
 - Gemfile
+- History.md
 - LICENSE.md
 - README.md
 - Rakefile
@@ -251,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -259,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Compress, lint and parse proxy auto-config files from commandline, rack-compatible