openopus-core-people 1.1.4 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed2fa95cbd0a805204b82dc871631f368ffb5f1a1eb402efef42af42b29119b0
-  data.tar.gz: 9ba36a30fdd823dad235de6459fe7b92ce10a4ce0388f122de899db02ced33f3
+  metadata.gz: 5fa609ee836533103efd9cac7c3a00e6e3b91ad3ea48c5e2bf16ff11b84d9ed5
+  data.tar.gz: 61d6376f1ba54350b83f635fe82e98bfe09582593fc470bbdade7b8276b55fa3
 SHA512:
-  metadata.gz: c5f7866c924421d780db37a67c7a9ff99d35e8f0a1ed52848bd510552a275fa08f7abf888ce8ddbea88f63731932683fef616c795c491b49f07d73774467b87c
-  data.tar.gz: '08f906f0c78dd3ab81a32984c7efaf5c4bf76788edee1e5cd0d03376a5c8b0e73430e921bba7ec10f336e11329be94f6f0ade5b77f4f031fa47e2791a7070bbe'
+  metadata.gz: c540c01684241f7802028026e0d7a1cc60f7fb8297ed2f4d959c16cffdac9e3a2918c039666fad9d00af81d8f87e487bb9fe83b8d37df347115aa43f50ff3305
+  data.tar.gz: 3bea98e5e63b9a7932bda9838ed4872cde3ec27c132bd3ee5b576f5466e56fee2d19b0b47fc3354a480f60e966588d0b2a2e2d374a38d7b5f2f9fcbd9978021d

data/app/models/address.rb

@@ -1,6 +1,6 @@
 class Address < ApplicationRecord
-  belongs_to :label, optional: true
-  belongs_to :addressable, polymorphic: true
+  include Labelize
+  belongs_to :addressable, polymorphic: true, optional: true
 
   accepts_nested_attributes_for :label
   

data/app/models/concerns/labelize.rb

@@ -0,0 +1,26 @@
+# labelize.rb: -*- Ruby -*-  DESCRIPTIVE TEXT.
+# 
+#  Copyright (c) 2019 Brian J. Fox Opus Logica, Inc.
+#  Author: Brian J. Fox (bfox@opuslogica.com)
+#  Birthdate: Wed Sep 11 09:37:52 2019.
+module Labelize
+  extend ActiveSupport::Concern
+  included do
+    belongs_to :label,  optional: true
+
+    def label
+      db_label = super
+      if not db_label
+        self.label = "Work"
+        db_label = super
+      end
+
+      db_label.value
+    end
+
+    def label=(name)
+      super(Label.get(name))
+      self.label
+    end
+  end
+end

data/app/models/email.rb

@@ -1,17 +1,27 @@
 class Email < ApplicationRecord
-  belongs_to :label, optional: true
-  belongs_to :emailable, polymorphic: true
+  include Labelize
+  belongs_to :emailable, polymorphic: true, optional: true
   accepts_nested_attributes_for :label
   before_create :default_label
+  before_save :canonicalize
+
+  VALID_EMAIL_FORMAT_REGEX = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
+
+  validates_format_of :address, with: VALID_EMAIL_FORMAT_REGEX, :on => :create
 
   def self.canonicalize(addr)
-    addr.strip.downcase if not addr.blank?
+    candidate = addr.strip.downcase if not addr.blank?
+    candidate ||= addr
   end
 
   def canonicalize
     self.address = self.class.canonicalize(self.address)
   end
 
+  def self.valid_format?(addr)
+    return (addr =~ VALID_EMAIL_FORMAT_REGEX) != nil
+  end
+  
   def default_label
     self.label = Label.get("Work")
   end

data/app/models/person.rb

@@ -11,12 +11,25 @@ class Person < ApplicationRecord
   accepts_nested_attributes_for :emails
 
   def self.lookup(name)
+    return nil if not name
     person   = self.find_by(self.name_components(name))
     person ||= self.includes(:nicknames).joins(:nicknames).find_by("nicknames.nickname" => name)
+
+    # Maybe we're looking up by phone number?
     if not person
-      people = self.all.collect do |p|
-        [p.id, [(p.fname[0] || ""), (p.minitial[0] || ""), (p.lname[0] || "")].join("").upcase]
-      end
+      phone = Phone.where(number: Phone.canonicalize(name)).first rescue nil
+      person = phone.phoneable if phone
+    end
+
+    if not person
+      email = Email.where(emailable_type: name.to_s, address: Email.canonicalize(name.downcase)).first
+      person = email.emailable if email
+    end
+
+    if not person
+      # Try hard to find a person by their initials, even if there wasn't a nickname for them.
+      people = self.all.collect {|p| [p.id, p.initials]}
+
       people.each do |parry|
         if parry[1] == name.upcase
           person = self.find(parry[0])
@@ -25,11 +38,6 @@ class Person < ApplicationRecord
       end
     end
 
-    if not person
-      addr = Email.where(emailable_type: self.name.to_s, address: Email.canonicalize(name.downcase)).first
-      person = addr.person.first if addr
-    end
-
     person
   end
 
@@ -82,7 +90,7 @@ class Person < ApplicationRecord
     result = possibles.include?(text.gsub(/[.]*/, "").downcase) if text.present?
   end
 
-  def self.name_components(name)
+  def self.name_components(name, transformer=nil)
     res = {}
     component = ""
     components = name.gsub(/,/, " ").gsub(/  /, " ").split(" ") rescue [name]
@@ -92,32 +100,51 @@ class Person < ApplicationRecord
     # What kind of thing is this?
     if is_name_prefix?(component)
       res[:prefix] = component
+      res[:prefix] = res[:prefix].send(transformer) if res[:prefix] && transformer
       res[:fname] = components.shift
     else
       res[:fname] = component
     end
 
+    res[:fname] = res[:fname].send(transformer) if res[:fname] && transformer
+
     # Next up, middle initial or last name.
     # If only one word remains, that's the last name
     if components.length == 1
       res[:lname] = components.shift
+      res[:lname] = res[:lname].send(transformer) if res[:lname] && transformer
     elsif components.length > 0
       # At least 2 words remain. We might have middle names, prefixes, suffixes, etc.
       components.reverse!
       component = components.shift
+
       if is_name_suffix?(component)
         res[:suffix] = component
+        res[:suffix] = res[:suffix].send(transformer) if res[:suffix] && transformer
         res[:lname] = components.shift
       else
         res[:lname] = component
       end
+
+      res[:lname] = res[:lname].send(transformer) if res[:lname] && transformer
+
       res[:minitial] = components.shift
+      res[:minitial] = res[:minitial].send(transformer) if res[:minitial] && transformer
+
     end
 
     res[:minitial] = res[:minitial].gsub(/[.]/, "") if res[:minitial].present?
     res
   end
-
+  
+  def initials
+    res = ""
+    res += fname[0] if fname
+    res += minitial[0] if minitial
+    res += lname[0] if lname
+    res.upcase
+  end
+  
   def name
     components = []
 

data/app/models/phone.rb

@@ -1,18 +1,23 @@
+require "phony_rails"
+
 class Phone < ApplicationRecord
-  belongs_to :label, optional: true
-  belongs_to :phoneable, polymorphic: true
+  include Labelize
+  belongs_to :phoneable, polymorphic: true, optional: true
   before_validation :canonicalize
 
   def self.canonicalize(digits_and_stuff)
-    canonical = digits_and_stuff
-    canonical.gsub!(" ", "") #remove extra spaces
+    canonical = digits_and_stuff.gsub(" ", "")
     if canonical
       canonical = canonical[2..100].strip if canonical.starts_with?("+1")
-      if canonical[0] != "+"
-        digits = digits_and_stuff.gsub(/[^0-9]/, "")
-        digits = digits[1..-1] if digits[0] == '1'
-        digits = "805" + digits if digits.length == 7
-        canonical = "(#{digits[0..2]}) #{digits[3..5]}-#{digits[6..10]}"
+      if self.const_defined?("PhonyRails")
+        canonical = PhonyRails.normalize_number(digits_and_stuff, default_country_code: "US").phony_formatted(format: :international)
+      else
+        if canonical[0] != "+"
+          digits = digits_and_stuff.gsub(/[^0-9]/, "")
+          digits = digits[1..-1] if digits[0] == '1'
+          digits = "805" + digits if digits.length == 7
+          canonical = "(#{digits[0..2]}) #{digits[3..5]}-#{digits[6..10]}"
+        end
       end
     end
     canonical
@@ -23,4 +28,18 @@ class Phone < ApplicationRecord
     self.number = self.class.canonicalize(self.number) if self.number
   end
 
+  def label
+    db_label = super
+    if not db_label
+      self.label = "Work"
+      db_label = super
+    end
+
+    db_label.value
+  end
+
+  def label=(name)
+    super(Label.get(name))
+    self.label
+  end
 end

data/app/models/user.rb

@@ -11,7 +11,8 @@ class User < ApplicationRecord
   
   def self.lookup(item)
     person = Person.lookup(item)
-    (person.send self.name.downcase.to_sym) if person
+    this_class = self.name.downcase.to_sym
+    (person.send this_class) if person and person.respond_to?(this_class)
   end
 
   def organization=(org)
@@ -28,5 +29,4 @@ class User < ApplicationRecord
     end
     super(attr)
   end
-
 end

data/lib/openopus/core/people/engine.rb

@@ -5,7 +5,7 @@ module Openopus
         initializer :append_migrations do |app|
           unless app.root.to_s.match(root.to_s)
             config.paths["db/migrate"].expanded.each do |expanded_path|
-              app.config.paths["db/migrate"] << expanded_path
+              # app.config.paths["db/migrate"] << expanded_path
             end
           end
         end

data/lib/openopus/core/people/version.rb

@@ -1,7 +1,7 @@
 module Openopus
   module Core
     module People
-      VERSION = '1.1.4'
+      VERSION = '1.1.10'
     end
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: openopus-core-people
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.10
 platform: ruby
 authors:
 - Brian J. Fox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-10 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 5.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 5.2.3
 - !ruby/object:Gem::Dependency
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.13
+- !ruby/object:Gem::Dependency
+  name: phony_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 description: A person can have many email addresses, but this is not usually represented
   in applications.  openopus/core/people creates the database structure, relations,
   and convenience functions for your application so you don't have to.  Just connect
@@ -53,6 +67,7 @@ files:
 - Rakefile
 - app/assets/config/openopus_core_people_manifest.js
 - app/models/address.rb
+- app/models/concerns/labelize.rb
 - app/models/email.rb
 - app/models/label.rb
 - app/models/nickname.rb
@@ -95,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Model the real world of people in your application, making user interaction