abbu 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50bca77bc23aaa22b0ba903a7a209158464bf8c9e7599723e7a3252708dd8338
-  data.tar.gz: a42bdb76e5acfd9f99c9c9bc0a53fa797cf093ff3e4f18e4441eeee06ad65322
+  metadata.gz: 6a2a430e28fa7792cb9f22a2e30f808a5d5752b0144cec428e64a88bde5740f9
+  data.tar.gz: 0c1e039e876c8a82b6a8ec52a046afe421f51d0236ceed9eab67f99a09261695
 SHA512:
-  metadata.gz: 3fcc9599424ce7d5577aa546ed42ab760efcdb45ea292ceb7a4e83404fd4726667df0b34020ed8f8dcbfdd21a73ed408bde38a0f8feb565bd0114fc44559433e
-  data.tar.gz: 90b0de3e8cf215467525b9e9520dc0af50c3cb40ae1a2c46ee5076663a3571b5e89f6a79e3fe96d52d12789e743703a23e90ccfac23ad6ae2d9a7cd4b9312905
+  metadata.gz: 5978d9208cac2c0a6bff53184b1dcd1fa016c204a34aa4a7912f9a814d616d4bc7a482d868bf3dc47a4fc2a1b6671bbf7c8092432c28eae2fb1ec3f628248822
+  data.tar.gz: bd915874f2b2987640a2942beaec9fee6e034411c81fbfa0df127136e60353c5cc0327d638a84a2e959600209d2e9ba72143768b39568484ce4bcbb498e486f4

data/CHANGELOG.md

@@ -11,6 +11,34 @@ Versioning follows [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+## [0.1.2] - 2026-04-26
+
+### Added
+
+- Full Apple Contacts schema support: job title, department, maiden name, phonetic names, pronouns, ringtone, texttone
+- Relational table parsing: URLs, notes, related names (family/business), social profiles (Twitter, etc.)
+- Nickname, prefix, and suffix fields with smart `full_name` formatting
+- Hash-based email/phone data preserving custom labels (e.g. "Direct Line", "Work")
+- Address, group, URL, notes, related names, and social profiles in CSV export
+- Comprehensive JSON export with all contact fields
+- vCard 3.0 export with ADR, URL, NICKNAME, TITLE, NOTE, X-SOCIALPROFILE
+- `rubocop-rspec` plugin integration
+- 100% line coverage across all 44 specs
+
+### Changed
+
+- Refactored `SqliteParser` to use `RECORD_FIELD_MAP` constant for maintainability
+- Refactored `CsvExporter` into `core_fields`/`extended_fields` for cleaner ABC metrics
+- All specs comply with rubocop-rspec conventions
+
+## [0.1.1] - 2026-04-23
+
+### Fixed
+
+- `require 'pathname'` missing in `archive.rb` causing `NameError` in isolation
+- Added regression guard spec for file require isolation
+
+
 ## [0.1.0] - 2026-04-12
 
 ### Added

data/docs/ABBU.md

@@ -44,20 +44,39 @@ AddressBook-v22.abcddb
 
 Key tables:
 
-| Table                  | Purpose                              |
-|------------------------|--------------------------------------|
-| `ZABCDRECORD`          | One row per contact (name, company)  |
-| `ZABCDEMAILADDRESS`    | Email addresses (linked by `ZOWNER`) |
-| `ZABCDPHONENUMBER`     | Phone numbers (linked by `ZOWNER`)   |
+| Table                    | Purpose                                |
+|--------------------------|----------------------------------------|
+| `ZABCDRECORD`            | One row per contact (name, company)    |
+| `ZABCDEMAILADDRESS`      | Email addresses (linked by `ZOWNER`)   |
+| `ZABCDPHONENUMBER`       | Phone numbers (linked by `ZOWNER`)     |
+| `ZABCDPOSTALADDRESS`     | Street addresses (linked by `ZOWNER`)  |
+| `Z_ABCDCONTACTGROUP`     | Group membership join table            |
+| `ZABCDURLADDRESS`        | URLs (linked by `ZOWNER`)              |
+| `ZABCDNOTE`              | Notes (linked by `ZCONTACT`)           |
+| `ZABCDRELATEDNAME`       | Related names (linked by `ZOWNER`)     |
+| `ZABCDSOCIALPROFILE`     | Social profiles (linked by `ZOWNER`)   |
 
 Notable columns in `ZABCDRECORD`:
 
-| Column          | Description      |
-|-----------------|------------------|
-| `Z_PK`          | Primary key      |
-| `ZFIRSTNAME`    | First name       |
-| `ZLASTNAME`     | Last name        |
-| `ZORGANIZATION` | Company / org    |
+| Column                   | Description              |
+|--------------------------|--------------------------|
+| `Z_PK`                   | Primary key              |
+| `Z_ENT`                  | Entity type (14=contact) |
+| `ZFIRSTNAME`             | First name               |
+| `ZLASTNAME`              | Last name                |
+| `ZNICKNAME`              | Nickname                 |
+| `ZTITLE`                 | Prefix (e.g. "Dr.")      |
+| `ZSUFFIX`                | Suffix (e.g. "Jr.")      |
+| `ZORGANIZATION`          | Company / org            |
+| `ZJOBTITLE`              | Job title                |
+| `ZDEPARTMENT`            | Department               |
+| `ZMAIDENNAME`            | Maiden name              |
+| `ZPHONETICFIRSTNAME`     | Phonetic first name      |
+| `ZPHONETICLASTNAME`      | Phonetic last name       |
+| `ZPHONETICORGANIZATION`  | Phonetic company         |
+| `ZPRONOUNS`              | Pronouns                 |
+| `ZRINGTONE`              | Ringtone                 |
+| `ZTEXTTONE`              | Text tone                |
 
 ### 2. Plist / `.abcdp` (legacy macOS)
 

data/lib/abbu/contact.rb

@@ -3,15 +3,24 @@
 
 module Abbu
   class Contact
-    attr_accessor :first_name, :last_name, :emails, :phones, :company
+    attr_accessor :first_name, :last_name, :emails, :phones, :company, :addresses, :groups, :nickname, :prefix, :suffix,
+                  :job_title, :department, :maiden_name, :phonetic_first_name, :phonetic_last_name, :phonetic_company,
+                  :pronouns, :ringtone, :texttone, :urls, :notes, :related_names, :social_profiles
 
     def initialize
       @emails = []
       @phones = []
+      @addresses = []
+      @groups = []
+      @urls = []
+      @notes = []
+      @related_names = []
+      @social_profiles = []
     end
 
     def full_name
-      [first_name, last_name].compact.join(' ')
+      quoted_nickname = nickname ? "\"#{nickname}\"" : nil
+      [prefix, first_name, quoted_nickname, last_name, suffix].compact.join(' ')
     end
 
     def to_s

data/lib/abbu/exporters/csv_exporter.rb

@@ -27,11 +27,45 @@ module Abbu
       private
 
       def headers
-        %w[Name Email Phone Company]
+        %w[Name Email Phone Company Address Groups URLs Notes RelatedNames SocialProfiles]
       end
 
       def row(contact)
-        [contact.full_name, contact.emails.first, contact.phones.first, contact.company]
+        core_fields(contact) + extended_fields(contact)
+      end
+
+      def core_fields(contact)
+        [
+          contact.full_name,
+          contact.emails.first&.fetch(:address, nil),
+          contact.phones.first&.fetch(:number, nil),
+          contact.company,
+          format_address(contact.addresses.first),
+          contact.groups.join(', ')
+        ]
+      end
+
+      def extended_fields(contact)
+        [
+          contact.urls.map { |u| u[:url] }.join(', '),
+          contact.notes.join("\n"),
+          format_related_names(contact.related_names),
+          format_social_profiles(contact.social_profiles)
+        ]
+      end
+
+      def format_address(addr)
+        return nil unless addr
+
+        [addr[:street], addr[:city], addr[:state], addr[:zip], addr[:country]].compact.join(', ')
+      end
+
+      def format_related_names(names)
+        names.map { |rn| "#{rn[:name]} (#{rn[:label]})" }.join(', ')
+      end
+
+      def format_social_profiles(profiles)
+        profiles.map { |sp| "#{sp[:username]} on #{sp[:service]}" }.join(', ')
       end
     end
   end

data/lib/abbu/exporters/json_exporter.rb

@@ -21,14 +21,29 @@ module Abbu
       private
 
       def payload
-        @contacts.map do |c|
-          {
-            name: c.full_name,
-            emails: c.emails,
-            phones: c.phones,
-            company: c.company
-          }
-        end
+        @contacts.map { |c| contact_hash(c) }
+      end
+
+      def contact_hash(contact) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+        {
+          name: contact.full_name,
+          first_name: contact.first_name,
+          last_name: contact.last_name,
+          nickname: contact.nickname,
+          prefix: contact.prefix,
+          suffix: contact.suffix,
+          company: contact.company,
+          job_title: contact.job_title,
+          department: contact.department,
+          emails: contact.emails,
+          phones: contact.phones,
+          addresses: contact.addresses,
+          groups: contact.groups,
+          urls: contact.urls,
+          notes: contact.notes,
+          related_names: contact.related_names,
+          social_profiles: contact.social_profiles
+        }.compact
       end
     end
   end

data/lib/abbu/exporters/vcard_exporter.rb

@@ -22,16 +22,55 @@ module Abbu
         @contacts.map { |c| vcard_for(c) }.join("\n")
       end
 
-      def vcard_for(contact)
+      def vcard_for(contact) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
         lines = ['BEGIN:VCARD', 'VERSION:3.0']
         lines << "FN:#{contact.full_name}"
         lines << "N:#{contact.last_name};#{contact.first_name};;;"
+        lines << "NICKNAME:#{contact.nickname}" if contact.nickname
         lines << "ORG:#{contact.company}" if contact.company
-        contact.emails.each { |e| lines << "EMAIL:#{e}" }
-        contact.phones.each { |p| lines << "TEL:#{p}" }
+        lines << "TITLE:#{contact.job_title}" if contact.job_title
+        append_emails(lines, contact)
+        append_phones(lines, contact)
+        append_addresses(lines, contact)
+        append_urls(lines, contact)
+        append_social_profiles(lines, contact)
+        contact.notes.each { |n| lines << "NOTE:#{n}" }
         lines << 'END:VCARD'
         lines.join("\n")
       end
+
+      def append_emails(lines, contact)
+        contact.emails.each do |e|
+          label = e[:label] || 'INTERNET'
+          lines << "EMAIL;TYPE=#{label}:#{e[:address]}"
+        end
+      end
+
+      def append_phones(lines, contact)
+        contact.phones.each do |p|
+          label = p[:label] || 'VOICE'
+          lines << "TEL;TYPE=#{label}:#{p[:number]}"
+        end
+      end
+
+      def append_addresses(lines, contact)
+        contact.addresses.each do |a|
+          label = a[:label] || 'HOME'
+          lines << "ADR;TYPE=#{label}:;;#{a[:street]};#{a[:city]};#{a[:state]};#{a[:zip]};#{a[:country]}"
+        end
+      end
+
+      def append_urls(lines, contact)
+        contact.urls.each do |u|
+          lines << "URL:#{u[:url]}"
+        end
+      end
+
+      def append_social_profiles(lines, contact)
+        contact.social_profiles.each do |sp|
+          lines << "X-SOCIALPROFILE;TYPE=#{sp[:service]}:#{sp[:username]}"
+        end
+      end
     end
   end
 end

data/lib/abbu/parsers/sqlite_parser.rb

@@ -6,7 +6,21 @@ require_relative '../contact'
 
 module Abbu
   module Parsers
-    class SqliteParser
+    class SqliteParser # rubocop:disable Metrics/ClassLength
+      # Column-name → attr_accessor mapping for flat fields on ZABCDRECORD
+      RECORD_FIELD_MAP = {
+        'ZFIRSTNAME' => :first_name, 'ZLASTNAME' => :last_name,
+        'ZNICKNAME' => :nickname, 'ZTITLE' => :prefix,
+        'ZSUFFIX' => :suffix, 'ZORGANIZATION' => :company,
+        'ZJOBTITLE' => :job_title, 'ZDEPARTMENT' => :department,
+        'ZMAIDENNAME' => :maiden_name,
+        'ZPHONETICFIRSTNAME' => :phonetic_first_name,
+        'ZPHONETICLASTNAME' => :phonetic_last_name,
+        'ZPHONETICORGANIZATION' => :phonetic_company,
+        'ZPRONOUNS' => :pronouns,
+        'ZRINGTONE' => :ringtone, 'ZTEXTTONE' => :texttone
+      }.freeze
+
       def initialize(db_paths)
         @db_paths = Array(db_paths)
       end
@@ -28,32 +42,111 @@ module Abbu
       end
 
       def records(db)
-        db.execute('SELECT * FROM ZABCDRECORD')
+        # Exclude groups (typically Z_ENT = 15 in this schema version)
+        db.execute('SELECT * FROM ZABCDRECORD WHERE Z_ENT != 15')
       end
 
       def emails_for(db, record_id)
         db.execute(
-          'SELECT ZADDRESSNORMALIZED FROM ZABCDEMAILADDRESS WHERE ZOWNER = ?',
+          'SELECT ZADDRESSNORMALIZED, ZLABEL FROM ZABCDEMAILADDRESS WHERE ZOWNER = ?',
           record_id
-        ).filter_map { |row| row['ZADDRESSNORMALIZED'] }
+        ).map { |row| { address: row['ZADDRESSNORMALIZED'], label: row['ZLABEL'] } }
       end
 
       def phones_for(db, record_id)
         db.execute(
-          'SELECT ZFULLNUMBER FROM ZABCDPHONENUMBER WHERE ZOWNER = ?',
+          'SELECT ZFULLNUMBER, ZLABEL FROM ZABCDPHONENUMBER WHERE ZOWNER = ?',
+          record_id
+        ).map { |row| { number: row['ZFULLNUMBER'], label: row['ZLABEL'] } }
+      end
+
+      def addresses_for(db, record_id) # rubocop:disable Metrics/MethodLength
+        db.execute(
+          'SELECT ZSTREET, ZCITY, ZSTATE, ZZIPCODE, ZCOUNTRYNAME, ZLABEL FROM ZABCDPOSTALADDRESS WHERE ZOWNER = ?',
           record_id
-        ).filter_map { |row| row['ZFULLNUMBER'] }
+        ).map do |row|
+          {
+            street: row['ZSTREET'],
+            city: row['ZCITY'],
+            state: row['ZSTATE'],
+            zip: row['ZZIPCODE'],
+            country: row['ZCOUNTRYNAME'],
+            label: row['ZLABEL']
+          }
+        end
+      end
+
+      def groups_for(db, record_id)
+        query = <<-SQL
+          SELECT g.ZFIRSTNAME
+          FROM Z_ABCDCONTACTGROUP j
+          JOIN ZABCDRECORD g ON j.Z_GROUP = g.Z_PK
+          WHERE j.Z_CONTACT = ?
+        SQL
+        db.execute(query, record_id).map { |row| row['ZFIRSTNAME'] }
+      rescue SQLite3::SQLException
+        []
+      end
+
+      def urls_for(db, record_id)
+        db.execute(
+          'SELECT ZURL, ZLABEL FROM ZABCDURLADDRESS WHERE ZOWNER = ?',
+          record_id
+        ).map { |row| { url: row['ZURL'], label: row['ZLABEL'] } }
+      rescue SQLite3::SQLException
+        []
+      end
+
+      def notes_for(db, record_id)
+        db.execute(
+          'SELECT ZTEXT FROM ZABCDNOTE WHERE ZCONTACT = ?',
+          record_id
+        ).filter_map { |row| row['ZTEXT'] }
+      rescue SQLite3::SQLException
+        []
+      end
+
+      def related_names_for(db, record_id)
+        db.execute(
+          'SELECT ZNAME, ZLABEL FROM ZABCDRELATEDNAME WHERE ZOWNER = ?',
+          record_id
+        ).map { |row| { name: row['ZNAME'], label: row['ZLABEL'] } }
+      rescue SQLite3::SQLException
+        []
+      end
+
+      def social_profiles_for(db, record_id)
+        db.execute(
+          'SELECT ZSERVICENAME, ZUSERNAME FROM ZABCDSOCIALPROFILE WHERE ZOWNER = ?',
+          record_id
+        ).map { |row| { service: row['ZSERVICENAME'], username: row['ZUSERNAME'] } }
+      rescue SQLite3::SQLException
+        []
       end
 
       def build_contact(db, row)
         contact = Contact.new
-        contact.first_name = row['ZFIRSTNAME']
-        contact.last_name  = row['ZLASTNAME']
-        contact.company    = row['ZORGANIZATION']
-        contact.emails     = emails_for(db, row['Z_PK'])
-        contact.phones     = phones_for(db, row['Z_PK'])
+        assign_flat_fields(contact, row)
+        assign_relational_fields(contact, db, row['Z_PK'])
         contact
       end
+
+      def assign_flat_fields(contact, row)
+        RECORD_FIELD_MAP.each do |column, attr|
+          contact.public_send(:"#{attr}=", row[column])
+        end
+      end
+
+      def assign_relational_fields(contact, db, record_id) # rubocop:disable Metrics/AbcSize
+        contact.emails          = emails_for(db, record_id)
+        contact.phones          = phones_for(db, record_id)
+        contact.addresses       = addresses_for(db, record_id)
+        contact.groups          = groups_for(db, record_id)
+        contact.urls            = urls_for(db, record_id)
+        contact.notes           = notes_for(db, record_id)
+        contact.related_names   = related_names_for(db, record_id)
+        contact.social_profiles = social_profiles_for(db, record_id)
+      end
     end
   end
 end

data/lib/abbu/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Abbu
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abbu
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Stan Carver II
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-24 00:00:00.000000000 Z
+date: 2026-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement