local_pac 0.6.3 → 0.7.0

data/.bowerrc

@@ -0,0 +1,4 @@
+{
+  "directory": "vendor/assets/components",
+  "json": "bower.json"
+}

data/.gitignore

@@ -19,3 +19,4 @@ share/archlinux/pkg/
 *.tar.xz
 *.tar.gz
 .sass-cache
+vendor/assets/components/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    local_pac (0.6.2)
+    local_pac (0.7.0)
       activesupport
       addressable
       bootstrap-sass
@@ -9,8 +9,8 @@ PATH
       facter
       haml
       i18n
-      pac
       pager
+      proxy_pac_rb
       rack-contrib
       rugged
       sass
@@ -28,7 +28,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.2)
+    activesupport (4.0.3)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -40,7 +40,7 @@ GEM
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     ast (1.1.0)
-    atomic (1.1.14)
+    atomic (1.1.15)
     awesome_print (1.2.0)
     backports (3.6.0)
     blockenspiel (0.4.5)
@@ -54,42 +54,42 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.4.0)
+    childprocess (0.5.1)
       ffi (~> 1.0, >= 1.0.11)
     chunky_png (1.3.0)
     cliver (0.3.2)
     coderay (1.1.0)
     columnize (0.3.6)
-    compass (0.12.2)
+    compass (0.12.3)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (~> 3.1)
+      sass (= 3.2.14)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    cucumber (1.3.10)
+    cucumber (1.3.11)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.0.2)
-    debugger (1.6.5)
+    debugger (1.6.6)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.1)
+      debugger-ruby_core_source (~> 1.3.2)
     debugger-completion (1.0.0)
       bond (>= 0.4.2)
       debugger (~> 1.1)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.1)
+    debugger-ruby_core_source (1.3.2)
     diff-lcs (1.2.5)
     docile (1.1.3)
-    dotenv (0.9.0)
+    dotenv (0.10.0)
     erubis (2.7.0)
-    excon (0.31.0)
+    excon (0.32.0)
     execjs (2.0.2)
     facter (1.7.5)
     fedux_org-stdlib (0.3.2)
@@ -104,12 +104,12 @@ GEM
       ruby-progressbar (~> 1.3)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    github-markup (1.0.1)
+    github-markup (1.0.3)
     haml (4.0.5)
       tilt
     hike (1.2.3)
     i18n (0.6.9)
-    inch (0.3.1)
+    inch (0.3.2)
       sparkr (>= 0.2.0)
       term-ansicolor
       yard (~> 0.8.7)
@@ -119,13 +119,12 @@ GEM
     mime-types (2.1)
     mini_portile (0.5.2)
     minitest (4.7.5)
-    multi_json (1.8.4)
+    multi_json (1.9.0)
     multi_test (0.0.3)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
-    pac (1.0.0)
     pager (1.0.1)
-    parser (2.1.4)
+    parser (2.1.7)
       ast (~> 1.1)
       slop (~> 3.4, >= 3.4.5)
     poltergeist (1.5.0)
@@ -134,6 +133,9 @@ GEM
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     powerpack (0.0.9)
+    proxy_pac_rb (0.2.2)
+      activesupport
+      addressable
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -141,10 +143,10 @@ GEM
     pry-debugger (0.2.2)
       debugger (~> 1.3)
       pry (~> 0.9.10)
-    pry-doc (0.5.1)
-      pry (>= 0.9)
-      yard (>= 0.8)
-    puma (2.7.1)
+    pry-doc (0.6.0)
+      pry (~> 0.9)
+      yard (~> 0.8)
+    puma (2.8.1)
       rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-contrib (1.1.0)
@@ -155,7 +157,7 @@ GEM
       rack (>= 1.0)
     rainbow (2.0.0)
     rake (10.1.1)
-    redcarpet (3.0.0)
+    redcarpet (3.1.1)
     ref (1.0.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -163,17 +165,17 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
+    rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
+    rspec-mocks (2.14.6)
     rubocop (0.18.1)
       json (>= 1.7.7, < 2)
       parser (~> 2.1.3)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
     ruby-prof (0.14.2)
-    ruby-progressbar (1.4.1)
+    ruby-progressbar (1.4.2)
     rugged (0.19.0)
     sass (3.2.14)
     simplecov (0.8.2)
@@ -206,20 +208,20 @@ GEM
     sprockets-sass (1.0.3)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    sys-proctable (0.9.3)
+    sys-proctable (0.9.4)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    thread_safe (0.2.0)
+      atomic (>= 1.1.7, < 2)
     tilt (1.4.1)
     tins (1.0.0)
     tmrb (1.2.7)
       thor
-    tzinfo (0.3.38)
+    tzinfo (0.3.39)
     uglifier (2.4.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)

data/app/assets/javascripts/application.js

@@ -1,20 +1,36 @@
-//= require jquery-min
+//= require jquery
 //= require bootstrap
+//= require moment
+//= require eonasdan-bootstrap-datetimepicker
 
 $('#navigation a[href="#styled"]').click(function (e) {
   e.preventDefault()
-  console.log('hit styled')
   $(this).tab('show')
 })
 
 $('#navigation a[href="#verbatim"]').click(function (e) {
   e.preventDefault()
-  console.log('hit verbatim')
   $(this).tab('show')
 })
 
-$(window).load(function(){
+$(document).ready(function(){
   $("#reset").click(function () {
-    $('#url').val('')
+    $('#search')[0].reset();
   });
 });
+
+$(document).ready(function(){
+  $(".lp_show_fields").click(function(e){
+    e.preventDefault()
+    $(".lp_fields_close, .lp_fields_open").toggle();
+    $(".lp_button_show_fields_close, .lp_button_show_fields_open").toggle();
+  });
+});
+
+$(function () {
+  $('#datetimepicker').datetimepicker();
+});
+
+$('#url').tooltip('hide')
+$('#client_ip').tooltip('hide')
+$('#time').tooltip('hide')

data/app/assets/stylesheets/application.css.scss

@@ -1,9 +1,10 @@
 @import 'bootstrap';
+@import 'eonasdan-bootstrap-datetimepicker';
 @import 'open-sans';
 
-body {
-  font-family: 'Open Sans', sans-serif;
-  padding-top: 80px;
+html, body {
+  font-family: 'Open Sans', 'sans-serif';
+  min-height: 100%;
 }
 
 .lp_data {
@@ -74,32 +75,101 @@ body {
   margin-left: 10px;
 }
 
+.lp_button_datetimepicker {
+  @extend .glyphicon;
+  @extend .glyphicon-calendar;
+}
+
+.lp_button_show_fields_open {
+  @extend .glyphicon;
+  @extend .glyphicon-minus;
+  display: none;
+}
+
+a:hover {
+  text-decoration: none;
+}
+
+a:visited {
+  text-decoration: none;
+}
+
+a:active {
+  text-decoration: none;
+}
+
+a:focus {
+  text-decoration: none;
+}
+
+.lp_button_show_fields_close {
+  @extend .glyphicon;
+  @extend .glyphicon-plus;
+  text-decoration: none;
+}
+
+.lp_fields_open {
+  display: none;
+  clear: both;
+}
+
+.lp_fields_close {
+  clear: both;
+}
+
+.lp_show_fields {
+  float: left;
+  margin-top: 5px;
+}
+
+.lp_time_group {
+  width: 250px;
+}
+
 .lp_search_group {
   @extend .form-group;
   width: 50%; 
-  display: inline-block;
-  margin-bottom: 0px;
-  margin-top: 0px;
   min-height: 40px;
+  margin: 0px auto;
 }
 
 .lp_buttons {
   display: inline-block;
   min-height: 40px;
+  float: right;
 }
 
-.lp_field_search {
+.lp_field_url {
   @extend .form-control;
   display: inline-block;
 }
 
+.lp_field_time {
+  @extend .form-control;
+  width: 40px;
+  
+}
+
+.lp_form_group {
+  @extend .form-group;
+}
+
+.lp_input_group {
+  @extend .input-group;
+}
+
+.lp_field_client_ip {
+  @extend .form-control;
+  width: 250px;
+}
+
 .lp_form {
   margin: 20px;
 }
 
-.lp_form_controls {
-  text-align: center;
-}
+//.lp_form_controls {
+//  text-align: center;
+//}
 
 .lp_verbatim {
   font-size: 5rem;
@@ -137,3 +207,34 @@ h1 {
   font-weight: bold;
   font-size: 4rem;
 }
+
+.lp_page_footer {
+  position: absolute;
+  bottom: 5px;
+  width: 100%;
+  z-index: -1;
+}
+
+.lp_page_header {
+  margin: 10px;
+}
+
+.lp_top_navigation {
+  @extend .navbar;
+  @extend .navbar-default;
+  margin-bottom: 7px;
+}
+
+.lp_bottom_navigation {
+  @extend .navbar;
+  @extend .navbar-default;
+
+  margin-top: 20px;
+  margin-bottom: 0px;
+  min-height: 30px;
+  height: 30px;
+  line-height: 30px;
+  text-align: center;
+  font-size: 1rem;
+  color: #9e9e9e;
+}

data/app/assets/stylesheets/buttons.scss

@@ -0,0 +1,81 @@
+@import "bootstrap";
+@import "font-awesome";
+
+.icon_button:empty {
+  line-height: 1.428571429;
+  width: 4rem;
+}
+
+.new_button {
+  @extend .icon_button;
+  @extend .btn;
+  @extend .btn-success;
+  @extend .glyphicon;
+  @extend .glyphicon-asterisk;
+
+  color: #FFFFFF;
+  float: right;
+  margin-top: 20px;
+  margin-right: 8px;
+}
+
+.save_button {
+  @extend .icon_button;
+  @extend .btn;
+  @extend .btn-primary;
+  @extend .glyphicon;
+  @extend .glyphicon-floppy-disk;
+
+  color: #FFFFFF;
+}
+
+.edit_button {
+  @extend .icon_button;
+  @extend .btn;
+  @extend .btn-default;
+  @extend .glyphicon;
+  @extend .glyphicon-pencil;
+}
+
+.destroy_button {
+  @extend .icon_button;
+  @extend .btn;
+  @extend .btn-danger;
+  @extend .glyphicon;
+  @extend .glyphicon-trash;
+  color: #FFFFFF;
+}
+
+.back_button {
+  @extend .icon_button;
+  @extend .btn;
+  @extend .btn-default;
+  @extend .glyphicon;
+  @extend .glyphicon-arrow-left;
+}
+
+.show_button {
+  @extend .icon_button;
+  @extend .btn;
+  @extend .btn-default;
+  @extend .glyphicon;
+  @extend .glyphicon-eye-open;
+}
+
+.search_button {
+  @extend .icon_button;
+  @extend .btn;
+  @extend .btn-default;
+  @extend .glyphicon;
+  @extend .glyphicon-search;
+  vertical-align: middle;
+}
+
+.clear_button {
+  @extend .icon_button;
+  @extend .btn;
+  @extend .btn-default;
+  @extend .fa;
+  @extend .fa-times;
+  vertical-align: middle;
+}

data/app/controllers/application_controller.rb

@@ -32,31 +32,73 @@ module LocalPac
       use Rack::PostBodyContentTypeParser
 
       not_found do
-        @error_summary = I18n.t('errors.unknown_proxy_pac.summary')
-        @error_details = I18n.t('errors.unknown_proxy_pac.details', name: env['PATH_INFO'])
+        handler = ErrorHandler.find(Exceptions::PacFileUnknown)
+        handler.use(JSON.dump(name: env['PATH_INFO']))
+
+        @error_summary = handler.summary(:html)
+        @error_details = handler.details(:html)
 
         halt 404, haml(:error, layout: :application)
       end
       
       error do
-        @error_summary = I18n.t('errors.default.summary')
-        @error_details = I18n.t('errors.default.details')
+        handler = ErrorHandler.find(StandardError)
+
+        @error_summary = handler.summary(:html)
+        @error_details = handler.details(:html)
 
         halt 500, haml(:error, layout: :application)
       end
 
+      error Exceptions::PacFileInvalid do
+        handler = ErrorHandler.find(Exceptions::PacFileInvalid)
+        handler.use(JSON.dump(name: env['sinatra.error'].message))
+
+        @error_summary = handler.summary(:html)
+        @error_details = handler.details(:html)
+
+        halt 401, haml(:error, layout: :application)
+      end
+
       error Exceptions::GivenUrlInvalid do
-        @error_summary = I18n.t('errors.invalid_url.summary') 
-        @error_details = I18n.t('errors.invalid_url.details', url: env['sinatra.error'].message)
+        handler = ErrorHandler.find(Exceptions::GivenUrlInvalid)
+        handler.use(env['sinatra.error'].message)
+
+        @error_summary = handler.summary(:html)
+        @error_details = handler.details(:html)
+
+        halt 401, haml(:error, layout: :application)
+      end
+
+      error Exceptions::GivenTimeInvalid do
+        handler = ErrorHandler.find(Exceptions::GivenTimeInvalid)
+        handler.use(env['sinatra.error'].message)
+
+        @error_summary = handler.summary(:html)
+        @error_details = handler.details(:html)
+
+        halt 401, haml(:error, layout: :application)
+      end
+
+      error Exceptions::GivenClientIpInvalid do
+        handler = ErrorHandler.find(Exceptions::GivenClientIpInvalid)
+        handler.use(env['sinatra.error'].message)
+
+        @error_summary = handler.summary(:html)
+        @error_details = handler.details(:html)
 
         halt 401, haml(:error, layout: :application)
       end
 
+
       set :raise_sinatra_param_exceptions, true
 
       error Sinatra::Param::InvalidParameterError do
-        @error_summary = I18n.t('errors.invalid_parameter.summary') 
-        @error_details = I18n.t('errors.invalid_parameter.details', parameter: env['sinatra.error'].param)
+        handler = ErrorHandler.find(Sinatra::Param::InvalidParameterError)
+        handler.use(JSON.dump(parameter: env['sinatra.error'].param))
+
+        @error_summary = handler.summary(:html)
+        @error_details = handler.details(:html)
 
         halt 401, haml(:error, layout: :application)
       end
@@ -86,17 +128,11 @@ module LocalPac
 
       configure :test do
         use Rack::CommonLogger, LocalPac::NullAccessLogger.new
-        set :raise_errors, false
+        set :raise_errors, true
       end
       
       configure do
         mime_type :proxy_pac_file, 'application/x-ns-proxy-autoconfig'
-
-        I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
-        I18n.load_path = Dir[::File.join(settings.root, 'locales', '*.yml')]
-        I18n.backend.load_translations
-
-        I18n.enforce_available_locales = true
       end
 
       helpers do

data/app/controllers/assets_controller.rb

@@ -43,8 +43,9 @@ module LocalPac
       configure do
 
         # Setup Sprockets
-        %w{javascripts stylesheets images fonts}.each do |type|
+        %w{javascripts stylesheets images fonts components}.each do |type|
           assets.append_path "assets/#{type}"
+          assets.append_path ::File.expand_path("../../../vendor/assets/#{type}", __FILE__)
           assets.append_path Compass::Frameworks['bootstrap'].templates_directory + "/../vendor/assets/#{type}"
         end
         assets.cache = Sprockets::Cache::FileStore.new(LocalPac.config.sass_cache)

data/app/controllers/git_hook_controller.rb

@@ -6,62 +6,52 @@ module LocalPac
       helpers Sinatra::Param
       helpers Sinatra::JSON
 
-      not_found do
-        halt 404, json(
-          error_summary: I18n.t('errors.unknown_git_hook.summary'),
-          error_details: I18n.t('errors.unknown_git_hook.details', name: env['PATH_INFO']),
-          result: :failure,
-        )
-      end
-      
       error do
-        halt 500, json(
-          error_summary: I18n.t('errors.default.summary'),
-          error_details: I18n.t('errors.default.details'),
-          result: :failure,
-        )
+        handler = ErrorHandler.find(StandardError)
+
+        halt 500, handler.to_json
       end
 
       error Exceptions::GivenUrlInvalid do
-        halt 401, json(
-          error_summary: I18n.t('errors.invalid_url.summary'),
-          error_details: I18n.t('errors.invalid_url.details', url: env['sinatra.error'].message),
-          result: :failure,
-        )
+        handler = ErrorHandler.find(Exceptions::GivenUrlInvalid)
+        handler.use(url: env['sinatra.error'].message)
+
+        halt 401, handler.to_json
+      end
+
+      not_found do
+        handler = ErrorHandler.find(Exceptions::GitHookUnknown)
+        handler.use(name: env['PATH_INFO'])
+
+        halt 404, handler.to_json
       end
 
       set :raise_sinatra_param_exceptions, true
 
       error Sinatra::Param::InvalidParameterError do
-        halt 401, json(
-          error_summary: I18n.t('errors.invalid_parameter.summary'),
-          error_details: I18n.t('errors.invalid_parameter.details', parameter: env['sinatra.error'].param),
-          result: :failure,
-        )
+        handler = ErrorHandler.find(Sinatra::Param::InvalidParameterError)
+        handler.use(JSON.dump(parameter: env['sinatra.error'].param))
+
+        halt 401, handler.to_json
       end
 
       error Exceptions::PacFileInvalid do
-        halt 403, json(
-          error_summary: I18n.t('errors.invalid_pac_file.summary'),
-          error_details: I18n.t('errors.invalid_pac_file.details', name: env['sinatra.error']),
-          result: :failure,
-        )
+        handler = ErrorHandler.find(Exceptions::PacFileInvalid)
+        handler.use(JSON.dump(name: env['sinatra.error']))
+
+        halt 403, handler.to_json
       end
 
       error Exceptions::ApiKeyInvalid do
-        halt 403, json(
-          error_summary: I18n.t('errors.invalid_api_key.summary'),
-          error_details: I18n.t('errors.invalid_api_key.details', name: env['sinatra.error']),
-          result: :failure,
-        )
+        handler = ErrorHandler.find(Exceptions::ApiKeyInvalid)
+
+        halt 403, handler.to_json
       end
 
       error Exceptions::ReloadOfLocalStorageFailed do
-        halt 500, json(
-          error_summary: I18n.t('errors.reload_of_local_storage_failed.summary'),
-          error_details: I18n.t('errors.reload_of_local_storage_failed.details'),
-          result: :failure,
-        )
+        handler = ErrorHandler.find(Exceptions::ReloadOfLocalStorageFailed)
+
+        halt 500, handler.to_json
       end
 
       before do
@@ -78,7 +68,7 @@ module LocalPac
 
         repo = GitStorage.new(LocalPac.config.local_storage)
         repo.each_added_pac_file(params[:old_commit_id], params[:new_commit_id]) do |f|
-          fail Exceptions::PacFileInvalid, f.path  unless validator.valid?(f)
+          fail Exceptions::PacFileInvalid, name: f.path  unless validator.valid?(f)
         end
 
         LocalPac::Actions::ReloadLocalStorage.new([LocalPac::App::FileServeController, LocalPac::App::LookupController]).run