wpa_cli_web 0.0.5 → 0.0.6

data/.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "lib/wpa_cli_web/public/bower_components"
+}

data/lib/wpa_cli_web.rb

@@ -6,7 +6,16 @@ class WpaCliWeb < Sinatra::Base
   include WpaCliRuby
 
   configure do
+    set :product_name,    "Radiodan"
     set :method_override, true
+    set :public_folder,   File.expand_path(File.join(File.dirname(__FILE__), 'wpa_cli_web', 'public'))
+    set :views,           File.expand_path(File.join(File.dirname(__FILE__), 'wpa_cli_web', 'views'))
+  end
+
+  helpers do
+    def product_name
+      settings.product_name
+    end
   end
 
   def wpa_cli_client
@@ -21,35 +30,6 @@ class WpaCliWeb < Sinatra::Base
     @host = request.host_with_port
   end
 
-  template :networks do
-    <<-eos
-      <ul>
-      <% @access_points.each do |ap| %>
-        <li><%= ap.ssid %> (<%= ap.signal_level %>)
-            <form method="post" action="/networks">
-              <input type="hidden" name="ssid" value="<%= ap.ssid %>" />
-              <input type="submit" value="Connect" />
-            </form>
-        </li>
-      <% end %>
-      </ul>
-    eos
-  end
-
-  template :networks_edit do
-    <<-eos
-      <h1><%= @ssid %></h1>
-      <form method="post" action="/networks/<%= @id %>">
-        <input type="hidden" name="_method" value="put" />
-        <input type="hidden" name="ssid" value="<%= @ssid %>" />
-        <label for="password">
-          Password: <input type="text" name="password" />
-        </label>
-        <input type="submit" value="Save" />
-      </form>
-    eos
-  end
-
   get '/' do
     redirect '/access_points'
   end
@@ -57,7 +37,11 @@ class WpaCliWeb < Sinatra::Base
   get '/access_points' do
     access_point_list = AccessPointList.new(wpa_cli_client)
     @access_points = access_point_list.access_points
-    erb :networks
+    if request.xhr?
+      erb :access_points_list, :layout => false
+    else
+      erb :access_points
+    end
   end
 
   post '/networks' do
@@ -93,6 +77,10 @@ class WpaCliWeb < Sinatra::Base
   end
 
   get '/restart' do
-    "Restart for these changes to take effect"
+    erb :restart
+  end
+
+  post '/restart' do
+    erb :restarting
   end
 end

data/lib/wpa_cli_web/public/bower_components/house-style/.bower.json

@@ -0,0 +1,14 @@
+{
+  "name": "house-style",
+  "dependencies": {
+    "normalize-css": "~2.1.2"
+  },
+  "_release": "a63177ae40",
+  "_resolution": {
+    "type": "branch",
+    "branch": "master",
+    "commit": "a63177ae4027c3f64771b3cef4977d0cac584de9"
+  },
+  "_source": "/Users/andrew/Projects/bbc/house-style",
+  "_target": "*"
+}

data/lib/wpa_cli_web/public/bower_components/house-style/.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "bower_components"
+}

data/lib/wpa_cli_web/public/bower_components/house-style/.gitignore

@@ -0,0 +1,2 @@
+node_modules
+.tmp

data/lib/wpa_cli_web/public/bower_components/house-style/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+group :development do
+  gem "guard-livereload", "~> 1.4.0"
+  gem "guard-webrick", "~> 0.1.4"
+end

data/lib/wpa_cli_web/public/bower_components/house-style/Gruntfile.js

@@ -0,0 +1,99 @@
+module.exports = function(grunt) {
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
+    config: {
+      banner: '/*! <%= pkg.name %> <%= grunt.template.today("dd-mm-yyyy") %> */\n',
+      tmpDir: './.tmp'
+    },
+    /*
+      Expand unprefixed CSS properties into 
+      their vendor-prefixed equivalents
+    */
+    autoprefixer: {
+      dist: {
+        options: {
+          browsers: ['last 1 version', '> 1%', 'ie 8', 'ie 7']
+        },
+        files: {
+          'house-style.css': ['house-style.css']
+        }
+      }
+    },
+    /*
+      Concatenate all CSS under modules into a single file
+    */
+    concat: {
+      css: {
+        options: {
+          banner: '<%= config.banner %>'
+        },
+        // the files to concatenate
+        src: [
+          // Specific external deps first
+          'bower_components/normalize-css/*.css',
+          // Then everything else
+          '<%= config.tmpDir %>/**/*.css'
+        ],
+        // the location of the resulting JS file
+        dest: '<%= pkg.name %>.css'
+      }
+    },
+    /*
+      Copy all modules into a tmp location for transformation
+    */
+    copy: {
+      tmp: {
+        files: [
+          {expand: true, src: ['modules/**'], dest: '<%= config.tmpDir %>'}, // includes files in path and its subdirs
+        ]
+      }
+    },
+    /*
+      Minify concatenated CSS
+    */
+    cssmin: {
+      dist: {
+        files: {
+          '<%= pkg.name %>.min.css': ['<%= concat.css.dest %>']
+        }
+      }
+    },
+    /*
+      Embed all image refs as base64 encoded data URIs
+    */
+    imageEmbed: {
+      dist: {
+        src: [ '<%= config.tmpDir %>/**/*.css' ],
+        dest: '.', // the same dir as src
+        options: {
+          deleteAfterEncoding : true
+        }
+      }
+    },
+    /*
+      Start a web server for local development
+    */
+    connect: {
+      server: {
+        options: {
+          port: 9292,
+          keepalive: true,
+        }
+      }
+    },
+    /* 
+      Remove built files 
+    */
+    clean: ['<%= pkg.name %>.min.css', '<%= pkg.name %>.css', '<%= config.tmpDir %>']
+  });
+
+  grunt.loadNpmTasks('grunt-autoprefixer');
+  grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-contrib-concat');
+  grunt.loadNpmTasks('grunt-contrib-connect');
+  grunt.loadNpmTasks('grunt-contrib-copy');
+  grunt.loadNpmTasks('grunt-contrib-cssmin');
+  grunt.loadNpmTasks('grunt-image-embed');
+
+  grunt.registerTask('build', ['clean', 'copy:tmp', 'imageEmbed', 'concat', 'autoprefixer', 'cssmin']);
+};

data/lib/wpa_cli_web/public/bower_components/house-style/Guardfile

@@ -0,0 +1,19 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+config = {
+  :host => '0.0.0.0',
+  :port => '35729',
+}
+
+guard 'livereload' do
+  watch(%r{components/.+\.(css|js|html)})
+  # watch(%r{app/views/.+\.(erb|haml|slim)$})
+  # watch(%r{app/helpers/.+\.rb})
+  # watch(%r{public/.+\.(css|js|html)})
+  # watch(%r{config/locales/.+\.yml})
+  # Rails Assets Pipeline
+  # watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html))).*}) { |m| "/assets/#{m[3]}" }
+end
+
+guard 'webrick'

data/lib/wpa_cli_web/public/bower_components/house-style/bower.json

@@ -0,0 +1,7 @@
+{
+  "name": "house-style",
+  "version": "0.0.1",
+  "dependencies": {
+    "normalize-css": "~2.1.2"
+  }
+}

data/lib/wpa_cli_web/public/bower_components/house-style/bower_components/normalize-css/LICENSE.md

@@ -0,0 +1,19 @@
+Copyright (c) Nicolas Gallagher and Jonathan Neal
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/lib/wpa_cli_web/public/bower_components/house-style/bower_components/normalize-css/README.md

@@ -0,0 +1,49 @@
+# normalize.css v2
+
+Normalize.css is a customisable CSS file that makes browsers render all
+elements more consistently and in line with modern standards. We researched the
+differences between default browser styles in order to precisely target only
+the styles that need normalizing.
+
+[Check out the demo](http://necolas.github.io/normalize.css/latest/test.html)
+
+[Legacy browser support is available in v1](https://github.com/necolas/normalize.css/tree/v1)
+
+## Install
+
+Download from the [project page](http://necolas.github.io/normalize.css/).
+
+Install with [Bower](http://bower.io/): `bower install --save normalize-css`
+
+## What does it do?
+
+* Preserves useful defaults, unlike many CSS resets.
+* Normalizes styles for a wide range of elements.
+* Corrects bugs and common browser inconsistencies.
+* Improves usability with subtle improvements.
+* Explains what code does using detailed comments.
+
+## How to use it
+
+Normalize.css is intended to be used as an alternative to CSS resets.
+
+It's suggested that you read the `normalize.css` file and consider customising
+it to meet your needs. Alternatively, include the file in your project and
+override the defaults later in your CSS.
+
+## Browser support
+
+* Google Chrome
+* Mozilla Firefox 4+
+* Apple Safari 5+
+* Opera 12+
+* Internet Explorer 8+
+
+## Contribute
+
+Please read the CONTRIBUTING.md
+
+## Acknowledgements
+
+Normalize.css is a project by [Nicolas Gallagher](https://github.com/necolas),
+co-created with [Jonathan Neal](https://github.com/jonathantneal).

data/lib/wpa_cli_web/public/bower_components/house-style/bower_components/normalize-css/bower.json

@@ -0,0 +1,23 @@
+{
+  "name": "normalize-css",
+  "version": "2.1.2",
+  "main": "normalize.css",
+  "author": {
+    "name": "Nicolas Gallagher"
+  },
+  "ignore": [
+    "CHANGELOG.md",
+    "CONTRIBUTING.md",
+    "component.json",
+    "test.html"
+  ],
+  "gitHead": "56af2b11703dd9e8819ae725ee67192a4b55a48c",
+  "readme": "# normalize.css v2\n\nNormalize.css is a customisable CSS file that makes browsers render all\nelements more consistently and in line with modern standards. We researched the\ndifferences between default browser styles in order to precisely target only\nthe styles that need normalizing.\n\n[Check out the demo](http://necolas.github.io/normalize.css/latest/test.html)\n\n[Legacy browser support is available in v1](https://github.com/necolas/normalize.css/tree/v1)\n\n## Install\n\nDownload from the [project page](http://necolas.github.io/normalize.css/).\n\nInstall with [Bower](http://bower.io/): `bower install --save normalize-css`\n\n## What does it do?\n\n* Preserves useful defaults, unlike many CSS resets.\n* Normalizes styles for a wide range of elements.\n* Corrects bugs and common browser inconsistencies.\n* Improves usability with subtle improvements.\n* Explains what code does using detailed comments.\n\n## How to use it\n\nNormalize.css is intended to be used as an alternative to CSS resets.\n\nIt's suggested that you read the `normalize.css` file and consider customising\nit to meet your needs. Alternatively, include the file in your project and\noverride the defaults later in your CSS.\n\n## Browser support\n\n* Google Chrome\n* Mozilla Firefox 4+\n* Apple Safari 5+\n* Opera 12+\n* Internet Explorer 8+\n\n## Contribute\n\nPlease read the CONTRIBUTING.md\n\n## Acknowledgements\n\nNormalize.css is a project by [Nicolas Gallagher](https://github.com/necolas),\nco-created with [Jonathan Neal](https://github.com/jonathantneal).\n",
+  "readmeFilename": "README.md",
+  "_id": "normalize-css@2.1.2",
+  "description": "Normalize.css is a customisable CSS file that makes browsers render all elements more consistently and in line with modern standards. We researched the differences between default browser styles in order to precisely target only the styles that need normalizing.",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/necolas/normalize.css.git"
+  }
+}

data/lib/wpa_cli_web/public/bower_components/house-style/bower_components/normalize-css/normalize.css

@@ -0,0 +1,396 @@
+/*! normalize.css v2.1.2 | MIT License | git.io/normalize */
+
+/* ==========================================================================
+   HTML5 display definitions
+   ========================================================================== */
+
+/**
+ * Correct `block` display not defined in IE 8/9.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+nav,
+section,
+summary {
+    display: block;
+}
+
+/**
+ * Correct `inline-block` display not defined in IE 8/9.
+ */
+
+audio,
+canvas,
+video {
+    display: inline-block;
+}
+
+/**
+ * Prevent modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
+ */
+
+audio:not([controls]) {
+    display: none;
+    height: 0;
+}
+
+/**
+ * Address styling not present in IE 8/9.
+ */
+
+[hidden] {
+    display: none;
+}
+
+/* ==========================================================================
+   Base
+   ========================================================================== */
+
+/**
+ * 1. Set default font family to sans-serif.
+ * 2. Prevent iOS text size adjust after orientation change, without disabling
+ *    user zoom.
+ */
+
+html {
+    font-family: sans-serif; /* 1 */
+    -ms-text-size-adjust: 100%; /* 2 */
+    -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/**
+ * Remove default margin.
+ */
+
+body {
+    margin: 0;
+}
+
+/* ==========================================================================
+   Links
+   ========================================================================== */
+
+/**
+ * Address `outline` inconsistency between Chrome and other browsers.
+ */
+
+a:focus {
+    outline: thin dotted;
+}
+
+/**
+ * Improve readability when focused and also mouse hovered in all browsers.
+ */
+
+a:active,
+a:hover {
+    outline: 0;
+}
+
+/* ==========================================================================
+   Typography
+   ========================================================================== */
+
+/**
+ * Address variable `h1` font-size and margin within `section` and `article`
+ * contexts in Firefox 4+, Safari 5, and Chrome.
+ */
+
+h1 {
+    font-size: 2em;
+    margin: 0.67em 0;
+}
+
+/**
+ * Address styling not present in IE 8/9, Safari 5, and Chrome.
+ */
+
+abbr[title] {
+    border-bottom: 1px dotted;
+}
+
+/**
+ * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
+ */
+
+b,
+strong {
+    font-weight: bold;
+}
+
+/**
+ * Address styling not present in Safari 5 and Chrome.
+ */
+
+dfn {
+    font-style: italic;
+}
+
+/**
+ * Address differences between Firefox and other browsers.
+ */
+
+hr {
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+    height: 0;
+}
+
+/**
+ * Address styling not present in IE 8/9.
+ */
+
+mark {
+    background: #ff0;
+    color: #000;
+}
+
+/**
+ * Correct font family set oddly in Safari 5 and Chrome.
+ */
+
+code,
+kbd,
+pre,
+samp {
+    font-family: monospace, serif;
+    font-size: 1em;
+}
+
+/**
+ * Improve readability of pre-formatted text in all browsers.
+ */
+
+pre {
+    white-space: pre-wrap;
+}
+
+/**
+ * Set consistent quote types.
+ */
+
+q {
+    quotes: "\201C" "\201D" "\2018" "\2019";
+}
+
+/**
+ * Address inconsistent and variable font size in all browsers.
+ */
+
+small {
+    font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ */
+
+sub,
+sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
+}
+
+sup {
+    top: -0.5em;
+}
+
+sub {
+    bottom: -0.25em;
+}
+
+/* ==========================================================================
+   Embedded content
+   ========================================================================== */
+
+/**
+ * Remove border when inside `a` element in IE 8/9.
+ */
+
+img {
+    border: 0;
+}
+
+/**
+ * Correct overflow displayed oddly in IE 9.
+ */
+
+svg:not(:root) {
+    overflow: hidden;
+}
+
+/* ==========================================================================
+   Figures
+   ========================================================================== */
+
+/**
+ * Address margin not present in IE 8/9 and Safari 5.
+ */
+
+figure {
+    margin: 0;
+}
+
+/* ==========================================================================
+   Forms
+   ========================================================================== */
+
+/**
+ * Define consistent border, margin, and padding.
+ */
+
+fieldset {
+    border: 1px solid #c0c0c0;
+    margin: 0 2px;
+    padding: 0.35em 0.625em 0.75em;
+}
+
+/**
+ * 1. Correct `color` not being inherited in IE 8/9.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ */
+
+legend {
+    border: 0; /* 1 */
+    padding: 0; /* 2 */
+}
+
+/**
+ * 1. Correct font family not being inherited in all browsers.
+ * 2. Correct font size not being inherited in all browsers.
+ * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
+ */
+
+button,
+input,
+select,
+textarea {
+    font-family: inherit; /* 1 */
+    font-size: 100%; /* 2 */
+    margin: 0; /* 3 */
+}
+
+/**
+ * Address Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+
+button,
+input {
+    line-height: normal;
+}
+
+/**
+ * Address inconsistent `text-transform` inheritance for `button` and `select`.
+ * All other form control elements do not inherit `text-transform` values.
+ * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
+ * Correct `select` style inheritance in Firefox 4+ and Opera.
+ */
+
+button,
+select {
+    text-transform: none;
+}
+
+/**
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ *    and `video` controls.
+ * 2. Correct inability to style clickable `input` types in iOS.
+ * 3. Improve usability and consistency of cursor style between image-type
+ *    `input` and others.
+ */
+
+button,
+html input[type="button"], /* 1 */
+input[type="reset"],
+input[type="submit"] {
+    -webkit-appearance: button; /* 2 */
+    cursor: pointer; /* 3 */
+}
+
+/**
+ * Re-set default cursor for disabled elements.
+ */
+
+button[disabled],
+html input[disabled] {
+    cursor: default;
+}
+
+/**
+ * 1. Address box sizing set to `content-box` in IE 8/9.
+ * 2. Remove excess padding in IE 8/9.
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+    box-sizing: border-box; /* 1 */
+    padding: 0; /* 2 */
+}
+
+/**
+ * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
+ * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
+ *    (include `-moz` to future-proof).
+ */
+
+input[type="search"] {
+    -webkit-appearance: textfield; /* 1 */
+    -moz-box-sizing: content-box;
+    -webkit-box-sizing: content-box; /* 2 */
+    box-sizing: content-box;
+}
+
+/**
+ * Remove inner padding and search cancel button in Safari 5 and Chrome
+ * on OS X.
+ */
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+    -webkit-appearance: none;
+}
+
+/**
+ * Remove inner padding and border in Firefox 4+.
+ */
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+    border: 0;
+    padding: 0;
+}
+
+/**
+ * 1. Remove default vertical scrollbar in IE 8/9.
+ * 2. Improve readability and alignment in all browsers.
+ */
+
+textarea {
+    overflow: auto; /* 1 */
+    vertical-align: top; /* 2 */
+}
+
+/* ==========================================================================
+   Tables
+   ========================================================================== */
+
+/**
+ * Remove most spacing between table cells.
+ */
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}