has_vcards 0.17.2 → 0.18.0

data/app/controllers/directory_lookup_controller.rb

@@ -0,0 +1,17 @@
+class DirectoryLookupController < ApplicationController
+  def search
+    @selector = params[:selector]
+    vcard_params = extract_vcard_params(params, @selector)
+
+    @vcard = Vcard.new(vcard_params)
+    render 'vcards/directory_lookup'
+  end
+
+  private
+  def extract_vcard_params(params, selector)
+    keys = selector.delete(']').split('[');
+    vcard_params = params
+    keys.each {|key| vcard_params = vcard_params[key]}
+    return vcard_params
+  end
+end

data/app/models/vcard/directory_lookup.rb

@@ -15,10 +15,11 @@ module Vcard::DirectoryLookup
 
     search.reject!{|key, value| ignore_fields.include? key}
 
+    logger.warn('[tel.search] Query')
     # TODO:
     # We should fetch additional pages if the result indicates there
     # are more pages.
-    ::SwissMatch.directory_service.addresses(search, :per_page => 100)
+    ::SwissMatch.directory_service.addresses(search, :per_page => 10)
   end
 
   def directory_found?(ignore_fields = [])

data/app/views/vcards/_address.html.haml

@@ -1,5 +1,5 @@
 %tr
   %td
-    = link_to [address.first_name, address.family_name].join(" "), directory_update_vcard_path(vcard, :vcard => address.to_vcard_attributes), :method => :post
+    = link_to [address.first_name, address.family_name].join(" "), '#', 'data-directory-lookup-selector' => @selector, 'data-directory-lookup-attributes' => h(address.to_vcard_attributes.to_json)
   %td= address.street
   %td= [address.zip_code, address.city].join(" ")

data/app/views/vcards/_directory_lookup.html.haml

@@ -12,10 +12,10 @@
       %tr
         %th{:colspan => 4}= t('directory_lookup.title')
 
-      = render 'directory_matches', :vcard => vcard, :match_type => :great
-      = render 'directory_matches', :vcard => vcard, :match_type => :family_name
-      = render 'directory_matches', :vcard => vcard, :match_type => :address
-      = render 'directory_matches', :vcard => vcard, :match_type => :locality
+      = render 'vcards/directory_matches', :vcard => vcard, :match_type => :great
+      = render 'vcards/directory_matches', :vcard => vcard, :match_type => :family_name
+      = render 'vcards/directory_matches', :vcard => vcard, :match_type => :address
+      = render 'vcards/directory_matches', :vcard => vcard, :match_type => :locality
 
   .modal-footer
     = link_to t_action(:cancel), '#', :class => 'btn', 'data-dismiss' => 'modal'

data/app/views/vcards/_directory_matches.html.haml

@@ -1,4 +1,4 @@
 - matches = vcard.send("#{match_type}_matches") - @seen_matches
 - if matches.present?
   - @seen_matches += matches
-  = render :partial => 'address', :collection => matches, :locals => {:vcard => vcard}
+  = render :partial => 'vcards/address', :collection => matches, :locals => {:vcard => vcard}

data/app/views/vcards/directory_lookup.js.erb

@@ -1,4 +1,4 @@
 $('#directory_lookup').remove();
 
-$('body').append('<%=j render "directory_lookup", :vcard => @vcard %>');
+$('body').append('<%=j render "vcards/directory_lookup", :vcard => @vcard %>');
 $('#directory_lookup').modal({show: true});

data/config/routes.rb

@@ -13,4 +13,7 @@ Rails.application.routes.draw do
       post :directory_update
     end
   end
+
+  # Directory Lookup
+  get 'directory_lookup/search' => 'directory_lookup#search'
 end

data/lib/has_vcards/version.rb

@@ -1,3 +1,3 @@
 module HasVcards
-  VERSION = '0.17.2'
+  VERSION = '0.18.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_vcards
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 87
   prerelease: false
   segments: 
   - 0
-  - 17
-  - 2
-  version: 0.17.2
+  - 18
+  - 0
+  version: 0.18.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-06 00:00:00 +02:00
+date: 2012-09-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,7 @@ extra_rdoc_files:
 - MIT-LICENSE
 - README.markdown
 files: 
+- app/controllers/directory_lookup_controller.rb
 - app/controllers/phone_numbers_controller.rb
 - app/controllers/vcards_controller.rb
 - app/helpers/has_vcards_helper.rb