rails-contact 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f08d1e4fe3f704acfbf960d33948277264f3ebb56ae72999d02a281526eba72b
-  data.tar.gz: 746e6e1bc998fc23ef6407eda47f04483c227c8df8ffa7f96fab4fc24d53f755
+  metadata.gz: 48540c1897658b886292f1fafe8157fa2aa7fed817d9b9ebb64213456ac958e3
+  data.tar.gz: 3329ba043c33922528e3736e8a77d739a71151c30d471bc300ef832131ab09fd
 SHA512:
-  metadata.gz: 34ad0a97ca7e0eeb7b566e278db0d83b2102fb6e6c3fc67fe3880a33c6fc0cea060c6282f4614834980ff7ed04d4ccec00c8863f09f6c01a92e01b82bc96e05a
-  data.tar.gz: 3a8f05a97f69d001580847192a4eebe98284b997cccb230c21e97556d4da504ac4b682e12a8c616cc43d0734e73ef851f450fc3e9736f9bf148979bc4ed626cd
+  metadata.gz: 34f85c62bf91b52739ad8833e884a44ac142c44b507eda5c1c1044320cda3fba787c1d20afa3d4eb196df81cf02dd806b593ef1b8d06d383790741bd80b055e1
+  data.tar.gz: 4ddb497c06c1fc0fed8ad0b5a636f5ff640afe425e1d1fe0b40c2acc9ab9500bc0b473eab23be1bde9eacfb29c972b63bf3e10095db7ed2f19cd3bdf169d7bbb

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.1.7
+
+- Google People API: `updateContact` sends required `updatePersonFields`; update payloads include `resourceName` and `etag`; sync preloads emails, phones, and addresses.
+- Google: optional `google_contact_family_name_suffix` (and env `RAILS_CONTACT_GOOGLE_CONTACT_FAMILY_NAME_SUFFIX`) for family name in sync payloads only.
+- Google: payload mapper skips blank emails/phones, omits empty association arrays, biography uses `TEXT_PLAIN` when present.
+- Elasticsearch search backend reuses one `Elasticsearch::Client` per process (fewer product-check warnings).
+- Remove CSV import from the gem (keep imports in the host application). Drops `rails_contact:import_csv` and `Csv::ImportService`.
+- Engine registers stylesheet/javascript paths for Propshaft.
+
 ## 0.1.5
 
 - Scope engine stylesheet to contacts content only (`.rails-contact-page`) so host app layout/header styling is not overridden.

data/README.md

@@ -9,7 +9,7 @@ It provides:
 - labels/tags
 - dynamic add/remove nested rows
 - Elasticsearch-backed search with DB fallback
-- CSV import and Google sync scaffolding
+- Google sync scaffolding
 - merge and bulk-delete operations
 - Devise-style override generators
 
@@ -128,6 +128,8 @@ Rails::Contact.configure do |config|
   config.google_sync_enabled = false
   config.google_max_contacts = 25_000
   config.rolling_window_sort = :updated_at
+  # Optional: appended to familyName in Google People API payloads only (blank = unchanged).
+  # config.google_contact_family_name_suffix = "_by_vendor"
   config.default_per_page = 25
 end
 ```
@@ -139,7 +141,6 @@ end
 ```bash
 rake rails_contact:reindex
 rake rails_contact:sync_google
-rake rails_contact:import_csv CSV_PATH=/absolute/path/to/eq.csv
 ```
 
 ---

data/docs/parity_matrix.md

@@ -46,7 +46,7 @@ This matrix tracks feature parity for `rails-contact` versus Google Contacts.
 
 | Capability | Google Contacts | rails-contact Target | Priority | Acceptance Criteria |
 |---|---|---|---|---|
-| CSV import | Flexible column import | Same | P0 | Mapping profile handles eq.csv fields |
+| CSV import | Flexible column import | Host app | P0 | Engine stays format-agnostic; host maps columns to models |
 | CSV export | Download contacts | Same | P1 | Export with stable headers and escaping |
 | Google sync | People API sync | Similar | P0/P1 | Two-way sync for rolling window with conflict policy |
 | Conflict resolution | Last write + ETag semantics | Same policy | P1 | Deterministic merge outcomes and tests |

data/lib/generators/rails/contact/install/templates/rails_contact.rb.tt

@@ -11,6 +11,8 @@ Rails::Contact.configure do |config|
   config.google_client_secret = ENV["GOOGLE_CLIENT_SECRET"]
   config.google_redirect_uri = ENV["GOOGLE_REDIRECT_URI"]
   config.google_token_path = ENV.fetch("RAILS_CONTACT_GOOGLE_TOKEN_PATH", "tmp/rails_contact_google_token.json")
+  # Optional: suffix appended to family name only in Google sync payloads (e.g. "_by_vendor"). Leave unset to disable.
+  # config.google_contact_family_name_suffix = ENV["RAILS_CONTACT_GOOGLE_CONTACT_FAMILY_NAME_SUFFIX"]&.presence
 
   config.default_per_page = 25
 end

data/lib/rails/contact/configuration.rb

@@ -5,7 +5,8 @@ module Rails
                     :google_sync_enabled, :google_max_contacts, :rolling_window_sort,
                     :google_client_id, :google_client_secret, :google_redirect_uri,
                     :google_token_path, :reset_index_on_boot, :default_per_page,
-                    :inherit_host_layout
+                    :inherit_host_layout,
+                    :google_contact_family_name_suffix
 
       def initialize
         @contact_class_name = "Rails::Contact::Contact"
@@ -18,6 +19,8 @@ module Rails
         @google_client_secret = ENV["GOOGLE_CLIENT_SECRET"]
         @google_redirect_uri = ENV["GOOGLE_REDIRECT_URI"]
         @google_token_path = ENV.fetch("RAILS_CONTACT_GOOGLE_TOKEN_PATH", "tmp/rails_contact_google_token.json")
+        # Optional: appended to familyName in Google People payloads only (not stored on Contact). Blank = disabled.
+        @google_contact_family_name_suffix = ENV["RAILS_CONTACT_GOOGLE_CONTACT_FAMILY_NAME_SUFFIX"]&.presence
         @reset_index_on_boot = false
         @default_per_page = 25
         # When true (default), engine pages use the host app +layout+ named +application+ so

data/lib/rails/contact/engine.rb

@@ -13,6 +13,11 @@ module Rails
         app.config.filter_parameters += %i[google_access_token google_refresh_token authorization]
       end
 
+      initializer "rails_contact.assets" do |app|
+        app.config.assets.paths << root.join("app/assets/stylesheets")
+        app.config.assets.paths << root.join("app/assets/javascripts")
+      end
+
       rake_tasks do
         load File.expand_path("../../tasks/rails/contact_tasks.rake", __dir__)
       end

data/lib/rails/contact/google/client.rb

@@ -6,6 +6,9 @@ module Rails
       class Client
         PEOPLE_API_BASE = "https://people.googleapis.com/v1".freeze
 
+        # Fields allowed in updatePersonFields (People API field mask); excludes Person metadata keys.
+        UPDATE_MASK_FIELDS = %w[names emailAddresses phoneNumbers addresses biographies].freeze
+
         def initialize(access_token:)
           @connection = Faraday.new(url: PEOPLE_API_BASE) do |faraday|
             faraday.request :retry, max: 3, interval: 0.5, backoff_factor: 2
@@ -19,7 +22,10 @@ module Rails
         end
 
         def update_contact(resource_name, payload)
-          patch("/#{resource_name}:updateContact", payload)
+          mask = update_person_fields_mask(payload)
+          raise ArgumentError, "updatePersonFields must not be empty" if mask.blank?
+
+          patch("/#{resource_name}:updateContact", payload, { "updatePersonFields" => mask })
         end
 
         def delete_contact(resource_name)
@@ -35,10 +41,11 @@ module Rails
           end)
         end
 
-        def patch(path, payload)
+        def patch(path, payload, params = nil)
           parse(@connection.patch(path) do |request|
             request.headers = headers
             request.body = payload.to_json
+            request.params.update(params) if params.present?
           end)
         end
 
@@ -49,6 +56,11 @@ module Rails
         def headers
           { "Authorization" => "Bearer #{@access_token}", "Content-Type" => "application/json" }
         end
+
+        def update_person_fields_mask(payload)
+          h = payload.stringify_keys
+          UPDATE_MASK_FIELDS.select { |field| h[field].present? }.join(",")
+        end
       end
     end
   end

data/lib/rails/contact/google/payload_mapper.rb

@@ -7,18 +7,44 @@ module Rails
         end
 
         def to_people_payload
+          bio_text = [ @contact.biography, @contact.region_name ].compact.join("\n")
           {
-            names: [ { givenName: @contact.given_name, familyName: @contact.family_name } ],
-            emailAddresses: @contact.emails.map { |email| { value: email.value, type: (email.label || "other") } },
-            phoneNumbers: @contact.phones.map { |phone| { value: phone.e164.presence || phone.value, type: (phone.label || "mobile") } },
+            names: [ { givenName: @contact.given_name, familyName: family_name_for_google } ],
+            emailAddresses: @contact.emails.filter_map do |email|
+              next if email.value.blank?
+
+              { value: email.value, type: (email.label || "other") }
+            end,
+            phoneNumbers: @contact.phones.filter_map do |phone|
+              value = phone.e164.presence || phone.value
+              next if value.blank?
+
+              { value: value, type: (phone.label || "mobile") }
+            end,
             addresses: @contact.addresses.map do |address|
               {
                 city: address.city,
                 formattedValue: address.formatted_value.presence || "Current city: #{@contact.current_city}\nDeparture city: #{@contact.departure_city}"
               }
             end,
-            biographies: [ { value: [ @contact.biography, @contact.region_name ].compact.join("\n") } ]
-          }.compact
+            biographies: ([ { value: bio_text, contentType: "TEXT_PLAIN" } ] if bio_text.present?)
+          }.compact.tap do |h|
+            h.delete(:emailAddresses) if h[:emailAddresses].blank?
+            h.delete(:phoneNumbers) if h[:phoneNumbers].blank?
+            h.delete(:addresses) if h[:addresses].blank?
+          end
+        end
+
+        private
+
+        def family_name_for_google
+          suffix = Rails::Contact.configuration.google_contact_family_name_suffix
+          return @contact.family_name if suffix.blank?
+
+          base = @contact.family_name.to_s
+          return suffix if base.blank?
+
+          base.end_with?(suffix) ? base : "#{base}#{suffix}"
         end
       end
     end

data/lib/rails/contact/google/sync_service.rb

@@ -8,7 +8,7 @@ module Rails
         end
 
         def sync!
-          Rails::Contact::Contact.sync_window.each do |contact|
+          Rails::Contact::Contact.sync_window.includes(:emails, :phones, :addresses).each do |contact|
             sync_contact(contact)
           end
         end
@@ -16,7 +16,11 @@ module Rails
         def sync_contact(contact)
           payload = PayloadMapper.new(contact).to_people_payload
           response = if contact.google_resource_name.present?
-                       @client.update_contact(contact.google_resource_name, payload)
+                       body = payload.merge(
+                         resourceName: contact.google_resource_name,
+                         etag: contact.google_etag
+                       ).compact
+                       @client.update_contact(contact.google_resource_name, body)
           else
                        @client.create_contact(payload)
           end

data/lib/rails/contact/search/backends/elasticsearch.rb

@@ -5,8 +5,22 @@ module Rails
         class Elasticsearch
           INDEX = "rails_contact_contacts".freeze
 
+          class << self
+            def default_client
+              @default_client ||= ::Elasticsearch::Client.new(url: Rails::Contact.configuration.elasticsearch_url)
+            end
+
+            def default_client=(client)
+              @default_client = client
+            end
+
+            def clear_default_client!
+              @default_client = nil
+            end
+          end
+
           def initialize(client: nil)
-            @client = client || ::Elasticsearch::Client.new(url: Rails::Contact.configuration.elasticsearch_url)
+            @client = client || self.class.default_client
           end
 
           def search(query, filters)

data/lib/rails/contact/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Contact
-    VERSION = "0.1.5"
+    VERSION = "0.1.7"
   end
 end

data/lib/rails/contact.rb

@@ -7,7 +7,6 @@ require "rails/contact/routing"
 require "rails/contact/search/query"
 require "rails/contact/search/backends/database"
 require "rails/contact/search/backends/elasticsearch"
-require "rails/contact/csv/import_service"
 require "rails/contact/google/client"
 require "rails/contact/google/token_store"
 require "rails/contact/google/payload_mapper"

data/lib/tasks/rails/contact_tasks.rake

@@ -20,12 +20,4 @@ namespace :rails_contact do
     puts "Google sync completed"
   end
 
-  desc "Import contacts from CSV path (CSV_PATH=/path/file.csv)"
-  task import_csv: :environment do
-    path = ENV["CSV_PATH"]
-    raise "Set CSV_PATH env var" if path.blank?
-
-    count = Rails::Contact::Csv::ImportService.new(path: path).import!
-    puts "Imported #{count} rows"
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-contact
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Kshitiz Sinha
@@ -93,8 +93,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '8.13'
-description: Mountable Rails engine offering contact CRUD, CSV import, Elasticsearch-backed
-  search, and optional capped Google Contacts two-way sync.
+description: Mountable Rails engine offering contact CRUD, Elasticsearch-backed search,
+  and optional capped Google Contacts two-way sync.
 email:
 - kshtzkr@gmail.com
 executables: []
@@ -169,7 +169,6 @@ files:
 - lib/generators/rails_contact/rails_contact_generator.rb
 - lib/rails/contact.rb
 - lib/rails/contact/configuration.rb
-- lib/rails/contact/csv/import_service.rb
 - lib/rails/contact/engine.rb
 - lib/rails/contact/google/client.rb
 - lib/rails/contact/google/conflict_resolver.rb

data/lib/rails/contact/csv/import_service.rb

@@ -1,87 +0,0 @@
-require "csv"
-
-module Rails
-  module Contact
-    module Csv
-      class ImportService
-        HEADER_MAP = {
-          "Enquirer First Name" => :given_name,
-          "Enquirer Last Name" => :family_name,
-          "Current City" => :current_city,
-          "Departure City" => :departure_city,
-          "Region Name" => :region_name
-        }.freeze
-
-        def initialize(path:, dedupe_key: :email)
-          @path = path
-          @dedupe_key = dedupe_key
-        end
-
-        def import!
-          imported = 0
-          CSV.foreach(@path, headers: true) do |row|
-            import_row(row.to_h)
-            imported += 1
-          end
-          imported
-        end
-
-        private
-
-        def import_row(row)
-          attrs = build_attributes(row)
-          contact = find_or_initialize(row)
-          contact.assign_attributes(attrs)
-          contact.save!
-          upsert_associations(contact, row)
-          Rails::Contact::IndexContactJob.perform_later(contact.id)
-        end
-
-        def build_attributes(row)
-          HEADER_MAP.each_with_object({}) do |(csv_key, attr), memo|
-            value = row[csv_key].to_s.strip
-            memo[attr] = (value == "blank" ? nil : value.presence)
-          end
-        end
-
-        def find_or_initialize(row)
-          email = normalize_email(row["Enquirer Email"])
-          return Rails::Contact::Contact.new if email.blank?
-          return Rails::Contact::Contact.new if @dedupe_key != :email
-
-          Rails::Contact::Contact.joins(:emails).where(rails_contact_contact_emails: { value: email }).first || Rails::Contact::Contact.new
-        end
-
-        def upsert_associations(contact, row)
-          email = normalize_email(row["Enquirer Email"])
-          primary_phone = normalize_phone(row["Enquirer Phone Country Code"], row["Enquirer Phone"])
-          alt_phone = normalize_phone(row["Alternate Wa Phone Country Code"], row["Alternate Wa Phone"])
-
-          contact.emails.find_or_create_by!(value: email, primary: true, label: "work") if email.present?
-          if primary_phone.present?
-            contact.phones.find_or_create_by!(value: primary_phone, e164: primary_phone, primary: true, label: "mobile")
-          end
-          if alt_phone.present?
-            contact.phones.find_or_create_by!(value: alt_phone, e164: alt_phone, primary: false, label: "whatsapp")
-          end
-
-          formatted_value = "Current city: #{contact.current_city}\nDeparture city: #{contact.departure_city}"
-          contact.addresses.find_or_create_by!(city: contact.current_city, departure_city: contact.departure_city, formatted_value: formatted_value)
-        end
-
-        def normalize_email(value)
-          clean = value.to_s.strip.downcase
-          clean.presence
-        end
-
-        def normalize_phone(country_code, number)
-          digits = number.to_s.gsub(/\D+/, "")
-          return nil if digits.blank?
-          prefix = country_code.to_s.strip
-          prefix = "+#{prefix}" unless prefix.start_with?("+")
-          "#{prefix}#{digits}"
-        end
-      end
-    end
-  end
-end