has_vcards 0.13.1 → 0.13.2

Sign up to get free protection for your applications and to get access to all the features.
data/app/models/vcard.rb CHANGED
@@ -14,17 +14,17 @@ class Vcard < ActiveRecord::Base
14
14
  delegate :post_office_box, :extended_address, :street_address, :locality, :region, :postal_code, :country_name, :to => :address
15
15
  delegate :post_office_box=, :extended_address=, :street_address=, :locality=, :region=, :postal_code=, :country_name=, :to => :address
16
16
  include HasAddress
17
-
17
+
18
18
  has_many :addresses, :autosave => true, :validate => true
19
19
  accepts_nested_attributes_for :addresses
20
-
20
+
21
21
  scope :active, :conditions => {:active => true}
22
22
  scope :by_name, lambda {|name| {:conditions => self.by_name_conditions(name)}}
23
- scope :with_address, joins(:address)
23
+ scope :with_address, joins(:address).includes(:address)
24
24
 
25
25
  belongs_to :object, :polymorphic => true
26
26
 
27
-
27
+
28
28
  # Convenience accessors
29
29
  def full_name
30
30
  result = read_attribute(:full_name)
@@ -67,7 +67,7 @@ class Vcard < ActiveRecord::Base
67
67
 
68
68
  def contact_lines(separator = " ")
69
69
  lines = contacts.map{|p| p.to_s unless (p.number.nil? or p.number.strip.empty?)}
70
-
70
+
71
71
  # Only return non-empty lines
72
72
  lines.map {|line| line.strip unless (line.nil? or line.strip.empty?)}.compact
73
73
  end
@@ -81,7 +81,7 @@ class Vcard < ActiveRecord::Base
81
81
  end
82
82
  end
83
83
  accepts_nested_attributes_for :contacts, :reject_if => proc {|attributes| attributes['number'].blank? }, :allow_destroy => true
84
-
84
+
85
85
  # Salutation
86
86
  def salutation
87
87
  case honorific_prefix
@@ -1,3 +1,3 @@
1
1
  module HasVcards
2
- VERSION = '0.13.1'
2
+ VERSION = '0.13.2'
3
3
  end
metadata CHANGED
@@ -1,61 +1,46 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: has_vcards
3
- version: !ruby/object:Gem::Version
4
- hash: 41
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.13.2
5
5
  prerelease:
6
- segments:
7
- - 0
8
- - 13
9
- - 1
10
- version: 0.13.1
11
6
  platform: ruby
12
- authors:
13
- - "Simon H\xC3\xBCrlimann (CyT)"
7
+ authors:
8
+ - Simon Hürlimann (CyT)
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
-
18
- date: 2012-04-03 00:00:00 Z
19
- dependencies:
20
- - !ruby/object:Gem::Dependency
12
+ date: 2012-04-11 00:00:00.000000000Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
21
15
  name: rails
22
- prerelease: false
23
- requirement: &id001 !ruby/object:Gem::Requirement
16
+ requirement: &70339041682500 !ruby/object:Gem::Requirement
24
17
  none: false
25
- requirements:
18
+ requirements:
26
19
  - - ~>
27
- - !ruby/object:Gem::Version
28
- hash: 7
29
- segments:
30
- - 3
31
- - 0
32
- version: "3.0"
20
+ - !ruby/object:Gem::Version
21
+ version: '3.0'
33
22
  type: :runtime
34
- version_requirements: *id001
35
- - !ruby/object:Gem::Dependency
36
- name: inherited_resources
37
23
  prerelease: false
38
- requirement: &id002 !ruby/object:Gem::Requirement
24
+ version_requirements: *70339041682500
25
+ - !ruby/object:Gem::Dependency
26
+ name: inherited_resources
27
+ requirement: &70339041681980 !ruby/object:Gem::Requirement
39
28
  none: false
40
- requirements:
41
- - - ">="
42
- - !ruby/object:Gem::Version
43
- hash: 3
44
- segments:
45
- - 0
46
- version: "0"
29
+ requirements:
30
+ - - ! '>='
31
+ - !ruby/object:Gem::Version
32
+ version: '0'
47
33
  type: :runtime
48
- version_requirements: *id002
34
+ prerelease: false
35
+ version_requirements: *70339041681980
49
36
  description: vCard like contact and address models and helpers for Rails.
50
37
  email: simon.huerlimann@cyt.ch
51
38
  executables: []
52
-
53
39
  extensions: []
54
-
55
- extra_rdoc_files:
40
+ extra_rdoc_files:
56
41
  - MIT-LICENSE
57
42
  - README.markdown
58
- files:
43
+ files:
59
44
  - app/controllers/phone_numbers_controller.rb
60
45
  - app/helpers/has_vcards_helper.rb
61
46
  - app/models/address.rb
@@ -81,38 +66,29 @@ files:
81
66
  - MIT-LICENSE
82
67
  - README.markdown
83
68
  homepage: https://github.com/huerlisi/has_vcards
84
- licenses:
69
+ licenses:
85
70
  - MIT
86
71
  post_install_message:
87
72
  rdoc_options: []
88
-
89
- require_paths:
73
+ require_paths:
90
74
  - lib
91
- required_ruby_version: !ruby/object:Gem::Requirement
75
+ required_ruby_version: !ruby/object:Gem::Requirement
92
76
  none: false
93
- requirements:
94
- - - ">="
95
- - !ruby/object:Gem::Version
96
- hash: 3
97
- segments:
98
- - 0
99
- version: "0"
100
- required_rubygems_version: !ruby/object:Gem::Requirement
77
+ requirements:
78
+ - - ! '>='
79
+ - !ruby/object:Gem::Version
80
+ version: '0'
81
+ required_rubygems_version: !ruby/object:Gem::Requirement
101
82
  none: false
102
- requirements:
103
- - - ">="
104
- - !ruby/object:Gem::Version
105
- hash: 3
106
- segments:
107
- - 0
108
- version: "0"
83
+ requirements:
84
+ - - ! '>='
85
+ - !ruby/object:Gem::Version
86
+ version: '0'
109
87
  requirements: []
110
-
111
88
  rubyforge_project:
112
89
  rubygems_version: 1.8.15
113
90
  signing_key:
114
91
  specification_version: 3
115
92
  summary: vCard plugin for Rails
116
93
  test_files: []
117
-
118
94
  has_rdoc: