rsvp 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2I2YzNjOTE0YmYyNTg4ZmNiYjdiOWVmOGMwZjc0NmY0N2JkYjQyOQ==
+    NTcxN2E0MmZmOGM1MTcwYTVkOTY1ODdjYTczYWY5ZTdmMzUxMTNjOA==
   data.tar.gz: !binary |-
-    NGQ1ZGQzZjNjMDUyZTQ0MmU3MjA5ZTViZDY5ZWU2OTViZTYyMTI0NA==
+    OTAzZGVlYjkyZmY2ZjZjMGVkZTBmNDcyODBhZGM4OGM2N2VlYzM0YQ==
 SHA512:
   metadata.gz: !binary |-
-    MTI4NDVlMTJlNWMwZGQwZDQ3MzQzZmNmMTQwYjk2NDBlNTYwNjY1OTllODYw
-    NzFkZDU2NDQzYmM3YzU1MDNiYTFlYjg1MTMzNTA5NTMxNzAyOGRkMWNhM2Q0
-    NzE1MzRlOWFkYWY0YzZlZDM2MmYwYzczNjY1YzMwOTI3NTg0NGY=
+    MzlhNzMyOTQxMzczNWExYWY0ZGQ3OWJjZDRmY2EzMGQwOTZhMWE3ZmExZDVi
+    NTMxY2RjNDI2YTQwOGVkYmQwYjhiYjlkMzZjNzI4M2NjNzMwYTg1OWI4MmY2
+    MzkxZTQ4ZmE4Y2ZjOTM1ZmFkNGM1Zjg0MTBlMWFjY2ZhNGJmNTY=
   data.tar.gz: !binary |-
-    Nzc5NGVkZTQ2MzNlOGEwMjVkNzI0NDM3MjdkNDUxNWQyMWU2NmVlZmY5MzA1
-    Y2E5M2Y2NzM1ZWQzZjJjZWYwZDM3NDVjZjAzYjFkYzM2ZGQzNmY0YmM0OGZk
-    NjVhMzIwMDUyN2NhMDgzYTZkMGVkNzM5YjJlMmMwNjlhYTQ1ZWU=
+    YjA0OGEyZjgxNjA3ZmU2ZThjYTY4ZTgxZmNjODI1N2EyZWFmMzVlMTkzNmFk
+    NzYyOWU1Njk2MWYwZmNmYTcxZDFkNzU4YTNmNjg0NDExYjk3YmRlN2ZlYWM5
+    M2NjY2IzYWMwMDk1NGM0YTc1YjNiZmRhNTljOWY4NWRiNWE2YTk=

data/app/models/rsvp/family.rb

@@ -1,12 +1,10 @@
 module Rsvp
   class Family < ActiveRecord::Base
-    attr_accessible :salutation_type, :city, :postal_code, :state, :street_1, :street_2
+    attr_accessible :city, :postal_code, :state, :street_1, :street_2
     has_many :invitations
     has_many :members
     has_many :people, :through => :members
 
-    validates :salutation_type, :presence => true
-
     include SalutationMixin
 
     def family

data/app/models/rsvp/invitation.rb

@@ -4,9 +4,8 @@ module Rsvp
     belongs_to :family
     has_many :responses
 
-    validates :salutation_type, :presence => true
     validates :rsvp_code, :presence => true, :uniqueness => true, :length => { is: 7 }
-    validates :total_invited, :inclusion => 1..10
+    validates :total_invited, :presence => true, :inclusion => 1..10
 
     include SalutationMixin
 

data/app/models/rsvp/person.rb

@@ -4,6 +4,7 @@ module Rsvp
     has_many :memberships, :class_name => "Member"
     has_many :families, :through => :memberships
 
+    validates :gender_type, :presence => true
     validates :first_name, :presence => true
     validates :last_name, :presence => true
 
@@ -15,5 +16,13 @@ module Rsvp
     def self.adult_females
       where("gender_type = ?", Gender::AdultFemale.to_s)
     end
+
+    def gender_type=(klass)
+      write_attribute(:gender_type, klass.to_s)
+    end
+
+    def gender_type
+      read_attribute(:gender_type).try(:constantize)
+    end
   end
 end

data/app/models/rsvp/salutation/husband_wife_and_family.rb

@@ -4,7 +4,7 @@ module Rsvp
       family.people.adult_males.first
     end
     def template
-      "Mr. and Mrs. [[male__first_name]] [[male__last_name]] and family"
+      "Mr. and Mrs. [[male__first_name]] [[male__last_name]] and Family"
     end
   end
 end

data/app/models/rsvp/salutation/single_female_and_guest.rb

@@ -4,7 +4,7 @@ module Rsvp
       family.people.adult_females.first
     end
     def template
-      "Ms. [[female__first_name]] [[female__last_name]] and guest"
+      "Ms. [[female__first_name]] [[female__last_name]] and Guest"
     end
   end
 end

data/app/models/rsvp/salutation/single_male_and_guest.rb

@@ -4,7 +4,7 @@ module Rsvp
       family.people.adult_males.first
     end
     def template
-      "Mr. [[male__first_name]] [[male__last_name]] and guest"
+      "Mr. [[male__first_name]] [[male__last_name]] and Guest"
     end
   end
 end

data/app/models/rsvp/salutation/widow_and_family.rb

@@ -4,7 +4,7 @@ module Rsvp
       family.people.adult_females.first
     end
     def template
-      "Mrs. [[female__first_name]] [[female__last_name]] and family"
+      "Mrs. [[female__first_name]] [[female__last_name]] and Family"
     end
   end
 end

data/app/models/rsvp/salutation/widower_and_family.rb

@@ -4,7 +4,7 @@ module Rsvp
       family.people.adult_males.first
     end
     def template
-      "Mr. [[male__first_name]] [[male__last_name]] and family"
+      "Mr. [[male__first_name]] [[male__last_name]] and Family"
     end
   end
 end

data/app/models/rsvp/salutation_mixin.rb

@@ -1,5 +1,13 @@
 module Rsvp
   module SalutationMixin
+    extend ActiveSupport::Concern
+    included do
+      attr_accessible :salutation_type, :salutation
+      after_save :generate_salutation
+
+      validates :salutation_type, :presence => true
+    end
+
     def salutation_type=(klass)
       write_attribute(:salutation_type, klass.to_s)
     end
@@ -8,8 +16,16 @@ module Rsvp
       read_attribute(:salutation_type).try(:constantize)
     end
 
-    def salutation
-      salutation_type.try(:new, family)
+    def generate_salutation
+      salutation = read_attribute(:salutation)
+      if salutation.blank? && salutation_type.present?
+        begin
+          write_attribute(:salutation, salutation_type.try(:new, family).to_s)
+          self.save(callbacks: false)
+        rescue
+          # Trap exceptions thrown due to incomplete data structures
+        end
+      end
     end
   end
 end

data/db/migrate/20140106042630_create_rsvp_families.rb

@@ -2,6 +2,7 @@ class CreateRsvpFamilies < ActiveRecord::Migration
   def change
     create_table :rsvp_families do |t|
       t.string :salutation_type, :limit => 50
+      t.string :salutation
       t.string :street_1, :limit => 75
       t.string :street_2, :limit => 75
       t.string :city, :limit => 50

data/db/migrate/20140106042845_create_rsvp_invitations.rb

@@ -3,6 +3,7 @@ class CreateRsvpInvitations < ActiveRecord::Migration
     create_table :rsvp_invitations do |t|
       t.integer :family_id
       t.string :salutation_type, :limit => 50
+      t.string :salutation
       t.string :rsvp_code, :limit => 20
       t.integer :total_invited
 

data/lib/rsvp/version.rb

@@ -1,3 +1,3 @@
 module Rsvp
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsvp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryan Ricard