motion-addressbook 1.5.0 → 1.6.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c5f98fa75e972433a15e036925c3411517e2c6d6
+  data.tar.gz: 7585741f2762ec9275c74b2a40e70075dee8a2fd
+SHA512:
+  metadata.gz: 6d3f794f0adefee07007dd44591f274a34b1fae7b06c341ba73b5dea7d2136962711be09818ff27d8adef86525d900e95a6c599b40ce16c9665fced6c651ec40
+  data.tar.gz: 192065725a196bd2bb8e05bddb436b458c479bbea4933a9870a84c40e37f96e34adc5d2a41a034878fe8b56a92c55283d338170cbb28b1faf15aff42683635c1

data/.gitignore

@@ -8,8 +8,9 @@ Gemfile.lock
 vendor/Pods/Pods.xcodeproj/project.pbxproj
 vendor/Pods/build*
 
-abhack/*.bridgesupport
-abhack/build*
-
 .dat*.00*
 pkg
+.projectile
+doc
+
+TAGS

data/README.md

@@ -1,6 +1,10 @@
-# Addressbook for RubyMotion[![Build Status](https://secure.travis-ci.org/alexrothenberg/motion-addressbook.png)](http://travis-ci.org/alexrothenberg/motion-addressbook) [![Code Climate](https://codeclimate.com/github/alexrothenberg/motion-addressbook.png)](https://codeclimate.com/github/alexrothenberg/motion-addressbook) [![Gem Version](https://badge.fury.io/rb/motion-addressbook.png)](http://badge.fury.io/rb/motion-addressbook)
+# Addressbook for RubyMotion
 
-A RubyMotion wrapper around the iOS Address Book framework for RubyMotion apps.
+[![Build Status](https://secure.travis-ci.org/alexrothenberg/motion-addressbook.png)](http://travis-ci.org/alexrothenberg/motion-addressbook)
+[![Code Climate](https://codeclimate.com/github/alexrothenberg/motion-addressbook.png)](https://codeclimate.com/github/alexrothenberg/motion-addressbook)
+[![Gem Version](https://badge.fury.io/rb/motion-addressbook.png)](http://badge.fury.io/rb/motion-addressbook)
+
+A RubyMotion wrapper around the iOS and OSX Address Book frameworks for RubyMotion apps.
 
 Apple's Address Book Programming Guide for [iOS](http://developer.apple.com/library/ios/#DOCUMENTATION/ContactData/Conceptual/AddressBookProgrammingGuideforiPhone/Introduction.html)
 or for [OSX](https://developer.apple.com/library/mac/#documentation/userexperience/Conceptual/AddressBook/AddressBook.html#//apple_ref/doc/uid/10000117i)
@@ -33,26 +37,30 @@ Or install it yourself (remember to add the bubble-wrap dependency) as:
 
 ### Requesting access
 
-iOS 6 requires asking the user for permission before it allows an app to access the AddressBook.  There are 3 ways to interact with this
+iOS 6/7 requires that the user give permission before it allows an app to access the AddressBook.
 
 1 - Let the gem take care of it for you
 
 ```ruby
-people = AddressBook::Person.all
-# A dialog may be presented to the user before "people" was returned
+ab = AddressBook::AddrBook.new
+# ...do something else...
+people = ab.people
 ```
 
+The `people` method will raise an exception if called while
+authorization has not been granted.
+
 2 - Manually decide when to ask the user for authorization
 
 ```ruby
 # asking whether we are already authorized
 if AddressBook.authorized?
-  puts "This app is authorized?"
+  puts "This app is authorized!"
 else
-  puts "This app is not authorized?"
+  puts "This app is not authorized!"
 end
 
-# ask the user to authorize us
+# ask the user to authorize us (blocking)
 if AddressBook.request_authorization
   # do something now that the user has said "yes"
 else
@@ -75,6 +83,9 @@ end
 # do something here before the user has decided
 ```
 
+The iOS6 simulator does not demand AddressBook authorization. The iOS7
+simulator does.
+
 ### Showing the ABPeoplePicker
 
 ```ruby
@@ -87,67 +98,76 @@ AddressBook.pick { |person|
 }
 ```
 
-### Instantiating a person object
+You can also specify the presenting controller:
 
-There are 3 ways to instantiate a person object
+```ruby
+AddressBook.pick presenter: self do |person|
+  ...
+end
+```
+
+### Working with Person objects
 
-### To get a new person not yet connected to the iOS Address Book
+Get a list of existing people from the Address Book. On IOS, results
+are sorted using the sort order (First/Last or Last/First) chosen by
+the user in iOS Settings.
 
 ```ruby
-AddressBook::Person.new
-# => #<AddressBook::Person:0x8c67ca0 @attributes={:first_name=>nil, :last_name=>nil, :job_title=>nil, :department=>nil, :organization=>nil} @new_record=true @ab_person=#<__NSCFType:0x6d832e0>>
+ab = AddressBook::AddrBook.new
+ab.people
+=> [#<AddressBook::Person:3: {:first_name=>"John", :last_name=>"Appleseed", ...}>, ...]
 ```
 
-### To get a list of existing people from the iOS Address Book
+Create a new Person and save to the Address Book.
+
+Note that Person records can take multiple values for email addresses, phone
+numbers, postal address, social profiles, and instant messaging
+profiles.
+
+```ruby
+ab.create_person(:first_name => 'Alex', :last_name => 'Rothenberg', :emails => [{ :value => 'alex@example.com', :label => 'Home'}], :phones => [{ :value => '9920149993', :label => 'Mobile'}])
+=> #<AddressBook::Person:7: {:first_name=>"Alex", :last_name=>"Rothenberg", ...}>
+```
 
-Get all people with `.all`
+Construct a new blank Person but do not store it immediately in the Address Book.
 
 ```ruby
-AddressBook::Person.all
-# => [#<AddressBook::Person:0x6d55e90 @attributes={:first_name=>"Alex", :last_name=>"Rothenberg", :job_title=>nil, :department=>nil, :organization=>nil} @ab_person=#<__NSCFType:0x6df8bf0>>,
-#     #<AddressBook::Person:0x6d550a0 @attributes={:first_name=>"Laurent", :last_name=>"Sansonetti", :job_title=>nil, :department=>nil, :organization=>"HipByte"} @ab_person=#<__NSCFType:0x6df97d0>>]
+ab.new_person(:first_name => "Bob")
+=> #<AddressBook::Person:-1: {:first_name=>"Bob"}>
+ab.last_name = 'Brown'
+ab.save
+=> #<AddressBook::Person:9: {:first_name=>"Bob", :last_name=>"Brown"}>
 ```
 
 Get a list of all people matching one attribute with `.find_all_by_XXX`
 
 ```ruby
 AddressBook::Person.find_all_by_email('alex@example.com')
-# => [#<AddressBook::Person:0x6d55e90 @attributes={:first_name=>"Alex", :last_name=>"Rothenberg", :job_title=>nil, :department=>nil, :organization=>nil} @ab_person=#<__NSCFType:0x6df8bf0>>]
+=> [#<AddressBook::Person:14: {:first_name=>"Alex", :last_name=>"Rothenberg", ...}>]
 ```
 
-Get the first person matching one attribute with `find_by_XXX`
+Get the first person matching one attribute with `.find_by_XXX`
 
 ```ruby
 AddressBook::Person.find_by_email('alex@example.com')
-# => #<AddressBook::Person:0x6d55e90 @attributes={:first_name=>"Alex", :last_name=>"Rothenberg", :job_title=>nil, :department=>nil, :organization=>nil} @ab_person=#<__NSCFType:0x6df8bf0>>
+=> #<AddressBook::Person:14: {:first_name=>"Alex", :last_name=>"Rothenberg", ...}>]
 ```
 
 Get a list of all people matching several attributes with `.where`
 
 ```ruby
 AddressBook::Person.where(:email => 'alex@example.com', :first_name => 'Alex')
-# => [#<AddressBook::Person:0x6d55e90 @attributes={:first_name=>"Alex", :last_name=>"Rothenberg", :job_title=>nil, :department=>nil, :organization=>nil} @ab_person=#<__NSCFType:0x6df8bf0>>]
+=> [#<AddressBook::Person:14: {:first_name=>"Alex", :last_name=>"Rothenberg", ...}>]
 ```
 
-To look for an existing person or get a new one if none is found `find_or_new_by_XXX`
+Look for an existing person or get a new one if none is found `find_or_new_by_XXX`
 
 ```ruby
 AddressBook::Person.find_or_new_by_email('alex@example.com')
-# => #<AddressBook::Person:0xe4e3a80 @attributes={:first_name=>"Alex", :last_name=>"Rothenberg", :job_title=>nil, :department=>nil, :organization=>nil} @ab_person=#<__NSCFType:0xe4bbef0>>
+=> #<AddressBook::Person:17: {:first_name=>"Alex", :last_name=>"Rothenberg", ...}>]
 ```
 
-### Create a new Contact and save in Contacts app
-
-```ruby
-AddressBook::Person.create(:first_name => 'Alex', :last_name => 'Rothenberg', :email => [{ :value => 'alex@example.com', :label => 'Home'}], , :phones => [{ :value => '9920149993', :label => 'Mobile'}])
-# => #<AddressBook::Person:0xe4e3a80 @attributes={:first_name=>"Alex", :last_name=>"Rothenberg", :job_title=>nil, :department=>nil, :organization=>nil} @ab_person=#<__NSCFType:0xe4bbef0>>
-
-# Multiple emails/phones ex.
-
-AddressBook::Person.create(:first_name => 'Alex', :last_name => 'Rothenberg', :emails => ["a@mail.com", "b@gmail.com", "c@gmail.com", {:value => 'ashish@gmail.com', :label => 'Personal'} ], :phones => ['1234','2345','4567'])
-=> #<AddressBook::Person:0x9ce23b0 @address_book=#<__NSCFType:0x9ce2660> @ab_person=#<__NSCFType:0x9ce2450> @attributes=nil>
-```
-### Update existing contact
+### Update existing Person
 
 ```ruby
 alex = AddressBook::Person.find_by_email('alex@example.com')
@@ -155,6 +175,17 @@ alex.job_title = 'RubyMotion Developer'
 alex.save
 ```
 
+### Contact Groups
+
+```ruby
+ab.groups
+=> [#<AddressBook::Group:1:Friends: 1 members>, #<AddressBook::Group:2:Work: 0 members>]
+
+g = ab.groups.first
+g.members
+=> [#<AddressBook::Person:2: {:first_name=>"Daniel", :last_name=>"Higgins", ...}>]
+```
+
 ## Contributing
 
 1. Fork it

data/lib/motion-addressbook/version.rb

@@ -1,5 +1,5 @@
 module Motion
   module Addressbook
-    VERSION = "1.5.0"
+    VERSION = "1.6.2"
   end
 end

data/lib/motion-addressbook.rb

@@ -1,5 +1,18 @@
 require "motion-addressbook/version"
 
+# RubyMotion bug RM-81 was fixed for 2.8; motion-addressbook
+if Gem::Version.new(Motion::Version) < Gem::Version.new("2.8")
+  raise <<EOT
+motion-addressbook requires at least RubyMotion version 2.8.
+
+If you cannot upgrade RubyMotion please use an older version of this gem.
+Add the following to your Gemfile:
+
+gem 'motion-addressbook', '<= 1.5.0'
+
+EOT
+end
+
 BubbleWrap.require 'motion/address_book.rb' do
   file('motion/address_book.rb').uses_framework('AddressBook')
 end
@@ -12,11 +25,6 @@ BubbleWrap.require_ios do
   BW.require 'motion/address_book/ios/multi_valued.rb'
   BW.require 'motion/address_book/ios/source.rb'
 
-  # This is an iOS-specific RubyMotion bug workaround.
-  Motion::Project::App.setup do |app|
-    app.vendor_project(File.expand_path(File.join(File.dirname(__FILE__), '../abhack')), :static)
-  end
-
   BW.require 'motion/address_book/ios/picker.rb' do
     file('motion/address_book/ios/picker.rb').uses_framework('AddressBookUI')
   end

data/motion/address_book/ios/addr_book.rb

@@ -2,57 +2,149 @@ module AddressBook
   class AddrBook
     attr_reader :ab
 
-    def initialize
-      @ab = AddressBook.address_book
-    end
-    def people(opts = {})
-      if opts[:source]
-        ABAddressBookCopyArrayOfAllPeopleInSource(ab, opts[:source].ab_source).map do |ab_person|
-          AddressBook::Person.new({}, ab_person, :address_book => ab)
+    def initialize(&block)
+      @ab = NullAddrBook
+      if authorized?
+        activate!
+        if block_given?
+          yield self
+        end
+      elsif block
+        # asynchronous auth
+        AddressBook.request_authorization do |granted|
+          if granted
+            activate!
+            block.call(self)
+          end
         end
       else
-        ABAddressBookCopyArrayOfAllPeople(ab).map do |ab_person|
-          AddressBook::Person.new({}, ab_person, :address_book => ab)
+        # synchronous auth
+        if native_ab = AddressBook.address_book
+          @ab = LiveAddrBook.new(native_ab)
         end
       end
     end
+
+    def activate!
+      @ab = LiveAddrBook.new(AddressBook.address_book)
+    end
+    def authorized?
+      AddressBook.authorized?
+    end
+
+    def auth!
+      raise "iOS Address Book authorization is required." if @ab.nil?
+    end
+
+    def people(opts = {}, &block)
+      ordered_list = ab_people(opts).map { |p| Person.new(nil, p, address_book: ab.ab) }
+      if block
+        ordered_list.sort_by { |p| block.call(p) }
+      else
+        ordered_list
+      end
+    end
     def count
-      ABAddressBookGetPersonCount(@ab)
+      ab.person_count
     end
     def new_person(attributes)
-      Person.new(attributes, nil, :address_book => @ab)
+      Person.new(attributes, nil, :address_book => ab.ab)
     end
     def create_person(attributes)
-      p = Person.new(attributes, nil, :address_book => @ab)
+      p = new_person(attributes)
       p.save
       p
     end
     def person(id)
-      (p = ABAddressBookGetPersonWithRecordID(ab, id)) && Person.new(nil, p, :address_book => ab)
+      (p = ab.person_with_id(id)) && Person.new(nil, p, :address_book => ab.ab)
     end
     def changedSince(timestamp)
       people.select {|p| p.modification_date > timestamp}
     end
 
     def groups
-      ABAddressBookCopyArrayOfAllGroups(@ab).map do |ab_group|
-        AddressBook::Group.new(:ab_group => ab_group, :address_book => @ab)
+      ab.all_groups.map do |ab_group|
+        AddressBook::Group.new(:ab_group => ab_group, :address_book => ab.ab)
       end
     end
+    def group_count
+      ab.group_count
+    end
     def new_group(attributes)
-      AddressBook::Group.new(:attributes => attributes, :address_book => @ab)
+      AddressBook::Group.new(:attributes => attributes, :address_book => ab.ab)
     end
     def group(id)
-      (g = ABAddressBookGetGroupWithRecordID(ab, id)) && Group.new(:ab_group => g, :address_book => @ab)
+      (g = ab.group_with_id(id)) && Group.new(:ab_group => g, :address_book => ab.ab)
     end
 
     def notify_changes(callback, context)
-      ABAddressBookRegisterExternalChangeCallback(ab, callback, context)
+      ab.register_callback(callback, context)
+    end
+
+    def sources
+      ab.sources.map {|s| Source.new(s)}
+    end
+
+    def inspect
+      "#<#{self.class}:#{"0x%0x" % object_id} #{ab.status}>"
+    end
+
+    private
+
+    def ab_people(opts = {})
+      ab_source = opts[:source]
+      ordering = opts.fetch(:ordering) { ABPersonGetSortOrdering() }
+
+      ab_people = if ab_source
+                    ab.all_people_in_source(ab_source)
+                  else
+                    ab.all_people
+                  end
+
+      ab_people.sort! { |x, y| ABPersonComparePeopleByName(x, y, ordering)  }
+      ab_people
+    end
+  end
+
+  class NullAddrBook
+    def self.status; "pending"; end
+    def self.method_missing(*args)
+      raise SecurityError, "iOS Address Book authorization is required."
     end
+  end
 
+  class LiveAddrBook
+    attr_reader :ab
+    def initialize(ab)
+      @ab = ab
+    end
+    def status; "live"; end
+    def all_people
+      ABAddressBookCopyArrayOfAllPeople(ab)
+    end
+    def all_people_in_source(source)
+      ABAddressBookCopyArrayOfAllPeopleInSource(ab, source)
+    end
+    def person_with_id(id)
+      ABAddressBookGetPersonWithRecordID(ab, id)
+    end
+    def person_count
+      ABAddressBookGetPersonCount(ab)
+    end
+    def all_groups
+      ABAddressBookCopyArrayOfAllGroups(ab)
+    end
+    def group_count
+      ABAddressBookGetGroupCount(ab)
+    end
+    def group_with_id(id)
+      ABAddressBookGetGroupWithRecordID(ab, id)
+    end
     def sources
-      # ABAddressBookCopyArrayOfAllSources(ab).map {|s| ABRecordCopyValue(s, KABSourceTypeProperty)}
-      ABAddressBookCopyArrayOfAllSources(ab).map {|s| Source.new(s)}
+      ABAddressBookCopyArrayOfAllSources(ab)
+    end
+    def register_callback(callback, context)
+      ABAddressBookRegisterExternalChangeCallback(ab, callback, context)
     end
   end
 end

data/motion/address_book/ios/group.rb

@@ -5,23 +5,12 @@
 #
 module AddressBook
   class Group
-    attr_reader :attributes, :error
+    attr_reader :attributes, :error, :address_book
 
     def initialize(opts)
-      @address_book = opts[:address_book]
-      if opts[:ab_group]
-        # import existing
-        @ab_group = opts[:ab_group]
-        @attributes = nil
-      else
-        # create new
-        @ab_group = nil
-        @attributes = opts[:attributes]
-      end
-    end
-
-    def address_book
-      @address_book ||= AddressBook.address_book
+      @address_book = opts.fetch(:address_book) { AddressBook.address_book }
+      @ab_group = opts[:ab_group]
+      @attributes = opts[:attributes]
     end
 
     def save
@@ -41,23 +30,30 @@ module AddressBook
       unless new?
         ABAddressBookRemoveRecord(address_book, ab_group, error)
         ABAddressBookSave(address_book, error)
-        @ab_group = nil
+        @ab_group = :deleted
         self
       end
     end
 
+    def deleted?
+      @ab_group == :deleted
+    end
+
     def ab_group
       @ab_group || convert_dict_to_ab
     end
     alias :ab_record :ab_group
 
     def uid
-      ABRecordGetRecordID(ab_group)
+      deleted? ? nil : ABRecordGetRecordID(ab_group)
     end
 
     def name
       ABRecordCopyValue(ab_group, KABGroupNameProperty)
     end
+    def name=(newname)
+      ABRecordSetValue(ab_group, KABGroupNameProperty, newname, error)
+    end
 
     def size
       members.count
@@ -77,11 +73,30 @@ module AddressBook
       end
     end
 
+    def add(*items)
+      items.each { |item| self << item }
+      self
+    end
+
+    def remove(person_or_group)
+      ABGroupRemoveMember(ab_group, person_or_group.ab_record, error)
+      self
+    end
+
     def <<(person_or_group)
       raise ArgumentError, "Must save member before adding to group" if person_or_group.new?
       ABGroupAddMember(ab_group, person_or_group.ab_record, error)
     end
 
+    def to_s
+      if deleted?
+        "#<#{self.class}:DELETED>"
+      else
+        "#<#{self.class}:#{uid}:#{name}: #{size} members>"
+      end
+    end
+    alias :inspect :to_s
+
     private
 
     def convert_dict_to_ab

data/motion/address_book/ios/multi_valued.rb

@@ -1,5 +1,7 @@
 module AddressBook
   class MultiValued
+    include Enumerable
+
     attr_reader :mv_type
 
     def initialize(opts)
@@ -23,6 +25,19 @@ module AddressBook
     def attributes
       @attributes ||= convert_multi_value_into_dictionary
     end
+    def to_ary
+      attributes
+    end
+    def [](index)
+      attributes[index]
+    end
+    def each
+      attributes.each { |i| yield i }
+    end
+    def to_s
+      "#<#{self.class}: #{attributes}>"
+    end
+    alias :inspect :to_s
 
     def convert_multi_value_into_dictionary
       count.times.map do |i|
@@ -122,10 +137,10 @@ module AddressBook
 
     def ab_record_to_dict(i)
       case multi_value_property_type
+      when KABDateTimePropertyType
+        {:date => ABMultiValueCopyValueAtIndex(@ab_multi_value, i)}
       when KABStringPropertyType
         {:value => ABMultiValueCopyValueAtIndex(@ab_multi_value, i)}
-      when KABDateTimePropertyType
-        {:date => ABHack.getDateValueAtIndex(i, from: @ab_multi_value)}
       when KABDictionaryPropertyType
         ab_record = ABMultiValueCopyValueAtIndex(@ab_multi_value, i)
         PropertyMap.each_with_object({}) do |(ab_key, attr_key), dict|

data/motion/address_book/ios/person.rb

@@ -1,28 +1,16 @@
 module AddressBook
   class Person
     attr_reader :error
+    attr_reader :address_book
 
-    def initialize(attributes={}, existing_ab_person = nil, opts = {})
-      @address_book = opts[:address_book]
-      if existing_ab_person.nil?
-        @ab_person = nil
-        @attributes = attributes
-      else
-        @ab_person = existing_ab_person
-        @attributes = nil
-      end
+    def initialize(attributes = nil, existing_ab_person = nil, opts = {})
+      @address_book = opts.fetch(:address_book) { AddressBook.address_book }
+      @attributes = attributes
+      @ab_person = existing_ab_person
     end
 
-    def self.all
-      ab = AddressBook.address_book
-      ab_people = ABAddressBookCopyArrayOfAllPeople(ab)
-      return [] if ab_people.nil?
-
-      people = ab_people.map do |ab_person|
-        new({}, ab_person, :address_book => ab)
-      end
-      people.sort! { |a,b| "#{a.first_name} #{a.last_name}" <=> "#{b.first_name} #{b.last_name}" }
-      people
+    def self.all(options = {})
+      AddressBook::AddrBook.new.people(options)
     end
 
     def self.create(attributes)
@@ -35,7 +23,7 @@ module AddressBook
       ABAddressBookAddRecord(address_book, ab_person, error)
       ABAddressBookSave(address_book, error)
       @attributes = nil # force refresh
-      uid
+      self
     end
 
     def attributes
@@ -65,7 +53,7 @@ module AddressBook
       conditions.keys.all? do |attribute|
         case attribute
         when :email
-          emails.attributes.map {|rec| rec[:value]}.any? {|v| v == conditions[attribute]}
+          emails.map {|rec| rec[:value]}.any? {|v| v == conditions[attribute]}
         else
           send(attribute) == conditions[attribute]
         end
@@ -215,6 +203,8 @@ module AddressBook
     def get_multi_valued(field)
       if mv = ABRecordCopyValue(ab_person, field)
         MultiValued.new(:ab_multi_value => mv)
+      else
+        []
       end
     end
 
@@ -223,7 +213,7 @@ module AddressBook
     end
 
     def phone_values
-      phones.attributes.map {|r| r[:value]}
+      phones.map {|r| r[:value]}
     end
 
     def emails
@@ -231,7 +221,7 @@ module AddressBook
     end
 
     def email_values
-      emails.attributes.map {|r| r[:value]}
+      emails.map {|r| r[:value]}
     end
 
     def addresses
@@ -260,8 +250,8 @@ module AddressBook
 
     def email; email_values.first; end
     def phone; phone_values.first; end
-    def url; urls.attributes.first[:value]; end
-    def address; addresses.attributes.first; end
+    def url; urls.any? && urls.first[:value]; end
+    def address; addresses.any? && addresses.first; end
 
     def find_or_new
       if new_record?
@@ -300,16 +290,11 @@ module AddressBook
     end
 
     def modification_date
-      # workaround for RubyMotion bug: blows up when fetching NSDate properties
-      # see http://hipbyte.myjetbrains.com/youtrack/issue/RM-81
-      # still broken in RubyMotion 2.0
-      ABHack.getDateProperty(KABPersonModificationDateProperty, from: ab_person)
-      # when RubyMotion bug is fixed, this should just be
-      # get_field(KABPersonModificationDateProperty)
+      get_field(KABPersonModificationDateProperty)
     end
 
     def creation_date
-      ABHack.getDateProperty(KABPersonCreationDateProperty, from: ab_person)
+      get_field(KABPersonCreationDateProperty)
     end
 
     # replace *all* properties of an existing Person with new values
@@ -427,10 +412,9 @@ module AddressBook
       end
 
       Person.multi_value_property_map.each do |ab_property, attr_key|
-        if value = get_multi_valued(ab_property)
-          if value.attributes.any?
-            @attributes[attr_key] = value.attributes
-          end
+        value = get_multi_valued(ab_property)
+        if value.any?
+          @attributes[attr_key] = value.attributes
         end
       end
 
@@ -443,13 +427,7 @@ module AddressBook
       end
     end
     def get_field(field)
-      if field == KABPersonBirthdayProperty
-        # special case: RubyMotion blows up on NSDate properties
-        # see http://hipbyte.myjetbrains.com/youtrack/issue/RM-81
-        ABHack.getDateProperty(field, from: ab_person)
-      else
-        ABRecordCopyValue(ab_person, field)
-      end
+      ABRecordCopyValue(ab_person, field)
     end
     def remove_field(field)
       ABRecordRemoveValue(ab_person, field, nil)
@@ -475,9 +453,5 @@ module AddressBook
       # what if there are more than one match? email should be unique but ...
       existing_records.first
     end
-
-    def address_book
-      @address_book ||= AddressBook.address_book
-    end
   end
 end

data/motion/address_book/ios/picker.rb

@@ -3,10 +3,10 @@ module AddressBook
     class << self
       attr_accessor :showing
     end
-    def self.show(&after)
+    def self.show(options={}, &after)
       raise "Cannot show two Pickers" if showing?
       @picker = Picker.new(&after)
-      @picker.show
+      @picker.show options
       @picker
     end
 
@@ -18,12 +18,13 @@ module AddressBook
       @after = after
     end
 
-    def show
+    def show(options)
       self.class.showing = true
 
       @people_picker_ctlr = ABPeoplePickerNavigationController.alloc.init
       @people_picker_ctlr.peoplePickerDelegate = self
-      UIApplication.sharedApplication.keyWindow.rootViewController.presentViewController(@people_picker_ctlr, animated:true, completion:nil)
+      presenter = options.fetch :presenter, UIApplication.sharedApplication.keyWindow.rootViewController
+      presenter.presentViewController(@people_picker_ctlr, animated:true, completion:nil)
     end
 
     def hide(ab_person=nil)
@@ -53,8 +54,8 @@ end
 
 module AddressBook
   module_function
-  def pick(&after)
-    AddressBook::Picker.show &after
+  def pick(options={}, &after)
+    AddressBook::Picker.show options, &after
   end
 end
 

data/motion/address_book/ios/source.rb

@@ -9,9 +9,9 @@ module AddressBook
     def type
       ABRecordCopyValue(ab_source, KABSourceTypeProperty)
     end
-  end
 
-  def local?
-    type == KABSourceTypeLocal
+    def local?
+      type == KABSourceTypeLocal
+    end
   end
 end

data/motion/address_book/osx/addr_book.rb

@@ -46,6 +46,9 @@ module AddressBook
         AddressBook::Group.new(:ab_group => ab_group, :address_book => @ab)
       end
     end
+    def group_count
+      groups.count
+    end
     def new_group(attributes)
       AddressBook::Group.new(:attributes => attributes, :address_book => @ab)
     end
@@ -56,12 +59,13 @@ module AddressBook
     end
 
     def notify_changes(callback, context)
-      ABAddressBookRegisterExternalChangeCallback(ab, callback, context)
+      App.notification_center.observe KABDatabaseChangedExternallyNotification do |notification|
+        callback.call(context)
+      end
     end
 
-    # def sources
-    #   # ABAddressBookCopyArrayOfAllSources(ab).map {|s| ABRecordCopyValue(s, KABSourceTypeProperty)}
-    #   ABAddressBookCopyArrayOfAllSources(ab).map {|s| Source.new(s)}
-    # end
+    def inspect
+      "#<#{self.class}:#{"0x%0x" % object_id} #{count} people, #{group_count} groups>"
+    end
   end
 end

data/motion/address_book/osx/group.rb

@@ -6,9 +6,10 @@
 module AddressBook
   class Group
     attr_reader :attributes, :error
+    attr_reader :address_book
 
     def initialize(opts)
-      @address_book = opts[:address_book]
+      @address_book = opts.fetch(:address_book) { AddressBook.address_book }
       if opts[:ab_group]
         # import existing
         @ab_group = opts[:ab_group]
@@ -20,10 +21,6 @@ module AddressBook
       end
     end
 
-    def address_book
-      @address_book ||= AddressBook.address_book
-    end
-
     def save
       address_book.addRecord(ab_group)
       address_book.save
@@ -64,6 +61,9 @@ module AddressBook
     def name
       get_field(KABGroupNameProperty)
     end
+    def name=(newname)
+      ABRecordSetValue(ab_group, KABGroupNameProperty, newname)
+    end
 
     def size
       members.count
@@ -85,7 +85,15 @@ module AddressBook
 
     def <<(person_or_group)
       raise ArgumentError, "Must save member before adding to group" if person_or_group.new?
-      ABGroupAddMember(ab_group, person_or_group.ab_record, error)
+      ABGroupAddMember(ab_group, person_or_group.ab_record)
+    end
+    def add(*items)
+      items.each { |item| self << item }
+      self
+    end
+    def remove(person_or_group)
+      ABGroupRemoveMember(ab_group, person_or_group.ab_record)
+      self
     end
 
     def local?

data/motion/address_book/osx/multi_valued.rb

@@ -1,5 +1,7 @@
 module AddressBook
   class MultiValued
+    include Enumerable
+
     attr_reader :mv_type
 
     def initialize(opts)
@@ -23,6 +25,19 @@ module AddressBook
     def attributes
       @attributes ||= convert_multi_value_into_dictionary
     end
+    def to_ary
+      attributes
+    end
+    def [](index)
+      attributes[index]
+    end
+    def each
+      attributes.each { |i| yield i }
+    end
+    def to_s
+      "#<#{self.class}: #{attributes}>"
+    end
+    alias :inspect :to_s
 
     def convert_multi_value_into_dictionary
       count.times.map do |i|

data/motion/address_book/osx/person.rb

@@ -1,9 +1,10 @@
 module AddressBook
   class Person
     attr_reader :error
+    attr_reader :address_book
 
     def initialize(target, opts = {})
-      @address_book = opts[:address_book]
+      @address_book = opts.fetch(:address_book) { AddressBook.address_book }
       if target.respond_to?(:fetch)
         # data for a new Person, to be saved to the Address Book
         @ab_person = nil
@@ -41,13 +42,17 @@ module AddressBook
       get_field('com.apple.uuid')
     end
 
-    def method_missing(name, *args)
-      if property = ReverseSingleValuePropertyMap[name]
+    def method_missing(method_name, *args)
+      if property = ReverseSingleValuePropertyMap[method_name]
         get_field(property)
+      elsif property = ReverseSingleValuePropertyMap[method_name.gsub(/=$/, '').to_sym]
+        set_field(property, args.first)
+        @attributes = nil
       else
         super
       end
     end
+
     # def self.method_missing(name, *args)
     #   if attribute_name = all_finder?(name)
     #     find_all_by(attribute_name, args.first)
@@ -107,6 +112,8 @@ module AddressBook
     def get_multi_valued(field)
       if mv = get_field(field)
         MultiValued.new(:ab_multi_value => mv)
+      else
+        []
       end
     end
 
@@ -240,7 +247,7 @@ module AddressBook
       KABFirstNameProperty => :first_name,
       KABLastNameProperty => :last_name,
       KABMiddleNameProperty => :middle_name,
-      KABPrefixProperty => :prefix,
+      KABTitleProperty => :prefix,
       KABSuffixProperty => :suffix,
       KABNicknameProperty => :nickname,
       KABJobTitleProperty => :job_title,
@@ -314,7 +321,7 @@ module AddressBook
 
       MultiValuePropertyMap.each do |ab_property, attr_key|
         if value = get_multi_valued(ab_property)
-          if value.attributes.any?
+          if value.any?
             @attributes[attr_key] = value.attributes
           end
         end
@@ -342,9 +349,5 @@ module AddressBook
         set_field(field, multi_field.ab_multi_value)
       end
     end
-
-    def address_book
-      @address_book ||= AddressBook.address_book
-    end
   end
 end

data/motion/address_book.rb

@@ -5,10 +5,10 @@ module AddressBook
     if App.osx?
       ABAddressBook.addressBook
     else # iOS
-      if Device.ios_version == '6.0'
-        ios6_create
-      else
+      if Device.ios_version =~ /5/
         ios5_create
+      else
+        ios6_create
       end
     end
   end
@@ -23,8 +23,13 @@ module AddressBook
 
   def ios6_create
     error = nil
-    @address_book = ABAddressBookCreateWithOptions(nil, error)
-    request_authorization unless authorized?
+    if authorized?
+      @address_book = ABAddressBookCreateWithOptions(nil, error)
+    else
+      request_authorization do |rc|
+        NSLog "AddressBook: access was #{rc ? 'approved' : 'denied'}"
+      end
+    end
     @address_book
   end
 

data/spec/ios/address_book/group_spec.rb

@@ -24,6 +24,10 @@ describe AddressBook::Group do
       @group.should.not.be.new
     end
 
+    it "should describe itself" do
+      @group.to_s.should.match /AddressBook::Group:.*:Test Group: 0 members/
+    end
+
     it "should not add unsaved person records" do
       p = @ab.new_person({:first_name => 'Alice', :last_name => 'Artichoke'})
       lambda {@group << p}.should.raise ArgumentError
@@ -32,13 +36,10 @@ describe AddressBook::Group do
 
   describe 'a group with members' do
     before do
-      @p1 = @ab.new_person({:first_name => 'Alice', :emails => [{:label => 'home', :value => 'alice@example.com'}]})
-      @p1.save
-      @p2 = @ab.new_person({:first_name => 'Bob', :emails => [{:label => 'home', :value => 'bob@example.com'}]})
-      @p2.save
+      @p1 = @ab.create_person({:first_name => 'Alice', :emails => [{:label => 'home', :value => 'alice@example.com'}]})
+      @p2 = @ab.create_person({:first_name => 'Bob', :emails => [{:label => 'home', :value => 'bob@example.com'}]})
       @group = @ab.new_group(:name => 'Test Group')
-      @group << @p1
-      @group << @p2
+      @group.add(@p1, @p2)
       @group.save
     end
     after do
@@ -58,6 +59,45 @@ describe AddressBook::Group do
     it "should search by id" do
       @ab.group(@group.uid).name.should.equal @group.name
     end
+
+    it "should describe itself" do
+      @group.to_s.should.match /AddressBook::Group:.*:Test Group: 2 members/
+    end
+
+    describe "after removing one member" do
+      before do
+        @group.remove(@p2)
+        @group.save
+      end
+
+      it "should no longer contain the removed member" do
+        @group.members.map(&:uid).should.equal [@p1.uid]
+      end
+    end
+  end
+
+  describe 'a deleted group' do
+    before do
+      @p1 = @ab.create_person({:first_name => 'Alice', :emails => [{:label => 'home', :value => 'alice@example.com'}]})
+      @p2 = @ab.create_person({:first_name => 'Bob', :emails => [{:label => 'home', :value => 'bob@example.com'}]})
+      @group = @ab.new_group(:name => 'Test Group')
+      @group.add(@p1, @p2)
+      @group.save
+      @group.delete!
+    end
+
+    after do
+      @p1.delete!
+      @p2.delete!
+    end
+
+    it "should have no uid" do
+      @group.uid.should.be.nil
+    end
+
+    it "should describe itself" do
+      @group.to_s.should.match /AddressBook::Group:DELETED/
+    end
   end
 
   # TODO: nested groups

data/spec/ios/address_book/person_spec.rb

@@ -1,4 +1,12 @@
 describe AddressBook::Person do
+  before do
+    @ab = AddressBook::AddrBook.new
+  end
+
+  it "should be authorized" do
+    @ab.authorized?.should.be.true
+  end
+
   describe 'ways of creating and finding people' do
     describe 'new' do
       before do
@@ -157,7 +165,11 @@ describe AddressBook::Person do
           { :label => 'home page', :value => "http://www.mysite.com/" },
           { :label => 'work', :value => 'http://dept.bigco.com/' },
           { :label => 'school', :value => 'http://state.edu/college' }
-        ]
+        ],
+        :social_profiles => [
+                             { service: 'FaceBook', username: 'testyman' },
+                             { service: 'twitter', username: 'testwit' }
+                            ]
       }
     end
 
@@ -242,6 +254,11 @@ describe AddressBook::Person do
         @ab_person.urls.attributes.should.equal @attributes[:urls]
       end
 
+      it 'should round-trip social profiles' do
+        @ab_person.social_profiles.count.should.equal 2
+        @ab_person.attributes[:social_profiles].should.equal @attributes[:social_profiles]
+      end
+
       describe 'once saved' do
         before do
           @before_count = AddressBook.count
@@ -446,4 +463,35 @@ describe AddressBook::Person do
       end
     end
   end
+
+  describe "sorting" do
+    before do
+      @ab.people.each(&:delete!)
+
+      @p1 = @ab.create_person({:first_name => 'Bob', :last_name => 'Edwards'}).uid
+      @p2 = @ab.create_person({:first_name => 'Doris', :last_name => 'Channing'}).uid
+      @p3 = @ab.create_person({:first_name => 'Anne', :last_name => 'Brown'}).uid
+      @p4 = @ab.create_person({:first_name => 'Eddie', :last_name => 'Anderson'}).uid
+      @p5 = @ab.create_person({:first_name => 'Carol', :last_name => 'Dolittle'}).uid
+    end
+
+    it "should sort on last name using OS sort" do
+      @ab.people(ordering: KABPersonSortByLastName).map(&:uid).should.equal [@p4, @p3, @p2, @p5, @p1]
+    end
+    it "should support last-name sort in Person#all" do
+      AddressBook::Person.all(ordering: KABPersonSortByLastName).map(&:uid).should.equal [@p4, @p3, @p2, @p5, @p1]
+    end
+
+    it "should sort on first name using OS sort" do
+      @ab.people(ordering: KABPersonSortByFirstName).map(&:uid).should.equal [@p3, @p1, @p5, @p2, @p4]
+    end
+    it "should support first-name sort in Person#all" do
+      AddressBook::Person.all(ordering: KABPersonSortByFirstName).map(&:uid).should.equal  [@p3, @p1, @p5, @p2, @p4]
+    end
+
+    it "should support a custom sort order" do
+      ordered = @ab.people { |p| p.last_name[1] }.map(&:uid)
+      ordered.should.equal [@p1, @p2, @p4, @p5, @p3]
+    end
+  end
 end

data/spec/ios/helpers/spec_helper.rb

@@ -0,0 +1,32 @@
+# These methods are intended to protect contents of the simulator
+# instance from destruction when the spec suite runs. Specifically,
+# the contents of the iOS Address Book, which is global to all
+# applications.
+
+SIMULATOR_ROOT = "#{ENV['HOME']}/../.."
+AB_PATH = SIMULATOR_ROOT + "/Library/AddressBook"
+AB_PATH_BAK = AB_PATH + ".bak"
+
+def protect_existing_address_book
+  # Can't use ruby methods to operate on these directories because the
+  # iOS layer protects them, but shelling out is still allowed so we
+  # can alter the world that way.
+
+  unless AddressBook.authorized?
+    warn "BLOCKING FOR AUTHORIZATION"
+    AddressBook.request_authorization
+  end
+
+  warn "PROTECTING EXISTING ADDRESS BOOK IN SIMULATOR"
+
+  `mv \"#{AB_PATH}\" "#{AB_PATH_BAK}"`
+end
+
+at_exit do
+  warn "RESTORING ORIGINAL ADDRESS BOOK IN SIMULATOR"
+
+  `rm -rf \"#{AB_PATH}\"`
+  `mv \"#{AB_PATH_BAK}\" "#{AB_PATH}"`
+end
+
+protect_existing_address_book

data/spec/osx/address_book/person_spec.rb

@@ -41,16 +41,16 @@ describe AddressBook::Person do
     end
 
     it 'should be able to get each of the single value fields' do
-      @the_person.first_name.should.equal   @alex_data[:first_name  ]
-      @the_person.last_name.should.equal    @alex_data[:last_name   ]
-      @the_person.middle_name.should.equal    @alex_data[:middle_name   ]
-      @the_person.suffix.should.equal       @alex_data[:prefix   ]
-      @the_person.suffix.should.equal    @alex_data[:suffix   ]
-      @the_person.nickname.should.equal    @alex_data[:nickname   ]
-      @the_person.job_title.should.equal    @alex_data[:job_title   ]
-      @the_person.department.should.equal   @alex_data[:department  ]
+      @the_person.first_name.should.equal   @alex_data[:first_name]
+      @the_person.last_name.should.equal    @alex_data[:last_name]
+      @the_person.middle_name.should.equal  @alex_data[:middle_name]
+      @the_person.prefix.should.equal       @alex_data[:prefix]
+      @the_person.suffix.should.equal       @alex_data[:suffix]
+      @the_person.nickname.should.equal     @alex_data[:nickname]
+      @the_person.job_title.should.equal    @alex_data[:job_title]
+      @the_person.department.should.equal   @alex_data[:department]
       @the_person.organization.should.equal @alex_data[:organization]
-      @the_person.note.should.equal @alex_data[:note]
+      @the_person.note.should.equal         @alex_data[:note]
       @the_person.should.be.person?
     end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-addressbook
 version: !ruby/object:Gem::Version
-  version: 1.5.0
-  prerelease: 
+  version: 1.6.2
 platform: ruby
 authors:
 - Alex Rothenberg
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,33 +28,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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: A RubyMotion wrapper around the iOS & OSX Address Book frameworks
@@ -74,8 +67,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- abhack/abhack.h
-- abhack/abhack.m
 - lib/motion-addressbook.rb
 - lib/motion-addressbook/version.rb
 - motion-addressbook.gemspec
@@ -98,39 +89,33 @@ files:
 - spec/ios/helpers/bacon_matchers.rb
 - spec/ios/helpers/hacks.rb
 - spec/ios/helpers/person_helpers.rb
+- spec/ios/helpers/spec_helper.rb
 - spec/osx/address_book/person_spec.rb
 - spec/osx/helpers/bacon_matchers.rb
 - spec/osx/helpers/hacks.rb
 - spec/osx/helpers/person_helpers.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2657752188704794631
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2657752188704794631
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A RubyMotion wrapper around the iOS & OSX Address Book frameworks
 test_files:
 - spec/ios/address_book/group_spec.rb
@@ -140,6 +125,7 @@ test_files:
 - spec/ios/helpers/bacon_matchers.rb
 - spec/ios/helpers/hacks.rb
 - spec/ios/helpers/person_helpers.rb
+- spec/ios/helpers/spec_helper.rb
 - spec/osx/address_book/person_spec.rb
 - spec/osx/helpers/bacon_matchers.rb
 - spec/osx/helpers/hacks.rb

data/abhack/abhack.h

@@ -1,8 +0,0 @@
-#import <AddressBook/AddressBook.h>
-
-@interface ABHack : NSObject
-
-+ (NSDate *) getDateProperty: (ABPropertyID) property from: (ABRecordRef) ab_person;
-+ (NSDate *) getDateValueAtIndex: (int) index from: (ABMutableMultiValueRef) ab_multi_value;
-
-@end

data/abhack/abhack.m

@@ -1,15 +0,0 @@
-#import "abhack.h"
-
-@implementation ABHack
-
-+ (NSDate *) getDateProperty: (ABPropertyID) property from: (ABRecordRef) ab_person
-{
-  return (NSDate *)ABRecordCopyValue(ab_person, property);
-}
-
-+ (NSDate *) getDateValueAtIndex: (int) index from: (ABMultiValueRef) ab_multi_value
-{
-  return (NSDate *)ABMultiValueCopyValueAtIndex(ab_multi_value, index);
-}
-
-@end