rails-contact 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47e4ae3ee8279318a713c01eabbc5e85416f1f9847351aaf4fd56e3fe2ea51e1
-  data.tar.gz: c06b8d14fe450aa764ce09216db49c8a0a2877842099d0571cd965f2ff88ddd7
+  metadata.gz: b0b84870f841f736094084fa2ae0c08805f5b54a30fa8960b95cc04f14998001
+  data.tar.gz: 830dfc497510913b838651a00f430d36919c35fca155b54424dae053d4feba60
 SHA512:
-  metadata.gz: ace1203d3ff1d490b519b14175088dc483ac71780bf1186a233ef6e31a522927df60d6d95c8ee25ea9f6074d53a7a4887ae9b8cc8af9aab67119269e3eec3f85
-  data.tar.gz: ad9e1d740f6cd540a3528accaa1cf3e35d898df89da18312916ee3ba23b79cd6c93ab28a347eff56fa39335bbe464b3e69343a16c930c521bde8926646a2d712
+  metadata.gz: bab63c0475d073586b14a681c7822f6185b4437e077b5bf3583fc7fa1c68f0ee581a4e7248d6498e77d72e0721c41e8105c188c56dfdeda54071573b9c4b33df
+  data.tar.gz: d46deab8ed814b053834de5157f76ef089efdc3fb04d630a03dbf85375b8686a89f70ab706b956b57f31bdf2152d2fcb9cca6352bccdecef310dfa21b8558486

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.1.18
+
+- **The `city` filter is a multi-select.** `?city[]=Pune&city[]=Delhi` now
+  filters on several current cities at once, matching how `region` and
+  `csv_import_id` already behave. The database backend always handled an
+  array (`where(current_city: [...])`) — only the parameter permit was
+  scalar, which silently dropped every value but the last. Blank entries
+  (the hidden option a `<select multiple>` always submits) are stripped, and
+  an old single-value bookmark (`?city=Pune`) is coerced to a one-element
+  array, so no existing link changes meaning. The database backend now drops
+  blank entries from `city`/`region` itself as well, so a caller reaching it
+  directly gets "no filter" from an untouched multi-select instead of zero
+  rows.
+
 ## 0.1.17
 
 - **Database backend free-text search is now prefix search.** `q` matches

data/app/controllers/rails/contact/contacts_controller.rb

@@ -136,7 +136,6 @@ module Rails
         metadata_scalars << :sort if config.metadata_sorts.any?
 
         permitted = params.permit(
-          :city,
           :sync_eligible,
           :starred,
           :travel_date_start,
@@ -144,16 +143,17 @@ module Rails
           :contact_created_at_start,
           :contact_created_at_end,
           *metadata_scalars,
+          city: [],
           region: [],
           csv_import_id: [],
           **metadata_arrays.index_with { [] }
         )
 
-        ([ :region, :csv_import_id ] + metadata_arrays).each { |key| normalize_multi_select!(permitted, key) }
+        ([ :city, :region, :csv_import_id ] + metadata_arrays).each { |key| normalize_multi_select!(permitted, key) }
         permitted
       end
 
-      # region, csv_import_id and every configured :values metadata filter are
+      # city, region, csv_import_id and every configured :values metadata filter are
       # multi-selects: a <select multiple> submits param[] (an array) plus a
       # hidden param[]="" that Rails always sends, so the blank must be
       # stripped — otherwise IN ('', 'x') matches every blank-valued row.

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

@@ -106,8 +106,16 @@ module Rails
 
           def apply_filters(scope, filters)
             scoped = scope
-            scoped = scoped.where(current_city: filters["city"]) if filters["city"].present?
-            scoped = scoped.where(region_name: filters["region"]) if filters["region"].present?
+            # city and region are multi-selects: one value or many. Blanks are
+            # dropped here as well as in the controller — an untouched
+            # <select multiple> submits [""], and `where(col: [""])` would
+            # return nothing at all rather than "no city filter". A caller
+            # reaching the backend directly gets the same answer as one coming
+            # through filter_params.
+            %w[city region].zip(%i[current_city region_name]).each do |key, column|
+              values = Array(filters[key]).map(&:to_s).reject(&:blank?)
+              scoped = scoped.where(column => values) if values.any?
+            end
             scoped = scoped.where(starred: ActiveModel::Type::Boolean.new.cast(filters["starred"])) if filters["starred"].present?
             if filters["sync_eligible"].present?
               scoped = scoped.where(sync_eligible: ActiveModel::Type::Boolean.new.cast(filters["sync_eligible"]))

data/lib/rails/contact/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Contact
-    VERSION = "0.1.17"
+    VERSION = "0.1.18"
   end
 end

data/spec/controllers/contacts_controller_spec.rb

@@ -4,16 +4,26 @@ RSpec.describe Rails::Contact::ContactsController do
   let(:controller) { described_class.new }
 
   describe "private filter params" do
-    it "permits city/sync_eligible and coerces a scalar region to an array" do
+    # city joined region as a multi-select in 0.1.18, so a scalar from an old
+    # bookmark is coerced to a one-element array rather than kept as a string.
+    it "permits sync_eligible and coerces scalar city/region to arrays" do
       controller.params = ActionController::Parameters.new(city: "Delhi", region: "Europe", sync_eligible: "true", x: "1")
       permitted = controller.send(:filter_params)
-      expect(permitted.to_h).to eq({ "city" => "Delhi", "region" => [ "Europe" ], "sync_eligible" => "true" })
+      expect(permitted.to_h).to eq({ "city" => [ "Delhi" ], "region" => [ "Europe" ], "sync_eligible" => "true" })
     end
 
-    it "permits multi-select region[] and csv_import_id[] arrays" do
-      controller.params = ActionController::Parameters.new(region: [ "Europe", "Asia" ], csv_import_id: [ "5", "7" ])
+    it "permits multi-select city[], region[] and csv_import_id[] arrays" do
+      controller.params = ActionController::Parameters.new(city: [ "Pune", "Delhi" ], region: [ "Europe", "Asia" ], csv_import_id: [ "5", "7" ])
       permitted = controller.send(:filter_params)
-      expect(permitted.to_h).to eq({ "region" => [ "Europe", "Asia" ], "csv_import_id" => [ "5", "7" ] })
+      expect(permitted.to_h).to eq({ "city" => [ "Pune", "Delhi" ], "region" => [ "Europe", "Asia" ], "csv_import_id" => [ "5", "7" ] })
+    end
+
+    it "strips the blank a city multi-select submits, and drops it when only blanks arrive" do
+      controller.params = ActionController::Parameters.new(city: [ "", "Pune" ])
+      expect(controller.send(:filter_params).to_h).to eq({ "city" => [ "Pune" ] })
+
+      controller.params = ActionController::Parameters.new(city: [ "" ])
+      expect(controller.send(:filter_params).to_h).to eq({})
     end
 
     it "strips the hidden blank a <select multiple> submits" do

data/spec/search/database_backend_spec.rb

@@ -29,6 +29,28 @@ RSpec.describe Rails::Contact::Search::Backends::Database do
     end
   end
 
+  # City became a multi-select in 0.1.18. The backend always accepted an array
+  # here — what was missing was a permit that let one through.
+  describe "city filter (multi-select)" do
+    # Distinct from the factory default ("Delhi"), so alice/bob/carol above
+    # can't drift into these expectations.
+    let!(:pune)   { create(:rails_contact_contact, given_name: "Pia", current_city: "Pune") }
+    let!(:jaipur) { create(:rails_contact_contact, given_name: "Dev", current_city: "Jaipur") }
+    let!(:kochi)  { create(:rails_contact_contact, given_name: "Mira", current_city: "Kochi") }
+
+    it "matches contacts in every selected city (array -> IN)" do
+      expect(records("city" => [ "Pune", "Jaipur" ])).to match_array([ pune, jaipur ])
+    end
+
+    it "matches a single city exactly as before (scalar)" do
+      expect(records("city" => "Kochi")).to match_array([ kochi ])
+    end
+
+    it "applies no constraint when the selection is blank only" do
+      expect(records("city" => [ "" ]).count).to eq(Rails::Contact::Contact.count)
+    end
+  end
+
   describe "query sanitization" do
     def search_for(query)
       described_class.new.search(query, {}, page: 1, per_page: 25).records

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-contact
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Kshitiz Sinha