locomotion 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb78cbd836a4e268cfa2de4229b0321e79395a84
-  data.tar.gz: 076ec8aad1472b53c1134d002a962dc9b6121ca3
+  metadata.gz: d0fe2c6c62bc55a832a7f7bed5545478b482a452
+  data.tar.gz: 3d395b4d55710a58b21f66644cb7f1c2200f8fcb
 SHA512:
-  metadata.gz: e46baff6202dc6f2567abcca48c74c0b5f9fea8bbab2606f13728a0380b605d7d133af6b53ab7790b1630543e6eb091e28dc148c1bd23bc329a6200fccfde970
-  data.tar.gz: 176e7098e6874a3303870f8a17ea623968e611e8bf69ed577fd7ba5c3edf3de5eee205b8848eb5bcb0fde9652961da715d31cdf7394e881915c533b6c13b5f86
+  metadata.gz: 4eea17a90db739eb0b6d4be28317baecc28d1a4a64a0b47abdd29a97a1575af2b0e295e39a8334ce31d954fc01c0793cb9b1ece70a01ac6ed18d81239fa4bd22
+  data.tar.gz: 2480e3a90d553128e90ea053525de21222e3855a77ce891af217ade4268838a59f9f0d398ed461d59ff28ed3bf04c768a5135e5708b2ffd0a843a558dbeb4472

data/lib/locomotion/version.rb

@@ -1,3 +1,3 @@
 module Locomotion
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/motion/locomotion.rb

@@ -1,6 +1,21 @@
 module Locomotion
   class << self
 
+    def accuracy= level
+      watchman.switch_to_accuracy({
+          best_for_navigation: KCLLocationAccuracyBestForNavigation,
+          best:                KCLLocationAccuracyBest,
+          nearest_ten:         KCLLocationAccuracyNearestTenMeters,
+          nearest_hundred:     KCLLocationAccuracyHundredMeters,
+          nearest_km:          KCLLocationAccuracyKilometer,
+          nearest_3km:         KCLLocationAccuracyThreeKilometers
+        }.fetch(level, KCLLocationAccuracyBest))
+    end
+
+    def distance_filter= distance
+      watchman.switch_to_distance_filter distance || KCLDistanceFilterNone
+    end
+
     def watch opts = {}, &block
       watchman.process opts
       watchman.listeners << block

data/motion/locomotion/location.rb

@@ -30,6 +30,10 @@ module Locomotion
      @original.horizontalAccuracy
    end
 
+   def distance_to other
+     @original.distanceFromLocation CLLocation.alloc.initWithLatitude other.latitude, longitude: other.longitude
+   end
+
    def inspect
      "<Location #{latitude} #{longitude} >"
    end

data/motion/locomotion/watchman.rb

@@ -28,7 +28,13 @@ module Locomotion
       @location_manager.allowDeferredLocationUpdatesUntilTraveled 10000, timeout: time
     end
 
+    def reset
+      @location_manager.stopUpdatingLocation
+      @location_manager.startUpdatingLocation
+    end
+
     def clear
+      @listeners = []
       @location_manager.stopUpdatingLocation
     end
 
@@ -41,5 +47,15 @@ module Locomotion
     def error code
     end
 
+    def switch_to_accuracy accuracy
+      @location_manager.desiredAccuracy = accuracy
+      reset
+    end
+
+    def switch_to_distance_filter distance
+      @location_manager.distanceFilter = distance
+      reset
+    end
+
   end
 end

data/spec/locomotion/location_spec.rb

@@ -0,0 +1,42 @@
+describe 'location' do
+  before do
+    @cllocation = CLLocation.alloc.initWithCoordinate CLLocationCoordinate2D.new(1,2),
+      altitude: 10,
+      horizontalAccuracy: 4,
+      verticalAccuracy: 3,
+      course: 1.3,
+      speed: 1.5,
+      timestamp: Time.at(123456789)
+    @location = Locomotion::Location.alloc.init @cllocation
+  end
+
+  it 'exposes latitude' do
+    @location.latitude.should.equal 1
+  end
+  it 'exposes longitude' do
+    @location.longitude.should.equal 2
+  end
+  it 'exposes speed' do
+    @location.speed.should.equal 1.5
+  end
+  it 'exposes heading' do
+    @location.heading.should.equal 1.3
+  end
+  it 'exposes time' do
+    @location.time.should.equal Time.at(123456789)
+  end
+  it 'exposes accuracy' do
+    @location.accuracy.should.equal 4
+  end
+
+  it 'formats nicely' do
+    @location.to_s.should.equal "<Location 1.0 2.0 >"
+    @location.to_s.should.equal @location.inspect
+  end
+
+  it 'can calculate distance to another location' do
+    another_location = Locomotion::Location.alloc.init CLLocation.alloc.initWithLatitude 1, longitude: 3
+    @location.distance_to(another_location).should.be.close 111302.649, 0.001
+  end
+
+end

data/spec/locomotion/watchman_spec.rb

@@ -1,31 +1,18 @@
 describe 'the watchman' do
 
   before do
-    test_manager = Class.new do
-      attr_accessor :delegate, :distanceFilter, :desiredAccuracy, :purpose
-
-      def startUpdatingLocation
-        commands << :start
-      end
-      def stopUpdatingLocation
-        commands << :stop
-      end
-      def allowDeferredLocationUpdatesUntilTraveled distance, timeout: time
-        commands << [:defer,distance,time]
-      end
-      def commands
-        @commands ||= []
-      end
-    end
-    @watchman = Locomotion::Watchman.alloc.init test_manager
+    @watchman = Locomotion::Watchman.alloc.init FakeLocationManager
+    @watchman.location_manager.reset
   end
 
   it 'initialises the location manager with the minimum distance filter' do
     @watchman.location_manager.distanceFilter.should.equal KCLDistanceFilterNone
   end
+
   it 'initialises the location manager with the best accuracy' do
     @watchman.location_manager.desiredAccuracy.should.equal KCLLocationAccuracyBest
   end
+
   it 'sets the delegate to be a locomotion delegate' do
     @watchman.location_manager.should.satisfy do |lm|
       lm.delegate.class == Locomotion::Delegate and
@@ -47,19 +34,38 @@ describe 'the watchman' do
     @watchman.go
     @watchman.location_manager.commands.should.equal [:start]
   end
+
   it 'tells location manager to defer on pause' do
     @watchman.pause 42
     @watchman.location_manager.commands.should.equal [[:defer,10000,42]]
   end
+
+  it 'tells location manager to stop then start on reset' do
+    @watchman.reset
+    @watchman.location_manager.commands.should.equal [:stop,:start]
+  end
+
   it 'tells location manager to stop on clear' do
     @watchman.clear
     @watchman.location_manager.commands.should.equal [:stop]
   end
 
+  it 'removes listeners on clear' do
+    @watchman.listeners << :a
+    @watchman.clear
+    @watchman.listeners.should.equal []
+  end
+
   it 'tells listeners on update' do
     @watchman.listeners << proc { |location| @location = location }
     @watchman.update CLLocation.alloc.initWithLatitude 1, longitude: 1
     @location.should.satisfy { |l| l.latitude == 1 && l.longitude == 1 }
   end
 
+  { switch_to_accuracy: :desiredAccuracy, switch_to_distance_filter: :distanceFilter }.each do |method,setting|
+    it "can configure #{setting} but resets afterwards" do
+      @watchman.send(method,42)
+      @watchman.location_manager.commands.should.equal [[setting,42],:stop,:start]
+    end
+  end
 end

data/spec/support/fake_location_manager.rb

@@ -0,0 +1,33 @@
+class FakeLocationManager
+  attr_accessor :delegate, :distanceFilter, :desiredAccuracy, :purpose
+
+  def distanceFilter= value
+    commands << [:distanceFilter,value]
+    @distanceFilter = value
+  end
+
+  def desiredAccuracy= value
+    commands << [:desiredAccuracy,value]
+    @desiredAccuracy= value
+  end
+
+  def startUpdatingLocation
+    commands << :start
+  end
+
+  def stopUpdatingLocation
+    commands << :stop
+  end
+
+  def allowDeferredLocationUpdatesUntilTraveled distance, timeout: time
+    commands << [:defer,distance,time]
+  end
+
+  def commands
+    @commands ||= []
+  end
+
+  def reset
+    @commands = []
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotion
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jon Rowe
@@ -29,7 +29,7 @@ cert_chain:
   2feWfO4gCNmvfFjULOAYHq9JHEjN5SLSXvj5HdSnDcCyIfJKn5Ya3JahWQaWIsXf
   /NPE/mB57TOwj+d7XUa2NC4HUadF8R51IYEcIB0PpIEzJlKtfXFcOZxO
   -----END CERTIFICATE-----
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,9 @@ files:
 - motion/locomotion/watchman.rb
 - spec/integration_spec.rb
 - spec/locomotion/delegate_spec.rb
+- spec/locomotion/location_spec.rb
 - spec/locomotion/watchman_spec.rb
+- spec/support/fake_location_manager.rb
 homepage: https://github.com/JonRowe/locomotion
 licenses:
 - MIT
@@ -110,4 +112,6 @@ test_files:
 - app/app_delegate.rb
 - spec/integration_spec.rb
 - spec/locomotion/delegate_spec.rb
+- spec/locomotion/location_spec.rb
 - spec/locomotion/watchman_spec.rb
+- spec/support/fake_location_manager.rb