motion-addressbook 1.7.2 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 686d48dc6904f9b9a55304536a80a6a54ba98609
-  data.tar.gz: a8c743b34dc3ec02f54d5bcc80110eba64b698bf
+  metadata.gz: 7e8cc5964dc93254dd6daa37e210928a6ee4b881
+  data.tar.gz: fa6ba42ab41a6b365185aca1e30517791639bebd
 SHA512:
-  metadata.gz: 5b62d28e2ac4e801430d98ebb9dcd77f48dd4ce193d6966eb668ae6fa25effa893b3eba5c3c33db4da5b2fde48eabc24d22ce9f92507a5cc9c55a0567b3c6d66
-  data.tar.gz: 028c26080e06d2da83637864311c1130ea4b0399e378df4eb724b60c3097a061ecea3ba4bc2620338fe19ca652d682f73545c447254ab88bdf99204c7057faa4
+  metadata.gz: 8bbc20f804a6de90d9b79b93f6421c58d5dbb32de68454465e8da3ba7fb6a7dd0fbcbaa04190d5bba855d5f0c21666340e150a36829e5befa30df40c41bdbb91
+  data.tar.gz: a65a9af3fe0b5a258d4dcf5643076637654f6bafea5b57db0b98336e6163ea03c4a1d5901ee1fc930aecb510fdb6cfac5a79617cb43e531e0e0f125832a95a0b

data/Gemfile

@@ -1,7 +1,4 @@
 source 'https://rubygems.org'
 
-# need to do this here as alphabetically "bubble-wrap" comes after "address_book" and require fails otherwise
-gem 'bubble-wrap', '~> 1.3'
-
 # Specify your gem's dependencies in motion-addressbook.gemspec
 gemspec

data/README.md

@@ -15,23 +15,30 @@ or for [OSX](https://developer.apple.com/library/mac/#documentation/userexperien
 
 Add these lines to your application's `Rakefile`:
 
-    require 'bundler'
-    Bundler.require
+```ruby
+require 'bundler'
+Bundler.require
+```
 
 Add this line to your application's `Gemfile`:
 
-    gem 'motion-addressbook'
+```ruby
+gem 'motion-addressbook'
+```
 
 And then execute:
 
-    $ bundle
+```bash
+$ bundle
+```
 
 ### Manually without bundler
 
-Or install it yourself (remember to add the bubble-wrap dependency) as:
+Or install it yourself as:
 
-    $ gem install bubble-wrap
-    $ gem install motion-addressbook
+```bash
+$ gem install motion-addressbook
+```
 
 ## Usage
 
@@ -72,10 +79,13 @@ end
 
 ```ruby
 # ask the user to authorize us
-if AddressBook.request_authorization do |granted|
+AddressBook.request_authorization do |granted|
   # this block is invoked sometime later
   if granted
-    # do something now that the user has said "yes"
+    Dispatch::Queue.main.sync do
+      # do something now that the user has said "yes"
+      # This has to be done on the main thread.
+    end
   else
     # do something now that the user has said "no"
   end
@@ -89,7 +99,8 @@ simulator does.
 ### Showing the ABPeoplePickerNavigationController
 
 ```ruby
-AddressBook.pick do |person|
+address_book = AddressBook::AddrBook.new
+address_book.picker do |person|
   if person
     # person is an AddressBook::Person object
   else
@@ -218,6 +229,10 @@ notification.
 ```ruby
 ab.observe!
 
+proc = Proc.new {|notification| NSLog "Address Book was changed!" }
+NSNotificationCenter.defaultCenter.addObserverForName(:addressbook_updated, object:nil, queue:NSOperationQueue.mainQueue, usingBlock:proc)
+
+# Or if you're using BubbleWrap:
 App.notification_center.observe :addressbook_updated do |notification|
   NSLog "Address Book was changed!"
 end

data/Rakefile

@@ -10,21 +10,16 @@ end
 Bundler.setup
 Bundler.require
 
-require 'bubble-wrap/reactor'
-
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
   app.name = 'AddressBook'
 
-  if Motion::Project::App.osx?
+  if ENV['osx']
     app.specs_dir = "./spec/osx"
+    app.info_plist['LSUIElement'] = true
   else
     app.specs_dir = "./spec/ios"
   end
-
-  if ENV['osx']
-    app.info_plist['LSUIElement'] = true
-  end
 end
 
 # The test suite may interfere with contacts already created in the

data/app/app_delegate.rb

@@ -15,9 +15,11 @@ class AppDelegate
       AddressBook::AddrBook.new do |ab|
         case command
         when 'people'
-          puts BW::JSON.generate(ab.people.map(&:attributes))
+          people = ab.people.map(&:attributes)
+          puts NSJSONSerialization.dataWithJSONObject(people, options:0, error:nil).to_str
         when 'groups'
-          puts BW::JSON.generate(ab.groups.map { |g| {name: g.name, members: g.members.map(&:uid) }})
+          groups = ab.groups.map { |g| {name: g.name, members: g.members.map(&:uid) }}
+          puts NSJSONSerialization.dataWithJSONObject(groups, options:0, error:nil).to_str
         end
       end
     end

data/lib/motion-addressbook.rb

@@ -13,30 +13,18 @@ gem 'motion-addressbook', '<= 1.5.0'
 EOT
 end
 
-BubbleWrap.require 'motion/address_book.rb' do
-  file('motion/address_book.rb').uses_framework('AddressBook')
-end
-
-BubbleWrap.require_ios do
-  # BW.require 'motion/address_book/multi_value.rb'
-  BW.require 'motion/address_book/ios/addr_book.rb'
-  BW.require 'motion/address_book/ios/person.rb'
-  BW.require 'motion/address_book/ios/group.rb'
-  BW.require 'motion/address_book/ios/multi_valued.rb'
-  BW.require 'motion/address_book/ios/source.rb'
-
-  BW.require 'motion/address_book/ios/picker.rb' do
-    file('motion/address_book/ios/picker.rb').uses_framework('AddressBookUI')
+lib_dir_path = File.dirname(File.expand_path(__FILE__))
+Motion::Project::App.setup do |app|
+
+  app.frameworks += ['AddressBook']
+  app.files.unshift(Dir.glob(File.join(lib_dir_path, "../motion/address_book.rb")))
+
+  if app.respond_to?(:template) && app.template == :osx
+    # We have an OS X project
+    app.files.unshift(Dir.glob(File.join(lib_dir_path, "../motion/address_book/osx/**.rb")))
+  else
+    # We have an iOS project
+    app.frameworks += ['AddressBookUI']
+    app.files.unshift(Dir.glob(File.join(lib_dir_path, "../motion/address_book/ios/**.rb")))
   end
-  BW.require 'motion/address_book/ios/creator.rb' do
-    file('motion/address_book/ios/creator.rb').uses_framework('AddressBookUI')
-  end
-end
-
-BubbleWrap.require_osx do
-  BW.require 'motion/address_book/osx/addr_book.rb'
-  BW.require 'motion/address_book/osx/person.rb'
-  BW.require 'motion/address_book/osx/group.rb'
-  BW.require 'motion/address_book/osx/multi_valued.rb'
-  BW.require 'motion/address_book/osx/source.rb'
 end

data/lib/motion-addressbook/version.rb

@@ -1,5 +1,5 @@
 module Motion
   module Addressbook
-    VERSION = "1.7.2"
+    VERSION = "1.7.4"
   end
 end

data/motion-addressbook.gemspec

@@ -17,8 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'bubble-wrap', '~> 1.3'
-
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
 end

data/motion/address_book.rb

@@ -2,10 +2,10 @@ module AddressBook
   module_function
 
   def address_book
-    if App.osx?
+    if Kernel.const_defined?(:NSApplication)
       ABAddressBook.addressBook
     else # iOS
-      if Device.ios_version =~ /5/
+      if UIDevice.currentDevice.systemVersion =~ /5/
         ios5_create
       else
         ios6_create
@@ -18,7 +18,7 @@ module AddressBook
   end
 
   def count
-    if App.ios?
+    if Kernel.const_defined?(:UIApplication)
       # ABAddressBookGetPersonCount(address_book)
       instance.count
     else

data/motion/address_book/ios/addr_book.rb

@@ -37,7 +37,7 @@ module AddressBook
 
     def observe!
       @notifier = Proc.new do |ab_instance, always_nil, context|
-        App.notification_center.post :addressbook_updated, self
+        NSNotificationCenter.defaultCenter.postNotificationName(:addressbook_updated, object: self, userInfo: nil)
       end
       ab.register_callback(@notifier)
     end

data/motion/address_book/ios/person.rb

@@ -54,6 +54,8 @@ module AddressBook
         case attribute
         when :email
           emails.map {|rec| rec[:value]}.any? {|v| v == conditions[attribute]}
+        when :phone
+          phones.map {|rec| rec[:value]}.any? {|v| v == conditions[attribute]}
         else
           send(attribute) == conditions[attribute]
         end
@@ -189,11 +191,11 @@ module AddressBook
     end
 
     def photo_image
-      UIImage.alloc.initWithData(photo)
+      ABPersonHasImageData(ab_person) ? UIImage.alloc.initWithData(photo) : nil
     end
 
     def photo
-      ABPersonCopyImageData(ab_person)
+      ABPersonHasImageData(ab_person) ? ABPersonCopyImageData(ab_person) : nil
     end
 
     def photo=(photo_data)

data/motion/address_book/ios/picker.rb

@@ -39,16 +39,27 @@ module AddressBook
         end)
     end
 
+    # iOS 8+
+    def peoplePickerNavigationController(people_picker, didSelectPerson: ab_person)
+      hide(ab_person)
+    end
+
+    def peoplePickerNavigationController(people_picker, didSelectPerson: ab_person, property:_, identifier:_)
+      hide(ab_person)
+    end
+
+    # iOS 7 and below - deprecated in iOS 8+
     def peoplePickerNavigationController(people_picker, shouldContinueAfterSelectingPerson:ab_person)
       hide(ab_person)
       false
     end
 
-    def peoplePickerNavigationController(people_picker, shouldContinueAfterSelectingPerson:ab_person, property:property, identifier:id)
+    def peoplePickerNavigationController(people_picker, shouldContinueAfterSelectingPerson:ab_person, property:_, identifier:_)
       hide(ab_person)
       false
     end
 
+    # iOS 2+
     def peoplePickerNavigationControllerDidCancel(people_picker)
       hide
     end

data/motion/address_book/osx/addr_book.rb

@@ -60,9 +60,10 @@ module AddressBook
     end
 
     def observe!
-      App.notification_center.observe KABDatabaseChangedExternallyNotification do |notification|
-        App.notification_center.post :addressbook_updated, self
+      proc = Proc.new do |notification|
+        NSNotificationCenter.defaultCenter.postNotificationName(:addressbook_updated, object: self, userInfo: nil)
       end
+      NSNotificationCenter.defaultCenter.addObserverForName(KABDatabaseChangedExternallyNotification, object:nil, queue:NSOperationQueue.mainQueue, usingBlock:proc)
     end
 
     def inspect

data/spec/ios/address_book/multi_valued_spec.rb

@@ -17,7 +17,7 @@ describe AddressBook::MultiValued do
     before do
       @attributes = [
         {
-          :label => 'home page',
+          :label => 'home-page',
           :value => "http://www.mysite.com/"
         }, {
           :label => 'work',

data/spec/ios/address_book/person_spec.rb

@@ -162,7 +162,7 @@ describe AddressBook::Person do
           {:label => 'home', :city => 'Dogpatch', :state => 'KY'}
         ],
         :urls => [
-          { :label => 'home page', :value => "http://www.mysite.com/" },
+          { :label => 'home-page', :value => "http://www.mysite.com/" },
           { :label => 'work', :value => 'http://dept.bigco.com/' },
           { :label => 'school', :value => 'http://state.edu/college' }
         ],
@@ -530,9 +530,9 @@ describe AddressBook::Person do
       @ab1.observe!
       @ab2.observe!
       @notifications = 0
-      App.notification_center.observe :addressbook_updated do |notification|
-        @notifications += 1
-      end
+
+      proc = Proc.new{|notification| @notifications += 1 }
+      NSNotificationCenter.defaultCenter.addObserverForName(:addressbook_updated, object:nil, queue:NSOperationQueue.mainQueue, usingBlock:proc)
     end
 
     # should see a single notification for each change to the AB database:

data/spec/ios/address_book/picker_spec.rb

@@ -7,30 +7,40 @@ describe AddressBook::Picker do
       @selected_person = nil
       @picker = @ab.picker(animated: false) do |person|
         @selected_person = person
+        resume
       end
     end
 
     after do
       @colin.delete!
+      @picker.hide(animated: false)
     end
 
     it 'should yield the selected person' do
-      @picker.peoplePickerNavigationController(@picker_nav_controller, shouldContinueAfterSelectingPerson: @ab_person)
-      @selected_person.should.not == nil
-      @selected_person.first_name.should == 'Colin'
+      @picker.peoplePickerNavigationController(@picker_nav_controller, shouldContinueAfterSelectingPerson: @ab_person) if UIDevice.currentDevice.systemVersion < "8.0"
+      @picker.peoplePickerNavigationController(@picker_nav_controller, didSelectPerson: @ab_person) if UIDevice.currentDevice.systemVersion >= "8.0"
+      wait 5 {
+        @selected_person.should.not == nil
+        @selected_person.first_name.should == 'Colin'
+      }
     end
 
     it 'should yield the selected person' do
       property = :some_property
       id = :some_id
-      @picker.peoplePickerNavigationController(@picker_nav_controller, shouldContinueAfterSelectingPerson: @ab_person, property:property, identifier:id)
-      @selected_person.should.not == nil
-      @selected_person.first_name.should == 'Colin'
+      @picker.peoplePickerNavigationController(@picker_nav_controller, shouldContinueAfterSelectingPerson: @ab_person, property:property, identifier:id) if UIDevice.currentDevice.systemVersion < "8.0"
+      @picker.peoplePickerNavigationController(@picker_nav_controller, didSelectPerson: @ab_person, property:property, identifier:id) if UIDevice.currentDevice.systemVersion >= "8.0"
+      wait 5 {
+        @selected_person.should.not == nil
+        @selected_person.first_name.should == 'Colin'
+      }
     end
 
     it 'should yield nil when cancelled' do
       @picker.peoplePickerNavigationControllerDidCancel(@picker_nav_controller)
-      @selected_person.should == nil
+      wait 5 {
+        @selected_person.should == nil
+      }
     end
   end
 end

data/spec/ios/helpers/spec_helper.rb

@@ -6,9 +6,10 @@ module Bacon
     def ab_connect
       AddressBook::AddrBook.new do |ab|
         if ab
-          EM.schedule_on_main do
+          cb = proc do
             Bacon.run
           end
+          Dispatch::Queue.main.async &cb
         else
           warn "ACCESS DENIED - ABORTING"
           exit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-addressbook
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.4
 platform: ruby
 authors:
 - Alex Rothenberg
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2016-09-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bubble-wrap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A RubyMotion wrapper around the iOS & OSX Address Book frameworks