rails-contact 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f08d1e4fe3f704acfbf960d33948277264f3ebb56ae72999d02a281526eba72b
-  data.tar.gz: 746e6e1bc998fc23ef6407eda47f04483c227c8df8ffa7f96fab4fc24d53f755
+  metadata.gz: 11aea6cb5a1f51337bf1c48e9cb0e3d34ada33d16af8fc5a8476a687d78eb5ba
+  data.tar.gz: 63ce98be235f82c0dfe65a22abe308566d44a72e423e0a2351d8e8d04a5ef0f4
 SHA512:
-  metadata.gz: 34ad0a97ca7e0eeb7b566e278db0d83b2102fb6e6c3fc67fe3880a33c6fc0cea060c6282f4614834980ff7ed04d4ccec00c8863f09f6c01a92e01b82bc96e05a
-  data.tar.gz: 3a8f05a97f69d001580847192a4eebe98284b997cccb230c21e97556d4da504ac4b682e12a8c616cc43d0734e73ef851f450fc3e9736f9bf148979bc4ed626cd
+  metadata.gz: 1dc45c5cbcb8d9db9bfa9e8374408e8746c2d0e03fd6bd7bea77acf767df515c74ce7b0334761e31f94ac9fdabb86a19af3d5a8ce4c3c6876b81184336e25704
+  data.tar.gz: 4345e73338be0e56ad00d29d9796fa3ea08e7136f319eb6df79939823f17fe1b898b8ef53d8047f9863142c3ab0751f60b4f00f40bc3b11e177dc6c9c3db95b4

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.1.8
+
+- Contacts index: paginated search (total count, previous/next, page indicator) with Elasticsearch and database backends.
+- `POST /google_sync_unsynced` and **Sync … not yet in Google** button when sync is enabled; `GoogleSyncUnsyncedJob` runs `SyncService#sync_unsynced!` for contacts with no `google_resource_name`.
+
+## 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/app/controllers/rails/contact/contacts_controller.rb

@@ -10,10 +10,30 @@ module Rails
 
       def index
         @query = params[:q].to_s.strip
-        @contacts = Search::Query.new(@query, filters: normalized_filters(filter_params)).call
+        result = Search::Query.new(
+          @query,
+          filters: normalized_filters(filter_params),
+          page: params[:page]
+        ).call
+        @contacts = result.records
+        @total_count = result.total_count
+        @page = result.page
+        @per_page = result.per_page
+        @total_pages = result.total_pages
+        @google_contacts_pending_sync = google_pending_sync_count
         render "rails/contact/index"
       end
 
+      def google_sync_unsynced
+        unless Rails::Contact.configuration.google_sync_enabled
+          redirect_to contacts_path, alert: "Google Contacts sync is disabled."
+          return
+        end
+
+        GoogleSyncUnsyncedJob.perform_later
+        redirect_to contacts_path, notice: "Google sync has been queued for contacts not yet linked."
+      end
+
       def show
         render "rails/contact/show"
       end
@@ -99,6 +119,12 @@ module Rails
         params.permit(:city, :region, :sync_eligible, :starred)
       end
 
+      def google_pending_sync_count
+        return 0 unless Rails::Contact.configuration.google_sync_enabled
+
+        Contact.where("google_resource_name IS NULL OR google_resource_name = ?", "").count
+      end
+
       def enqueue_index(contact_id)
         IndexContactJob.perform_later(contact_id)
       end

data/app/jobs/rails/contact/google_sync_unsynced_job.rb

@@ -0,0 +1,13 @@
+module Rails
+  module Contact
+    class GoogleSyncUnsyncedJob < ApplicationJob
+      queue_as :default
+
+      def perform
+        return unless Rails::Contact.configuration.google_sync_enabled
+
+        Google::SyncService.new.sync_unsynced!
+      end
+    end
+  end
+end

data/app/views/rails/contact/_index_pagination.html.erb

@@ -0,0 +1,25 @@
+<% if defined?(@total_count) && @total_count.to_i > 0 %>
+  <div class="flex flex-col gap-3 border-t border-gray-200 bg-gray-50 px-4 py-3 sm:flex-row sm:items-center sm:justify-between">
+    <p class="text-sm text-gray-600">
+      <% start_i = (@page - 1) * @per_page + 1 %>
+      <% end_i = [ @page * @per_page, @total_count ].min %>
+      Showing <span class="font-medium text-gray-900"><%= start_i %>–<%= end_i %></span>
+      of <span class="font-medium text-gray-900"><%= number_with_delimiter(@total_count) %></span>
+      <% if @per_page.present? && @per_page > 0 %>
+        <span class="text-gray-500">(<%= @per_page %> per page)</span>
+      <% end %>
+    </p>
+    <% if defined?(@total_pages) && @total_pages > 1 %>
+      <div class="flex flex-wrap items-center gap-2">
+        <% qp = request.query_parameters.except(:page, :action, :controller) %>
+        <% if @page > 1 %>
+          <%= link_to "Previous", url_for(qp.merge(page: @page - 1)), class: "inline-flex rounded-md border border-gray-300 bg-white px-3 py-1.5 text-sm font-medium text-gray-700 hover:bg-gray-50" %>
+        <% end %>
+        <span class="text-sm text-gray-600">Page <%= @page %> / <%= @total_pages %></span>
+        <% if @page < @total_pages %>
+          <%= link_to "Next", url_for(qp.merge(page: @page + 1)), class: "inline-flex rounded-md border border-gray-300 bg-white px-3 py-1.5 text-sm font-medium text-gray-700 hover:bg-gray-50" %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

data/app/views/rails/contact/index.html.erb

@@ -26,6 +26,22 @@
     <% end %>
   </div>
 
+  <% if Rails::Contact.configuration.google_sync_enabled %>
+    <div class="rounded-xl border border-gray-200 bg-white p-4 shadow-sm">
+      <h2 class="mb-2 text-sm font-semibold text-gray-900">Google Contacts</h2>
+      <% if @google_contacts_pending_sync.to_i.positive? %>
+        <%= form_with url: google_sync_unsynced_contacts_path, method: :post, local: true, class: "flex flex-wrap items-center gap-3" do %>
+          <%= submit_tag "Sync #{@google_contacts_pending_sync} contact#{'s' if @google_contacts_pending_sync != 1} not yet in Google",
+                class: "inline-flex rounded-md bg-emerald-600 px-4 py-2 text-sm font-semibold text-white hover:bg-emerald-700",
+                data: { confirm: "Queue Google sync for #{@google_contacts_pending_sync} contact(s)? This runs in the background." } %>
+        <% end %>
+        <p class="mt-2 text-xs text-gray-500">Creates or updates People entries for contacts with no Google link yet. Already-linked contacts are unchanged.</p>
+      <% else %>
+        <p class="text-sm text-gray-600">Every contact in the database is already linked to Google (or there are no contacts).</p>
+      <% end %>
+    </div>
+  <% end %>
+
   <div class="rounded-xl border border-gray-200 bg-white p-4 shadow-sm">
     <%= form_with url: bulk_destroy_contacts_path, method: :post, local: true, class: "inline-flex items-center gap-2" do |f| %>
       <%= hidden_field_tag :ids, "", id: "bulk-ids-field" %>
@@ -76,6 +92,7 @@
         <% end %>
       </tbody>
     </table>
+    <%= render "rails/contact/index_pagination" %>
   </div>
 </div>
 

data/config/routes.rb

@@ -1,6 +1,7 @@
 Rails::Contact::Engine.routes.draw do
   post "/bulk_destroy", to: "contacts#bulk_destroy", as: :bulk_destroy_contacts
   post "/merge", to: "contacts#merge", as: :merge_contacts
+  post "/google_sync_unsynced", to: "contacts#google_sync_unsynced", as: :google_sync_unsynced_contacts
   get "/", to: "contacts#index", as: :contacts
   get "/new", to: "contacts#new", as: :new_contact
   post "/", to: "contacts#create"

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,15 +8,35 @@ 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
 
+        def unsynced_contacts_scope
+          Rails::Contact::Contact.where("google_resource_name IS NULL OR google_resource_name = ?", "")
+        end
+
+        def sync_unsynced!
+          unsynced_contacts_scope.in_batches(of: 100) do |batch|
+            batch.preload(:emails, :phones, :addresses).each do |contact|
+              sync_contact(contact)
+            rescue StandardError => e
+              Rails.logger.error(
+                "[Rails::Contact] Google sync_unsynced failed for contact #{contact.id}: #{e.class}: #{e.message}"
+              )
+            end
+          end
+        end
+
         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/database.rb

@@ -3,13 +3,19 @@ module Rails
     module Search
       module Backends
         class Database
-          def search(query, filters)
+          def search(query, filters, page:, per_page:)
+            offset = (page - 1) * per_page
             scope = Contact.includes(:emails, :phones, :labels).recent_first
             scope = apply_filters(scope, filters)
-            return scope.limit(limit) if query.blank?
+
+            if query.blank?
+              total = scope.count
+              records = scope.offset(offset).limit(per_page).to_a
+              return Search::Result.new(records: records, total_count: total, page: page, per_page: per_page)
+            end
 
             wildcard = "%#{query.downcase}%"
-            scope.left_joins(:emails, :phones, :labels).where(
+            filtered = scope.left_joins(:emails, :phones, :labels).where(
               "LOWER(rails_contact_contacts.given_name) LIKE :q OR "\
               "LOWER(rails_contact_contacts.family_name) LIKE :q OR "\
               "LOWER(COALESCE(rails_contact_contacts.metadata->>'company', '')) LIKE :q OR "\
@@ -19,7 +25,10 @@ module Rails
               "LOWER(rails_contact_labels.name) LIKE :q",
               q: wildcard,
               raw: "%#{query}%"
-            ).distinct.limit(limit)
+            ).distinct
+            total = filtered.count(:id)
+            records = filtered.offset(offset).limit(per_page).to_a
+            Search::Result.new(records: records, total_count: total, page: page, per_page: per_page)
           end
 
           private
@@ -34,10 +43,6 @@ module Rails
             end
             scoped
           end
-
-          def limit
-            Rails::Contact.configuration.default_per_page
-          end
         end
       end
     end

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

@@ -5,17 +5,34 @@ 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)
-            response = @client.search(index: INDEX, body: search_body(query, filters))
-            ids = response.fetch("hits", {}).fetch("hits", []).map { |doc| doc["_id"] }
+          def search(query, filters, page:, per_page:)
+            response = @client.search(index: INDEX, body: search_body(query, filters, page: page, per_page: per_page))
+            hits = response.fetch("hits", {})
+            ids = hits.fetch("hits", []).map { |doc| doc["_id"] }
+            total_count = extract_total_hits(hits["total"])
             records_by_id = Contact.where(id: ids).index_by { |record| record.id.to_s }
-            ids.filter_map { |id| records_by_id[id.to_s] }
+            records = ids.filter_map { |id| records_by_id[id.to_s] }
+            Search::Result.new(records: records, total_count: total_count, page: page, per_page: per_page)
           rescue StandardError
-            Search::Backends::Database.new.search(query, filters)
+            Search::Backends::Database.new.search(query, filters, page: page, per_page: per_page)
           end
 
           def upsert(contact)
@@ -67,9 +84,12 @@ module Rails
             }
           end
 
-          def search_body(query, filters)
+          def search_body(query, filters, page:, per_page:)
+            from = (page - 1) * per_page
             {
-              size: Rails::Contact.configuration.default_per_page,
+              from: from,
+              size: per_page,
+              track_total_hits: true,
               sort: [ { updated_at: { order: "desc" } }, { id: { order: "desc" } } ],
               query: {
                 bool: {
@@ -80,6 +100,12 @@ module Rails
             }
           end
 
+          def extract_total_hits(raw)
+            return 0 if raw.nil?
+
+            raw.is_a?(Hash) ? raw.fetch("value", 0).to_i : raw.to_i
+          end
+
           def search_clause(query)
             return [ { match_all: {} } ] if query.blank?
 

data/lib/rails/contact/search/query.rb

@@ -2,13 +2,17 @@ module Rails
   module Contact
     module Search
       class Query
-        def initialize(query, filters: {})
+        MAX_PER_PAGE = 100
+
+        def initialize(query, filters: {}, page: nil, per_page: nil)
           @query = query
           @filters = filters.to_h.compact_blank
+          @page = page.to_i < 1 ? 1 : page.to_i
+          @per_page = resolve_per_page(per_page)
         end
 
         def call
-          backend.search(@query, @filters)
+          backend.search(@query, @filters, page: @page, per_page: @per_page)
         end
 
         private
@@ -21,6 +25,12 @@ module Rails
             Search::Backends::Database.new
           end
         end
+
+        def resolve_per_page(per_page)
+          p = per_page.to_i
+          p = Rails::Contact.configuration.default_per_page if p <= 0
+          [ p, MAX_PER_PAGE ].min
+        end
       end
     end
   end

data/lib/rails/contact/search/result.rb

@@ -0,0 +1,13 @@
+module Rails
+  module Contact
+    module Search
+      Result = Struct.new(:records, :total_count, :page, :per_page, keyword_init: true) do
+        def total_pages
+          return 0 if total_count.zero? || per_page.zero?
+
+          (total_count.to_f / per_page).ceil
+        end
+      end
+    end
+  end
+end

data/lib/rails/contact/version.rb

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

data/lib/rails/contact.rb

@@ -4,10 +4,10 @@ require "rails/contact/engine"
 require "rails/contact/configuration"
 require "rails/contact/orm"
 require "rails/contact/routing"
+require "rails/contact/search/result"
 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.8
 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: []
@@ -119,6 +119,7 @@ files:
 - app/helpers/rails/contact/application_helper.rb
 - app/jobs/rails/contact/application_job.rb
 - app/jobs/rails/contact/google_sync_job.rb
+- app/jobs/rails/contact/google_sync_unsynced_job.rb
 - app/jobs/rails/contact/index_contact_job.rb
 - app/mailers/rails/contact/application_mailer.rb
 - app/mailers/rails/contact/contact_mailer.rb
@@ -137,6 +138,7 @@ files:
 - app/views/rails/contact/_email_fields.html.erb
 - app/views/rails/contact/_event_fields.html.erb
 - app/views/rails/contact/_form.html.erb
+- app/views/rails/contact/_index_pagination.html.erb
 - app/views/rails/contact/_nested_fields_script.html.erb
 - app/views/rails/contact/_phone_fields.html.erb
 - app/views/rails/contact/_stylesheet.html.erb
@@ -169,7 +171,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
@@ -182,6 +183,7 @@ files:
 - lib/rails/contact/search/backends/database.rb
 - lib/rails/contact/search/backends/elasticsearch.rb
 - lib/rails/contact/search/query.rb
+- lib/rails/contact/search/result.rb
 - lib/rails/contact/version.rb
 - lib/tasks/rails/contact_tasks.rake
 - spec/concerns/filterable_spec.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