proxy_pac_rb 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 588a9ba9887581a9fa61028cd10121cb6f8623c1
-  data.tar.gz: 87af23d999bf290bc75cccf41b7500e7917e117a
+  metadata.gz: 714eabb362c0c081f97351723504e7067707d2ad
+  data.tar.gz: 4982228289a0c4fd793f2367d9e8cdfeed087e96
 SHA512:
-  metadata.gz: 056f01d2d8f7533ab40363884e302d962751e348533b8c3bb508569046dbfcce3ed0f2536b937c9af66f82981b599334678e443673df364cf6a23c11be4f003e
-  data.tar.gz: f01a4f9e1069b045f959e0d5871e3f6e7c1213b0d55bb49c0bec1d46a9e12e05802fa5368428c6747d8fbe010313256778eb564bfa99aa7f61a9f0d1615d5971
+  metadata.gz: 123bfc62237965a88097c3e60d7ff877f1ddb442804988a3dc5e2911ca6f3b004a5c2a19831b20c6b220fd702e6dab7b6253ef60497c9860dcbd6e4bfaa6de90
+  data.tar.gz: 2de9d79fe35a031cece8d0942c658bb83210efeab64088fe859a437531f00b65cc649d90f2452b8783521611159148129fe1729cd2157771bda367e3e4370ea3

data/Gemfile

@@ -16,12 +16,12 @@ end
 
 group :development, :test do
   gem 'activesupport', '~> 4.0.0', require: false
-  gem 'aruba', require: false
+  gem 'aruba', require: false, git: 'https://github.com/cucumber/aruba'
   gem 'awesome_print', require: 'ap'
   gem 'bundler', '~> 1.3', require: false
   gem 'command_exec', require: false
   gem 'coveralls', require: false
-  gem 'cucumber', require: false
+  gem 'cucumber', require: false, git: 'https://github.com/cucumber/cucumber'
   gem 'erubis'
   gem 'fedux_org-stdlib', '~>0.7.25', require: false
   gem 'filegen'

data/Gemfile.lock

@@ -1,7 +1,28 @@
+GIT
+  remote: https://github.com/cucumber/aruba
+  revision: 9e9b45d7d0d4ec93df0d81b0ba37b6efe03021d5
+  specs:
+    aruba (0.6.2)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+
+GIT
+  remote: https://github.com/cucumber/cucumber
+  revision: 9d11cb7e10ed72b7dd72ba7aaafaccbb8e018da0
+  specs:
+    cucumber (2.0.0)
+      builder (>= 2.1.2)
+      cucumber-core (~> 1.1.3)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+
 PATH
   remote: .
   specs:
-    proxy_pac_rb (0.5.0)
+    proxy_pac_rb (0.5.1)
       activesupport
       addressable
       uglifier
@@ -16,10 +37,6 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     addressable (2.3.8)
-    aruba (0.6.2)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
@@ -30,7 +47,7 @@ GEM
     builder (3.2.2)
     byebug (4.0.5)
       columnize (= 0.9.0)
-    childprocess (0.5.5)
+    childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
     columnize (0.9.0)
@@ -46,13 +63,6 @@ GEM
       thor (~> 0.19.1)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    cucumber (2.0.0)
-      builder (>= 2.1.2)
-      cucumber-core (~> 1.1.3)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
     cucumber-core (1.1.3)
       gherkin (~> 2.12.0)
     debug_inspector (0.0.2)
@@ -201,13 +211,13 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 4.0.0)
-  aruba
+  aruba!
   awesome_print
   bundler (~> 1.3)
   byebug
   command_exec
   coveralls
-  cucumber
+  cucumber!
   erubis
   fedux_org-stdlib (~> 0.7.25)
   filegen

data/lib/proxy_pac_rb/javascript_compiler.rb

@@ -16,9 +16,11 @@ module ProxyPacRb
     def compile(content:, environment:)
       fail Exceptions::RuntimeUnavailable, "#{runtime.name} is unavailable on this system" unless runtime.available?
 
-      environment.prepare(content)
+      proxy_pac_content = content.to_s.dup
 
-      context = runtime.compile(content)
+      environment.prepare(proxy_pac_content)
+
+      context = runtime.compile(proxy_pac_content)
       context.include environment
 
       Javascript.new(context)

data/lib/proxy_pac_rb/proxy_pac_file.rb

@@ -3,8 +3,7 @@ module ProxyPacRb
   class ProxyPacFile
     include Comparable
 
-    attr_accessor :valid, :type, :message, :readable, :javascript, :parsable, :source
-    attr_writer :content
+    attr_accessor :valid, :type, :message, :readable, :javascript, :parsable, :source, :content
 
     def initialize(source:)
       if source.is_a? ProxyPacFile
@@ -28,12 +27,6 @@ module ProxyPacRb
       !@content.nil?
     end
 
-    def content
-      return nil if @content.nil?
-
-      @content.dup
-    end
-
     def <=>(other)
       content <=> other.content
     end
@@ -66,9 +59,35 @@ module ProxyPacRb
       end
 
       uri = Addressable::URI.heuristic_parse(url)
+
+      if hostname?(url)
+        uri.scheme = 'http'
+        uri.path = '/'
+        uri.host = url
+      end
+
       fail UrlInvalidError, 'url is missing host' unless uri.host
 
       javascript.FindProxyForURL(uri.to_s, uri.host)
     end
+
+    private
+
+    def hostname?(name)
+      %r{
+        \A
+        (
+          (
+            [a-zA-Z0-9]
+            | [a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9]
+          )\.
+        )*
+        (
+          [A-Za-z0-9]
+          | [A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9]
+        )
+        \Z
+        }x === name
+    end
   end
 end

data/lib/proxy_pac_rb/version.rb

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

data/spec/api/proxy_pac_dumper_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe ProxyPacDumper do
 
     context 'when proxy pac is string' do
       before :each do
-        in_current_dir do
+        in_current_directory do
           dumper.dump(proxy_pac, type: :string)
         end
       end
@@ -51,13 +51,13 @@ RSpec.describe ProxyPacDumper do
       end
 
       before :each do
-        in_current_dir do
+        in_current_directory do
           dumper.dump(proxy_pac, type: :template)
         end
       end
 
       around :example do |example|
-        in_current_dir { example.call }
+        in_current_directory { example.call }
       end
 
       it { expect(destination).to be_existing_file }

data/spec/api/proxy_pac_file_spec.rb

@@ -87,4 +87,30 @@ RSpec.describe ProxyPacFile do
       it { expect(proxy_pac).to be_readable }
     end
   end
+
+  describe '#find' do
+    before :each do
+      proxy_pac.readable = true
+      proxy_pac.valid    = true
+      proxy_pac.content  = source
+
+      parser = ProxyPacParser.new
+      parser.parse(proxy_pac)
+    end
+
+    context 'when ip is used as url' do
+      let(:url) { '127.0.0.1' }
+      it { expect(proxy_pac.find(url)).to eq 'DIRECT' }
+    end
+
+    context 'when plain host is used as url' do
+      let(:url) { 'localhost' }
+      it { expect(proxy_pac.find(url)).to eq 'DIRECT' }
+    end
+
+    context 'when fqdn is used as url' do
+      let(:url) { 'localhost.localdomain' }
+      it { expect(proxy_pac.find(url)).to eq 'DIRECT' }
+    end
+  end
 end

data/spec/rspec/readability_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe 'Readability', type: :proxy_pac do
   end
 
   context 'when is file' do
-    let(:root_path) { current_dir }
+    let(:root_path) { current_directory }
 
     subject { 'proxy.pac' }
 

data/spec/support/aruba.rb

@@ -17,7 +17,7 @@ end
 RSpec.configure do |c|
   c.include SpecHelper::Aruba
   c.before :each do
-    clean_current_dir
+    clean_current_directory
     restore_env
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxy_pac_rb
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Dennis Günnewig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable