tgios 0.0.33 → 0.0.34

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmQ2NjZhNDUwNmRiOTJjNTAyY2MzYmMzN2Q3ZWY1MTY2NjNjNGM5Zg==
+    ZGQxNmQ5YzAxNDM2MTUxYWRhYTc5ZmQ0YjIyYjVhZjgxYzljNDUyZA==
   data.tar.gz: !binary |-
-    NGFjMWE1YWJiYmI1YzM3MTQzYjI4ODhjOWFiNDhkNzAwYzIxZWM1ZA==
+    MjViMzE5MmQ0ZmI4N2Q2MzU5NTc3ZTA3OWUwY2JiZWZmMWVmODJkMA==
 SHA512:
   metadata.gz: !binary |-
-    MDk4MDFhN2I1NzkwYWM3NmRiMTY1ZmMyOGZiYzcwOGViMWUzNGE5MGFiMzU0
-    NWM0MDI0OTEyMTBjNDk5YzJjMGJhMGQ0YzFmNWYwY2JiYWE4YmUzN2UwZTk5
-    OGVjNzFiZmI5MGU5OTJkZjg3MjI4MTk4MDNmMWJlZmMxYzgxZjU=
+    ODM3OTgyMTdjZGIzMDkxZjg0NWI4MWQzYjc4MTI1MzdhNjk2ZTE1ODEwYWVh
+    OTY3MmY3ZDMwNjZiZTk2N2NlNzMwYWU2YjJlZTFmMGVlMmUzMWZiZmQ2NGVh
+    YzY1MDFiZDgwODU5NmI3YjFiMWE5MTM0ODRiNmRlYzU4NmExZWM=
   data.tar.gz: !binary |-
-    YzJmMDQ4NDc3ODk0MjE4NjJmNDQxYzFlYmY2N2M3MmY4ZmFiYTg0NTM0NWQ1
-    NzJjNDQxMjEyNDFiMWMyNDJiOWQ4ZWZmOGZhNmE3Y2IyMzkyNjZhMTRmODNi
-    MjgyYTJlNTBmM2E0OTlhNzg3MjQ3Yjc3MmZkYWNkNzYyYWZlZmI=
+    ZDE1YjNjMGI4ZjA0NjViOTViYjQwN2VlMGRkM2Q3NjNkN2EzZTNhZmU1ZWQ3
+    YjA0ZDU3OTZlNTEwN2E0OWIwMzRmYWQ3YzNhMGVlMGQyNGVjZGRiYjE4ZTQ1
+    NTUzOTc1NGVkZTg1MDAyZjVjOTk0NDkzMzgyZGQ4Yzc2OTI4MDI=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tgios (0.0.33)
+    tgios (0.0.34)
       awesome_print_motion
       motion-layout
       plastic_cup (>= 0.1.1)

data/lib/tgios/beacon_manager.rb

@@ -11,7 +11,11 @@ module Tgios
   end
 
   class BeaconManager < BindingBase
-    attr_accessor :rssi
+    attr_accessor :rssi, :current_beacon
+
+    BeaconFoundKey = 'Tgios::BeaconManager::BeaconFound'
+    EnterRegionKey = 'Tgios::BeaconManager::EnterRegion'
+    ExitRegionKey = 'Tgios::BeaconManager::ExitRegion'
 
     def self.default=(val)
       @default = val
@@ -21,9 +25,11 @@ module Tgios
       @default
     end
 
-    def initialize(uuid, rssi=-70)
+    def initialize(uuid, rssi=-70, background=false, tolerance=5)
       @events = {}
       @previous_beacons = []
+      @background = background
+      @tolerance = (tolerance || 5)
 
       @uuid = NSUUID.alloc.initWithUUIDString(uuid)
       @rssi = rssi
@@ -47,38 +53,45 @@ module Tgios
     def locationManager(manager, didDetermineState: state, forRegion: region)
       NSLog "didDetermineState #{state}"
       if state == CLRegionStateInside
-        location_manager.startRangingBeaconsInRegion(region)
+        manager.startRangingBeaconsInRegion(region)
       end
     end
 
     def locationManager(manager, didEnterRegion: region)
       NSLog 'didEnterRegion'
       if region.isKindOfClass(CLBeaconRegion)
-        location_manager.startRangingBeaconsInRegion(region)
+        manager.startRangingBeaconsInRegion(region)
       end
     end
 
     def locationManager(manager, didExitRegion: region)
       NSLog 'didExitRegion'
       if region.isKindOfClass(CLBeaconRegion)
-        location_manager.stopRangingBeaconsInRegion(region)
+        manager.stopRangingBeaconsInRegion(region)
+        if has_event(:exit_region)
+          @events[:exit_region].call(region)
+        end
       end
     end
 
     def locationManager(manager, didRangeBeacons: beacons, inRegion: region)
       if has_event(:beacons_found)
-        @events[:beacons_found].call(beacons.select{|b| b.proximity != CLProximityUnknown && b.rssi >= @rssi})
+        @events[:beacons_found].call(beacons.select{|b| b.proximity != CLProximityUnknown && b.rssi >= @rssi}, beacons)
       end
-      if has_event(:beacon_found)
-        known_beacons = beacons.select{|b| b.proximity != CLProximityUnknown}.sort_by{|b| b.rssi}
-        if known_beacons.present?
-          beacon = known_beacons.last if known_beacons.last.rssi >= @rssi
-          beacon ||= known_beacons.last if known_beacons.length == 1 && known_beacons.last.rssi >= @rssi - 1
-        end
 
-        push_beacon(beacon)
+      known_beacons = beacons.select{|b| b.proximity != CLProximityUnknown}.sort_by{|b| b.rssi}
+      if known_beacons.present?
+        beacon = known_beacons.last if known_beacons.last.rssi >= @rssi
+        beacon ||= known_beacons.last if known_beacons.length == 1 && known_beacons.last.rssi >= @rssi - 1
+      end
+
+      push_beacon(beacon)
+
+      if has_event(:beacon_found)
         @events[:beacon_found].call(@current_beacon)
       end
+
+      BeaconFoundKey.post_notification(self, {region: region, beacon: @current_beacon})
     end
 
     def location_manager
@@ -86,10 +99,26 @@ module Tgios
           begin
             manager = CLLocationManager.alloc.init
             manager.delegate = self
+            request_authorization(manager)
             manager
           end
     end
 
+    def request_authorization(manager)
+      if manager.respond_to?(:requestAlwaysAuthorization)
+        status = CLLocationManager.authorizationStatus
+        if status == KCLAuthorizationStatusAuthorizedWhenInUse || status == KCLAuthorizationStatusDenied
+          title = (status == kCLAuthorizationStatusDenied) ? "Location services are off" : "Background location is not enabled"
+          message = "To use background location you must turn on 'Always' in the Location Services Settings"
+
+          UIAlertView.alert(title, message: message)
+        else
+          manager.requestAlwaysAuthorization
+        end
+      end
+
+    end
+
     def start_monitor
       location_manager.startMonitoringForRegion(@region)
       location_manager.requestStateForRegion(@region)
@@ -107,7 +136,7 @@ module Tgios
 
     def on_enter_background(noti)
       NSLog 'on_enter_background'
-      stop_monitor
+      stop_monitor unless @background
     end
 
     def has_event(event)
@@ -125,7 +154,7 @@ module Tgios
         end
       end
       @previous_beacons << beacon
-      @previous_beacons.delete_at(0) if @previous_beacons.length > 3
+      @previous_beacons.delete_at(0) if @previous_beacons.length > @tolerance
     end
 
     def beacon_eqs(beacon1, beacon2)

data/lib/tgios/scan_qr_controller.rb

@@ -1,5 +1,7 @@
 module Tgios
   class ScanQrController < UIViewController
+    attr_accessor :types
+
     def viewDidLoad
       super
       self.view.backgroundColor = :dark_gray.uicolor
@@ -39,25 +41,13 @@ module Tgios
       @output = AVCaptureMetadataOutput.alloc.init
       @output.setMetadataObjectsDelegate self, queue: @queue.dispatch_object
 
-      @session.addInput @input
-      @session.addOutput @output
-      @output.metadataObjectTypes = [ AVMetadataObjectTypeQRCode ]
-
-      @isScanning = true
-
-      @session.startRunning
-      #NSLog "session running: #{@session.running?}"
-
-
-
       camera_size = layerRect.size
       sq_size = 240
       sq_border = 20
       line_length = 60
+      border_color = :white.cgcolor(0.8)
       sq_x = (camera_size.width - sq_size) / 2
       sq_y = (camera_size.height - sq_size) / 2
-      v_height = sq_size - sq_border * 2
-      border_color = :white.cgcolor(0.8)
 
       square = Base.style(CALayer.layer, {frame: [[sq_x, sq_y],[sq_size, sq_size]]})
 
@@ -81,25 +71,30 @@ module Tgios
 
       self.view.layer.addSublayer square
 
+      @output.rectOfInterest = [[sq_y / camera_size.height, sq_x / camera_size.width], [sq_size / camera_size.height, sq_size / camera_size.width]]
+
+      @session.addInput @input
+      @session.addOutput @output
+      @output.metadataObjectTypes = ( @types || [AVMetadataObjectTypeQRCode] )
+
+      @isScanning = true
+
+      @session.startRunning
+
       true
     end
 
     def captureOutput(captureOutput, didOutputMetadataObjects: metadataObjects, fromConnection: connection)
-
       metadataObject = metadataObjects[0]
 
-      if !@scanned && metadataObject.present? && metadataObject.type == AVMetadataObjectTypeQRCode
+      if !@scanned && metadataObject.present?
         @scanned = true
-        #NSLog "#{metadataObjects[0].stringValue}"
-
 
         self.performSelectorOnMainThread('openQRCode:', withObject: metadataObject.stringValue, waitUntilDone: false)
       end
     end
 
     def openQRCode(result)
-      #NSLog "openQRCode()"
-
       stop_scanning
 
       @events[:result_scanned].call(result)
@@ -114,7 +109,6 @@ module Tgios
         @isScanning = false
 
         @session.stopRunning
-        #NSLog "session running: #{@session.running?}"
 
         @previewLayer.removeFromSuperlayer
         @previewLayer = nil

data/lib/tgios/ui_table_view_list_binding.rb

@@ -66,6 +66,15 @@ module Tgios
     end
 
     def tableView(tableView, heightForRowAtIndexPath: index_path)
+      height = if @events.has_key?(:cell_height)
+                 record = @list[index_path.row]
+                 @events[:cell_height].call(index_path, record)
+               end
+      return height if height.is_a?(Numeric)
+      cell_height
+    end
+
+    def cell_height
       return @options[:height] unless @options[:height].nil?
       if @options[:lines]
         26 + 19 * (@options[:lines] || 2)
@@ -88,6 +97,32 @@ module Tgios
         end
       end
     end
+    
+    def tableView(tableView, commitEditingStyle: editingStyle, forRowAtIndexPath: index_path)
+      if editingStyle == UITableViewCellEditingStyleDelete
+        if @events[:delete_row].present?
+          @events[:delete_row].call(@list[index_path.row], {tableView: tableView, commitEditingStyle: editingStyle, forRowAtIndexPath:index_path}) do |success|
+            tableView.deleteRowsAtIndexPaths([index_path], withRowAnimation: UITableViewRowAnimationFade) if success
+          end
+        end
+      end
+    end
+    
+    def tableView(tableView, canEditRowAtIndexPath: index_path)
+      can_edit = false
+
+      if @events[:delete_row].present?
+        if @events[:can_edit].present?
+          @events[:can_edit].call(tableView, index_path) do |success|
+            can_edit = success
+          end
+        else
+          can_edit = true
+        end
+      end
+
+      can_edit
+    end
 
     def onPrepareForRelease
       @events=nil
@@ -103,4 +138,4 @@ module Tgios
 
   end
 
-end
+end

data/lib/tgios/ui_table_view_model_binding.rb

@@ -45,10 +45,14 @@ module Tgios
       bindings_prepare_release
       @bindings={}
       @tv_bindings={}
-      self.model=model
       @tableView.dataSource=self
       @tableView.delegate=self
-      @table_utility_binding = UITableViewUtilityBinding.new.bind(@tableView)
+      self.model=model
+      if @table_utility_binding.nil?
+        @table_utility_binding = UITableViewUtilityBinding.new.bind(@tableView)
+      else
+        @table_utility_binding.bind(@tableView)
+      end
       self
     end
 

data/lib/tgios/version.rb

@@ -1,3 +1,3 @@
 module Tgios
-  VERSION = '0.0.33'
+  VERSION = '0.0.34'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tgios
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
 platform: ruby
 authors:
 - April Tsang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sugarcube