local_pac 0.0.6 → 0.0.7

data/lib/local_pac/file_server.rb

@@ -1,5 +1,7 @@
 module LocalPac
   class FileServer < Sinatra::Base
+    use Rack::Deflater
+
     configure do
       mime_type :proxy_pac_file, 'application/x-ns-proxy-autoconfig'
     end

data/lib/local_pac/java_script_compressor.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+module LocalPac
+  class JavaScriptCompressor
+    private
+
+    attr_reader :compressor
+
+    public
+
+    def initialize(compressor = Uglifier.new)
+      @compressor = compressor
+    end
+
+    def prepare(file)
+      file.compressed_content = compressor.compile(file.content)
+    end
+  end
+end

data/lib/local_pac/null_pac_file.rb

@@ -13,6 +13,14 @@ module LocalPac
       nil
     end
 
+    def compressed_content=(val)
+      nil
+    end
+
+    def prepare(val)
+      nil
+    end
+
     def nil?
       true
     end

data/lib/local_pac/pac_file.rb

@@ -2,6 +2,7 @@
 module LocalPac
   class PacFile
     attr_reader :path
+    attr_accessor :compressed_content
 
     def initialize(path)
       @path = path
@@ -18,5 +19,9 @@ module LocalPac
     def nil?
       false
     end
+
+    def prepare(handler)
+      handler.prepare(self)
+    end
   end
 end

data/lib/local_pac/pac_file_validator.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+module LocalPac
+  class PacFileValidator
+    def valid?(file)
+      PAC.source(file.content) 
+
+      true
+    rescue
+      false
+    end
+  end
+end

data/lib/local_pac/pac_manager.rb

@@ -3,22 +3,27 @@ module LocalPac
 
     private
 
-    attr_reader :cache, :null_file, :paths, :creator
+    attr_reader :cache, :null_file, :paths, :creator, :content_handler, :validator
 
     public
 
     def initialize(paths = default_paths, creator = PacFile)
-      @paths   = Array(paths)
-      @creator = creator
-      @cache = ActiveSupport::Cache::MemoryStore.new
-      @null_file = proc { NullPacFile.new }
+      @paths           = Array(paths)
+      @creator         = creator
+      @cache           = ActiveSupport::Cache::MemoryStore.new
+      @null_file       = proc { NullPacFile.new }
+      @content_handler = JavaScriptCompressor.new
+      @validator       = PacFileValidator.new
     end
 
     def find(name)
       name = File.basename(name, '.pac').to_sym
 
       cache.fetch(name) do
-        pac_files.find(null_file) { |f| f.name == name }
+        file = valid_pac_files.find(null_file) { |f| f.name == name }
+        file.prepare(content_handler)
+
+        file
       end
     end
 
@@ -30,6 +35,15 @@ module LocalPac
       end
     end
 
+    def valid_pac_files
+      files = []
+      pac_files.each do |f|
+        files << f if validator.valid?(f)
+      end
+
+      files
+    end
+
     def default_paths
       [
         File.expand_path(File.join(ENV['HOME'], '.config', 'pacfiles')),

data/lib/local_pac/version.rb

@@ -1,4 +1,4 @@
 #main LocalPac
 module LocalPac
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/lib/local_pac.rb

@@ -1,6 +1,8 @@
 require 'sinatra'
 require 'fileutils'
 require 'logger'
+require 'uglifier'
+require 'pac'
 
 require 'active_support/cache'
 
@@ -10,5 +12,7 @@ require 'local_pac/file_server'
 require 'local_pac/pac_manager'
 require 'local_pac/pac_file'
 require 'local_pac/null_pac_file'
+require 'local_pac/java_script_compressor'
+require 'local_pac/pac_file_validator'
 
 module LocalPac; end

data/local_pac.gemspec

@@ -23,4 +23,7 @@ EOS
   spec.add_runtime_dependency 'sinatra'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'activesupport'
+  spec.add_runtime_dependency 'uglifier'
+  spec.add_runtime_dependency 'therubyracer'
+  spec.add_runtime_dependency 'pac'
 end

data/spec/features/fetch_proxy_pac_spec.rb

@@ -2,8 +2,15 @@ require 'spec_helper'
 
 describe 'Fetch proxy pac' do
   context '/v1/pac' do
+    let(:valid_pac_file) do <<-EOS.strip_heredoc
+                           function FindProxyForURL(url, host) {
+                             return "DIRECT"
+                           }
+                           EOS
+    end
+
     it 'finds an existing proxy pac' do
-      create_file '.config/pacfiles/file1.pac', 'asdf'
+      create_file '.config/pacfiles/file1.pac', valid_pac_file
 
       env = {
         'HOME' => working_directory,
@@ -11,7 +18,7 @@ describe 'Fetch proxy pac' do
 
       with_environment env, clear: true do
         response = get('/v1/pac/file1.pac')
-        expect(response.body).to eq('asdf')
+        expect(response.body).to eq(valid_pac_file)
       end
     end
 
@@ -19,5 +26,19 @@ describe 'Fetch proxy pac' do
       response = get('/v1/pac/does_not_exist.pac')
       expect(response.body).to include('does_not_exist.pac')
     end
+
+    it 'compresses data for transit if requested' do
+      ['deflate','gzip', 'deflate,gzip','gzip,deflate'].each do|compression_method|
+        response = get('/v1/pac/does_not_exist.pac', {}, { 'HTTP_ACCEPT_ENCODING' => compression_method })
+        expect(response.headers['Content-Encoding']).to be
+      end
+    end
+
+    it 'does not compresses data for transit if not requested' do
+      ['deflate','gzip', 'deflate,gzip','gzip,deflate'].each do|compression_method|
+        response = get('/v1/pac/does_not_exist.pac')
+        expect(response.headers['Content-Encoding']).not_to be
+      end
+    end
   end
 end

data/spec/java_script_compressor_spec.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe JavaScriptCompressor do
+  context '#prepare' do
+    it 'compresses the javascript content' do
+      javascript = <<-EOS.strip_heredoc
+      function FindProxyForURL(url, host) {
+
+      dnsDomainIs(host, 'example.org');
+      shExpMatch(url, "*.local")
+      isInNet("127.0.0.1", "172.16.0.0", "255.240.0.0")
+      myIpAddress()
+      dnsResolve(host)
+      isPlainHostName(host)
+      localHostOrDomainIs(host, "www.google.com")
+      isResolvable(host)  
+      dnsDomainLevels(host)
+      weekdayRange("MON", "FRI")
+      dateRange("JAN", "MAR") 
+      timeRange(8, 18)
+      alert('asdf')
+
+      }
+      EOS
+
+      compressed_javascript = <<-EOS.strip_heredoc.chomp
+      function FindProxyForURL(e,a){dnsDomainIs(a,"example.org"),shExpMatch(e,"*.local"),isInNet("127.0.0.1","172.16.0.0","255.240.0.0"),myIpAddress(),dnsResolve(a),isPlainHostName(a),localHostOrDomainIs(a,"www.google.com"),isResolvable(a),dnsDomainLevels(a),weekdayRange("MON","FRI"),dateRange("JAN","MAR"),timeRange(8,18),alert("asdf")}
+      EOS
+
+      file = double('file')
+      allow(file).to receive(:content).and_return(javascript)
+      expect(file).to receive(:compressed_content=).with(compressed_javascript)
+
+      compressor = JavaScriptCompressor.new
+      compressor.prepare(file)
+    end
+  end
+end

data/spec/null_pac_file_spec.rb

@@ -29,4 +29,14 @@ describe NullPacFile do
       expect(file.nil?).to be_true
     end
   end
+
+  context '#compressed_content' do
+    it 'uses an external handler to compress content' do
+      handler = double('handler')
+
+      file = create_file('file1.pac', 'content')
+      file = NullPacFile.new
+      file.prepare(handler)
+    end
+  end
 end

data/spec/pac_file_spec.rb

@@ -30,4 +30,15 @@ describe PacFile do
       expect(file.nil?).to be_false
     end
   end
+
+  context '#compressed_content' do
+    it 'uses an external handler to compress content' do
+      handler = double('handler')
+      expect(handler).to receive(:prepare)
+
+      file = create_file('file1.pac', 'content')
+      file = PacFile.new(file)
+      file.prepare(handler)
+    end
+  end
 end

data/spec/pac_file_validator_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe PacFileValidator do
+  context '#valid?' do
+    let(:valid_pac_file) do <<-EOS.strip_heredoc
+                           function FindProxyForURL(url, host) {
+                             return "DIRECT"
+                           }
+                           EOS
+    end
+
+    let(:invalid_pac_file) do <<-EOS.strip_heredoc
+                           function FindProxyForURL(url, host) {
+                           EOS
+    end
+
+    it 'returns true if file is valid' do
+      file = double('PacFile')
+      expect(file).to receive(:content).and_return(valid_pac_file)
+      validator = PacFileValidator.new
+      expect(validator.valid?(file)).to be_true
+    end
+
+    it 'returns true if file is invalid' do
+      file = double('PacFile')
+      expect(file).to receive(:content).and_return(invalid_pac_file)
+      validator = PacFileValidator.new
+      expect(validator.valid?(file)).to be_false
+    end
+  end
+end

data/spec/pac_manager_spec.rb

@@ -3,9 +3,16 @@ require 'spec_helper'
 
 describe PacManager do
   context '#find' do
+    let(:valid_pac_file) do <<-EOS.strip_heredoc
+                           function FindProxyForURL(url, host) {
+                             return "DIRECT"
+                           }
+                           EOS
+    end
+
     it 'finds the file in given path' do
       directory = create_directory 'pac_files'
-      file_path = create_file 'pac_files/file1.pac'
+      file_path = create_file 'pac_files/file1.pac', valid_pac_file
       create_file 'pac_files/file2.pac'
 
       manager = PacManager.new(directory)
@@ -19,9 +26,9 @@ describe PacManager do
       expect(file.nil?).to be_true
     end
 
-    it 'caches files', :focus do
+    it 'caches files' do
       directory = create_directory 'pac_files'
-      file_path = create_file 'pac_files/file1.pac'
+      file_path = create_file 'pac_files/file1.pac', valid_pac_file
 
       manager = PacManager.new(directory)
       file = manager.find('file1')
@@ -32,5 +39,14 @@ describe PacManager do
       file = manager.find('file1')
       expect(file.path).to eq(file_path)
     end
+    
+    it 'ignores invalid pac files' do
+      directory = create_directory 'pac_files'
+      create_file 'pac_files/file1.pac', 'asdfasdf'
+
+      manager = PacManager.new(directory)
+      file = manager.find('file1.pac')
+      expect(file.nil?).to be_true
+    end
   end
 end

data/spec/support/string.rb

@@ -0,0 +1,2 @@
+# encoding: utf-8
+require 'active_support/core_ext/string/strip'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: local_pac
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -59,6 +59,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: therubyracer
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pac
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'This gem helps you to serve proxy.pacs locallly
 
 '
@@ -82,9 +130,11 @@ files:
 - files/proxy.pac
 - lib/local_pac.rb
 - lib/local_pac/file_server.rb
+- lib/local_pac/java_script_compressor.rb
 - lib/local_pac/logger.rb
 - lib/local_pac/null_pac_file.rb
 - lib/local_pac/pac_file.rb
+- lib/local_pac/pac_file_validator.rb
 - lib/local_pac/pac_manager.rb
 - lib/local_pac/spec_helper.rb
 - lib/local_pac/version.rb
@@ -95,14 +145,17 @@ files:
 - share/systemd/local_pac.socket
 - share/systemd/local_pac@.service
 - spec/features/fetch_proxy_pac_spec.rb
+- spec/java_script_compressor_spec.rb
 - spec/null_pac_file_spec.rb
 - spec/pac_file_spec.rb
+- spec/pac_file_validator_spec.rb
 - spec/pac_manager_spec.rb
 - spec/spec_helper.rb
 - spec/support/environment.rb
 - spec/support/filesystem.rb
 - spec/support/rack_test.rb
 - spec/support/rspec.rb
+- spec/support/string.rb
 homepage: https://github.com/dg-vrnetze/local_pac
 licenses:
 - MIT
@@ -132,12 +185,15 @@ test_files:
 - features/fetch_proxy_pac.feature
 - features/support/env.rb
 - spec/features/fetch_proxy_pac_spec.rb
+- spec/java_script_compressor_spec.rb
 - spec/null_pac_file_spec.rb
 - spec/pac_file_spec.rb
+- spec/pac_file_validator_spec.rb
 - spec/pac_manager_spec.rb
 - spec/spec_helper.rb
 - spec/support/environment.rb
 - spec/support/filesystem.rb
 - spec/support/rack_test.rb
 - spec/support/rspec.rb
+- spec/support/string.rb
 has_rdoc: