wpa_cli_web 0.0.8 → 0.0.9

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.pattern = "test/**/*_test.rb"
+end
+
+task :default => [:test]

data/lib/wpa_cli_web/access_point_list.rb

@@ -7,12 +7,29 @@ class AccessPointList
   end
 
   def access_points
-    @access_points.
-      reject { |network| network.ssid.nil? }.
-      group_by {|network| network.ssid}.
-      map {|ssid, network_group| network_group}.
-      map {|network_group| network_group.sort_by { |network| network.signal_level}.reverse.take(1)}.
-      flatten.
+      strongest_unique_ssids_sorted_alphabetically
+  end
+
+  def strongest_unique_ssids_sorted_alphabetically
+    strongest_unique_ssids.
       sort_by { |network| network.ssid }
   end
+
+  def strongest_unique_ssids
+    network_groups.
+      map {|network_group| network_group.sort_by { |network| network.signal_level}.reverse.take(1)}.
+      flatten
+  end
+
+  def network_groups
+    access_points_grouped_by_ssid.map {|ssid, network_group| network_group}
+  end
+
+  def access_points_grouped_by_ssid
+    access_points_with_an_ssid.group_by {|network| network.ssid}
+  end
+
+  def access_points_with_an_ssid
+    @access_points.reject { |network| network.ssid.nil? }
+  end
 end

data/test/wpa_cli_web/access_point_list_test.rb

@@ -0,0 +1,28 @@
+require 'minitest/autorun'
+require 'wpa_cli_ruby'
+require 'mocha'
+require_relative '../../lib/wpa_cli_web/access_point_list.rb'
+
+describe AccessPointList do
+  before do
+    mock_wrapper = stub()
+    mock_wrapper.expects(:scan).returns("Selected interface 'wlan0'\nOK\n")
+    response = <<-eos
+Selected interface 'wlan0'
+bssid / frequency / signal level / flags / ssid
+12:34:56:78:aa:bb	2437	-47	[WPA-EAP-TKIP][WPA2-EAP-CCMP][ESS]	z_ssid
+12:34:56:78:bb:cc	2412	-57	[WPA2-PSK-CCMP][ESS]	a_ssid
+43:34:56:78:bb:cc	2412	-87	[WPA-EAP-TKIP][WPA2-EAP-CCMP][ESS]	z_ssid
+eos
+    mock_wrapper.expects(:scan_results).returns(response)
+    @access_point_list = AccessPointList.new(WpaCliRuby::WpaCli.new(mock_wrapper))
+  end
+
+  describe "access_points" do
+    it "returns a list of unique, strongest access points sorted alphabetically" do
+      assert_equal 2, @access_point_list.access_points.size
+      assert_equal "a_ssid", @access_point_list.access_points[0].ssid
+      assert_equal "z_ssid", @access_point_list.access_points[1].ssid
+    end
+  end
+end

data/wpa_cli_web.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "wpa_cli_web"
-  spec.version       = "0.0.8"
+  spec.version       = "0.0.9"
   spec.authors       = ["Chris Lowis", "Andrew Nicolaou"]
   spec.email         = ["chris.lowis@gmail.com"]
   spec.description   = %q{Web interface for configuring wifi using wpa_cli}
@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "mocha"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wpa_cli_web
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -92,6 +92,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Web interface for configuring wifi using wpa_cli
 email:
 - chris.lowis@gmail.com
@@ -219,6 +235,7 @@ files:
 - lib/wpa_cli_web/views/networks_edit.erb
 - lib/wpa_cli_web/views/restart.erb
 - lib/wpa_cli_web/views/restarting.erb
+- test/wpa_cli_web/access_point_list_test.rb
 - wpa_cli_web.gemspec
 homepage: ''
 licenses:
@@ -245,5 +262,6 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Web interface for configuring wifi using wpa_cli
-test_files: []
+test_files:
+- test/wpa_cli_web/access_point_list_test.rb
 has_rdoc: