From ba67396539e04075f8f2e0e311a47f0a5f8cbb23 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Wed, 13 Apr 2016 14:25:14 +0200
Subject: [PATCH 1/3] Adds migration for renaming genre to gender

---
 db/migrate/20160413122359_rename_genre_to_gender.rb | 5 +++++
 db/schema.rb                                        | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20160413122359_rename_genre_to_gender.rb

diff --git a/db/migrate/20160413122359_rename_genre_to_gender.rb b/db/migrate/20160413122359_rename_genre_to_gender.rb
new file mode 100644
index 000000000..f0bccfc28
--- /dev/null
+++ b/db/migrate/20160413122359_rename_genre_to_gender.rb
@@ -0,0 +1,5 @@
+class RenameGenreToGender < ActiveRecord::Migration
+  def change
+    rename_column :users, :genre, :gender
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index cd05a0d2f..6bee6d425 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160411161531) do
+ActiveRecord::Schema.define(version: 20160413122359) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -422,7 +422,7 @@ ActiveRecord::Schema.define(version: 20160411161531) do
     t.string   "oauth_email"
     t.integer  "geozone_id"
     t.string   "redeemable_code"
-    t.string   "genre",                     limit: 10
+    t.string   "gender",                    limit: 10
     t.datetime "date_of_birth"
   end
 

From 1b1f2bc2c977350c170c9946d94d32139424a1a9 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Wed, 13 Apr 2016 14:27:27 +0200
Subject: [PATCH 2/3] renames genre to gender in code

---
 app/models/verification/residence.rb | 6 +++---
 lib/census_api.rb                    | 2 +-
 lib/tasks/users.rake                 | 6 +++---
 spec/models/residence_spec.rb        | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/models/verification/residence.rb b/app/models/verification/residence.rb
index 661659a01..5756af2b3 100644
--- a/app/models/verification/residence.rb
+++ b/app/models/verification/residence.rb
@@ -32,7 +32,7 @@ class Verification::Residence
                 document_type:         document_type,
                 geozone:               self.geozone,
                 date_of_birth:         date_of_birth.to_datetime,
-                genre:                 genre,
+                gender:                gender,
                 residence_verified_at: Time.now)
   end
 
@@ -77,8 +77,8 @@ class Verification::Residence
     @census_api_response.district_code
   end
 
-  def genre
-    @census_api_response.genre
+  def gender
+    @census_api_response.gender
   end
 
   private
diff --git a/lib/census_api.rb b/lib/census_api.rb
index 2b8c7d7a2..ee8107ea1 100644
--- a/lib/census_api.rb
+++ b/lib/census_api.rb
@@ -52,7 +52,7 @@ class CensusApi
       data[:datos_vivienda][:item][:codigo_distrito]
     end
 
-    def genre # "Varón" or "Mujer"
+    def gender # "Varón" or "Mujer"
       case data[:datos_habitante][:item][:descripcion_sexo]
       when "Varón"
         "male"
diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake
index 18dad53bc..c56df2dd0 100644
--- a/lib/tasks/users.rake
+++ b/lib/tasks/users.rake
@@ -42,11 +42,11 @@ namespace :users do
 
   desc "Associates demographic information to users"
   task assign_demographic: :environment do
-    User.residence_verified.where(genre: nil).find_each do |u|
+    User.residence_verified.where(gender: nil).find_each do |u|
       begin
         response = CensusApi.new.call(u.document_type, u.document_number)
         if response.valid?
-          u.genre = response.genre
+          u.gender = response.gender
           u.date_of_birth = response.date_of_birth.to_datetime
           u.save
           print "."
@@ -54,7 +54,7 @@ namespace :users do
           print "X"
         end
       rescue
-        puts "Could not assign genre/dob for user: #{u.id}"
+        puts "Could not assign gender/dob for user: #{u.id}"
       end
     end
   end
diff --git a/spec/models/residence_spec.rb b/spec/models/residence_spec.rb
index faa81b5c3..ce151eaee 100644
--- a/spec/models/residence_spec.rb
+++ b/spec/models/residence_spec.rb
@@ -85,7 +85,7 @@ describe Verification::Residence do
 
   describe "save" do
 
-    it "should store document number, document type, geozone, date of birth and genre" do
+    it "should store document number, document type, geozone, date of birth and gender" do
       user = create(:user)
       residence.user = user
       residence.save
@@ -96,7 +96,7 @@ describe Verification::Residence do
       expect(user.date_of_birth.year).to eq(1980)
       expect(user.date_of_birth.month).to eq(12)
       expect(user.date_of_birth.day).to eq(31)
-      expect(user.genre).to eq('male')
+      expect(user.gender).to eq('male')
       expect(user.geozone).to eq(geozone)
     end
 

From edb56b24cec2a9ed9c48f187c41cad6ae46b7ba1 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Wed, 13 Apr 2016 14:30:58 +0200
Subject: [PATCH 3/3] removes lying comment

---
 lib/census_api.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/census_api.rb b/lib/census_api.rb
index ee8107ea1..678a748c6 100644
--- a/lib/census_api.rb
+++ b/lib/census_api.rb
@@ -52,7 +52,7 @@ class CensusApi
       data[:datos_vivienda][:item][:codigo_distrito]
     end
 
-    def gender # "Varón" or "Mujer"
+    def gender
       case data[:datos_habitante][:item][:descripcion_sexo]
       when "Varón"
         "male"