teebo 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b39c312308355f0fe6943109ae6356a52cc0f1cc
-  data.tar.gz: c9c8fc4e0db8f9228b4d4d512c716d8359d52c05
+  metadata.gz: c08b25e131c864ae6ff3222cf665dc2359ad7849
+  data.tar.gz: 7533533ef81909ca782e0d3acfb53dc616592946
 SHA512:
-  metadata.gz: be7143b79ea1c277f7b0f4ee92ab57cc21b04ea96e92de23cccbf3644ec290f0f896f25a2fd3ac29bd4828a9c477d95074d5c2642f58821f6bc47ae4d0d7c4e0
-  data.tar.gz: 19ce9d17ae23fd916a8e5f528a0bda3a61b2fc17fe18dccec909bbc5196676072daa38294f3a1262ce9cbb69816c074d296f06b0632b553dd1edf36c2f3b71a7
+  metadata.gz: 61eff7754a95eea9831e654aeee41539062d2b3b77efbf97e684ce0f3248bb196d1a236c5593a85edb25b13873dedbf3049aeb8ab5f0a714cd613ab245e64da1
+  data.tar.gz: 4f96222ca2bfe0dafa081e3cc34f7dfe6c6590db374fd0e82f0c8cc790ea7058d3b79feb6e8b4f410c9a2c71351428e20f6023ba3555167f40897cc31d55f615

data/lib/teebo.rb

@@ -6,32 +6,10 @@ module Teebo
 
     def initialize
       # Initialize the database
-      @@database = SQLite3::Database.new "lib/data/seed-data.db"
-      @@database.results_as_hash = true
+      @database = SQLite3::Database.new "lib/data/seed-data.db"
+      @database.results_as_hash = true
     end
 
-    def weight
-
-    end
-
-    def update_sum_count
-      sexes = ['M', 'F']
-      sexes.each do |sex|
-        get_rows = <<-SQL
-          select * from given_names where sex = ?
-        SQL
-
-        put_count_to = <<-SQL
-          update given_names set count_to = ? where id = ?
-        SQL
-
-        count = 0
-        @database.execute(get_rows, sex) do |row|
-          count += row['count']
-          database.execute(put_count_to, count, row[0])
-        end
-      end
-    end
   end
 end
 

data/lib/teebo/name.rb

@@ -5,6 +5,34 @@ module Teebo
   #
   class Name < Base
 
+    #
+    # Picks a random first & last name, selecting a random gender if it's not
+    # specified.
+    #
+    def name sex=nil
+      if sex.nil?
+        sex = ['M', 'F'].sample
+      end
+      given_name(sex) + " " + surname
+    end
+
+    #
+    # Generates a normal full name, including a middle name.
+    #
+    # For now, this is fairly sloppy, as the probability that a middle name will
+    # simply be another given name of the same gender is almost certainly less
+    # than 100%.
+    #
+    # TODO: Make this take into account different probablities of different
+    #       types of middle names.
+    #
+    def full_name sex=nil
+      if sex.nil?
+        sex = ['M', 'F'].sample
+      end
+      given_name(sex) + " " + given_name(sex) + " " + surname
+    end
+
     #
     # Finds the total count for the number of names in the database.
     #
@@ -12,7 +40,7 @@ module Teebo
       find_count = <<-SQL
         select sum(count) from 'given_names' where sex = ?
       SQL
-      return @@database.execute(find_count, sex)[0][0]
+      @database.execute(find_count, sex)[0][0]
     end
 
     #
@@ -26,8 +54,21 @@ module Teebo
       SQL
 
       count = sum_count sex
-      rand = rand(count)
-      return @@database.execute(find_range_query, sex, rand)[0]['name']
+      selection = rand(count)
+      @database.execute(find_range_query, sex, selection)[0]['name']
+    end
+
+    #
+    # Selects a random (weighted) surname from the database.
+    #
+    def surname
+      find_range_query = <<-SQL
+        select * from surnames where (count_to - ?) >= 0 order by id limit 1
+      SQL
+
+      count = @database.execute('select sum(count) from surnames')[0][0]
+      selection = rand(count)
+      @database.execute(find_range_query, selection)[0]['name']
     end
   end
 end

metadata

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