has_vcards 0.11.1 → 0.12.0

data/app/models/phone_number.rb

@@ -1,6 +1,6 @@
 class PhoneNumber < ActiveRecord::Base
   # Vcard association
-  belongs_to :vcard
+  belongs_to :vcard, :inverse_of => :contacts
   belongs_to :object, :polymorphic => true
 
   # Validation

data/app/models/vcard.rb

@@ -20,7 +20,6 @@ class Vcard < ActiveRecord::Base
   
   scope :active, :conditions => {:active => true}
   scope :by_name, lambda {|name| {:conditions => self.by_name_conditions(name)}}
-  scope :with_address, joins(:address)
 
   belongs_to :object, :polymorphic => true
 
@@ -73,50 +72,14 @@ class Vcard < ActiveRecord::Base
   end
 
   # Phone numbers
-  has_many :contacts, :class_name => 'PhoneNumber', :as => :object
-  accepts_nested_attributes_for :contacts
-
-  has_many :phone_numbers, :class_name => 'PhoneNumber', :as => :object, :conditions => ["phone_number_type = ?", 'phone'], :after_add => :add_phone_number
-  def add_phone_number(number)
-      number.phone_number_type = 'phone'
-      number.save
-  end
-
-  def phone_number
-    phone_numbers.first
-  end
-  
-  def phone_number=(number)
-    phone_numbers.build(:number => number, :phone_number_type => 'phone')
-  end
-  
-  has_many :mobile_numbers, :class_name => 'PhoneNumber', :as => :object, :conditions => ["phone_number_type = ?", 'mobile'], :after_add => :add_mobile_number
-  def add_mobile_number(number)
-      number.phone_number_type = 'mobile'
-      number.save
-  end
-
-  def mobile_number
-    mobile_numbers.first
-  end
-  
-  def mobile_number=(number)
-    mobile_numbers.build(:number => number, :phone_number_type => 'mobile')
-  end
-  
-  has_many :fax_numbers, :class_name => 'PhoneNumber', :as => :object, :conditions => ["phone_number_type = ?", 'fax'], :after_add => :add_fax_number
-  def add_fax_number(number)
-      number.phone_number_type = 'fax'
-      number.save
-  end
-
-  def fax_number
-    fax_numbers.first
-  end
-  
-  def fax_number=(number)
-    fax_numbers.build(:number => number, :phone_number_type => 'fax')
+  has_many :contacts, :class_name => 'PhoneNumber', :as => :object, :inverse_of => :vcard do
+    def build_defaults
+      ['Tel. geschäft', 'Tel. privat', 'Handy', 'E-Mail'].map{ |phone_number_type|
+        build(:phone_number_type => phone_number_type) unless exists?(:phone_number_type => phone_number_type)
+      }
+    end
   end
+  accepts_nested_attributes_for :contacts, :reject_if => proc {|attributes| attributes['number'].blank? }
   
   # Salutation
   def salutation

data/lib/has_vcards/version.rb

@@ -1,3 +1,3 @@
 module HasVcards
-  VERSION = '0.11.1'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_vcards
 version: !ruby/object:Gem::Version 
-  hash: 49
-  prerelease: 
+  hash: 47
+  prerelease: false
   segments: 
   - 0
-  - 11
-  - 1
-  version: 0.11.1
+  - 12
+  - 0
+  version: 0.12.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-21 00:00:00 Z
+date: 2011-11-21 00:00:00 +01:00
+default_executable: 
 dependencies: []
 
 description: Rails gem providing VCard like contact and address models and helpers.
@@ -47,6 +48,7 @@ files:
 - lib/has_vcards/railtie.rb
 - lib/has_vcards/version.rb
 - README.markdown
+has_rdoc: true
 homepage: https://github.com/huerlisi/bookyt_pos
 licenses: []
 
@@ -76,10 +78,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: VCard rails plugin
 test_files: []
 
-has_rdoc: