has_vcards 0.19.0 → 0.20.0

data/app/models/address.rb

@@ -1,6 +1,11 @@
+# encoding: utf-8
+
 class Address < ActiveRecord::Base
+  # Access restrictions
+  attr_accessible :extended_address, :street_address, :post_office_box, :postal_code, :locality, :zip_locality
+
   belongs_to :vcard
-  
+
   # Validations
   include I18nHelpers
 

data/app/models/honorific_prefix.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+
+class HonorificPrefix < ActiveRecord::Base
+  # Access restrictions
+  attr_accessible :sex, :position, :name
+end

data/app/models/phone_number.rb

@@ -1,4 +1,7 @@
 class PhoneNumber < ActiveRecord::Base
+  # Access restrictions
+  attr_accessible :phone_number_type, :number
+
   # Vcard association
   belongs_to :vcard, :inverse_of => :contacts
   belongs_to :object, :polymorphic => true

data/app/models/vcard.rb

@@ -11,10 +11,15 @@ module HasAddress
 end
 
 class Vcard < ActiveRecord::Base
+  # Access restrictions
+  attr_accessible :full_name, :honorific_prefix, :family_name, :given_name
+
   has_one :address, :autosave => true, :validate => true
   accepts_nested_attributes_for :address
+  attr_accessible :address_attributes
   delegate  :post_office_box, :extended_address, :street_address, :locality, :region, :postal_code, :country_name, :zip_locality, :to => :address
   delegate  :post_office_box=, :extended_address=, :street_address=, :locality=, :region=, :postal_code=, :country_name=, :zip_locality=, :to => :address
+  attr_accessible :post_office_box, :extended_address, :street_address, :locality, :region, :postal_code, :country_name, :zip_locality
   include HasAddress
 
   has_many :addresses, :autosave => true, :validate => true
@@ -46,7 +51,9 @@ class Vcard < ActiveRecord::Base
   end
 
   def abbreviated_name
-    "#{given_name[0..0]}. #{family_name}"
+    return read_attribute(:full_name) if read_attribute(:full_name)
+
+    [given_name.try(:first).try(:upcase), family_name].compact.join(". ")
   end
 
   # Advanced finders
@@ -93,7 +100,7 @@ class Vcard < ActiveRecord::Base
     end
   end
   accepts_nested_attributes_for :contacts, :reject_if => proc {|attributes| attributes['number'].blank? }, :allow_destroy => true
-
+  attr_accessible :contacts_attributes
   # Salutation
   def salutation
     case honorific_prefix

data/app/views/people/_address_form.html.haml

@@ -0,0 +1,15 @@
+.row-fluid
+  .span6
+    %h3= t('form.person.address')
+    = render 'vcards/form', :f => f
+
+  .span6
+    %h3= t_model(PhoneNumber)
+    .nested-form.list.contacts
+      = f.fields_for :vcard do |vcard|
+        - vcard.object.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
+      %i.icon-plus
+      =t_action(:more)

data/app/views/phone_numbers/_form.html.haml

@@ -1,5 +1,7 @@
-#phone_number_form
-  = form_for [@vcard, @phone_number], :remote => true do |phone_number|
-    = phone_number.select :phone_number_type, ['Tel. privat', 'Tel. geschäft', 'Handy', 'Fax', 'E-Mail']
-    = phone_number.text_field :number, :size => 12, :autocomplete => 'off'
-    = phone_number.submit "Speichern"
+.nested-form-item
+  .control-group.string.optional
+    %label.select.optional.control-label= item.select :phone_number_type, ['Tel. geschäft', 'Tel. privat', 'Handy', 'Fax', 'E-Mail', 'Webseite']
+    .controls
+      = item.text_field :number, :autocomplete => 'off', :class => 'string optional'
+      = link_to content_tag(:i, '', :class => 'icon-trash delete-nested-form-item'), '#'
+    = item.hidden_field :_destroy

data/config/locales/de.yml

@@ -14,6 +14,7 @@ de:
     honorific_prefix: Anrede
     honorific_suffix: Namenszusatz
     address_type:     Art
+    address:          Adresse
 
   activerecord:
     models:

data/db/migrate/20121113120000_create_honorific_prefixes_table.rb

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

data/lib/has_vcards/version.rb

@@ -1,3 +1,3 @@
 module HasVcards
-  VERSION = '0.19.0'
+  VERSION = '0.20.0'
 end

metadata

@@ -1,72 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: has_vcards
-version: !ruby/object:Gem::Version 
-  hash: 83
-  prerelease: false
-  segments: 
-  - 0
-  - 19
-  - 0
-  version: 0.19.0
+version: !ruby/object:Gem::Version
+  version: 0.20.0
+  prerelease: 
 platform: ruby
-authors: 
-- "Simon H\xC3\xBCrlimann (CyT)"
+authors:
+- Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-20 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &80833440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: inherited_resources
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *80833440
+- !ruby/object:Gem::Dependency
+  name: inherited_resources
+  requirement: &80833160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *80833160
 description: vCard like contact and address models and helpers for Rails.
 email: simon.huerlimann@cyt.ch
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - MIT-LICENSE
 - README.markdown
-files: 
+files:
 - app/controllers/directory_lookup_controller.rb
 - app/controllers/phone_numbers_controller.rb
 - app/controllers/vcards_controller.rb
 - app/helpers/has_vcards_helper.rb
 - app/input/zip_locality_input.rb
 - app/models/address.rb
+- app/models/honorific_prefix.rb
 - app/models/phone_number.rb
 - app/models/vcard.rb
 - app/models/vcard/directory_address.rb
 - app/models/vcard/directory_lookup.rb
+- app/views/people/_address_form.html.haml
 - app/views/phone_numbers/_form.html.haml
 - app/views/phone_numbers/_list.html.haml
 - app/views/phone_numbers/_nested_form.html.haml
@@ -85,44 +71,36 @@ files:
 - db/migrate/000_create_vcard_tables.rb
 - db/migrate/20120119091225_add_index_to_vcards.rb
 - db/migrate/20120813065226_add_time_stamps_to_has_vcards_tables.rb
+- db/migrate/20121113120000_create_honorific_prefixes_table.rb
 - lib/has_vcards.rb
 - lib/has_vcards/railtie.rb
 - lib/has_vcards/version.rb
 - MIT-LICENSE
 - README.markdown
-has_rdoc: true
 homepage: https://github.com/huerlisi/has_vcards
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: vCard plugin for Rails
 test_files: []
-
+has_rdoc: