genderize 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 130eb88d15b63e6b884dbc13af79ca7378bcbe92
-  data.tar.gz: 06d1941d8108fa31d1f698a3a73e591ea3eaa5a9
+  metadata.gz: f590ec5a9831dd9016d6b09cca52d9b7b3f61953
+  data.tar.gz: f5173c96546200eb7eb22277c19afc4d43878cdd
 SHA512:
-  metadata.gz: 474518f5236848d1f2833308f59c64a1b6be51ec85fa70e7d6dff8c40e3a5137a23ec05c68da30440098df08b8249cfba2a2575cb07d712b8936547a0c0a605c
-  data.tar.gz: cef4b252424262c974f33575c920e8ad37b28a33f9b649ce4bf71bcc37e4f915b462013bf1afab20a3c8d333e8aeecc8803c90a1781468642153bc7df34ddbce
+  metadata.gz: da8cf63be0f3e3c1e756a8e02e8144f6c7806a4b05ec6c60436d43e71a6262129aee4f7cda4d155181d6abdf4ab0b5b9cac134304e0578d1171cbe9ab1b37c53
+  data.tar.gz: 5b9ae766aa1e2fae6679da160a112a0e655a2c57e38982c9068d3c62e827dca04a6e7b957d908f1b297cfab2c30e46f1d3e8db1a05e22b30408153d391dea8dd

data/lib/genderize/gender.rb

@@ -2,48 +2,63 @@ module Genderize
   class Gender
   
     include I18n
-
-    attr_reader :name, :abbr, :subject, :object, :possessive, :casual
-
-    def initialize(abbr)
-      raise "Invalid abbreviation" unless abbr.to_s =~ /\A(f|m)\Z/i
-      @abbr = abbr.downcase
-      @male = self.abbr == 'm'
-      @name = male? ? t("name") : t("name", "feminine")
     
-      # pronouns
-      @subject    = male? ? t("subject") : t("subject", "feminine")
-      @object     = male? ? t("object") : t("object", "feminine")
-      @possessive = male? ? t("possessive") : t("possessive", "feminine")
+    attr_reader :abbr
+    
+    def initialize(abbr)
+      raise "Invalid abbreviation: '#{abbr}'" unless abbr.blank? or abbr.to_s =~ /\A(f|m)\Z/i
+      @abbr = abbr.blank? ? nil : abbr.to_s.downcase
+    end
     
-      # Other forms
-      @casual     = male? ? t("casual") : t("casual", "feminine")
+    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?
-      @male
+      abbr == 'm'
     end
   
     def female?
-      !male?
+      abbr == 'f'
     end
   
     def to_s
-      @abbr
+      abbr
     end
   
     def ==(val)
-      to_s == val.to_s
+      abbr.to_s == val.to_s
     end
   
     private
-  
-    def t(attribute, gender = "masculine")
-      I18n.t("genderize.#{attribute}.#{gender}")
+    
+    def translation_for(key)
+      case
+      when male? then I18n.t("genderize.#{key}.masculine")
+      when female? then I18n.t("genderize.#{key}.feminine")
+      else
+        nil
+      end
     end
     
   end

data/lib/genderize/genderize.rb

@@ -1,5 +1,3 @@
-require "genderize/gender"
-
 module Genderize::Genderize
 
   def self.included(base)
@@ -7,9 +5,9 @@ module Genderize::Genderize
   end
   
   module ClassMethods
+    require "genderize/gender"
     
     def genderize(col_name = "gender")
-      
       # Reads the DB column value for gender attribute and creates a new Gender 
       # object with it's value
       #
@@ -19,8 +17,12 @@ module Genderize::Genderize
       define_method col_name do
         if value = instance_variable_get("@#{col_name}")
           return value
+        end
+        read_value = read_attribute(col_name)
+        if read_value.blank?
+          return read_value
         else
-          instance_variable_set("@#{col_name}", Gender.new(read_attribute(col_name)))
+          instance_variable_set("@#{col_name}", Genderize::Gender.new(read_attribute(col_name)))
         end
       end
       
@@ -31,11 +33,16 @@ module Genderize::Genderize
       #
       # Raises ArgumentError if gender is not a single alphanumeric character "m" or "f"
       define_method "#{col_name}=" do |string|
-        unless string.to_s =~ /\A(m|f)\Z/i
+        unless string.blank? or string.to_s =~ /\A(m|f)\Z/i
           raise ArgumentError, "Gender must be a single alphanumeric character" 
         end
         write_attribute(col_name, string)
-        instance_variable_set("@#{col_name}", Gender.new(read_attribute(col_name)))
+        
+        if string.blank?
+          instance_variable_set("@#{col_name}", string)
+        else
+          instance_variable_set("@#{col_name}", Genderize::Gender.new(read_attribute(col_name)))
+        end
       end
       
     end

data/lib/genderize/version.rb

@@ -1,3 +1,3 @@
 module Genderize
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/dummy/log/test.log

@@ -35,3 +35,58 @@ Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+   (0.1ms)  begin transaction
+  SQL (35.2ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 06 May 2013 14:54:57 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 06 May 2013 14:54:57 UTC +00:00]]
+   (4.5ms)  commit transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
+Connecting to database specified by database.yml
+   (0.1ms)  begin transaction
+  SQL (3.0ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 06 May 2013 14:55:10 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 06 May 2013 14:55:10 UTC +00:00]]
+   (53.6ms)  commit transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
+Connecting to database specified by database.yml
+   (0.1ms)  begin transaction
+  SQL (3.0ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 06 May 2013 14:55:52 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 06 May 2013 14:55:52 UTC +00:00]]
+   (58.9ms)  commit transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
+Connecting to database specified by database.yml
+   (0.1ms)  begin transaction
+  SQL (3.1ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 06 May 2013 14:57:23 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 06 May 2013 14:57:23 UTC +00:00]]
+   (56.5ms)  commit transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
+Connecting to database specified by database.yml
+   (0.1ms)  begin transaction
+  SQL (3.0ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 06 May 2013 14:57:33 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 06 May 2013 14:57:33 UTC +00:00]]
+   (54.0ms)  commit transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
+Connecting to database specified by database.yml
+   (0.1ms)  begin transaction
+  SQL (3.1ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 06 May 2013 14:58:24 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 06 May 2013 14:58:24 UTC +00:00]]
+   (4.0ms)  commit transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
+Connecting to database specified by database.yml
+   (0.1ms)  begin transaction
+  SQL (3.2ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 06 May 2013 14:58:57 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 06 May 2013 14:58:57 UTC +00:00]]
+   (59.5ms)  commit transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
+Connecting to database specified by database.yml
+   (0.1ms)  begin transaction
+  SQL (3.2ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 06 May 2013 14:59:21 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 06 May 2013 14:59:21 UTC +00:00]]
+   (57.2ms)  commit transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
+Connecting to database specified by database.yml
+   (0.1ms)  begin transaction
+  SQL (3.1ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 06 May 2013 15:00:22 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 06 May 2013 15:00:22 UTC +00:00]]
+   (55.7ms)  commit transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
+Connecting to database specified by database.yml
+   (0.1ms)  begin transaction
+  SQL (3.3ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 06 May 2013 15:00:58 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 06 May 2013 15:00:58 UTC +00:00]]
+   (131.4ms)  commit transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
+Connecting to database specified by database.yml
+   (0.1ms)  begin transaction
+  SQL (3.1ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 06 May 2013 15:01:20 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 06 May 2013 15:01:20 UTC +00:00]]
+   (57.0ms)  commit transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1

data/spec/lib/gender_spec.rb

@@ -4,6 +4,7 @@ describe Genderize::Gender do
   
   let(:female) { Gender.new("f") }
   let(:male) { Gender.new("M") }  
+  let(:blank) { Gender.new('') }
   
   describe :name do
     
@@ -23,6 +24,15 @@ describe Genderize::Gender do
       
     end
     
+    context "when blank" do
+      
+      it "should be nil" do
+        blank.name.should be_nil
+      end
+      
+    end
+    
+    
   end
   
   describe :abbr do 
@@ -42,6 +52,15 @@ describe Genderize::Gender do
       end
       
     end
+    
+    context "when blank" do
+      
+      it "should be nil" do
+        blank.abbr.should be_nil
+      end
+      
+    end
+    
   
   end
   
@@ -62,6 +81,15 @@ describe Genderize::Gender do
       end
       
     end
+    
+    context "when blank" do
+      
+      it "should be nil" do
+        blank.subject.should be_nil
+      end
+      
+    end
+    
   end
   
   describe  :object do
@@ -82,6 +110,14 @@ describe Genderize::Gender do
       
     end
 
+    context "when blank" do
+      
+      it "should be nil" do
+        blank.object.should be_nil
+      end
+      
+    end
+
   
   end
   
@@ -103,6 +139,15 @@ describe Genderize::Gender do
       
     end
     
+    context "when blank" do
+      
+      it "should be nil" do
+        blank.possessive.should be_nil
+      end
+      
+    end
+    
+    
   
   end
   
@@ -124,6 +169,15 @@ describe Genderize::Gender do
       
     end
     
+    context "when blank" do
+      
+      it "should be nil" do
+        blank.casual.should be_nil
+      end
+      
+    end
+    
+    
   end
   
   describe :to_s do
@@ -153,12 +207,14 @@ describe Genderize::Gender do
     
     it "should return true if passed abbr value" do
       (male == "m").should be_true
-      (female == "f").should be_true      
+      (female == "f").should be_true 
+      (blank == nil).should be_true     
     end
 
     it "should return false if not passed abbr value" do
       (male == "f").should be_false
       (female == 1).should be_false
+      (blank == "$").should be_false           
     end
     
   end

metadata

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