has_vcards 0.20.3 → 1.0.0.rc0

data/app/models/has_vcards/vcard/directory_address.rb

@@ -0,0 +1,25 @@
+module HasVcards
+  class Vcard
+    module DirectoryAddress
+      def to_vcard
+        Vcard.new(
+          given_name: first_name,
+          family_name: family_name,
+          street_address: street,
+          postal_code: zip_code,
+          locality: city
+        )
+      end
+
+      def to_vcard_attributes
+        {
+          given_name: first_name,
+          family_name: family_name,
+          street_address: street,
+          postal_code: zip_code,
+          locality: city
+        }
+      end
+    end
+  end
+end

data/app/models/has_vcards/vcard/directory_lookup.rb

@@ -0,0 +1,123 @@
+module HasVcards
+  module Vcard::DirectoryLookup
+    def map_for_directory
+      search = {}
+      search[:first_name] = given_name
+      search[:family_name] = family_name
+      search[:street] = street_address
+      search[:zip_code] = postal_code
+      search[:city] = locality
+
+      search
+    end
+
+    def directory_lookup(ignore_fields = [])
+      search = map_for_directory
+
+      search.reject! { |key, _value| ignore_fields.include? key }
+
+      # TODO: We should fetch additional pages if the result indicates there
+      # are more pages.
+      ::SwissMatch.directory_service.addresses(search, per_page: 10)
+    end
+
+    def directory_found?(ignore_fields = [])
+      directory_lookup(ignore_fields).present?
+    end
+
+    def normalize(value)
+      normalized_value = UnicodeUtils.downcase(value.to_s)
+      normalized_value.gsub!(/str\./, 'strasse')
+      normalized_value.gsub!(/str([ $])/, 'strasse\1')
+
+      normalized_value
+    end
+
+    def directory_matches(ignore_lookup_fields = [])
+      matches = directory_lookup(ignore_lookup_fields)
+      matches.map do |match|
+        search = map_for_directory
+
+        perfect = []
+        search.each do |key, value|
+          perfect << key if normalize(match.send(key)) == normalize(value)
+        end
+
+        partial = []
+        search.each do |key, value|
+          partial << key if value.present? && normalize(match.send(key)).include?(normalize(value))
+        end
+        partial -= perfect
+
+        bad = search.keys - perfect - partial - ignore_lookup_fields
+
+        { address: match, perfect: perfect, partial: partial, bad: bad, ignore: ignore_lookup_fields }
+      end
+    end
+
+    def directory_filter(match, filter = {})
+      # Exact filters
+      filter[:perfect].each do |field|
+        return false unless match[:perfect].include?(field)
+      end if filter[:perfect]
+      filter[:partial].each do |field|
+        return false unless match[:partial].include?(field)
+      end if filter[:partial]
+      filter[:bad].each do |field|
+        return false unless match[:bad].include?(field)
+      end if filter[:bad]
+
+      # "Better than" filters
+      filter[:partial_or_perfect].each do |field|
+        return false unless match[:perfect].include?(field) || match[:partial].include?(field)
+      end if filter[:partial_or_perfect]
+
+      true
+    end
+
+    def filtered_matches(filters)
+      ignores = filters.delete(:ignore) || []
+
+      directory_matches(ignores).map do |match|
+        match[:address] if directory_filter(match, filters)
+      end.compact
+    end
+
+    # Everything matches
+    def perfect_matches
+      filtered_matches(perfect: [:family_name, :first_name, :street, :city])
+    end
+
+    def perfect_match?
+      perfect_matches.present?
+    end
+
+    # Everything is found, given or family name does is partial match
+    def great_matches
+      filtered_matches(partial_or_perfect: [:family_name, :first_name], perfect: [:street, :city])
+    end
+
+    def great_match?
+      great_matches.present?
+    end
+
+    # Everything but given name matches, family name might be partial
+    def family_name_matches
+      filtered_matches(ignore: [:first_name], partial_or_perfect: [:family_name], perfect: [:street, :city])
+    end
+
+    def family_name_match?
+      family_name_matches.present?
+    end
+
+    # Same address different names
+    def address_matches
+      filtered_matches(ignore: [:first_name, :family_name], perfect: [:street, :city])
+    end
+
+    # Similar name in same locality
+    def locality_matches
+      filtered_matches(ignore: [:first_name, :street], partial_or_perfect: [:family_name], perfect: [:city])
+    end
+  end
+end

data/app/views/has_vcards/layouts/has_vcards/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>HasVcards</title>
+  <%= stylesheet_link_tag    "has_vcards/application", media: "all" %>
+  <%= javascript_include_tag "has_vcards/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/app/views/{people → has_vcards/people}/_address_form.html.haml

@@ -7,7 +7,7 @@
     %h3= t_model(PhoneNumber)
     .nested-form.list.contacts
       = f.fields_for :vcard do |vcard|
-        - vcard.object.contacts.build_defaults
+        - vcard.reference.contacts.build_defaults
         - vcard.fields_for :contacts do |contact|
           = render 'phone_numbers/form', :item => contact
     = link_to [:new_phone_number, resource.persisted? ? resource : controller_name], :remote => true, :class => 'btn' do

data/app/views/{vcards → has_vcards/vcards}/_form.html.haml

@@ -7,7 +7,7 @@
       .span12= vcard.input :honorific_prefix, :collection => HonorificPrefix.find(:all, :order => 'sex DESC, position').collect { |prefix| prefix.name }
     .row-fluid
       .span12
-        .control-group{:class => "#{'error' if vcard.object.errors.include?(:family_name) or vcard.object.errors.include?(:given_name)}"}
+        .control-group{:class => "#{'error' if vcard.reference.errors.include?(:family_name) or vcard.reference.errors.include?(:given_name)}"}
           %label.control-label= "#{t_attr(:family_name, Vcard)}, #{t_attr(:given_name, Vcard)}"
           .controls
             = vcard.input :family_name, :wrapper => :inline, :input_html => {'data-autofocus' => true}

data/app/views/{vcards → has_vcards/vcards}/_show.html.haml

@@ -1,5 +1,5 @@
 - vcard = vcard if defined?(vcard)
-- vcard ||= object.try(:vcard) if defined?(object)
+- vcard ||= reference.try(:vcard) if defined?(reference)
 - vcard ||= @vcard
 - vcard ||= resource.try(:vcard) if defined?(resource)
 = show_for vcard do |vcard|

data/config/locales/de.yml

@@ -18,12 +18,12 @@ de:
 
   activerecord:
     models:
-      vcard:              Kontakt
-      address:            Adresse
-      phone_number:       Kontakt
+      has_vcards/vcard:              Kontakt
+      has_vcards/address:            Adresse
+      has_vcards/phone_number:       Kontakt
 
     attributes:
-      vcard:
+      has_vcards/vcard:
         full_name:        Name
         nickname:         Spitzname
         family_name:      Nachname
@@ -44,7 +44,7 @@ de:
         phone_number:     Telefon
         mobile_number:    Mobile
         fax_number:       Fax
-      address:
+      has_vcards/address:
         post_office_box:  Postfach
         extended_address: Adresszusatz
         street_address:   Strasse
@@ -53,9 +53,14 @@ de:
         postal_code:      PLZ
         country_name:     Land
         address_type:     Art
-      phone_number:
+      has_vcards/phone_number:
         number:           Nummer
         phone_number_type: Nummer-Typ
+        phone_number_type_enum:
+          phone:  Tel
+          fax:    Fax
+          mobile: Mob
+          email:  Mail
 
   formtastic:
     labels:
@@ -77,15 +82,3 @@ de:
       family_name: Anderer Vorname
       address:     An dieser Adresse
       locality:    In diesem Ort
-
-  # Honorific Prefixes
-  salutation:
-    'Herr Dr. med.': Sehr geehrter Herr Dr. %{family_name}
-    'Frau Dr. med.': Sehr geehrte Frau Dr. %{family_name}
-    'Herr Dr.': Sehr geehrter Herr Dr. %{family_name}
-    'Frau Dr.': Sehr geehrte Frau Dr. %{family_name}
-    'Herr': Sehr geehrter Herr %{family_name}
-    'Frau': Sehr geehrte Frau %{family_name}
-    'Br.': Sehr geehrter Bruder %{family_name}
-    'Sr.': Sehr geehrte Schwester %{family_name}
-    default: Sehr geehrte Damen und Herren

data/config/locales/en.yml

@@ -6,12 +6,12 @@ en:
 
   activerecord:
     models:
-      vcard:              VCard
-      address:            Address
-      phone_number:       Contact
+      has_vcards/vcard:              VCard
+      has_vcards/address:            Address
+      has_vcards/phone_number:       Contact
 
     attributes:
-      vcard:
+      has_vcards/vcard:
         full_name:        Name
         nickname:         Nickname
         family_name:      Family name
@@ -32,7 +32,7 @@ en:
         phone_number:     Phone
         mobile_number:    Mobile
         fax_number:       Fax
-      address:
+      has_vcards/address:
         post_office_box:  Post Office Box
         extended_address: Extended address
         extended_address: Adresszusatz
@@ -42,9 +42,14 @@ en:
         postal_code:      PLZ
         country_name:     Land
         address_type:     Art
-      phone_number:
+      has_vcards/phone_number:
         number:           Number
         phone_number_type: Number Type
+        phone_number_type_enum:
+          phone:  Phone
+          fax:    Fax
+          mobile: Mobile
+          email:  Mail
 
   formtastic:
     labels:
@@ -57,3 +62,13 @@ en:
       region:           Region
       postal_code:      PLZ
       country_name:     Land
+
+  # DirectoryLookup
+  directory_lookup:
+    title:         Treffer in Telefonbuch
+    match_type:
+      perfect:     Genauer Treffer
+      great:       Ungenauer Name
+      family_name: Anderer Vorname
+      address:     An dieser Adresse
+      locality:    In diesem Ort

data/config/locales/fr.yml

@@ -18,12 +18,12 @@ fr:
 
   activerecord:
     models:
-      vcard:              Kontakt
-      address:            Adresse
-      phone_number:       Kontakt
+      has_vcards/vcard:              Kontakt
+      has_vcards/address:            Adresse
+      has_vcards/phone_number:       Kontakt
 
     attributes:
-      vcard:
+      has_vcards/vcard:
         full_name:        Name
         nickname:         Spitzname
         family_name:      Nachname
@@ -44,7 +44,7 @@ fr:
         phone_number:     Telefon
         mobile_number:    Mobile
         fax_number:       Fax
-      address:
+      has_vcards/address:
         post_office_box:  Postfach
         extended_address: Adresszusatz
         street_address:   Strasse
@@ -53,7 +53,7 @@ fr:
         postal_code:      PLZ
         country_name:     Land
         address_type:     Art
-      phone_number:
+      has_vcards/phone_number:
         number:           Nummer
         phone_number_type: Nummer-Typ
 
@@ -77,15 +77,3 @@ fr:
       family_name: Anderer Vorname
       address:     An dieser Adresse
       locality:    In diesem Ort
-
-  # Honorific Prefixes
-  salutation:
-    'Herr Dr. med.': Sehr geehrter Herr Dr.
-    'Frau Dr. med.': Sehr geehrte Frau Dr.
-    'Herr Dr.': Sehr geehrter Herr Dr.
-    'Frau Dr.': Sehr geehrte Frau Dr.
-    'Herr': Monsieur
-    'Frau': Madame
-    'Br.': Sehr geehrter Bruder
-    'Sr.': Sehr geehrte Schwester
-    default: Mesdames, Messieurs,

data/config/routes.rb

@@ -1,5 +1,5 @@
 # Routes
-Rails.application.routes.draw do
+HasVcards::Engine.routes.draw do
   # Phone Numbers
   resources :phone_numbers
 

data/db/migrate/20121113120000_create_honorific_prefixes_table.rb

@@ -1,6 +1,6 @@
 class CreateHonorificPrefixesTable < ActiveRecord::Migration
   def up
-    change_table "honorific_prefixes" do |t|
+    create_table "honorific_prefixes" do |t|
       t.integer "sex"
       t.string  "name"
       t.integer "position"

data/db/migrate/20140617113710_rename_tables_for_namespacing.rb

@@ -0,0 +1,8 @@
+class RenameTablesForNamespacing < ActiveRecord::Migration
+  def change
+    rename_table :addresses, :has_vcards_addresses
+    rename_table :honorific_prefixes, :has_vcards_honorific_prefixes
+    rename_table :phone_numbers, :has_vcards_phone_numbers
+    rename_table :vcards, :has_vcards_vcards
+  end
+end

data/db/migrate/20140619101337_remove_object_from_phone_number.rb

@@ -0,0 +1,6 @@
+class RemoveObjectFromPhoneNumber < ActiveRecord::Migration
+  def change
+    remove_column :has_vcards_phone_numbers, :object_id
+    remove_column :has_vcards_phone_numbers, :object_type
+  end
+end

data/db/migrate/20140619102041_rename_vcard_object_to_reference.rb

@@ -0,0 +1,6 @@
+class RenameVcardObjectToReference < ActiveRecord::Migration
+  def change
+    rename_column :has_vcards_vcards, :object_id,   :reference_id
+    rename_column :has_vcards_vcards, :object_type, :reference_type
+  end
+end

data/db/migrate/20140619121756_refactor_honorific_prefix.rb

@@ -0,0 +1,5 @@
+class RefactorHonorificPrefix < ActiveRecord::Migration
+  def change
+    drop_table :has_vcards_honorific_prefixes
+  end
+end

data/lib/has_vcards.rb

@@ -1,20 +1,7 @@
-require 'has_vcards/railtie' if defined?(::Rails::Railtie)
+require 'has_vcards/engine'
 
-module HasVcardsClassMethods
-  def has_vcards(options = {})
-    class_eval <<-end_eval
-      scope :by_name, lambda {|name| {:include => :vcard, :order => 'vcards.full_name', :conditions => Vcard.by_name_conditions(name)}}
-
-      has_one :vcard, :as => 'object', :autosave => true, :validate => true
-      delegate :full_name, :nickname, :family_name, :given_name, :additional_name, :honorific_prefix, :honorific_suffix, :to => :vcard
-      delegate :full_name=, :nickname=, :family_name=, :given_name=, :additional_name=, :honorific_prefix=, :honorific_suffix=, :to => :vcard
-      
-      has_many :vcards, :as => 'object', :autosave => true, :validate => true
-
-      def vcard_with_autobuild
-        vcard_without_autobuild || build_vcard
-      end
-      alias_method_chain :vcard, :autobuild
-    end_eval
-  end
+# Base module
+#
+# This defines the namespace and adds autoload definitions.
+module HasVcards
 end