motion-addressbook 1.2.0 → 1.4.0

data/.gitignore

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

data/.travis.yml

@@ -1,6 +1,7 @@
 language: objective-c
-before_install:
-  - source /Users/travis/.bash_profile
-  - rvm use 1.9.3
-install: bundle install
-script: bundle exec rake spec
+before_install: rvm use 1.9.3
+notifications:
+  email:
+    recipients:
+      - alex@alexrothenberg.com
+      - jmay@pobox.com

data/Gemfile

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

data/README.md

@@ -8,7 +8,14 @@ Apple's [Address Book Programming Guide for iOS](http://developer.apple.com/libr
 
 ## Installation
 
-Add this line to your application's Gemfile:
+### If you're using `bundler` (this is recommended):
+
+Add these lines to your application's `Rakefile`:
+
+    require 'bundler'
+    Bundler.require
+
+Add this line to your application's `Gemfile`:
 
     gem 'motion-addressbook'
 
@@ -16,8 +23,11 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
+### Manually without bundler
+
+Or install it yourself (remember to add the bubble-wrap dependency) as:
 
+    $ gem install bubble-wrap
     $ gem install motion-addressbook
 
 ## Usage
@@ -130,10 +140,14 @@ AddressBook::Person.find_or_new_by_email('alex@example.com')
 ### Create a new Contact and save in Contacts app
 
 ```ruby
-AddressBook::Person.create(:first_name => 'Alex', :last_name => 'Rothenberg', :email => 'alex@example.com')
+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
 
 ```ruby

data/Rakefile

@@ -1,8 +1,13 @@
 #!/usr/bin/env rake
 $:.unshift("/Library/RubyMotion/lib")
-require 'motion/project'
+require 'motion/project/template/ios'
 require "bundler/gem_tasks"
 Bundler.setup
 Bundler.require
 
 require 'bubble-wrap/test'
+
+Motion::Project::App.setup do |app|
+  # Use `rake config' to see complete project settings.
+  app.name = 'AddressBook'
+end

data/abhack/abhack.h

@@ -0,0 +1,8 @@
+#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

@@ -0,0 +1,15 @@
+#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

data/lib/motion-addressbook/version.rb

@@ -1,5 +1,5 @@
 module Motion
   module Addressbook
-    VERSION = "1.2.0"
+    VERSION = "1.4.0"
   end
 end

data/lib/motion-addressbook.rb

@@ -8,6 +8,12 @@ BW.require 'motion/address_book/addr_book.rb'
 BW.require 'motion/address_book/person.rb'
 BW.require 'motion/address_book/group.rb'
 BW.require 'motion/address_book/multi_valued.rb'
+BW.require 'motion/address_book/source.rb'
+
 BW.require 'motion/address_book/picker.rb' do
   file('motion/address_book/picker.rb').uses_framework('AddressBookUI')
 end
+
+Motion::Project::App.setup do |app|
+  app.vendor_project(File.expand_path(File.join(File.dirname(__FILE__), '../abhack')), :static)
+end

data/motion/address_book/addr_book.rb

@@ -5,9 +5,15 @@ module AddressBook
     def initialize
       @ab = AddressBook.address_book
     end
-    def people
-      ABAddressBookCopyArrayOfAllPeople(ab).map do |ab_person|
-        AddressBook::Person.new({}, ab_person, :address_book => ab)
+    def people(opts = {})
+      if opts[:source]
+        ABAddressBookCopyArrayOfAllPeopleInSource(ab, opts[:source].ab_source).map do |ab_person|
+          AddressBook::Person.new({}, ab_person, :address_book => ab)
+        end
+      else
+        ABAddressBookCopyArrayOfAllPeople(ab).map do |ab_person|
+          AddressBook::Person.new({}, ab_person, :address_book => ab)
+        end
       end
     end
     def count
@@ -24,6 +30,9 @@ module AddressBook
     def person(id)
       (p = ABAddressBookGetPersonWithRecordID(ab, id)) && Person.new(nil, p, :address_book => ab)
     end
+    def changedSince(timestamp)
+      people.select {|p| p.modification_date > timestamp}
+    end
 
     def groups
       ABAddressBookCopyArrayOfAllGroups(@ab).map do |ab_group|
@@ -40,5 +49,10 @@ module AddressBook
     def notify_changes(callback, context)
       ABAddressBookRegisterExternalChangeCallback(ab, callback, context)
     end
+
+    def sources
+      # ABAddressBookCopyArrayOfAllSources(ab).map {|s| ABRecordCopyValue(s, KABSourceTypeProperty)}
+      ABAddressBookCopyArrayOfAllSources(ab).map {|s| Source.new(s)}
+    end
   end
 end

data/motion/address_book/group.rb

@@ -32,9 +32,10 @@ module AddressBook
       self
     end
 
-    def new?
+    def new_record?
       uid == KABRecordInvalidID
     end
+    alias :new? :new_record?
 
     def delete!
       unless new?
@@ -77,7 +78,7 @@ module AddressBook
     end
 
     def <<(person_or_group)
-      raise "Must save member before adding to group" if person_or_group.new?
+      raise ArgumentError, "Must save member before adding to group" if person_or_group.new?
       ABGroupAddMember(ab_group, person_or_group.ab_record, error)
     end
 

data/motion/address_book/multi_valued.rb

@@ -1,15 +1,17 @@
 module AddressBook
   class MultiValued
+    attr_reader :mv_type
+
     def initialize(opts)
       unless opts.one?
         raise ArgumentError, "MultiValued requires :attributes *or* :ab_multi_value argument"
       end
 
       if opts[:ab_multi_value]
-        # @ab_multi_value = ABMultiValueCreateMutableCopy(opts[:ab_multi_value])
-        @ab_multi_value = opts[:ab_multi_value]
+        @ab_multi_value = ABMultiValueCreateMutableCopy(opts[:ab_multi_value])
       else
         @attributes = opts[:attributes]
+        raise ArgumentError, "Empty multi-value objects are not allowed" if @attributes.empty?
       end
     end
 
@@ -26,7 +28,7 @@ module AddressBook
       count.times.map do |i|
         label = ABMultiValueCopyLabelAtIndex(@ab_multi_value, i)
         label_val = ABAddressBookCopyLocalizedLabel(label)
-        data = ab_record_to_dict(ABMultiValueCopyValueAtIndex(@ab_multi_value, i))
+        data = ab_record_to_dict(i)
         data.merge(:label => label_val)
       end
     end
@@ -35,25 +37,51 @@ module AddressBook
       @ab_multi_value ||= convert_dictionary_into_multi_value
     end
 
+    def localized_label(str)
+      LabelMap[str] || str
+    end
+
     def convert_dictionary_into_multi_value
-      if @attributes.find {|rec| rec[:value]}
-        mv = ABMultiValueCreateMutable(KABMultiStringPropertyType)
+      @mv_type = multi_value_property_type
+      mv = ABMultiValueCreateMutable(mv_type)
+
+      case mv_type
+      when KABMultiStringPropertyType
         @attributes.each do |rec|
-          ABMultiValueAddValueAndLabel(mv, rec[:value], rec[:label], nil)
+          ABMultiValueAddValueAndLabel(mv, rec[:value], localized_label(rec[:label]), nil)
         end
-        mv
-      else
-        mv = ABMultiValueCreateMutable(KABMultiDictionaryPropertyType)
+      when KABMultiDateTimePropertyType
+        @attributes.each do |rec|
+          ABMultiValueAddValueAndLabel(mv, rec[:date], localized_label(rec[:label]), nil)
+        end
+      else # KABMultiDictionaryPropertyType
         @attributes.each do |rec|
-          ABMultiValueAddValueAndLabel(mv, dict_to_ab_record(rec), rec[:label], nil)
+          if value = dict_to_ab_record(rec)
+            ABMultiValueAddValueAndLabel(mv, value, localized_label(rec[:label]), nil)
+          end
+        end
+      end
+
+      mv
+    end
+
+    def multi_value_property_type
+      if @ab_multi_value
+        ABMultiValueGetPropertyType(@ab_multi_value)
+      else
+        if attributes.find {|rec| rec[:value]}
+          KABMultiStringPropertyType
+        elsif attributes.find {|rec| rec[:date]}
+          KABMultiDateTimePropertyType
+        else
+          KABMultiDictionaryPropertyType
         end
-        mv
       end
     end
 
     # these are for mapping fields in a kABMultiDictionaryPropertyType record
     # to keys in a standard hash (NSDictionary)
-    @@attribute_map = {
+    PropertyMap = {
       KABPersonAddressStreetKey => :street,
       KABPersonAddressCityKey => :city,
       KABPersonAddressStateKey => :state,
@@ -71,20 +99,61 @@ module AddressBook
       KABPersonInstantMessageUsernameKey => :username
     }
 
+    LabelMap = {
+      "mobile"   => KABPersonPhoneMobileLabel ,
+      "iphone"   => KABPersonPhoneIPhoneLabel ,
+      "main"     => KABPersonPhoneMainLabel   ,
+      "home_fax" => KABPersonPhoneHomeFAXLabel,
+      "work_fax" => KABPersonPhoneWorkFAXLabel,
+      "pager"    => KABPersonPhonePagerLabel  ,
+      "work"     => KABWorkLabel              ,
+      "home"     => KABHomeLabel              ,
+      "other"    => KABOtherLabel             ,
+      "home page"=> KABPersonHomePageLabel,
+      "anniversary"=> KABPersonAnniversaryLabel
+    }
+
     def dict_to_ab_record(h)
-      @@attribute_map.each_with_object({}) do |(ab_key, attr_key), ab_record|
+      h = PropertyMap.each_with_object({}) do |(ab_key, attr_key), ab_record|
         ab_record[ab_key] = h[attr_key] if h[attr_key]
       end
+      h.any? ? h : nil
     end
 
-    def ab_record_to_dict(ab_record)
-      case ab_record
-      when String
-        {:value => ab_record}
-      else
-        @@attribute_map.each_with_object({}) do |(ab_key, attr_key), dict|
+    def ab_record_to_dict(i)
+      case multi_value_property_type
+      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|
           dict[attr_key] = ab_record[ab_key] if ab_record[ab_key]
         end
+      else
+        raise TypeError, "Unknown MultiValue property type"
+      end
+    end
+
+    def <<(rec)
+      case multi_value_property_type
+      when KABMultiStringPropertyType
+        ABMultiValueAddValueAndLabel(ab_multi_value, rec[:value], localized_label(rec[:label]), nil)
+      when KABMultiDateTimePropertyType
+        ABMultiValueAddValueAndLabel(ab_multi_value, rec[:date], localized_label(rec[:label]), nil)
+      when KABMultiDictionaryPropertyType
+        ABMultiValueAddValueAndLabel(ab_multi_value, dict_to_ab_record(rec), localized_label(rec[:label]), nil)
+      else
+        raise TypeError, "Unknown MultiValue property type"
+      end
+
+      @attributes = convert_multi_value_into_dictionary
+    end
+
+    def first_for(label)
+      if rec = attributes.find {|r| r[:label] == label.to_s}
+        rec[:value] ? rec[:value] : rec
       end
     end
   end

data/motion/address_book/person.rb

@@ -75,15 +75,15 @@ module AddressBook
     def self.attribute_map
       {
         :first_name   => KABPersonFirstNameProperty,
-        :middle_name   => KABPersonMiddleNameProperty,
+        :middle_name  => KABPersonMiddleNameProperty,
         :last_name    => KABPersonLastNameProperty,
-        :suffix    => KABPersonSuffixProperty,
-        :nickname    => KABPersonNicknameProperty,
+        :suffix       => KABPersonSuffixProperty,
+        :nickname     => KABPersonNicknameProperty,
         :job_title    => KABPersonJobTitleProperty,
         :department   => KABPersonDepartmentProperty,
         :organization => KABPersonOrganizationProperty,
-        # :dob    => KABPersonBirthdayProperty,
-        :note    => KABPersonNoteProperty
+        :birthday     => KABPersonBirthdayProperty,
+        :note         => KABPersonNoteProperty
       }
     end
     def attribute_map
@@ -93,6 +93,8 @@ module AddressBook
     def method_missing(name, *args)
       if attribute_name = getter?(name)
         get(attribute_name)
+      # if getter?(name)
+      #   get(name)
       elsif attribute_name = setter?(name)
         set(attribute_name, args.first)
       else
@@ -119,8 +121,15 @@ module AddressBook
     def getter?(method_name)
       if self.class.is_attribute? method_name
         method_name
+        # true
       else
         nil
+        # attribute = method_name.split('_').last
+        # if ['email', 'phone'].include?(attribute)
+        #   true
+        # else
+        #   false
+        # end
       end
     end
     def setter?(method_name)
@@ -157,6 +166,8 @@ module AddressBook
     end
 
     def get(attribute_name)
+      # label, attribute = attribute_name.split('_')
+      # self.send("#{attribute}s").first_for(label)
       attributes[attribute_name.to_sym] ||= get_field(attribute_map[attribute_name])
     end
 
@@ -187,6 +198,10 @@ module AddressBook
       find_by(attribute_name, criteria) || new_by(attribute_name, criteria)
     end
 
+    def photo_image
+      UIImage.alloc.initWithData(photo)
+    end
+
     def photo
       ABPersonCopyImageData(ab_person)
     end
@@ -196,7 +211,9 @@ module AddressBook
     end
 
     def get_multi_valued(field)
-      MultiValued.new(:ab_multi_value => ABRecordCopyValue(ab_person, field))
+      if mv = ABRecordCopyValue(ab_person, field)
+        MultiValued.new(:ab_multi_value => mv)
+      end
     end
 
     def phones
@@ -235,6 +252,10 @@ module AddressBook
       get_multi_valued(KABPersonRelatedNamesProperty)
     end
 
+    def dates
+      get_multi_valued(KABPersonDateProperty)
+    end
+
     def email; email_values.first; end
     def phone; phone_values.first; end
     def url; urls.attributes.first[:value]; end
@@ -276,18 +297,56 @@ module AddressBook
       get_field(KABPersonKindProperty) == KABPersonKindOrganization
     end
 
-    # must stash date values in instance variables or RubyMotion throws a malloc error
+    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)
+    end
+
     def creation_date
-      @creation_date = get_field(KABPersonCreationDateProperty)
+      ABHack.getDateProperty(KABPersonCreationDateProperty, from: ab_person)
     end
 
-    def modification_date
-      @modification_date = get_field(KABPersonModificationDateProperty)
+    # replace *all* properties of an existing Person with new values
+    def replace(new_attributes)
+      @attributes = new_attributes
+      load_ab_person
+    end
+
+    def source
+      s = ABPersonCopySource(ab_person)
+      Source.new(s)
+      # fetching KABSourceNameProperty always seems to return NULL
+      # ABRecordCopyValue(s, KABSourceTypeProperty)
+    end
+
+    def linked_people
+      recs = ABPersonCopyArrayOfAllLinkedPeople(ab_person).mutableCopy
+      recs.delete(ab_person) # LinkedPeople always includes self
+      recs.map do |linked_rec|
+        Person.new(nil, linked_rec, :address_book => address_book)
+      end
+    end
+
+    def to_vcard
+      self.class.vcard_for(self)
+    end
+
+    def self.vcard_for(people)
+      if people.respond_to? :map
+        ab_persons = people.map(&:ab_person)
+      else
+        ab_persons = [people.ab_person]
+      end
+      ABPersonCreateVCardRepresentationWithPeople(ab_persons)
     end
 
     private
 
-    def single_value_property_map
+    def self.single_value_property_map
       {
         KABPersonFirstNameProperty => :first_name,
         KABPersonLastNameProperty => :last_name,
@@ -297,12 +356,12 @@ module AddressBook
         KABPersonJobTitleProperty => :job_title,
         KABPersonDepartmentProperty => :department,
         KABPersonOrganizationProperty => :organization,
-        # KABPersonBirthdayProperty => :dob,
+        KABPersonBirthdayProperty => :birthday,
         KABPersonNoteProperty => :note
       }
     end
 
-    def multi_value_property_map
+    def self.multi_value_property_map
       {
         KABPersonPhoneProperty => :phones,
         KABPersonEmailProperty => :emails,
@@ -310,7 +369,8 @@ module AddressBook
         KABPersonURLProperty => :urls,
         KABPersonSocialProfileProperty => :social_profiles,
         KABPersonInstantMessageProperty => :im_profiles,
-        KABPersonRelatedNamesProperty => :related_names
+        KABPersonRelatedNamesProperty => :related_names,
+        KABPersonDateProperty => :dates
       }
     end
 
@@ -318,9 +378,11 @@ module AddressBook
     def load_ab_person
       @attributes ||= {}
 
-      single_value_property_map.each do |ab_property, attr_key|
+      Person.single_value_property_map.each do |ab_property, attr_key|
         if attributes[attr_key]
           set_field(ab_property, attributes[attr_key])
+        else
+          remove_field(ab_property)
         end
       end
 
@@ -330,16 +392,23 @@ module AddressBook
         set_field(KABPersonKindProperty, KABPersonKindPerson)
       end
 
-      multi_value_property_map.each do |ab_property, attr_key|
+      Person.multi_value_property_map.each do |ab_property, attr_key|
         if attributes[attr_key]
           set_multi_valued(ab_property, attributes[attr_key])
+        else
+          remove_field(ab_property)
         end
       end
+
+      ab_person
     end
 
+    # populate attributes from existing ABPerson
     def import_ab_person
       @attributes = {}
-      single_value_property_map.each do |ab_property, attr_key|
+      @modification_date = nil
+
+      Person.single_value_property_map.each do |ab_property, attr_key|
         if value = get_field(ab_property)
           @attributes[attr_key] = value
         end
@@ -349,9 +418,11 @@ module AddressBook
         @attributes[:is_org] = true
       end
 
-      multi_value_property_map.each do |ab_property, attr_key|
-        if (value = get_multi_valued(ab_property).attributes) && value.any?
-          @attributes[attr_key] = value
+      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
         end
       end
 
@@ -364,10 +435,20 @@ module AddressBook
       end
     end
     def get_field(field)
-      ABRecordCopyValue(ab_person, 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
+    end
+    def remove_field(field)
+      ABRecordRemoveValue(ab_person, field, nil)
     end
 
     def set_multi_valued(field, values)
+      values = values.map { |value| ( (value.kind_of?String) ? {:value => value} : value)}
       if values && values.any?
         multi_field = MultiValued.new(:attributes => values)
         ABRecordSetValue(ab_person, field, multi_field.ab_multi_value, nil)

data/motion/address_book/source.rb

@@ -0,0 +1,17 @@
+module AddressBook
+  class Source
+    attr_reader :ab_source
+
+    def initialize(ab_source)
+      @ab_source = ab_source
+    end
+
+    def type
+      ABRecordCopyValue(ab_source, KABSourceTypeProperty)
+    end
+  end
+
+  def local?
+    type == KABSourceTypeLocal
+  end
+end

data/motion-addressbook.gemspec

@@ -2,8 +2,11 @@
 require File.expand_path('../lib/motion-addressbook/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Alex Rothenberg"]
-  gem.email         = ["alex@alexrothenberg.com"]
+  gem.name          = "motion-addressbook"
+  gem.version       = Motion::Addressbook::VERSION
+
+  gem.authors       = ["Alex Rothenberg", "Jason May"]
+  gem.email         = ["alex@alexrothenberg.com", "jmay@pobox.com"]
   gem.description   = %q{A RubyMotion wrapper around the iOS Address Book framework}
   gem.summary       = %q{A RubyMotion wrapper around the iOS Address Book framework}
   gem.homepage      = ""
@@ -11,11 +14,10 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "motion-addressbook"
   gem.require_paths = ["lib"]
-  gem.version       = Motion::Addressbook::VERSION
-  
-  gem.add_dependency 'bubble-wrap'
-  gem.add_development_dependency 'rake'  
+
+  gem.add_dependency 'bubble-wrap', '~> 1.3'
+
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
 end

data/spec/address_book/group_spec.rb

@@ -23,6 +23,11 @@ describe AddressBook::Group do
     it "should not be new" do
       @group.should.not.be.new
     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
+    end
   end
 
   describe 'a group with members' do

data/spec/address_book/multi_valued_spec.rb

@@ -1,4 +1,18 @@
 describe AddressBook::MultiValued do
+  describe 'a new multi-value' do
+    it 'should convert to localized labels' do
+      AddressBook::MultiValued::LabelMap.size.should.equal 11
+      AddressBook::MultiValued::LabelMap.each do |label, localized|
+        mv = AddressBook::MultiValued.new(:attributes => [{:label => label, :value => 'test'}])
+        ABMultiValueCopyLabelAtIndex(mv.ab_multi_value, 0).should.equal localized
+      end
+    end
+
+    it "should not allow empty input" do
+      ->{AddressBook::MultiValued.new(:attributes => [])}.should.raise ArgumentError
+    end
+  end
+
   describe 'a string multi-value' do
     before do
       @attributes = [
@@ -25,6 +39,16 @@ describe AddressBook::MultiValued do
       mv2 = AddressBook::MultiValued.new(:ab_multi_value => abmv)
       mv2.attributes.should.equal @attributes
     end
+
+    describe 'after appending' do
+      before do
+        @mv << {:label => 'work', :value => 'another string'}
+      end
+
+      it "should have new values" do
+        @mv.count.should.equal 4
+      end
+    end
   end
 
   describe 'a dictionary multi-value' do
@@ -57,10 +81,91 @@ describe AddressBook::MultiValued do
     it 'should have correct internal representation' do
       internal = @mv.ab_multi_value
       ABMultiValueGetCount(internal).should.equal 2
-      ABMultiValueCopyLabelAtIndex(internal, 0).should.equal "home"
-      ABMultiValueCopyLabelAtIndex(internal, 1).should.equal "work"
+      ABMultiValueCopyLabelAtIndex(internal, 0).should.equal KABHomeLabel
+      ABMultiValueCopyLabelAtIndex(internal, 1).should.equal KABWorkLabel
       ABMultiValueCopyValueAtIndex(internal, 0).keys.count.should.equal 3
       ABMultiValueCopyValueAtIndex(internal, 1).keys.count.should.equal 3
     end
+
+    describe 'after appending' do
+      before do
+        @mv << {:label => 'summer', :city => 'Key West', :state => 'FL'}
+      end
+
+      it "should have new values" do
+        @mv.count.should.equal 3
+      end
+    end
+  end
+
+  describe 'a date multi-value' do
+    before do
+      @attributes = [
+        {
+          :label => 'birthday',
+          :date => NSDate.dateWithNaturalLanguageString('April 5, 1962')
+        }, {
+          :label => 'anniversary',
+          :date => NSDate.dateWithNaturalLanguageString('September 22, 1994')
+        }, {
+          :label => 'death',
+          :date => NSDate.dateWithNaturalLanguageString('December 1, 2008')
+        }
+      ]
+      @mv = AddressBook::MultiValued.new(:attributes => @attributes)
+    end
+
+    it 'should be countable' do
+      @mv.count.should.equal 3
+    end
+
+    it 'should be reversible' do
+      abmv = @mv.ab_multi_value
+      mv2 = AddressBook::MultiValued.new(:ab_multi_value => abmv)
+      mv2.attributes.should.equal @attributes
+      # 3.should.equal 3
+    end
+
+    it 'should not explode' do
+      abmv = @mv.ab_multi_value
+      mv2 = AddressBook::MultiValued.new(:ab_multi_value => abmv)
+      dt = mv2.attributes[1][:date]
+      t = NSDate.dateWithNaturalLanguageString('September 22, 1994')
+      dt.should.equal t
+      dt.should.equal t
+      dt.should.equal t
+    end
+
+    describe 'after appending' do
+      before do
+        @mv << {:label => 'graduation', :date => NSDate.dateWithNaturalLanguageString('June 1, 1983')}
+      end
+
+      it "should have new values" do
+        @mv.count.should.equal 4
+      end
+    end
+  end
+
+  describe 'a broken multi-value' do
+    before do
+      @attributes = [{:label => 'work', :value => nil}]
+      @mv = AddressBook::MultiValued.new(:attributes => @attributes)
+    end
+
+    it 'should ignore the missing entry' do
+      @mv.size.should.equal 0
+    end
+  end
+
+  describe 'a date multi-value' do
+    before do
+      @attributes = [{:label => 'anniversary', :date => Time.now}]
+      @mv = AddressBook::MultiValued.new(:attributes => @attributes)
+    end
+
+    it 'should round-trip input' do
+      @mv.attributes.should.equal @attributes
+    end
   end
 end

data/spec/address_book/person_spec.rb

@@ -11,6 +11,9 @@ describe AddressBook::Person do
       it 'should create but not save in the address book' do
         @alex.should.be.new_record
       end
+      it 'should have no mod date' do
+        @alex.modification_date.should.be.nil
+      end
       it 'should have initial values' do
         @alex.first_name.should == 'Alex'
         @alex.last_name.should  == 'Testy'
@@ -28,11 +31,15 @@ describe AddressBook::Person do
     describe 'existing' do
       before do
         @email = unique_email
-        @alex = @ab.create_person(new_alex(@email))
+        @origdata = new_alex(@email)
+        @alex = @ab.create_person(@origdata)
       end
       after do
         @alex.delete!
       end
+      it 'should have a mod date' do
+        @alex.modification_date.should.not.be.nil
+      end
       describe '.find_by_uid' do
         it 'should find match' do
           alex = @ab.person(@alex.uid)
@@ -101,6 +108,24 @@ describe AddressBook::Person do
           @person.delete!
         end
       end
+
+      describe ".replace" do
+        before do
+          warn "DOING REPLACE"
+          @newdata = {
+            :first_name => 'Alexander',
+            :last_name => "Testy",
+            :organization => "Acme, Inc.",
+            :emails => [{:label => 'work', :value => @origdata[:emails].first[:value]}]
+          }
+          @alex.replace(@newdata)
+          @alex.save
+        end
+
+        it "should have the new contents" do
+          @alex.attributes.should == @newdata
+        end
+      end
     end
 
     describe '.find_or_new_by_XXX - new or existing' do
@@ -141,6 +166,7 @@ describe AddressBook::Person do
         :department => 'Development',
         :organization => 'The Company',
         :note => 'some important guy',
+        :birthday => NSDate.dateWithNaturalLanguageString('July 1, 1982'),
         # :mobile_phone => '123 456 7890', :office_phone => '987 654 3210',
         :phones => [
           {:label => 'mobile', :value => '123 456 7899'},
@@ -157,6 +183,10 @@ 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' }
+        ],
+        :dates => [
+          { :label => 'anniversary', :date => NSDate.dateWithNaturalLanguageString('October 9, 2009') },
+          { :label => 'apotheosis', :date => NSDate.dateWithNaturalLanguageString('April 1, 2013') }
         ]
       }
     end
@@ -169,6 +199,7 @@ describe AddressBook::Person do
       it 'should not be existing' do
         @ab_person.should.be.new_record
         @ab_person.should.not.be.exists
+        @ab_person.modification_date.should.be.nil
       end
 
       it 'should be able to get each of the single value fields' do
@@ -213,11 +244,26 @@ describe AddressBook::Person do
           @ab_person.organization.should.equal 'new organization'
         end
 
+        def empty_image(width, height)
+          UIGraphicsBeginImageContext(CGSizeMake(width, height) )
+          CGContextSetFillColorWithColor(UIGraphicsGetCurrentContext(), '#ffffff'.to_color)
+          image = UIGraphicsGetImageFromCurrentImageContext()
+          UIGraphicsEndImageContext()
+          image
+        end
+
         it 'should be able to set the photo' do
-          image = CIImage.emptyImage
-          data = UIImagePNGRepresentation(UIImage.imageWithCIImage image)
+          data = UIImagePNGRepresentation empty_image(1,1)
           @ab_person.photo = data
-          UIImagePNGRepresentation(@ab_person.photo).should.equal data
+          @ab_person.photo.should.not == nil
+          @ab_person.photo.should.equal data
+        end
+
+        it 'should be able to get the photo as an image' do
+          data = UIImagePNGRepresentation empty_image(1,1)
+          @ab_person.photo = data
+          @ab_person.photo_image.size
+          @ab_person.photo_image.size.should.equal CGSizeMake(1,1)
         end
       end
 
@@ -243,6 +289,7 @@ describe AddressBook::Person do
 
       describe 'once saved' do
         before do
+          @before = Time.now
           @before_count = AddressBook.count
           @ab_person.save
         end
@@ -255,6 +302,11 @@ describe AddressBook::Person do
           @ab_person.should.be.exists
         end
 
+        # it 'should populate timestamps' do
+        #   @ab_person.modification_date.should.not.be.nil
+        #   should.satisfy {@ab_person.modification_date > @before}
+        # end
+
         it "should increment the count" do
           AddressBook.count.should.equal @before_count+1
         end
@@ -264,7 +316,7 @@ describe AddressBook::Person do
         end
 
         it 'should have scalar properties' do
-          [:first_name, :middle_name, :last_name, :job_title, :department, :organization, :note].each do |attr|
+          [:first_name, :middle_name, :last_name, :job_title, :department, :organization, :note, :birthday].each do |attr|
             @ab_person.send(attr).should.equal @attributes[attr]
           end
         end
@@ -371,7 +423,8 @@ describe AddressBook::Person do
         :last_name => 'Whorfin',
         :organization => 'Acme Inc.',
         :is_org => true,
-        :note => 'big important company'
+        :note => 'big important company',
+        :birthday => NSDate.dateWithNaturalLanguageString('August 17, 1947')
       )
     end
 
@@ -391,6 +444,7 @@ describe AddressBook::Person do
         @person.getter?('job_title'   ).should.be truthy
         @person.getter?('department'  ).should.be truthy
         @person.getter?('organization').should.be truthy
+        @person.getter?('birthday').should.be truthy
       end
       it 'should know what is not a getter' do
         @person.getter?('nonesense'        ).should.be falsey
@@ -448,4 +502,69 @@ describe AddressBook::Person do
       end
     end
   end
+
+  describe "multiple emails/phone #'s handling" do
+    it "should accept multiple emails/phone #'s as array of strings for new records" do
+      person = @ab.new_person(
+        :first_name => 'Ashish',
+        :last_name => 'Upadhyay',
+        :email => ['a@mail.com','a@mail.com','a@mail.com'],
+        :phones => ['1212999222','1212999333','1212999444'],
+      )
+      person.should.be.new_record
+    end
+    it "should accept multiple emails/phone #'s as array of hashes for new records" do
+      person = @ab.new_person(
+        :first_name => 'Ashish',
+        :last_name => 'Upadhyay',
+        :email => [{ :value => 'a@mail.com' } , { :value => 'a@mail.com' } , { :value => 'a@mail.com' } ] ,
+        :phones => [{ :value => '1212999222' } , { :value => '1212999333' } , { :value => '1212999444' } ] ,
+      )
+      person.should.be.new_record
+    end
+    it "should accept multiple emails/phone #'s as array of combination of strings or hashes for new records" do
+      person = @ab.new_person(
+        :first_name => 'Ashish',
+        :last_name => 'Upadhyay',
+        :email => [ { :value => 'a@mail.com' } , 'a@mail.com' , { :value => 'a@mail.com', :label => 'Office'}] ,
+        :phones => [ '1212999222' ,  { :value => '1212999333', :label => 'Personal' } , { :value => '1212999444' } ] ,
+      )
+      person.should.be.new_record
+    end
+  end
+
+  describe 'vcard' do
+    before do
+      @alex  = @ab.create_person(new_alex(unique_email))
+      @jason = @ab.create_person(new_alex('jason@example.com'))
+    end
+    after do
+      @jason.delete!
+      @alex.delete!
+    end
+
+    describe '.vcard_for' do
+      it 'creates a vcard for a single person' do
+        alex_vcard = AddressBook::Person.vcard_for(@alex).to_s
+        alex_vcard.should.include? 'BEGIN:VCARD'
+        alex_vcard.should.include? "EMAIL;type=INTERNET;type=HOME;type=pref:#{@alex.email}"
+        alex_vcard.should.include? 'END:VCARD'
+      end
+      it 'creates a vcard for an array of people' do
+        alex_and_jason_vcard = AddressBook::Person.vcard_for([@alex, @jason]).to_s
+        alex_and_jason_vcard.should.include? 'BEGIN:VCARD'
+        alex_and_jason_vcard.should.include? "EMAIL;type=INTERNET;type=HOME;type=pref:#{@alex.email}"
+        alex_and_jason_vcard.should.include? "EMAIL;type=INTERNET;type=HOME;type=pref:#{@jason.email}"
+        alex_and_jason_vcard.should.include? 'END:VCARD'
+      end
+    end
+    describe '#to_vcard' do
+      it 'knows how to create vcard for itself' do
+        alex_vcard = @alex.to_vcard.to_s
+        alex_vcard.should.include? 'BEGIN:VCARD'
+        alex_vcard.should.include? "EMAIL;type=INTERNET;type=HOME;type=pref:#{@alex.email}"
+        alex_vcard.should.include? 'END:VCARD'
+      end
+    end
+  end
 end

metadata

@@ -1,32 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: motion-addressbook
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
 - Alex Rothenberg
+- Jason May
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-05-17 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
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -62,6 +63,7 @@ dependencies:
 description: A RubyMotion wrapper around the iOS Address Book framework
 email:
 - alex@alexrothenberg.com
+- jmay@pobox.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -72,6 +74,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- abhack/abhack.h
+- abhack/abhack.m
 - lib/motion-addressbook.rb
 - lib/motion-addressbook/version.rb
 - motion-addressbook.gemspec
@@ -82,6 +86,7 @@ files:
 - motion/address_book/multi_valued.rb
 - motion/address_book/person.rb
 - motion/address_book/picker.rb
+- motion/address_book/source.rb
 - spec/address_book/group_spec.rb
 - spec/address_book/multi_value_spec.rb
 - spec/address_book/multi_valued_spec.rb
@@ -104,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3256350264444301144
+      hash: -259703607999042735
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3256350264444301144
+      hash: -259703607999042735
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24