diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-05-01 02:23:47 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-05-01 02:23:47 -0700 |
| commit | efba1d4227514a6ce4880910a6531b0a6c3c75aa (patch) | |
| tree | daff4155b8c19b915125ac0b0da458279358e743 /activemodel/test/models/contact.rb | |
| parent | 81807e0fe2879e08563c91ee6809ab6d1d0bd081 (diff) | |
| parent | 6c280f3398966ffba45069500ff43d632513fe44 (diff) | |
| download | rails-efba1d4227514a6ce4880910a6531b0a6c3c75aa.tar.gz rails-efba1d4227514a6ce4880910a6531b0a6c3c75aa.tar.bz2 rails-efba1d4227514a6ce4880910a6531b0a6c3c75aa.zip | |
Merge commit 'rails/master'
Conflicts:
railties/guides/source/index.html.erb
Diffstat (limited to 'activemodel/test/models/contact.rb')
| -rw-r--r-- | activemodel/test/models/contact.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/activemodel/test/models/contact.rb b/activemodel/test/models/contact.rb index a9009fbdef..605e435f39 100644 --- a/activemodel/test/models/contact.rb +++ b/activemodel/test/models/contact.rb @@ -3,6 +3,14 @@ class Contact attr_accessor :id, :name, :age, :created_at, :awesome, :preferences + def social + %w(twitter github) + end + + def network + {:git => :github} + end + def initialize(options = {}) options.each { |name, value| send("#{name}=", value) } end |