has_contact_number 0.1.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ffbc27af06a9ce3aa4bba728fd3fd108916f5503
-  data.tar.gz: 5729a354b6244a8d56f1a042dd2fe13ba163a59a
+SHA256:
+  metadata.gz: 5d056ae179d5898609de13d5b73010177dbb06f2c3adea1947e308480d366334
+  data.tar.gz: 139f8bedf15eb4f3a5475c69094da19d9d283313dca38110fdd0ec60aefdf5f7
 SHA512:
-  metadata.gz: 387dd6edce276bb6af1fa9e9e1156df4e85211a408488984bb79f2bae95f5403546dc07fb339eec77dd6430c8b751e48ba2aafa6a674072d81990b9bf1aa80ff
-  data.tar.gz: 58f1bf86989806033a3850e4eab3f5c223a3a0eda89d0974925f5d6394956b85295011983e2179defbb2bc3af759cfb858afd47305a315a6e6ff684c5c1e0282
+  metadata.gz: 5d289a54bbce761715d0b8fbbb690cd206caa1162a30ce03102093e4792eb006c28f179047cd1f62049e976d5fcfac1e06888f3802a2233d4923bc4bfbccb3f8
+  data.tar.gz: e123155db191afc408839d81d6806058ae31b14d40cde2e4d4e1d1b70109335aecf78237c420977876defbd77c00d3687a5231156e7866a0b0fe896a93d09cf7

data/lib/has_contact_number/helper_methods.rb

@@ -1,13 +1,24 @@
 # frozen_string_literal: true
 module ActionView::Helpers::FormOptionsHelper
 
-  puts '------------------------------------HasContactNumber::HelperMethods---------------------'
-  def options_for_isd_code_select
-    @isd_code_options ||= IsoCountryCodes.all.map do |record|
-
-      [record.calling_code, record.calling_code.delete('+').rjust(4, '0')]
+  OPTIONS_FOR_ISD_CODES_SELECT = IsoCountryCodes.all.map{ |icc|
+    {
+      code: icc.calling_code,
+      code_to_i: icc.calling_code.delete('+').to_i,
+      code_to_db: icc.calling_code.delete('+').rjust(4, '0'),
+      country: icc.name,
+      country_with_code: "#{icc.name} (#{icc.calling_code})"
+    }
+  }
+  OPTIONS_FOR_ISD_CODES_SELECT_BY_CODE = OPTIONS_FOR_ISD_CODES_SELECT.uniq.sort_by{|record| record[:code_to_i]}.map do |record|
+    [record[:code], record[:code_to_db]]
+  end
+  OPTIONS_FOR_ISD_CODES_SELECT_BY_COUNTRY_NAME = OPTIONS_FOR_ISD_CODES_SELECT.sort_by{|record| record[:country]}.map do |record|
+    [record[:country_with_code], record[:code_to_db]]
+  end
 
-    end
+  def options_for_isd_code_select(display_country_names: true)
+    display_country_names ? OPTIONS_FOR_ISD_CODES_SELECT_BY_COUNTRY_NAME : OPTIONS_FOR_ISD_CODES_SELECT_BY_CODE
   end
 
 end

data/lib/has_contact_number/model_methods.rb

@@ -2,7 +2,6 @@
 module HasContactNumber::ModelMethods
 
   extend ActiveSupport::Concern
-  puts '---------------------HasContactNumber::ModelMethods---------------------'
   module ClassMethods
 
     def contact_number_attributes(*columns)
@@ -21,16 +20,22 @@ module HasContactNumber::ModelMethods
           @#{column}_isd_code ||= #{column} && #{column}[0..3]
         end
 
+        def #{column}_isd_code=(val)
+          @#{column}_isd_code = val
+          self.#{column} = "\#{val}\#{#{column}_without_isd_code}"
+        end
+
         def #{column}_without_isd_code
           @#{column}_without_isd_code ||= #{column} && #{column}[4..-1]
         end
 
-        before_validation { |model|
-          model.#{column} = model.#{column}_isd_code + model.#{column}_without_isd_code
-        }
+        def #{column}_without_isd_code=(val)
+          @#{column}_without_isd_code = val
+          self.#{column} = "\#{#{column}_isd_code}\#{val}"
+        end
 
-        validates :#{column}_isd_code, presence: true, if: '#{column}_without_isd_code.present?'
-        validates :#{column}_without_isd_code, presence: true, if: '#{column}_isd_code.present?'
+        validates :#{column}_isd_code, presence: true, if: proc { |model| model.#{column}_without_isd_code.present? }
+        validates :#{column}_without_isd_code, presence: true, if: proc { |model| model.#{column}_isd_code.present? }
         validates :#{column}, phony_plausible: true, if: proc { |model|
           model.#{column}_isd_code.present? && model.#{column}_without_isd_code.present?
         }

data/lib/has_contact_number/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module HasContactNumber
 
-  VERSION = '0.1.0'
+  VERSION = '0.4.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_contact_number
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Anand Bait
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso_country_codes
@@ -124,8 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.2.7
 signing_key: 
 specification_version: 4
 summary: Phone, mobile, fax numbers with ISD code storage and validation.