genderize 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f900977dce6ce532aaaaeb0eac75f034ef6f9a6f
-  data.tar.gz: 4a9dfe4d19dd6a31893c72d49d3f692eaea1b5aa
+  metadata.gz: 9d5896e1856dac2e401a587209c71b2cae369821
+  data.tar.gz: 6a116943a73774552baf065423aba613f3b4642c
 SHA512:
-  metadata.gz: 8ad68c57f62525bfc471f944f8242692debe6473a82bfb15c2379cc02d9f9704d7206e126682d4c59d3c2e07fdd3da13474789f779baa76980c02455d82131f7
-  data.tar.gz: 7d9c2260901360ef81bd9282d0373a1bea5df76a721e1973d79216f83276fda5fb9e0a9a74202d48277479d3ab328670a3d4380e7874ba9fddb4b327893b022b
+  metadata.gz: 6f1afe0ebcb4288691692cebffc584697e5c83cd328ee9165892b98571d8bcddeed28270dd5ae492ccc6b87cb851bff25b4a8257328926fd5c1030dd024cf748
+  data.tar.gz: 5140e5c42950d1f64e6cc5715a31d37eea13fa7f65a6ff39c4abdd15e8d47a345927e89e7cc4afe50218280435baba9240312af4bf7ac90ed9248ef422fcabb3

data/config/locales/genderize.en.yml

@@ -3,21 +3,26 @@ en:
     name:
       masculine: "male"
       feminine: "female"
-        
+      blank: ""
+
   # pronouns
     subject:
       masculine: 'he'
       feminine: 'she'
-    
+      blank: "they"
+
     object:
       masculine: 'him'
       feminine: 'her'
-      
+      blank: "them"
+
     possessive:
       masculine: 'his'
       feminine: 'her'
-    
+      blank: "their"
+
     # Other forms
     casual:
       masculine: guy
-      feminine: girl
+      feminine: girl
+      blank: person

data/config/locales/genderize.es.yml

@@ -3,21 +3,26 @@ es:
     name:
       masculine: "hombre"
       feminine: "mujer"
-        
+      blank: ""
+
   # pronouns
     subject:
       masculine: 'él'
       feminine: 'ella'
-    
+      blank: ""
+
     object:
       masculine: 'él'
       feminine: 'ella'
-      
+      blank: ""
+
     possessive:
       masculine: 'suyo'
       feminine: 'suya'
-    
+      blank: ""
+
     # Other forms
     casual:
       masculine: chico
       feminine: chica
+      blank: ""

data/lib/genderize/gender.rb

@@ -1,67 +1,72 @@
 module Genderize
   class Gender
-  
+
     include I18n
-    
+
+    # Maps the gender abbreviation name to the full name for translation keys
+    ABR_KEY_NAME_MAPPING = { "" => "blank", "m" => "masculine", "f" => "feminine" }
+
+
     attr_reader :abbr
-    
+
     def initialize(abbr)
       unless abbr.blank? or abbr.to_s =~ /\A(f|m|female|male)\Z/i
-        raise "Invalid abbreviation: '#{abbr}'" 
+        raise "Invalid abbreviation: '#{abbr}'"
       end
-      @abbr = abbr.blank? ? nil : abbr.to_s.first.downcase
+      @abbr = abbr.blank? ? '' : abbr.to_s.first.downcase
     end
-    
+
     def name
       @name ||= translation_for("name")
     end
-  
+
     def subject
       @subject ||= translation_for("subject")
     end
-    
+
     def object
       @object ||= translation_for("object")
     end
-    
+
     def possessive
       @possessive ||= translation_for("possessive")
     end
-    
+
     def casual
       @casual ||= translation_for("casual")
     end
-    
+
     def capital_abbr
       abbr.capitalize
     end
-  
+
     def male?
       abbr == 'm'
     end
-  
+
     def female?
       abbr == 'f'
     end
-  
+
+    def blank?
+      abbr == ""
+    end
+
     def to_s
       abbr
     end
-  
+
     def ==(val)
       abbr.to_s == val.to_s
     end
-  
+
+
     private
-    
+
+
     def translation_for(key)
-      case
-      when male? then I18n.t("genderize.#{key}.masculine")
-      when female? then I18n.t("genderize.#{key}.feminine")
-      else
-        nil
-      end
+      I18n.t("genderize.#{key}.#{ABR_KEY_NAME_MAPPING[abbr]}")
     end
-    
+
   end
 end

data/lib/genderize/version.rb

@@ -1,3 +1,3 @@
 module Genderize
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/dummy/log/test.log

@@ -56,3 +56,23 @@ Migrating to CreateUsers (20130506080641)
   SQL (0.3ms)  INSERT INTO "users" ("name", "gender", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["name", "f"], ["gender", "f"], ["created_at", "2016-05-27 13:33:00.356946"], ["updated_at", "2016-05-27 13:33:00.356946"]]
    (2.5ms)  commit transaction
   User Load (0.1ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" DESC LIMIT 1
+   (0.1ms)  begin transaction
+  SQL (0.4ms)  INSERT INTO "users" ("name", "gender", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["name", "f"], ["gender", "f"], ["created_at", "2016-05-27 13:56:15.467527"], ["updated_at", "2016-05-27 13:56:15.467527"]]
+   (0.5ms)  commit transaction
+  User Load (0.1ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" DESC LIMIT 1
+   (0.0ms)  begin transaction
+  SQL (0.3ms)  INSERT INTO "users" ("name", "gender", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["name", "f"], ["gender", "f"], ["created_at", "2016-05-27 13:57:19.171265"], ["updated_at", "2016-05-27 13:57:19.171265"]]
+   (2.4ms)  commit transaction
+  User Load (0.1ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" DESC LIMIT 1
+   (0.0ms)  begin transaction
+  SQL (0.4ms)  INSERT INTO "users" ("name", "gender", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["name", "f"], ["gender", "f"], ["created_at", "2016-05-27 13:57:59.175258"], ["updated_at", "2016-05-27 13:57:59.175258"]]
+   (2.3ms)  commit transaction
+  User Load (0.1ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" DESC LIMIT 1
+   (0.0ms)  begin transaction
+  SQL (0.4ms)  INSERT INTO "users" ("name", "gender", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["name", "f"], ["gender", "f"], ["created_at", "2016-05-27 13:58:25.137246"], ["updated_at", "2016-05-27 13:58:25.137246"]]
+   (2.4ms)  commit transaction
+  User Load (0.1ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" DESC LIMIT 1
+   (0.1ms)  begin transaction
+  SQL (0.4ms)  INSERT INTO "users" ("name", "gender", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["name", "f"], ["gender", "f"], ["created_at", "2016-05-27 13:58:39.130168"], ["updated_at", "2016-05-27 13:58:39.130168"]]
+   (2.4ms)  commit transaction
+  User Load (0.1ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" DESC LIMIT 1

data/spec/lib/gender_spec.rb

@@ -11,6 +11,7 @@ describe Genderize::Gender do
     it "should find the correct abbreviation" do
       expect(Gender.new("female").abbr).to eql('f')
       expect(Gender.new("male").abbr).to eql('m')
+      expect(Gender.new("").abbr).to eql('')
     end
 
   end
@@ -36,8 +37,8 @@ describe Genderize::Gender do
 
     context "when blank" do
 
-      it "should be nil" do
-        expect(blank.name).to be_nil
+      it "should be ''" do
+        expect(blank.name).to eql("")
       end
 
     end
@@ -65,8 +66,8 @@ describe Genderize::Gender do
 
     context "when blank" do
 
-      it "should be nil" do
-        expect(blank.abbr).to be_nil
+      it "should be ''" do
+        expect(blank.abbr).to eql("")
       end
 
     end
@@ -94,8 +95,8 @@ describe Genderize::Gender do
 
     context "when blank" do
 
-      it "should be nil" do
-        expect(blank.subject).to be_nil
+      it "should be 'they'" do
+        expect(blank.subject).to eql("they")
       end
 
     end
@@ -122,8 +123,8 @@ describe Genderize::Gender do
 
     context "when blank" do
 
-      it "should be nil" do
-        expect(blank.object).to be_nil
+      it "should be 'them'" do
+        expect(blank.object).to eql("them")
       end
 
     end
@@ -151,8 +152,8 @@ describe Genderize::Gender do
 
     context "when blank" do
 
-      it "should be nil" do
-        expect(blank.possessive).to be_nil
+      it "should be 'their'" do
+        expect(blank.possessive).to eql("their")
       end
 
     end
@@ -181,8 +182,8 @@ describe Genderize::Gender do
 
     context "when blank" do
 
-      it "should be nil" do
-        expect(blank.casual).to be_nil
+      it "should be 'person'" do
+        expect(blank.casual).to eql("person")
       end
 
     end
@@ -193,13 +194,15 @@ describe Genderize::Gender do
   describe :to_s do
 
     it "should equal the abbr value" do
-      expect(male.to_s).to eql(male.abbr)
+      expect(male.to_s).to   eql(male.abbr)
       expect(female.to_s).to eql(female.abbr)
+      expect(blank.to_s).to  eql(blank.abbr)
     end
 
     it "returns a string" do
-      expect(male.to_s).to be_an_instance_of(String)
+      expect(male.to_s).to   be_an_instance_of(String)
       expect(female.to_s).to be_an_instance_of(String)
+      expect(blank.to_s).to  be_an_instance_of(String)
     end
 
   end
@@ -207,8 +210,9 @@ describe Genderize::Gender do
   describe :capital_abbr do
 
     it "should equal the abbr value capitalized" do
-      expect(male.capital_abbr).to eql(male.abbr.capitalize)
+      expect(male.capital_abbr).to   eql(male.abbr.capitalize)
       expect(female.capital_abbr).to eql(female.abbr.capitalize)
+      expect(blank.capital_abbr).to  eql(blank.abbr.capitalize)
     end
 
   end
@@ -219,6 +223,7 @@ describe Genderize::Gender do
       expect(male == "m").to be_truthy
       expect(female == "f").to be_truthy
       expect(blank == nil).to be_truthy
+      expect(blank == '').to be_truthy
     end
 
     it "should return false if not passed abbr value" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genderize
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Bodacious