motion-addressbook 1.7.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 062e2ed0b9018682964f43fcaf0711c7c9147cc6
-  data.tar.gz: ac3392b93c651c531dd6f506ffc9e6d5c1f272fb
+  metadata.gz: 686d48dc6904f9b9a55304536a80a6a54ba98609
+  data.tar.gz: a8c743b34dc3ec02f54d5bcc80110eba64b698bf
 SHA512:
-  metadata.gz: fe803b3bf9eeae54d44b33ce8bd8f1c9016ca5ce62ba36c47a15da3b2fa0a09cca2141e7314c10b756a0a42afa0fbd9b64df8cf5b3b523963858de94721ef85a
-  data.tar.gz: 0e3dd574fd3eb184f6408843613315816095cb69f4653465d056f29d0c8ae2d128c03eb782fbfe516d7eb9b4f616fc270971927914d61df16e6b942d362980ec
+  metadata.gz: 5b62d28e2ac4e801430d98ebb9dcd77f48dd4ce193d6966eb668ae6fa25effa893b3eba5c3c33db4da5b2fde48eabc24d22ce9f92507a5cc9c55a0567b3c6d66
+  data.tar.gz: 028c26080e06d2da83637864311c1130ea4b0399e378df4eb724b60c3097a061ecea3ba4bc2620338fe19ca652d682f73545c447254ab88bdf99204c7057faa4

data/.gitignore

@@ -1,4 +1,4 @@
-.repl_history
+.*history
 build
 resources/*.nib
 resources/*.momd

data/README.md

@@ -86,16 +86,16 @@ end
 The iOS6 simulator does not demand AddressBook authorization. The iOS7
 simulator does.
 
-### Showing the ABPeoplePicker
+### Showing the ABPeoplePickerNavigationController
 
 ```ruby
-AddressBook.pick { |person|
+AddressBook.pick do |person|
   if person
     # person is an AddressBook::Person object
   else
     # canceled
   end
-}
+end
 ```
 
 You can also specify the presenting controller:
@@ -106,6 +106,18 @@ AddressBook.pick presenter: self do |person|
 end
 ```
 
+### Showing the ABNewPersonViewController
+
+```ruby
+AddressBook.create do |person|
+  if person
+    # person is an AddressBook::Person object
+  else
+    # canceled
+  end
+end
+```
+
 ### Working with Person objects
 
 Get a list of existing people from the Address Book. On IOS, results

data/Rakefile

@@ -1,17 +1,16 @@
 require "bundler/gem_tasks"
 $:.unshift("/Library/RubyMotion/lib")
+
 if ENV['osx']
   require 'motion/project/template/osx'
 else
   require 'motion/project/template/ios'
 end
+
 Bundler.setup
 Bundler.require
 
-unless ENV['osx']
-  # iOS needs an AppDelegate for REPL to launch; steal one from BW
-  require 'bubble-wrap/test'
-end
+require 'bubble-wrap/reactor'
 
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
@@ -22,4 +21,47 @@ Motion::Project::App.setup do |app|
   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
+# simulator.  In order to avoid disrupting anything the existing
+# simulator environment, run the test suite in its own blank simulator
+# and clean up afterwards.
+
+namespace :spec do
+  task :isolate do
+    system "launchctl list | grep simulator | cut -f3 | xargs -L 1 launchctl remove"
+
+    @_protected = []
+    Dir.glob("#{ENV['HOME']}/Library/Application Support/iPhone Simulator/[0-9]*").each do |dir|
+      if Dir.exists?("#{dir}.backup")
+        warn "*" * 70
+        warn "PREVIOUS TEST RUN FAILED. RESTORING SIMULATOR BACKUP AND ABORTING."
+        warn "*" * 70
+        system "rm -rf \"#{dir}\""
+        File.rename("#{dir}.backup", dir)
+        exit 1
+      else
+        warn "PROTECTING EXISTING SIMULATOR IN #{dir}"
+        File.rename(dir, "#{dir}.backup")
+        @_protected << dir
+      end
+    end
+
+    at_exit do
+      system "launchctl list | grep simulator | cut -f3 | head -1 | xargs launchctl remove"
+
+      @_protected.each do |dir|
+        warn "RESTORING SIMULATOR IN #{dir}"
+        system "rm -rf \"#{dir}\""
+        File.rename("#{dir}.backup", dir)
+      end
+    end
+  end
+
+  task :simulator => :isolate
 end

data/app/app_delegate.rb

@@ -0,0 +1,25 @@
+class AppDelegate
+  def application(application, didFinishLaunchingWithOptions:launchOptions)
+    @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+    @window.rootViewController = UIViewController.alloc.init
+    @window.makeKeyAndVisible
+
+    command_line
+
+    true
+  end
+
+  def command_line
+    if command = NSProcessInfo.processInfo.environment['dump']
+      warn "Executing command line instruction: #{command}"
+      AddressBook::AddrBook.new do |ab|
+        case command
+        when 'people'
+          puts BW::JSON.generate(ab.people.map(&:attributes))
+        when 'groups'
+          puts BW::JSON.generate(ab.groups.map { |g| {name: g.name, members: g.members.map(&:uid) }})
+        end
+      end
+    end
+  end
+end

data/lib/motion-addressbook.rb

@@ -28,6 +28,9 @@ BubbleWrap.require_ios do
   BW.require 'motion/address_book/ios/picker.rb' do
     file('motion/address_book/ios/picker.rb').uses_framework('AddressBookUI')
   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

data/lib/motion-addressbook/version.rb

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

data/motion/address_book/ios/addr_book.rb

@@ -15,6 +15,8 @@ module AddressBook
           if granted
             activate!
             block.call(self)
+          else
+            block.call(nil)
           end
         end
       else
@@ -25,6 +27,10 @@ module AddressBook
       end
     end
 
+    def self.instance
+      @instance ||= new
+    end
+
     def activate!
       @ab = LiveAddrBook.new(AddressBook.address_book)
     end
@@ -41,7 +47,7 @@ module AddressBook
     end
 
     def auth!
-      raise "iOS Address Book authorization is required." if @ab.nil?
+      raise SecurityError, "iOS Address Book authorization is required." if @ab.nil?
     end
 
     def people(opts = {}, &block)
@@ -97,6 +103,14 @@ module AddressBook
       "#<#{self.class}:#{"0x%0x" % object_id} #{ab.status}>"
     end
 
+    def picker(options={}, &after)
+      AddressBook::Picker.show options.merge(ab: self), &after
+    end
+
+    def creator(options, &after)
+      AddressBook::Creator.show(options.merge(ab: self), &after)
+    end
+
     private
 
     def ab_people(opts = {})

data/motion/address_book/ios/creator.rb

@@ -0,0 +1,47 @@
+module AddressBook
+  class Creator
+    class << self
+      attr_accessor :showing
+    end
+    def self.show(options={}, &after)
+      raise "Cannot show two Pickers" if showing?
+      @creator = self.new(options[:ab], &after)
+      @creator.show options
+      @creator
+    end
+
+    def self.showing?
+      !!showing
+    end
+
+    def initialize(ab, &after)
+      @ab = ab
+      @after = after
+    end
+
+    def show(options={})
+      self.class.showing = true
+
+      @new_person_ctlr = ABNewPersonViewController.alloc.init
+      @new_person_ctlr.newPersonViewDelegate = self
+
+      @presenter = options.fetch :presenter, UIApplication.sharedApplication.keyWindow.rootViewController
+      @animated = options.fetch :animated, true
+      @presenter.presentViewController(@new_person_ctlr, animated: @animated, completion: nil)
+    end
+
+    def hide(ab_person=nil)
+      person = ab_person && @ab.person(ABRecordGetRecordID(ab_person))
+
+      @presenter.dismissViewControllerAnimated(@animated, completion: lambda do
+        @after.call(person) if @after
+        self.class.showing = false
+      end)
+    end
+
+    def newPersonViewController(new_person_ctlr, didCompleteWithNewPerson: ab_person)
+      hide(ab_person)
+    end
+
+  end
+end

data/motion/address_book/ios/multi_valued.rb

@@ -60,19 +60,16 @@ module AddressBook
       @mv_type = multi_value_property_type
       mv = ABMultiValueCreateMutable(mv_type)
 
-      case mv_type
-      when KABMultiStringPropertyType
-        @attributes.each do |rec|
-          ABMultiValueAddValueAndLabel(mv, rec[:value], localized_label(rec[:label]), nil)
-        end
-      when KABMultiDateTimePropertyType
-        @attributes.each do |rec|
-          ABMultiValueAddValueAndLabel(mv, rec[:date], localized_label(rec[:label]), nil)
-        end
-      else # KABMultiDictionaryPropertyType
-        @attributes.each do |rec|
+      @attributes.each do |rec|
+        label = localized_label(rec[:label])
+        case mv_type
+        when KABMultiStringPropertyType
+          ABMultiValueAddValueAndLabel(mv, rec[:value], label, nil)
+        when KABMultiDateTimePropertyType
+          ABMultiValueAddValueAndLabel(mv, rec[:date], label, nil)
+        else # KABMultiDictionaryPropertyType
           if value = dict_to_ab_record(rec)
-            ABMultiValueAddValueAndLabel(mv, value, localized_label(rec[:label]), nil)
+            ABMultiValueAddValueAndLabel(mv, value, label, nil)
           end
         end
       end

data/motion/address_book/ios/person.rb

@@ -10,7 +10,7 @@ module AddressBook
     end
 
     def self.all(options = {})
-      AddressBook::AddrBook.new.people(options)
+      AddressBook::AddrBook.instance.people(options)
     end
 
     def self.create(attributes)

data/motion/address_book/ios/picker.rb

@@ -5,7 +5,7 @@ module AddressBook
     end
     def self.show(options={}, &after)
       raise "Cannot show two Pickers" if showing?
-      @picker = Picker.new(&after)
+      @picker = self.new(options[:ab] || AddressBook::AddrBook.instance, &after)
       @picker.show options
       @picker
     end
@@ -14,7 +14,8 @@ module AddressBook
       !!showing
     end
 
-    def initialize(&after)
+    def initialize(ab, &after)
+      @ab = ab
       @after = after
     end
 
@@ -23,17 +24,19 @@ module AddressBook
 
       @people_picker_ctlr = ABPeoplePickerNavigationController.alloc.init
       @people_picker_ctlr.peoplePickerDelegate = self
-      presenter = options.fetch :presenter, UIApplication.sharedApplication.keyWindow.rootViewController
-      presenter.presentViewController(@people_picker_ctlr, animated:true, completion:nil)
+
+      @presenter = options.fetch :presenter, UIApplication.sharedApplication.keyWindow.rootViewController
+      @animated = options.fetch :animated, true
+      @presenter.presentViewController(@people_picker_ctlr, animated: @animated, completion: nil)
     end
 
     def hide(ab_person=nil)
-      person = ab_person ? AddressBook::Person.new({}, ab_person) : nil
+      person = ab_person && @ab.person(ABRecordGetRecordID(ab_person))
 
-      UIApplication.sharedApplication.keyWindow.rootViewController.dismissViewControllerAnimated(true, completion:lambda{
-        @after.call(person) if @after
-        self.class.showing = false
-      })
+      @presenter.dismissViewControllerAnimated(@animated, completion: lambda do
+          @after.call(person) if @after
+          self.class.showing = false
+        end)
     end
 
     def peoplePickerNavigationController(people_picker, shouldContinueAfterSelectingPerson:ab_person)
@@ -49,13 +52,6 @@ module AddressBook
     def peoplePickerNavigationControllerDidCancel(people_picker)
       hide
     end
-  end
-end
 
-module AddressBook
-  module_function
-  def pick(options={}, &after)
-    AddressBook::Picker.show options, &after
   end
 end
-

data/spec/ios/address_book/creator_spec.rb

@@ -0,0 +1,33 @@
+describe AddressBook::Creator do
+  before do
+    @ab = AddressBook::AddrBook.new
+    @person = @ab.create_person(first_name: 'Colin')
+    @ab_person = @person.ab_person
+  end
+
+  after do
+    @person.delete!
+  end
+
+  describe 'IOS UI for creating an entry' do
+    before do
+      @created_person = :not_set
+      @picker = @ab.creator(animated: false) do |person|
+        @created_person = person
+      end
+    end
+
+    it 'should yield the created person' do
+      @picker.newPersonViewController(nil, didCompleteWithNewPerson: @ab_person)
+      @created_person.should.not == nil
+      @created_person.should.be.kind_of?(AddressBook::Person)
+      @created_person.first_name.should == 'Colin'
+    end
+
+    it 'should yield nil if canceled' do
+      @created_person.should == :not_set
+      @picker.newPersonViewController(nil, didCompleteWithNewPerson: nil)
+      @created_person.should == nil
+    end
+  end
+end

data/spec/ios/address_book/person_spec.rb

@@ -11,7 +11,7 @@ describe AddressBook::Person do
     describe 'new' do
       before do
         @data = new_alex
-        @alex = AddressBook::Person.new(@data)
+        @alex = @ab.new_person(@data)
       end
       it 'should create but not save in the address book' do
         @alex.should.be.new_record
@@ -30,7 +30,7 @@ describe AddressBook::Person do
     describe 'existing' do
       before do
         @email = unique_email
-        @alex = AddressBook::Person.create(new_alex(@email))
+        @alex = @ab.create_person(new_alex(@email))
       end
       after do
         @alex.delete!
@@ -93,16 +93,16 @@ describe AddressBook::Person do
 
       describe '.all' do
         it 'should have the person we created' do
-          all_names = AddressBook::Person.all.map do |person|
+          all_names = @ab.people.map do |person|
             [person.first_name, person.last_name]
           end
           all_names.should.include? [@alex.first_name, @alex.last_name]
         end
 
         it 'should get bigger when we create another' do
-          initial_people_count = AddressBook::Person.all.size
-          @person = AddressBook::Person.create({:first_name => 'Alex2', :last_name=>'Rothenberg2'})
-          AddressBook::Person.all.size.should.equal (initial_people_count + 1)
+          initial_people_count = @ab.count
+          @person = @ab.create_person({:first_name => 'Alex2', :last_name=>'Rothenberg2'})
+          @ab.count.should.equal (initial_people_count + 1)
           @person.delete!
         end
       end
@@ -111,7 +111,7 @@ describe AddressBook::Person do
     describe '.find_or_new_by_XXX - new or existing' do
       before do
         @email = unique_email
-        @alex = AddressBook::Person.create(new_alex(@email))
+        @alex = @ab.create_person(new_alex(@email))
       end
       after do
         @alex.delete!
@@ -175,7 +175,7 @@ describe AddressBook::Person do
 
     describe 'a new person' do
       before do
-        @ab_person = AddressBook::Person.new(@attributes)
+        @ab_person = @ab.new_person(@attributes)
       end
 
       it 'should not be existing' do
@@ -314,7 +314,7 @@ describe AddressBook::Person do
 
     describe 'an existing person' do
       before do
-        @orig_ab_person = AddressBook::Person.new(@attributes)
+        @orig_ab_person = @ab.new_person(@attributes)
         @orig_ab_person.save
         @ab_person = AddressBook::Person.find_or_new_by_email(@attributes[:emails][0][:value])
       end
@@ -356,7 +356,7 @@ describe AddressBook::Person do
           { :label => 'work' },
           { :label => 'work', :url => 'http://state.edu/college' }
         ]
-        @ab_person = AddressBook::Person.create(@attributes)
+        @ab_person = @ab.create_person(@attributes)
       end
       after do
         @ab_person.delete!
@@ -381,7 +381,7 @@ describe AddressBook::Person do
 
   describe "organization record" do
     before do
-      @person = AddressBook::Person.new(
+      @person = @ab.new_person(
         :first_name => 'John',
         :last_name => 'Whorfin',
         :organization => 'Acme Inc.',
@@ -397,7 +397,7 @@ describe AddressBook::Person do
 
   describe 'method missing magic' do
     before do
-      @person = AddressBook::Person.new
+      @person = @ab.new_person({})
     end
     describe 'getters' do
       it 'should have a getter for each attribute' do
@@ -466,36 +466,64 @@ describe AddressBook::Person do
 
   describe "sorting" do
     before do
+      # warn "BEFORE CREATION COUNT: #{@ab.count}"
       @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
+      @p1 = @ab.create_person(first_name: 'Bob', last_name: 'Edwards')
+      # warn "I CREATED #{@p1}"
+      @p2 = @ab.create_person(first_name: 'Doris', last_name: 'Channing')
+      @p3 = @ab.create_person(first_name: 'Anne', last_name: 'Brown')
+      @p4 = @ab.create_person(first_name: 'Eddie', last_name: 'Anderson')
+      @p5 = @ab.create_person(first_name: 'Carol', last_name: 'Dolittle')
+      # warn "AFTER CREATION COUNT: #{@ab.count}"
     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]
+    after do
+      # warn "BEFORE CLEANUP COUNT: #{@ab.count}"
+      @ab.people.each(&:delete!)
+      # warn "AFTER CLEANUP COUNT: #{@ab.count}"
+      # [@p1, @p2, @p3, @p4, @p5].each(&:delete!)
     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
+    describe "with different sort orders" do
+      it "should sort on last name using OS sort" do
+        # warn "PEOPLE COUNT IS #{@ab.people.count}"
+        expectation = [@p4, @p3, @p2, @p5, @p1].map(&:uid)
+        @ab.people(ordering: KABPersonSortByLastName).map(&:uid).should.equal expectation
+      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 pass" do
+        3.should == 3
+      end
+
+      it "should sort on first name using OS sort" do
+        # warn "PEOPLE COUNT IS #{@ab.people.count}"
+        expectation = [@p3, @p1, @p5, @p2, @p4].map(&:uid)
+        @ab.people(ordering: KABPersonSortByFirstName).map(&:uid).should.equal expectation
+      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]
+      it "should pass" do
+        3.should == 3
+      end
+
+      it "should support a custom sort order" do
+        # warn "@ab.people is #{@ab.people}"
+        # warn "PEOPLE COUNT IS #{@ab.people.count}"
+        ordered = @ab.people { |p| p.last_name[1] }.map(&:uid)
+        # warn "sorted is #{ordered}"
+        expectation = [@p1, @p2, @p4, @p5, @p3].map(&:uid)
+        ordered.should.equal expectation
+      end
     end
   end
 
-  describe "notifications" do
+  describe "notifications across AB instances" do
     before do
       @ab1 = AddressBook::AddrBook.new
       @ab2 = AddressBook::AddrBook.new
@@ -505,15 +533,26 @@ describe AddressBook::Person do
       App.notification_center.observe :addressbook_updated do |notification|
         @notifications += 1
       end
+    end
 
+    # should see a single notification for each change to the AB database:
+    #   2 creations, 2 deletions
+    it "should come in once for every external change" do
       @alice = @ab2.create_person({first_name: 'Alice'})
       @bob = @ab1.create_person({first_name: 'Bob'})
       @alice.delete!
       @bob.delete!
-    end
 
-    it "should be notified of every change" do
       @notifications.should.equal 4
     end
   end
+
+  after do
+    puts
+    NSLog("=============== person_spec.rb line #{__LINE__} ===============")
+    wait 1 do
+      NSLog("=============== person_spec.rb line #{__LINE__} ===============")
+    end
+  end
+
 end

data/spec/ios/address_book/picker_spec.rb

@@ -1,34 +1,36 @@
-# I don't know how to test a class wrapping a controller like this yet
-#
-# describe AddressBook::Picker do
-#   describe 'IOS UI for finding people' do
-#     before do
-#       @selected_person = nil
-#       @picker = AddressBook.pick do |person|
-#         @selected_person = person
-#       end
-#     end
+describe AddressBook::Picker do
+  describe 'IOS UI for finding people' do
+    before do
+      @ab = AddressBook::AddrBook.new
+      @colin = @ab.create_person(first_name: 'Colin')
+      @ab_person = @colin.ab_person
+      @selected_person = nil
+      @picker = @ab.picker(animated: false) do |person|
+        @selected_person = person
+      end
+    end
 
-#     it 'should yield the selected person' do
-#       ab_person = AddressBook::Person.new(first_name: 'Colin').ab_person
-#       @picker.peoplePickerNavigationController(@picker_nav_controller, shouldContinueAfterSelectingPerson: ab_person)
-#       @selected_person.should.not == nil
-#       @selected_person.first_name.should == 'Colin'
-#     end
+    after do
+      @colin.delete!
+    end
 
-#     it 'should yield the selected person' do
-#       property = :some_property
-#       id = :some_id
-#       ab_person = AddressBook::Person.new(first_name: 'Colin').ab_person
-#       @picker.peoplePickerNavigationController(@picker_nav_controller, shouldContinueAfterSelectingPerson: ab_person, property:property, identifier:id)
-#       @selected_person.should.not == nil
-#       @selected_person.first_name.should == 'Colin'
-#     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'
+    end
 
-#     it 'should yield nil when cancelled' do
-#       ab_person = AddressBook::Person.new(first_name: 'Colin').ab_person
-#       @picker.peoplePickerNavigationControllerDidCancel(@picker_nav_controller)
-#       @selected_person.should == nil
-#     end
-#   end
-# 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'
+    end
+
+    it 'should yield nil when cancelled' do
+      @picker.peoplePickerNavigationControllerDidCancel(@picker_nav_controller)
+      @selected_person.should == nil
+    end
+  end
+end

data/spec/ios/helpers/spec_helper.rb

@@ -1,48 +1,27 @@
-# 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.
-#
-# WARNING: Altering the simulator configuration at runtime is a risky
-# practice. If we use `Kernel.system` instead of backquotes when
-# invoking `mv` and `rm` below, the simulator throws a warning:
-#
-#    The iOS Simulator libSystem was initialized out of order.  This
-#    is most often caused by running host executables or inserting
-#    host dylibs.  In the future, this will cause an abort.
-#
-
-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.
-
-  warn "PROTECTING EXISTING ADDRESS BOOK IN SIMULATOR"
-
-  `rm -rf \"#{AB_PATH_BAK}\"`
-  `mv \"#{AB_PATH}\" \"#{AB_PATH_BAK}\"`
-  # Kernel.system "rm -rf \"#{AB_PATH_BAK}\""
-  # Kernel.system "mv \"#{AB_PATH}\" \"#{AB_PATH_BAK}\""
-end
-
-at_exit do
-  warn "RESTORING ORIGINAL ADDRESS BOOK IN SIMULATOR"
-
-  Kernel.system "rm -rf \"#{AB_PATH}\""
-  Kernel.system "mv \"#{AB_PATH_BAK}\" \"#{AB_PATH}\""
-end
-
-def wait_for_authorization
-  @semaphore = Dispatch::Semaphore.new(0)
-  AddressBook::AddrBook.new do
-    @semaphore.signal
+module Bacon
+  class << self
+    @@old_run = instance_method(:run)
+    @@already_started = false
+
+    def ab_connect
+      AddressBook::AddrBook.new do |ab|
+        if ab
+          EM.schedule_on_main do
+            Bacon.run
+          end
+        else
+          warn "ACCESS DENIED - ABORTING"
+          exit
+        end
+      end
+    end
+
+    def run
+      if AddressBook.authorized?
+        @@old_run.bind(self).call
+      else
+        ab_connect
+      end
+    end
   end
-  @semaphore.wait
 end
-
-protect_existing_address_book
-wait_for_authorization

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-addressbook
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Alex Rothenberg
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2014-04-14 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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A RubyMotion wrapper around the iOS & OSX Address Book frameworks
@@ -61,19 +61,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- app/app_delegate.rb
 - lib/motion-addressbook.rb
 - lib/motion-addressbook/version.rb
 - motion-addressbook.gemspec
 - motion/address_book.rb
 - motion/address_book/ios/addr_book.rb
+- motion/address_book/ios/creator.rb
 - motion/address_book/ios/group.rb
-- motion/address_book/ios/multi_value.rb
 - motion/address_book/ios/multi_valued.rb
 - motion/address_book/ios/person.rb
 - motion/address_book/ios/picker.rb
@@ -82,6 +83,7 @@ files:
 - motion/address_book/osx/group.rb
 - motion/address_book/osx/multi_valued.rb
 - motion/address_book/osx/person.rb
+- spec/ios/address_book/creator_spec.rb
 - spec/ios/address_book/group_spec.rb
 - spec/ios/address_book/multi_valued_spec.rb
 - spec/ios/address_book/person_spec.rb
@@ -104,21 +106,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A RubyMotion wrapper around the iOS & OSX Address Book frameworks
 test_files:
+- spec/ios/address_book/creator_spec.rb
 - spec/ios/address_book/group_spec.rb
 - spec/ios/address_book/multi_valued_spec.rb
 - spec/ios/address_book/person_spec.rb

data/motion/address_book/ios/multi_value.rb

@@ -1,120 +0,0 @@
-module AddressBook
-  class MultiValue
-    attr_reader :attributes, :ab_multi_values
-
-    def self.attribute_map
-      { :mobile   => KABPersonPhoneMobileLabel ,
-        :iphone   => KABPersonPhoneIPhoneLabel ,
-        :main     => KABPersonPhoneMainLabel   ,
-        :home_fax => KABPersonPhoneHomeFAXLabel,
-        :work_fax => KABPersonPhoneWorkFAXLabel,
-        :pager    => KABPersonPhonePagerLabel  ,
-        :work     => KABWorkLabel              ,
-        :home     => KABHomeLabel              ,
-        :other    => KABOtherLabel
-      }
-    end
-    def attribute_map
-      self.class.attribute_map
-    end
-
-    def alex
-      ABMultiValueGetIdentifierAtIndex @ab_multi_values, 0
-    end
-
-    def initialize(attributes={}, existing_ab_multi_values=nil)
-      @attributes = {}
-      if existing_ab_multi_values
-        @ab_multi_values = ABMultiValueCreateMutableCopy(existing_ab_multi_values)
-        load_attributes_from_ab
-      else
-        @ab_multi_values = ABMultiValueCreateMutable(KABMultiStringPropertyType)
-      end
-      attributes.each do |attribute, value|
-        send("#{attribute}=", value)
-      end
-    end
-
-    def method_missing(name, *args)
-      if attribute_name = getter?(name)
-        get(attribute_name)
-      elsif attribute_name = setter?(name)
-        set(attribute_name, args.first)
-      else
-        super
-      end
-    end
-
-    def self.is_attribute?(attribute_name)
-      return false if attribute_name.nil?
-      attribute_map.include?(attribute_name.to_sym) || [:email, :phone_number].include?( attribute_name.to_sym)
-    end
-
-    def getter?(method_name)
-      if self.class.is_attribute? method_name
-        method_name
-      else
-        nil
-      end
-    end
-    def setter?(method_name)
-      method_name.to_s =~ /^(\w*)=$/
-      if self.class.is_attribute? $1
-        $1
-      else
-        nil
-      end
-    end
-
-    def get(attribute_name)
-      attributes[attribute_name.to_sym] ||= get_field(attribute_map[attribute_name])
-    end
-
-    def set(attribute_name, value)
-      set_field(attribute_map[attribute_name.to_sym], value)
-      attributes[attribute_name.to_sym] = value
-    end
-
-    def set_field(ab_label, value)
-      if blank?(ab_label)
-        ABMultiValueAddValueAndLabel(@ab_multi_values, value, ab_label, nil) unless value.nil?
-      else
-        ABMultiValueReplaceValueAtIndex(@ab_multi_values, value, 0)
-      end
-    end
-
-    def get_field(ab_label)
-      puts
-      puts [__FILE__, __LINE__, ab_label].inspect
-      index = ABMultiValueGetIndexForIdentifier(@ab_multi_values, ab_label)
-      puts [__FILE__, __LINE__, index].inspect
-      ABMultiValueCopyValueAtIndex(@ab_multi_values, index)
-    end
-
-    def values
-      attributes.values
-    end
-
-    def include? value
-      return false if values.nil?
-      values.include? value
-    end
-
-    def size
-      ABMultiValueGetCount(@ab_multi_values)
-    end
-
-    def load_attributes_from_ab
-      (0...size).to_a.each do |i|
-        label = ABMultiValueCopyLabelAtIndex(@ab_multi_values, i)
-        @attributes[attribute_map.invert[label]] = ABMultiValueCopyValueAtIndex(@ab_multi_values, i)
-      end
-    end
-
-    private
-    def blank?(ab_label)
-      attributes[ab_label].nil?
-    end
-
-  end
-end