randomperson 1.1.1 → 1.2.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+v1.2.0 Wednesday the 22nd of August 2012
+
+* Removed the evil evals.
+* Simplified some of the code.
+
+----
+
 v1.1.1 Tuesday the 21st of August 2012
 
 * Removed some monkey patches.

data/lib/randomperson/demographic.rb

@@ -3,7 +3,24 @@
 require_relative "./loader.rb"
 require_relative "./ext/set.rb"
 
+
+
 module RandomPerson
+  class Constant < String
+      
+    def to_constant
+      names = split('::')
+      names.shift if names.empty? || names.first.empty?
+  
+      constant = Object
+      names.each do |name|
+        constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+      end
+      constant
+    end
+
+  end
+
 
   class Demographic
     include Loader
@@ -13,8 +30,8 @@ module RandomPerson
 
     attr_accessor :malefirst, :femalefirst, :last, :gender_ratio, :age_lower, :age_upper, :prefix, :suffix #,:age_ratio
     
-    def self.available_classes
-      @available_classes ||= Set.new
+    def self.available_name_files
+      @available_name_files ||= Set.new
     end
     
 
@@ -32,7 +49,7 @@ module RandomPerson
       @age_upper = opts[:age_upper] || 115
       
 
-      Demographic.available_classes.merge Demographic.load_names
+      Demographic.available_name_files.merge Demographic.load_names
     end
 
 
@@ -65,6 +82,16 @@ module RandomPerson
         w =~ /^\p{Upper}/
       }
     end
+
+
+    def require_and_add( yesses ) 
+      yesses.map {|file_name|
+        require file_name
+        Constant.new( Demographic.translate file_name )
+      }.each do |klass|
+        addklass klass
+      end
+    end
       
     # tribe, gender, position
     def method_missing( name, *args )
@@ -72,17 +99,16 @@ module RandomPerson
       
       words = get_words( name )
       
-      nots = get_nots( words ).map{|word| Demographic.available_classes.classify_true(word)}.fold(:&)
-      
-      yesses = get_yesses( words ).map{|word| Demographic.available_classes.classify_true(word)}.fold(:&)
+      nots = get_nots( words ).map{|word|
+        Demographic.available_name_files.classify_true(word)
+      }.fold(:&)
       
-      Demographic.prefix_em( 
-        yesses.map do |(file_name)| 
-          Demographic.requiring( file_name ) 
-        end ).each do |klass|
-          addklass klass
-      end
+      yesses = get_yesses( words ).map{|word| 
+          Demographic.available_name_files.classify_true(word)
+      }.fold(:&)
       
+      require_and_add yesses
+
       self # just because
     end
     

data/lib/randomperson/ext/date.rb

@@ -1,3 +1,6 @@
+require 'date'
+
+
 module RandomPerson
   class Date < ::Date
 

data/lib/randomperson/ext/set.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module RandomPerson
 
   # @todo Spec

data/lib/randomperson/loader.rb

@@ -21,18 +21,11 @@ module RandomPerson
         end
          Dir.glob( fulls )
       end
-      
 
-      # Requires the file and then returns the name of the class
-      # @param [String] file_name The file to require and extract the class name from.
-      # @return [String] The class name.
-      def requiring( file_name )
-        require file_name
-        set_of_names = File.basename( file_name, ".rb" ).split("-").map(&:capitalize).join
-      end
-      
-      def prefix_em( collection, prefix="RandomPerson::Names::" )
-        collection.map{|x| "#{prefix}#{x}"}
+
+      # Changes the file name into a string useable as a constant class name
+      def translate( file_name, prefix="RandomPerson::Names::" )
+        "#{prefix}#{File.basename( file_name, ".rb" ).split("-").map(&:capitalize).join}"
       end
         
     
@@ -41,17 +34,19 @@ module RandomPerson
   
   
     module InstanceMethods
-    
-      # this adds the classes as constants
+
       # The patterns are there to stop other files being added by accident.
       # and to load the right names into the right instance var
+      # @todo remove evil
+      # @param [#to_constant] klass
       def addklass( klass, patterns=[["Male",'First'],["Female", "First"], ['Last'], ['Prefix'], ['Suffix']] )
       
         patterns.each do |ps|
           if ps.all?{|p| klass =~ /#{p}/ }
-            instance_variable_set( "@#{ps.join.downcase}", eval("#{klass}.new") )
+            instance_variable_set( "@#{ps.join.downcase}", klass.to_constant.new)
           end # if
         end
+        klass
       end # addklass
 
     end # InstanceMethods

data/lib/randomperson/version.rb

@@ -1,3 +1,3 @@
 module RandomPerson
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/randomperson.rb

@@ -5,9 +5,6 @@ module RandomPerson
 
   #require all the scaffolding
   
-  require 'set'
-  require 'date'
-  
   require_relative './randomperson/version.rb'
   require_relative './randomperson/ext/array.rb'
   require_relative './randomperson/ext/date.rb'
@@ -63,6 +60,7 @@ module RandomPerson
 
     # The last person generated.
     # If a demographic name is given that is different to the last then a new person is generated. If no name is given then the last is used.
+    # @param [String] demo_name The key of the demographic to use, e.g "American Ladies".
     def person( demo_name=nil )
       person, last_demo_name = 
         if demo_name.nil? 

data/spec/demographic_spec.rb

@@ -10,7 +10,8 @@ module RandomPerson
 
     
     describe "available_classes" do
-      subject { Demographic.available_classes }
+      before(:all) { Demographic.available_name_files.clear }
+      subject { Demographic.available_name_files }
       it { should_not be_nil }
       it { should be_a_kind_of Set }
       it { should be_empty }
@@ -24,15 +25,24 @@ module RandomPerson
       specify { subject.map{|f| File.basename(f, ".rb")}.should include "welsh-prefix" }
     end
     
-    describe "Requiring" do
+    describe "Translating" do
       %w{ancient-greek-female-first german-female-first spanish-male-first welsh-prefix}.each do |name|
         file_name = File.expand_path( File.join( File.dirname(__FILE__),"../lib/randomperson/names", "#{name}.rb") )
-        expected = name.split("-").map(&:capitalize).join
+        expected = "RandomPerson::Names::#{name.split("-").map(&:capitalize).join}"
         it "should require and return the class name" do
-          Demographic.requiring( file_name ).should == expected
+          Demographic.translate( file_name ).should == expected
         end
       end
     end
+
+    describe "require_and_add" do
+      subject { 
+        Demographic.new.require_and_add(Demographic.load_names)
+      }
+      it { should_not be_nil }
+      it { should be_a_kind_of Array }
+      it { should_not be_empty }
+    end
     
     describe "Instatiation" do
       subject { Demographic.new }

data/spec/last_and_first_names_spec.rb

@@ -4,107 +4,23 @@ require "spec_helper"
 require_relative "./support/shared_examples/names.rb"
 require_relative "../lib/randomperson/person.rb"
 require_relative "../lib/randomperson/demographic.rb"
+require_relative "./support/helpers.rb"
 
 module RandomPerson
   module Names
-    
-    available_classes = Demographic.load_names
-    available_classes.each do |klass|
-      klass = Demographic.requiring klass
-      
-      k = eval "RandomPerson::Names::#{klass}"
-      
-        
-
-      word = /\b\p{Upper}\p{Alpha}+?\b (?:(?:\s|-)\b\p{Upper}\p{Alpha}+?\b)?/x
-      hypenated_rgx = /^#{word}$/x 
-      french_rgx = /^(?:(?: (?:\bLe\b\s) | (?:\bd[eu]\b)\s) | (?:#{word}-))? #{word}$/x
-      hypenated_many_rgx = /^#{word} (?:(?:\s|-)#{word})*$/x
-      unhypenated_rgx = /^#{word}\s#{word}?$/x 
-      poss_unhyph = /^#{word}(?:\s#{word})?$/
-      thai_style = /^\b\p{Graph}+?\b$/x
-      default_fix = {times: 50 } 
-      fixtures = {}
-      fixtures.default = default_fix
-      fixtures["SpanishLast"] = default_fix.merge({ rgx: /^ \b\p{Upper}(?:\p{Alpha}+-)?\p{Alpha}+?\b\s (?: (?:\bde\b\s) | (?: \b\p{Upper}(?:\p{Alpha}+-)?\p{Alpha}+?\b\s (?:\by\b\s)? ) )? \b\p{Upper}(?:\p{Alpha}+-)?\p{Alpha}+?\b$/x })
-      fixtures["AmericanLast"] = default_fix.merge({ rgx: hypenated_rgx } )
-      fixtures["AnyLast"] = default_fix.merge({ rgx: hypenated_rgx  } )
-      fixtures["BritishLast"] = default_fix.merge({ rgx: hypenated_rgx  } )
-      fixtures["EnglishLast"] = default_fix.merge({ rgx: hypenated_rgx  } )
-      fixtures["ScottishLast"] = default_fix.merge({ rgx: hypenated_rgx  } )
-      fixtures["WelshLast"] = default_fix.merge({ rgx: poss_unhyph  } )
-      fixtures["FrenchLast"] = default_fix.merge({ rgx: french_rgx} )
-      fixtures["FrenchFemaleFirst"] = default_fix.merge({ rgx: hypenated_rgx  } )
-      fixtures["FrenchMaleFirst"] = default_fix.merge({ rgx: hypenated_rgx  } )
-      fixtures["BasqueMaleFirst"] = default_fix.merge({ rgx: hypenated_rgx  } )
-      fixtures["BasqueLast"] = default_fix.merge({ rgx: unhypenated_rgx  } )
-      fixtures["ThaiRomanisedLast"] = default_fix.merge({ rgx: hypenated_rgx  } )
-      fixtures["ThaiFemaleFirst"] = default_fix.merge({ rgx: thai_style } )
-      fixtures["ThaiMaleFirst"] = default_fix.merge({ rgx: thai_style} )
-      fixtures["ThaiLast"] = default_fix.merge({ rgx: thai_style} )
-      fixtures["ThaiFirst"] = default_fix.merge({ rgx: thai_style} )
-      fixtures["ThaiRomanisedMaleFirst"] = default_fix.merge({ rgx: hypenated_many_rgx} )
-      fixtures["ThaiRomanisedFemaleFirst"] = default_fix.merge({ rgx: hypenated_many_rgx} )
-      fixtures["AncientGreekLast"] = default_fix.merge(
-        { rgx: /^\bof\b\s(?:\b\p{Alpha}+?\b(?:\s|-)){0,3}\b\p{Alpha}+?\b$/x } )
-      
-#PREFIXES
-      fix_fixtures = {}
-      fix_fixtures["FinnishPrefix"] = {
-        young_male: {gender: "m", age: rand(17), in: ["herra"]}, #rgx: /^\bherra\b$/x },
-        older_male: {gender: "m", in: ["herra", "Dr"]}, #rgx: /^\b(?:herra|Dr)\b$/x },
-        young_female: {gender: "f", age: rand(17), in: ["neiti"]}, #rgx: /^\bneiti\b$/x },
-        older_female: {gender: "f", age: rand(17), in: ["rouva", "neiti", "Dr"]} #rgx: /^\b(?:rouva)|(?:neiti)|(?:Dr)\b$/x },
-      }
-      fix_fixtures["SpanishPrefix"] = {
-        young_male: {gender: "m", age: rand(17), in: ["Sr."]}, #rgx: /^\bSr\b\.$/x },
-        older_male: {gender: "m", in: ["Sr.", "Dr."]}, #rgx: /^\b(?:[SD]r\b\.)$/x },
-        young_female: {gender: "f", age: rand(17), in: ["Srta."]}, #rgx: /^\bSrta\b.$/x },
-        older_female: {gender: "f", in: ["Dra.", "Srta.", "Sra."]}#rgx: /^[DS]rt?a\b\.$/x }
-      }
-      fix_fixtures["AmericanPrefix"] = {
-        young_female: {gender: "f", age: rand(17), rgx: /^\bMiss\b$/},
-        older_female: {gender: "f", in: ["Miss", "Mrs.", "Dr.", "Ms."]}, #rgx: /^\bM(?:(?:iss\b)|(?:(?:r?s)\b\.))$|(?:Dr\b\.$)/x },
-        young_male: {gender: "m", age: rand(17), in: ["Mr."]}, #rgx: /^\bMr\b\.$/},
-        older_male:  {gender: "m", in: ["Mr.", "Dr."]}, 
-      } #rgx: /^\b[MD]r\b\.$/}, }
-      fix_fixtures["AmericanSuffix"] = {
-        young_female: {},
-        older_female: {},
-        young_male: {},
-        older_male:  {} }
-      fix_fixtures["BritishPrefix"] = {
-        young_female: {gender: "f", age: rand(17), rgx: /^\bMiss\b$/},
-        older_female: {gender: "f", rgx: /^\b(?:M(?:is|r)?s)|(?:Dr)\b$/},
-        young_male: {gender: "m", age: rand(17), rgx: /^\bMr\b$/},
-        older_male:  {gender: "m", rgx: /^\b[MD]r\b$/}, }
-      fix_fixtures["EnglishPrefix"] = fix_fixtures["ScottishPrefix"] = fix_fixtures["WelshPrefix"] = fix_fixtures["BritishPrefix"]
-
-#SUFFIXES
-      fix_fixtures["BritishSuffix"] = {
-        young_female: {age: rand(17), gender: "f", in: [""] },
-        older_female: { gender: "f", in: %w( OBE MBE GBE KBE DBE CBE JP GM PhD BSc BA )}, 
-        young_male: {age: rand(17), gender: "m", in: [""] },
-        older_male: {gender: "m", in: %w( OBE MBE GBE KBE DBE CBE JP GM PhD BSc BA ) }, 
-      }
-      fix_fixtures["AmericanSuffix"] = { # strictly speaking, gender doesn't matter here, but I'll leave the test in.
-        young_female: {age: rand(17), gender: "f", in: [ 'Jr.', ''] + %w( I II III IV V) },
-        young_male: { age: rand(17), gender: "m", in: [ 'Jr.', ''] + %w( I II III IV V ) },
-        older_male: { gender: "m", in: [ ''] + %w( I II III IV V Sr. ) },
-        older_female: { gender: "f", in: [ ''] + %w( I II III IV V Sr. ) }, 
-      }
 
+    Demographic.new.require_and_add(Demographic.load_names).each do |klass|
+      klass = klass.split("::").last
 
       puts "Describe #{klass}" #because rspec doesn't output this before it blow up! Sheesh!!
       describe klass do
-        let(:instance) { k.new }
+        let(:instance) { RandomPerson::Constant.new("RandomPerson::Names::#{klass}").to_constant.new }
         subject{ instance }
         it_should_behave_like "a Name class"
         if ["Prefix", "Suffix"].any?{|x| klass.include? x }
-          
-          it_should_behave_like "it cares about gender and/or age", fix_fixtures[klass] 
+          it_should_behave_like "it cares about gender and/or age", RandomPerson::Spec::Helpers.fix_fixtures[klass] 
         else
-          it_should_behave_like "a name generator", fixtures[klass]
+          it_should_behave_like "a name generator", RandomPerson::Spec::Helpers.fixtures[klass]
         end
       end # describe
     end # loop

data/spec/spec_helper.rb

@@ -18,8 +18,8 @@ SimpleCov.start do
   add_filter "/spec/"
 end
 
+
 RSpec.configure do |c|
-#  c.include RandomPerson::Spec::Helpers
  c.treat_symbols_as_metadata_keys_with_true_values = true
 end
 

data/spec/support/helpers.rb

@@ -8,6 +8,96 @@ module RandomPerson
       def all_kind_of?( collection, kind )
         collection.all? {|c| c.kind_of? kind }
       end
+
+      Word = /\b\p{Upper}\p{Alpha}+?\b (?:(?:\s|-)\b\p{Upper}\p{Alpha}+?\b)?/x
+      Hypenated_rgx = /^#{Word}$/x 
+      French_rgx = /^(?:(?: (?:\bLe\b\s) | (?:\bd[eu]\b)\s) | (?:#{Word}-))? #{Word}$/x
+      Hypenated_many_rgx = /^#{Word} (?:(?:\s|-)#{Word})*$/x
+      Unhypenated_rgx = /^#{Word}\s#{Word}?$/x 
+      Poss_unhyph = /^#{Word}(?:\s#{Word})?$/
+      Thai_style = /^\b\p{Graph}+?\b$/x
+      Default_fix = {times: 50 } 
+      
+      def self.fixtures
+        if @fixtures.nil?
+          @fixtures = {}
+          @fixtures.default = Default_fix
+          @fixtures["SpanishLast"] = Default_fix.merge({ rgx: /^ \b\p{Upper}(?:\p{Alpha}+-)?\p{Alpha}+?\b\s (?: (?:\bde\b\s) | (?: \b\p{Upper}(?:\p{Alpha}+-)?\p{Alpha}+?\b\s (?:\by\b\s)? ) )? \b\p{Upper}(?:\p{Alpha}+-)?\p{Alpha}+?\b$/x })
+          @fixtures["AmericanLast"] = Default_fix.merge({ rgx: Hypenated_rgx } )
+          @fixtures["AnyLast"] = Default_fix.merge({ rgx: Hypenated_rgx  } )
+          @fixtures["BritishLast"] = Default_fix.merge({ rgx: Hypenated_rgx  } )
+          @fixtures["EnglishLast"] = Default_fix.merge({ rgx: Hypenated_rgx  } )
+          @fixtures["ScottishLast"] = Default_fix.merge({ rgx: Hypenated_rgx  } )
+          @fixtures["WelshLast"] = Default_fix.merge({ rgx: Poss_unhyph  } )
+          @fixtures["FrenchLast"] = Default_fix.merge({ rgx: French_rgx} )
+          @fixtures["FrenchFemaleFirst"] = Default_fix.merge({ rgx: Hypenated_rgx  } )
+          @fixtures["FrenchMaleFirst"] = Default_fix.merge({ rgx: Hypenated_rgx  } )
+          @fixtures["BasqueMaleFirst"] = Default_fix.merge({ rgx: Hypenated_rgx  } )
+          @fixtures["BasqueLast"] = Default_fix.merge({ rgx: Unhypenated_rgx  } )
+          @fixtures["ThaiRomanisedLast"] = Default_fix.merge({ rgx: Hypenated_rgx  } )
+          @fixtures["ThaiFemaleFirst"] = Default_fix.merge({ rgx: Thai_style } )
+          @fixtures["ThaiMaleFirst"] = Default_fix.merge({ rgx: Thai_style} )
+          @fixtures["ThaiLast"] = Default_fix.merge({ rgx: Thai_style} )
+          @fixtures["ThaiFirst"] = Default_fix.merge({ rgx: Thai_style} )
+          @fixtures["ThaiRomanisedMaleFirst"] = Default_fix.merge({ rgx: Hypenated_many_rgx} )
+          @fixtures["ThaiRomanisedFemaleFirst"] = Default_fix.merge({ rgx: Hypenated_many_rgx} )
+          @fixtures["AncientGreekLast"] = Default_fix.merge(
+            { rgx: /^\bof\b\s(?:\b\p{Alpha}+?\b(?:\s|-)){0,3}\b\p{Alpha}+?\b$/x } )
+        end
+        @fixtures
+      end
+      
+      # prefixes
+      def self.fix_fixtures
+        if @fix_fixtures.nil?
+          @fix_fixtures = {}
+          @fix_fixtures["FinnishPrefix"] = {
+            young_male: {gender: "m", age: rand(17), in: ["herra"]}, #rgx: /^\bherra\b$/x },
+            older_male: {gender: "m", in: ["herra", "Dr"]}, #rgx: /^\b(?:herra|Dr)\b$/x },
+            young_female: {gender: "f", age: rand(17), in: ["neiti"]}, #rgx: /^\bneiti\b$/x },
+            older_female: {gender: "f", age: rand(17), in: ["rouva", "neiti", "Dr"]} #rgx: /^\b(?:rouva)|(?:neiti)|(?:Dr)\b$/x },
+          }
+          @fix_fixtures["SpanishPrefix"] = {
+            young_male: {gender: "m", age: rand(17), in: ["Sr."]}, #rgx: /^\bSr\b\.$/x },
+            older_male: {gender: "m", in: ["Sr.", "Dr."]}, #rgx: /^\b(?:[SD]r\b\.)$/x },
+            young_female: {gender: "f", age: rand(17), in: ["Srta."]}, #rgx: /^\bSrta\b.$/x },
+            older_female: {gender: "f", in: ["Dra.", "Srta.", "Sra."]}#rgx: /^[DS]rt?a\b\.$/x }
+          }
+          @fix_fixtures["AmericanPrefix"] = {
+            young_female: {gender: "f", age: rand(17), rgx: /^\bMiss\b$/},
+            older_female: {gender: "f", in: ["Miss", "Mrs.", "Dr.", "Ms."]}, #rgx: /^\bM(?:(?:iss\b)|(?:(?:r?s)\b\.))$|(?:Dr\b\.$)/x },
+            young_male: {gender: "m", age: rand(17), in: ["Mr."]}, #rgx: /^\bMr\b\.$/},
+            older_male:  {gender: "m", in: ["Mr.", "Dr."]}, 
+          } #rgx: /^\b[MD]r\b\.$/}, }
+          @fix_fixtures["AmericanSuffix"] = {
+            young_female: {},
+            older_female: {},
+            young_male: {},
+            older_male:  {} }
+          @fix_fixtures["BritishPrefix"] = {
+            young_female: {gender: "f", age: rand(17), rgx: /^\bMiss\b$/},
+            older_female: {gender: "f", rgx: /^\b(?:M(?:is|r)?s)|(?:Dr)\b$/},
+            young_male: {gender: "m", age: rand(17), rgx: /^\bMr\b$/},
+            older_male:  {gender: "m", rgx: /^\b[MD]r\b$/}, }
+          @fix_fixtures["EnglishPrefix"] = @fix_fixtures["ScottishPrefix"] = @fix_fixtures["WelshPrefix"] = @fix_fixtures["BritishPrefix"]
+  
+    #SUFFIXES
+          @fix_fixtures["BritishSuffix"] = {
+            young_female: {age: rand(17), gender: "f", in: [""] },
+            older_female: { gender: "f", in: %w( OBE MBE GBE KBE DBE CBE JP GM PhD BSc BA )}, 
+            young_male: {age: rand(17), gender: "m", in: [""] },
+            older_male: {gender: "m", in: %w( OBE MBE GBE KBE DBE CBE JP GM PhD BSc BA ) }, 
+          }
+          @fix_fixtures["AmericanSuffix"] = { # strictly speaking, gender doesn't matter here, but I'll leave the test in.
+            young_female: {age: rand(17), gender: "f", in: [ 'Jr.', ''] + %w( I II III IV V) },
+            young_male: { age: rand(17), gender: "m", in: [ 'Jr.', ''] + %w( I II III IV V ) },
+            older_male: { gender: "m", in: [ ''] + %w( I II III IV V Sr. ) },
+            older_female: { gender: "f", in: [ ''] + %w( I II III IV V Sr. ) }, 
+          }
+        end
+        @fix_fixtures
+      end
+
     end # Helpers
   end # Spec
 end # RandomPerson

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: randomperson
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wirble
@@ -135,6 +135,7 @@ files:
 - lib/randomperson/ext/hash.rb
 - lib/randomperson/ext/kernel.rb
 - lib/randomperson/ext/set.rb
+- lib/randomperson/ext/string.rb
 - lib/randomperson/generator.rb
 - lib/randomperson/loader.rb
 - lib/randomperson/name.rb