genderize 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb0f9371760b224246e156a4c38f010df1e7e56a
-  data.tar.gz: f9a43ab985038479e2b1ec4eb712db849004d845
+  metadata.gz: f900977dce6ce532aaaaeb0eac75f034ef6f9a6f
+  data.tar.gz: 4a9dfe4d19dd6a31893c72d49d3f692eaea1b5aa
 SHA512:
-  metadata.gz: 463b88c489a86cdabf90ae3eb3f9b818e3b8177cda066ce1cf5b56f3332fec2fa5e9b41b8c7ff9e07268bf8a074be9390c7349d08bab4e8c45427a08316f5318
-  data.tar.gz: 0bb8dcf6ba581f3436afa2b8fbed28a49018a7e242d895151e50732128e018e17f6b5e5e1a77e924477546df2ff143197140cff9ca9508a2020ac80594fdc525
+  metadata.gz: 8ad68c57f62525bfc471f944f8242692debe6473a82bfb15c2379cc02d9f9704d7206e126682d4c59d3c2e07fdd3da13474789f779baa76980c02455d82131f7
+  data.tar.gz: 7d9c2260901360ef81bd9282d0373a1bea5df76a721e1973d79216f83276fda5fb9e0a9a74202d48277479d3ab328670a3d4380e7874ba9fddb4b327893b022b

data/lib/genderize.rb

@@ -6,33 +6,27 @@ unless Rails
 end
 
 module Genderize
-  
+
   def self.included(base)
     base.extend(ClassMethods)
   end
-  
+
   module ClassMethods
 
-    
+
     def genderize(col_name = "gender")
-      # Reads the DB column value for gender attribute and creates a new Gender 
+      # Reads the DB column value for gender attribute and creates a new Gender
       # object with it's value
       #
       # The object is memoized for future calls.
-      # 
+      #
       # Returns a Gender
       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}", Genderize::Gender.new(read_attribute(col_name)))
-        end
+        current_value = instance_variable_get("@#{col_name}")
+        persist_value = Genderize::Gender.new(read_attribute(col_name))
+        return current_value || instance_variable_set("@#{col_name}", persist_value)
       end
-      
+
       # Writes to the DB column the new value for the gender attribute
       # Sets the instance varaible value too
       #
@@ -41,19 +35,19 @@ module Genderize
       # Raises ArgumentError if gender is not a single alphanumeric character "m" or "f"
       define_method "#{col_name}=" do |string|
         string = string.to_s.first
-        unless string.to_s =~ /\A(m|f)\Z/i
-          raise ArgumentError, "Gender must be a single alphanumeric character" 
+        unless string.to_s =~ /\A(m|f|)\Z/i
+          raise ArgumentError, "Gender must be one of '', 'm', or 'f'"
         end
         write_attribute(col_name, string)
-        
+
         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
-    
+
   end
 end

data/lib/genderize/version.rb

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

data/spec/dummy/config/application.rb

@@ -47,7 +47,7 @@ module Dummy
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
+    config.active_record.whitelist_attributes = true if Rails.version < "4.0.0"
 
     # Enable the asset pipeline
     config.assets.enabled = true

data/spec/dummy/config/environments/production.rb

@@ -19,8 +19,12 @@ Dummy::Application.configure do
   # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
   # config.action_dispatch.rack_cache = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  if Rails.version >= "4.2.0"
+    config.serve_static_files = false
+  else
+    # Disable Rails's static asset server (Apache or nginx will already do this).
+    config.serve_static_assets = false
+  end
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/spec/dummy/config/environments/test.rb

@@ -8,9 +8,8 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
-  
+
   if Rails.version =~ /\A3/
     # Log error messages when you accidentally call methods on nil
     config.whiny_nils = true
@@ -20,6 +19,14 @@ Dummy::Application.configure do
     config.eager_load = false
   end
 
+  if Rails.version >= "4.2.0"
+    config.serve_static_files = false
+  else
+    # Disable Rails's static asset server (Apache or nginx will already do this).
+    config.serve_static_assets = false
+  end
+
+
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false

data/spec/dummy/db/schema.rb

@@ -13,7 +13,7 @@
 
 ActiveRecord::Schema.define(version: 20130506080641) do
 
-  create_table "users", force: true do |t|
+  create_table "users", force: :cascade do |t|
     t.string   "name",       limit: 20, null: false
     t.string   "gender",     limit: 1,  null: false
     t.datetime "created_at"

data/spec/dummy/log/development.log

@@ -1,11 +1,24 @@
-   (2.5ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (3.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Migrating to CreateUsers (20130506080641)
-   (0.1ms)  begin transaction
-   (0.4ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(20) NOT NULL, "gender" varchar(1) NOT NULL, "created_at" datetime, "updated_at" datetime) 
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20130506080641"]]
-   (3.5ms)  commit transaction
+DEPRECATION WARNING: config.active_record.whitelist_attributes is deprecated and have no effect. Remove its call from the configuration. (called from block in tsort_each at /Users/Gavin/.rvm/rubies/ruby-2.3.0/lib/ruby/2.3.0/tsort.rb:228)
+   (2.5ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.3ms)  select sqlite_version(*)
+   (0.6ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateUsers (20130506080641)
+   (0.1ms)  begin transaction
+DEPRECATION WARNING: `#timestamps` was called without specifying an option for `null`. In Rails 5, this behavior will change to `null: false`. You should manually specify `null: true` to prevent the behavior of your existing migrations from changing. (called from block in change at /Users/Gavin/Clients/KatanaCode/genderize/spec/dummy/db/migrate/20130506080641_create_users.rb:8)
+   (0.5ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(20) NOT NULL, "gender" varchar(1) NOT NULL, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20130506080641"]]
+   (0.7ms)  commit transaction
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+DEPRECATION WARNING: config.active_record.whitelist_attributes is deprecated and have no effect. Remove its call from the configuration. (called from block in tsort_each at /Users/Gavin/.rvm/rubies/ruby-2.3.0/lib/ruby/2.3.0/tsort.rb:228)
+   (2.9ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateUsers (20130506080641)
+   (0.1ms)  begin transaction
+DEPRECATION WARNING: `#timestamps` was called without specifying an option for `null`. In Rails 5, this behavior will change to `null: false`. You should manually specify `null: true` to prevent the behavior of your existing migrations from changing. (called from block in change at /Users/Gavin/Clients/KatanaCode/genderize/spec/dummy/db/migrate/20130506080641_create_users.rb:8)
+   (0.3ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(20) NOT NULL, "gender" varchar(1) NOT NULL, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20130506080641"]]
+   (0.7ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.0ms)  SELECT "schema_migrations".* FROM "schema_migrations"

data/spec/dummy/log/test.log

@@ -1,45 +1,58 @@
-   (54.5ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (2.4ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Migrating to CreateUsers (20130506080641)
-   (0.1ms)  begin transaction
-   (0.5ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(20) NOT NULL, "gender" varchar(1) NOT NULL, "created_at" datetime, "updated_at" datetime) 
-  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20130506080641"]]
-   (3.0ms)  commit transaction
+   (2.6ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.0ms)  select sqlite_version(*)
+   (0.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-   (0.1ms)  begin transaction
-  SQL (87.6ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 30 Jun 2014 22:05:57 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 30 Jun 2014 22:05:57 UTC +00:00]]
+Migrating to CreateUsers (20130506080641)
+   (0.0ms)  begin transaction
+   (0.3ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(20) NOT NULL, "gender" varchar(1) NOT NULL, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20130506080641"]]
+   (0.5ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (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:22:21.503307"], ["updated_at", "2016-05-27 13:22:21.503307"]]
+   (2.7ms)  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:22:53.702225"], ["updated_at", "2016-05-27 13:22:53.702225"]]
    (2.5ms)  commit transaction
-  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
-   (0.1ms)  begin transaction
-  SQL (3.3ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 30 Jun 2014 22:08:19 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 30 Jun 2014 22:08:19 UTC +00:00]]
-   (53.4ms)  commit transaction
-  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
-   (0.1ms)  begin transaction
-  SQL (2.3ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 30 Jun 2014 22:08:51 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 30 Jun 2014 22:08:51 UTC +00:00]]
-   (51.2ms)  commit transaction
-  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
+  User Load (0.1ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" DESC LIMIT 1
    (0.1ms)  begin transaction
-  SQL (2.4ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 30 Jun 2014 22:09:03 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 30 Jun 2014 22:09:03 UTC +00:00]]
+  SQL (0.3ms)  INSERT INTO "users" ("name", "gender", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["name", "f"], ["gender", "f"], ["created_at", "2016-05-27 13:28:16.419497"], ["updated_at", "2016-05-27 13:28:16.419497"]]
+   (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.3ms)  INSERT INTO "users" ("name", "gender", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["name", "f"], ["gender", "f"], ["created_at", "2016-05-27 13:29:04.891644"], ["updated_at", "2016-05-27 13:29:04.891644"]]
+   (2.5ms)  commit transaction
+  User Load (0.2ms)  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:29:41.054526"], ["updated_at", "2016-05-27 13:29:41.054526"]]
    (2.7ms)  commit transaction
-  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
-   (0.1ms)  begin transaction
-  SQL (2.3ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 30 Jun 2014 22:10:54 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 30 Jun 2014 22:10:54 UTC +00:00]]
-   (51.3ms)  commit transaction
-  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
-   (0.1ms)  begin transaction
-  SQL (3.2ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 30 Jun 2014 22:11:20 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 30 Jun 2014 22:11:20 UTC +00:00]]
+  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:30:10.725246"], ["updated_at", "2016-05-27 13:30:10.725246"]]
+   (2.6ms)  commit transaction
+  User Load (0.2ms)  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:31:19.111752"], ["updated_at", "2016-05-27 13:31:19.111752"]]
    (2.4ms)  commit transaction
-  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
-   (0.1ms)  begin transaction
-  SQL (2.3ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 30 Jun 2014 22:11:42 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 30 Jun 2014 22:11:42 UTC +00:00]]
-   (122.6ms)  commit transaction
-  User Load (0.4ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
-   (0.1ms)  begin transaction
-  SQL (2.4ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 30 Jun 2014 22:12:53 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 30 Jun 2014 22:12:53 UTC +00:00]]
+  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:31:42.590594"], ["updated_at", "2016-05-27 13:31:42.590594"]]
+   (2.6ms)  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:31:58.855684"], ["updated_at", "2016-05-27 13:31:58.855684"]]
+   (2.2ms)  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:32:11.842003"], ["updated_at", "2016-05-27 13:32:11.842003"]]
+   (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.3ms)  INSERT INTO "users" ("name", "gender", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["name", "f"], ["gender", "f"], ["created_at", "2016-05-27 13:32:49.476375"], ["updated_at", "2016-05-27 13:32:49.476375"]]
+   (2.6ms)  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:33:00.356946"], ["updated_at", "2016-05-27 13:33:00.356946"]]
    (2.5ms)  commit transaction
-  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
-   (0.1ms)  begin transaction
-  SQL (2.3ms)  INSERT INTO "users" ("created_at", "gender", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Mon, 30 Jun 2014 22:13:48 UTC +00:00], ["gender", "f"], ["name", "f"], ["updated_at", Mon, 30 Jun 2014 22:13:48 UTC +00:00]]
-   (54.8ms)  commit transaction
-  User Load (0.2ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" DESC LIMIT 1
+  User Load (0.1ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" DESC LIMIT 1

data/spec/dummy/spec/models/user_spec.rb

@@ -1,57 +1,63 @@
 require 'spec_helper'
 
-describe User do
-  
+describe User, type: :model do
+
   describe "gender" do
-    
+
     let(:user) { User.new(gender: "f") }
-      
+
     it "should return a Gender object" do
-      user.gender.should be_an_instance_of(Gender)
+      expect(user.gender).to be_an_instance_of(Genderize::Gender)
     end
-    
+
     it "should be female?" do
-      user.gender.should be_female
+      expect(user.gender).to be_female
     end
-    
+
     it "should be male when changed" do
       user.gender = "m"
-      user.gender.should be_male
+      expect(user.gender).to be_male
     end
-    
+
+    it "should be blank when changed" do
+      user.gender = ""
+      expect(user.gender).to be_empty
+    end
+
   end
-  
+
   describe "full gender names" do
-    
+
     it 'should set the gender as the abbreviation' do
-      User.new(gender: "female").gender.should be_female
-      User.new(gender: "male").gender.should be_male
+      expect(User.new(gender: "female").gender).to be_female
+      expect(User.new(gender: "male").gender).to   be_male
+      expect(User.new(gender: "").gender).to       be_blank
     end
-    
+
   end
   # Since the db column name can be changed, we're using the "name" column to
   # test this behaviour
   describe "name" do
-    
+
     let(:user) { User.new(name: "f", gender: "f") }
-    
+
     it "should return a Gender object" do
-      user.name.should be_an_instance_of Gender
+      expect(user.name).to be_an_instance_of Genderize::Gender
     end
-    
+
     it "should change the name column" do
       user.save!
       user = User.last
-      user.name.should == "f"
-      user.name.should be_female
+      expect(user.name).to eq("f")
+      expect(user.name).to be_female
     end
-    
+
     it "should not change the gender column" do
       user.name = "m"
-      user.name.should be_male
-      user.gender.should_not be_male
+      expect(user.name).to be_male
+      expect(user.gender).not_to be_male
     end
-    
+
   end
-  
+
 end

data/spec/lib/gender_spec.rb

@@ -1,232 +1,232 @@
 require "spec_helper"
 
 describe Genderize::Gender do
-  
+
   let(:female) { Gender.new("f") }
-  let(:male) { Gender.new("M") }  
-  let(:blank) { Gender.new('') }
-  
+  let(:male)   { Gender.new("M") }
+  let(:blank)  { Gender.new('')  }
+
   context "when full gender name is used" do
-    
+
     it "should find the correct abbreviation" do
-      Gender.new("female").abbr.should eql('f')
-      Gender.new("male").abbr.should eql('m')
+      expect(Gender.new("female").abbr).to eql('f')
+      expect(Gender.new("male").abbr).to eql('m')
     end
-    
+
   end
-  
-  
+
+
   describe :name do
-    
+
     context "when male" do
-      
+
       it "should be 'male'" do
-        male.name.should eql("male")
+        expect(male.name).to eql("male")
       end
-      
+
     end
 
     context "when female" do
-      
+
       it "should be 'female'" do
-        female.name.should eql("female")
+        expect(female.name).to eql("female")
       end
-      
+
     end
-    
+
     context "when blank" do
-      
+
       it "should be nil" do
-        blank.name.should be_nil
+        expect(blank.name).to be_nil
       end
-      
+
     end
-    
-    
+
+
   end
-  
-  describe :abbr do 
-  
+
+  describe :abbr do
+
     context "when male" do
-      
+
       it "should be 'm'" do
-        male.abbr.should eql("m")
+        expect(male.abbr).to eql("m")
       end
-      
+
     end
 
     context "when female" do
-      
+
       it "should be 'f'" do
-        female.abbr.should eql("f")
+        expect(female.abbr).to eql("f")
       end
-      
+
     end
-    
+
     context "when blank" do
-      
+
       it "should be nil" do
-        blank.abbr.should be_nil
+        expect(blank.abbr).to be_nil
       end
-      
+
     end
-    
-  
+
+
   end
-  
+
   describe :subject do
-  
+
     context "when male" do
-      
+
       it "should be 'he'" do
-        male.subject.should eql("he")
+        expect(male.subject).to eql("he")
       end
-      
+
     end
 
     context "when female" do
-      
+
       it "should be 'she'" do
-        female.subject.should eql("she")
+        expect(female.subject).to eql("she")
       end
-      
+
     end
-    
+
     context "when blank" do
-      
+
       it "should be nil" do
-        blank.subject.should be_nil
+        expect(blank.subject).to be_nil
       end
-      
+
     end
-    
+
   end
-  
+
   describe  :object do
 
     context "when male" do
-      
+
       it "should be 'him'" do
-        male.object.should eql("him")
+        expect(male.object).to eql("him")
       end
-      
+
     end
 
     context "when female" do
-      
+
       it "should be 'her'" do
-        female.object.should eql("her")
+        expect(female.object).to eql("her")
       end
-      
+
     end
 
     context "when blank" do
-      
+
       it "should be nil" do
-        blank.object.should be_nil
+        expect(blank.object).to be_nil
       end
-      
+
     end
 
-  
+
   end
-  
+
   describe  :possessive do
-    
+
     context "when male" do
-      
+
       it "should be 'his'" do
-        male.possessive.should eql("his")
+        expect(male.possessive).to eql("his")
       end
-      
+
     end
 
     context "when female" do
-      
+
       it "should be 'her'" do
-        female.possessive.should eql("her")
+        expect(female.possessive).to eql("her")
       end
-      
+
     end
-    
+
     context "when blank" do
-      
+
       it "should be nil" do
-        blank.possessive.should be_nil
+        expect(blank.possessive).to be_nil
       end
-      
+
     end
-    
-    
-  
+
+
+
   end
-  
+
   describe :casual do
-    
+
     context "when male" do
-      
+
       it "should be 'guy'" do
-        male.casual.should eql("guy")
+        expect(male.casual).to eql("guy")
       end
-      
+
     end
 
     context "when female" do
-      
+
       it "should be 'girl'" do
-        female.casual.should eql("girl")
+        expect(female.casual).to eql("girl")
       end
-      
+
     end
-    
+
     context "when blank" do
-      
+
       it "should be nil" do
-        blank.casual.should be_nil
+        expect(blank.casual).to be_nil
       end
-      
+
     end
-    
-    
+
+
   end
-  
+
   describe :to_s do
-    
+
     it "should equal the abbr value" do
-      male.to_s.should eql(male.abbr)
-      female.to_s.should eql(female.abbr)      
+      expect(male.to_s).to eql(male.abbr)
+      expect(female.to_s).to eql(female.abbr)
     end
-    
+
     it "returns a string" do
-      male.to_s.should be_an_instance_of(String)
-      female.to_s.should 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)
     end
-    
+
   end
-  
+
   describe :capital_abbr do
-    
+
     it "should equal the abbr value capitalized" do
-      male.capital_abbr.should eql(male.abbr.capitalize)
-      female.capital_abbr.should eql(female.abbr.capitalize)
+      expect(male.capital_abbr).to eql(male.abbr.capitalize)
+      expect(female.capital_abbr).to eql(female.abbr.capitalize)
     end
-    
+
   end
-  
+
   describe :== do
-    
+
     it "should return true if passed abbr value" do
-      (male == "m").should be_true
-      (female == "f").should be_true 
-      (blank == nil).should be_true     
+      expect(male == "m").to be_truthy
+      expect(female == "f").to be_truthy
+      expect(blank == nil).to be_truthy
     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           
+      expect(male == "f").to be_falsey
+      expect(female == 1).to be_falsey
+      expect(blank == "$").to be_falsey
     end
-    
+
   end
-  
+
 end

data/spec/spec_helper.rb

@@ -5,9 +5,10 @@ require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
 require "support/deferred_garbage_collection"
 
-include Genderize
+require "genderize"
+include Genderize # make the Gender class available in specs
 
 RSpec.configure do |config|
   config.before(:all) { DeferredGarbageCollection.start }
-  config.after(:all) { DeferredGarbageCollection.reconsider }
+  config.after(:all)  { DeferredGarbageCollection.reconsider }
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: genderize
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Bodacious
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A helpful class for gender-specific models in Ruby applications. Genderize
@@ -61,19 +61,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
 - config/locales/genderize.en.yml
 - config/locales/genderize.es.yml
 - config/routes.rb
+- lib/genderize.rb
 - lib/genderize/engine.rb
 - lib/genderize/gender.rb
 - lib/genderize/version.rb
-- lib/genderize.rb
-- lib/generators/genderize/install/install_generator.rb
 - lib/generators/genderize/install/USAGE
+- lib/generators/genderize/install/install_generator.rb
 - lib/tasks/genderize_tasks.rake
-- MIT-LICENSE
-- Rakefile
-- README.md
+- spec/dummy/README.rdoc
+- spec/dummy/Rakefile
 - spec/dummy/app/helpers/users_helper.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/users/_form.html.erb
@@ -81,6 +83,7 @@ files:
 - spec/dummy/app/views/users/index.html.erb
 - spec/dummy/app/views/users/new.html.erb
 - spec/dummy/app/views/users/show.html.erb
+- spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -96,15 +99,12 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/config.ru
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20130506080641_create_users.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
 - spec/dummy/log/test.log
-- spec/dummy/Rakefile
-- spec/dummy/README.rdoc
 - spec/dummy/script/rails
 - spec/dummy/spec/models/user_spec.rb
 - spec/genderize_spec.rb
@@ -121,17 +121,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: A helpful class for gender-specific models in Ruby applications