namey 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa5a09d5a8963ae86584590f9e2d7d703546962c
-  data.tar.gz: 1d7d4ee745e34d96bae0908018d8342745e6288d
+  metadata.gz: e59aa0769b5a9649a5e085ed0bde683d01bd1f09
+  data.tar.gz: 545e7460db8f48350a3da025f5352c340f3e44f4
 SHA512:
-  metadata.gz: 4e80f8deb12e4a83d7d6284fdb4ed092b5b48101ff8afd4ca2797c5ccb7f8071b236fbbf11623077b1674d2b62f5184d02a783e2d6a367867673e65684860b50
-  data.tar.gz: ab56ece4af77c5d9f140c381e041bec2f488aac035d1c4ed933334fddd08349d781b050a75478707bd1dd8f3d9cd6622d4c099bd3d2c968e1c78aa6cd1c9a2ea
+  metadata.gz: d28e6ca0a7f5941d1f6127aed018dd02224777cc5c7232334a6e0ff933b3c95034b4d2c66f5242aa1132ed67a090e46289f3286383b8d7f1b584d2ce40bd13cd
+  data.tar.gz: 9135a3de24e94563769fbbc8203d88b864d0cebcb4ddcc86765233d556fa5e43d7ff5a5c9851c83e0225fc7d45b1a5bea92ae2e5f2ced622d76a18102775b716

data/.travis.yml

@@ -2,7 +2,10 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.3.0
+  - 2.4.1
   - jruby-head
   - jruby-19mode
-# uncomment this line if your project needs to run something other than `rake`:
-# script: bundle exec rspec spec
+before_install:  # For jruby-head to work.
+  - gem install bundler
+  - gem update bundler

data/Gemfile

@@ -6,9 +6,7 @@ gemspec
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
   gem "rspec"
-
   gem "watchr"
 end
 

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Colin Mitchell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/bin/namey-load-data

@@ -15,7 +15,7 @@ puts "Load data to #{dest}"
 #@parser.load_female_names("data/dist.female.first")
 #@parser.load_surnames("data/dist.all.last")
 
-base_url = "http://www.census.gov/genealogy/www/data/1990surnames"
+base_url = "http://www2.census.gov/topics/genealogy/1990surnames"
 @parser.load_male_names("#{base_url}/dist.male.first")
 @parser.load_female_names("#{base_url}/dist.female.first")
 @parser.load_surnames("#{base_url}/dist.all.last")

data/lib/namey/generator.rb

@@ -140,12 +140,14 @@ module Namey
     #
     def random_sort(set)
 
-      # this is a bit of a hack obviously, but it checks the sort of data engine being used
-      # to figure out how to randomly sort
-      if @db.class.name == "Sequel::SQLite::Database"
-        set.order{RANDOM{}}
-      else
-        set.order{RAND{}}
+      set.order do
+        # this is a bit of a hack obviously, but it checks the sort of
+        # data engine being used to figure out how to randomly sort
+        if @db.class.name !~ /mysql/i
+          random.function
+        else
+          rand.function
+        end
       end
     end
 

data/lib/namey/version.rb

@@ -1,4 +1,4 @@
 module Namey
   NAME = "namey"
-  VERSION = "0.0.10"
+  VERSION = "0.0.12"
 end

data/namey.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = ["colin@muffinlabs.com"]
   s.homepage    = "https://github.com/muffinista/namey"
   s.summary     = %q{Simple name generator based on US Census Data}
-  s.description = %q{Simple name generator, which can generate male/female names based on US Census Data}
+  s.description = %q{Simple name generator, which can generate names based on US Census Data}
 
   s.rubyforge_project = "namey"
 
@@ -27,19 +27,13 @@ Gem::Specification.new do |s|
   end
 
   if RUBY_VERSION < "1.9"
-    spec.add_dependency "activesupport", "~> 3.0.11"
+    s.add_dependency "activesupport", "~> 3.0.11"
   end
   
-  #s.specification_version = 3
-
   s.add_development_dependency(%q<rake>, [">= 0"])
-  s.add_development_dependency(%q<rspec>, [">= 2.12.0"])
+  s.add_development_dependency(%q<rspec>, [">= 3"])
     
-  s.add_runtime_dependency(%q<sequel>, [">= 0"])
+  s.add_runtime_dependency(%q<sequel>, ["~> 4.48"])
   s.add_runtime_dependency(sqlite, [">= 0"])
-  s.add_development_dependency(%q<shoulda>, [">= 0"])
   s.add_development_dependency(%q<yard>, [">= 0"])      
 end
-
-
-# http://www.census.gov/genealogy/names/

data/spec/generator_spec.rb

@@ -2,7 +2,8 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Namey::Generator" do
   before(:each) do
-    @uri = "#{'jdbc:' if RUBY_PLATFORM == 'java'}sqlite:/"
+    #@uri = "#{'jdbc:' if RUBY_PLATFORM == 'java'}#{Namey.db_path}"
+    @uri = Namey.db_path
     @gen = Namey::Generator.new(@uri)
   end
 
@@ -15,47 +16,57 @@ describe "Namey::Generator" do
   
   describe "name" do
     it "should pass params to generate" do
-      @gen.should_receive(:generate).with(:frequency => :common, :with_surname => true)
+      expect(@gen).to receive(:generate).with(:frequency => :common, :with_surname => true)
       @gen.name
     end
   end
 
   describe "male" do
     it "should pass params to generate" do
-      @gen.should_receive(:generate).with(:type => :male, :frequency => :common, :with_surname => true)
+      expect(@gen).to receive(:generate).with(:type => :male, :frequency => :common, :with_surname => true)
       @gen.male
     end
   end
 
   describe "female" do
     it "should pass params to generate" do
-      @gen.should_receive(:generate).with(:type => :female, :frequency => :common, :with_surname => true)
+      expect(@gen).to receive(:generate).with(:type => :female, :frequency => :common, :with_surname => true)
       @gen.female
     end
   end
 
   describe "surname" do
     it "should pass params to generate" do
-      @gen.should_receive(:generate).with(:type => :surname, :frequency => :common)
+      expect(@gen).to receive(:generate).with(:type => :surname, :frequency => :common)
       @gen.surname
     end
   end
 
   describe "generate" do
     it "should pass to get_name once for surnames" do
-      @gen.should_receive(:get_name).with(:surname, 0, 20).and_return("Chuck")
-      @gen.generate(:type => :surname).should == "Chuck"
+      expect(@gen).to receive(:get_name).with(:surname, 0, 20).and_return("Chuck")
+      expect(@gen.generate(:type => :surname)).to eq("Chuck")
     end
 
     it "should pass to get_name once when with_surname is false" do
-      @gen.should_receive(:get_name).with(:male, 0, 20).and_return("Chuck")
-      @gen.generate(:type => :male, :with_surname => false).should == "Chuck"
+      expect(@gen).to receive(:get_name).with(:male, 0, 20).and_return("Chuck")
+      expect(@gen.generate(:type => :male, :with_surname => false)).to eq("Chuck")
     end
 
     it "should pass to get_name twice for full names" do
-      @gen.should_receive(:get_name).with(:male, 0, 20).and_return("Chuck")      
-      @gen.should_receive(:get_name).with(:surname, 0, 20).and_return("Smith")
-      @gen.generate(:type => :male).should == "Chuck Smith"
+      expect(@gen).to receive(:get_name).with(:male, 0, 20).and_return("Chuck")
+      expect(@gen).to receive(:get_name).with(:surname, 0, 20).and_return("Smith")
+      expect(@gen.generate(:type => :male)).to eq("Chuck Smith")
+    end
+
+    it "should work" do
+      expect(@gen.generate).to_not be_nil
+    end
+
+    it "should work even for bad frequencies" do
+      expect(@gen.generate(:frequency => :foo)).to_not be_nil
+      expect(@gen.generate(:min_freq => 50, :max_freq => 2)).to_not be_nil
     end
   end
+
 end

data/specs.watchr

@@ -0,0 +1,60 @@
+# Run me with:
+#
+# $ watchr specs.watchr
+
+# --------------------------------------------------
+# Convenience Methods
+# --------------------------------------------------
+def all_spec_files
+  Dir['spec/**/*_spec.rb']
+end
+
+def run_spec_matching(thing_to_match)
+  matches = all_spec_files.grep(/#{thing_to_match}/i)
+  if matches.empty?
+    puts "Sorry, thanks for playing, but there were no matches for #{thing_to_match}"
+  else
+    run matches.join(' ')
+  end
+end
+
+def run(files_to_run)
+  puts("Running: #{files_to_run}")
+  system("clear;rspec -cfs #{files_to_run}")
+  no_int_for_you
+end
+
+def run_all_specs
+  run(all_spec_files.join(' '))
+end
+
+# --------------------------------------------------
+# Watchr Rules
+# --------------------------------------------------
+watch('^spec/(.*)_spec\.rb') { |m| run_spec_matching(m[1]) }
+#watch('^spec/controllers/(.*)_spec\.rb') { |m| run_spec_matching(m[1]) }
+
+watch("^lib/chatterbot/(.*)\.rb") { |m| run_spec_matching(m[1]) }
+#watch('^spec/spec_helper\.rb') { run_all_specs }
+
+# --------------------------------------------------
+# Signal Handling
+# --------------------------------------------------
+
+def no_int_for_you
+  @sent_an_int = nil
+end
+
+Signal.trap 'INT' do
+  if @sent_an_int then
+    puts " A second INT? Ok, I get the message. Shutting down now."
+    exit
+  else
+    puts " Did you just send me an INT? Ugh. I'll quit for real if you do it again."
+    @sent_an_int = true
+    Kernel.sleep 1.5
+    run_all_specs
+  end
+end
+
+run_all_specs

metadata

@@ -1,101 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: namey
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Colin Mitchell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.48'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.48'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  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: yard
   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: Simple name generator, which can generate male/female names based on
-  US Census Data
+description: Simple name generator, which can generate names based on US Census Data
 email:
 - colin@muffinlabs.com
 executables:
@@ -104,72 +89,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
+- LICENSE
 - README.markdown
 - Rakefile
-- api/Gemfile
-- api/config.ru.example
-- api/namey_app.rb
-- api/public/LICENSE
-- api/public/Makefile
-- api/public/README.md
-- api/public/ajax-loader.gif
-- api/public/api.js
-- api/public/bootstrap.css
-- api/public/bootstrap.min.css
-- api/public/docs/assets/css/docs.css
-- api/public/docs/assets/ico/bootstrap-apple-114x114.png
-- api/public/docs/assets/ico/bootstrap-apple-57x57.png
-- api/public/docs/assets/ico/bootstrap-apple-72x72.png
-- api/public/docs/assets/ico/favicon.ico
-- api/public/docs/assets/img/bird.png
-- api/public/docs/assets/img/browsers.png
-- api/public/docs/assets/img/example-diagram-01.png
-- api/public/docs/assets/img/example-diagram-02.png
-- api/public/docs/assets/img/example-diagram-03.png
-- api/public/docs/assets/img/grid-18px.png
-- api/public/docs/assets/img/twitter-logo-no-bird.png
-- api/public/docs/assets/js/application.js
-- api/public/docs/assets/js/google-code-prettify/prettify.css
-- api/public/docs/assets/js/google-code-prettify/prettify.js
-- api/public/docs/index.html
-- api/public/docs/javascript.html
-- api/public/examples/container-app.html
-- api/public/examples/fluid.html
-- api/public/examples/hero.html
-- api/public/js/bootstrap-alerts.js
-- api/public/js/bootstrap-buttons.js
-- api/public/js/bootstrap-dropdown.js
-- api/public/js/bootstrap-modal.js
-- api/public/js/bootstrap-popover.js
-- api/public/js/bootstrap-scrollspy.js
-- api/public/js/bootstrap-tabs.js
-- api/public/js/bootstrap-twipsy.js
-- api/public/js/tests/index.html
-- api/public/js/tests/unit/bootstrap-alerts.js
-- api/public/js/tests/unit/bootstrap-buttons.js
-- api/public/js/tests/unit/bootstrap-dropdown.js
-- api/public/js/tests/unit/bootstrap-modal.js
-- api/public/js/tests/unit/bootstrap-popover.js
-- api/public/js/tests/unit/bootstrap-scrollspy.js
-- api/public/js/tests/unit/bootstrap-tabs.js
-- api/public/js/tests/unit/bootstrap-twipsy.js
-- api/public/js/tests/vendor/qunit.css
-- api/public/js/tests/vendor/qunit.js
-- api/public/lib/bootstrap.less
-- api/public/lib/forms.less
-- api/public/lib/mixins.less
-- api/public/lib/patterns.less
-- api/public/lib/reset.less
-- api/public/lib/scaffolding.less
-- api/public/lib/tables.less
-- api/public/lib/type.less
-- api/public/lib/variables.less
-- api/public/namey.css
-- api/public/ui.js
-- api/views/index.erb
 - bin/namey-load-data
 - bin/random-name
 - data/names.db
@@ -180,6 +105,7 @@ files:
 - namey.gemspec
 - spec/generator_spec.rb
 - spec/spec_helper.rb
+- specs.watchr
 homepage: https://github.com/muffinista/namey
 licenses: []
 metadata: {}
@@ -189,19 +115,20 @@ 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: namey
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple name generator based on US Census Data
-test_files: []
-has_rdoc: 
+test_files:
+- spec/generator_spec.rb
+- spec/spec_helper.rb