namey 0.0.8 → 0.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7f320c1ddb09bf1cc1c10663965949acafcce32d
+  data.tar.gz: a5f73434c7fe00392070f9d88b053aafddff3ad2
+SHA512:
+  metadata.gz: a2b993038638bee8bbaebc224cdf9c0522f7ee64bf6d0983ad4a25d1ad6fe4012d73a6acb0fe250c40bfcfafb6a0d9530310a6f28540bb487dc7aa0044d67e73
+  data.tar.gz: f67f9d2b65f84d903c95826aa3627e7bd0873de0c0608cc595d22db8202e825f2ab9f2e23f37e7e05eb7d499f8db7ea10d21ab8f27541e4527ed647393e63a5e

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+config.ru

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - jruby-head
+  - jruby-19mode
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in namey.gemspec
 gemspec
@@ -6,12 +6,9 @@ gemspec
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem 'simplecov', :require => false, :group => :test
-
   gem "shoulda", ">= 0"
   gem "rspec"
 
-  gem "bundler", "~> 1.0.0"
   gem "watchr"
 end
 
@@ -19,7 +16,8 @@ end
 # couple extra gems for testing db connectivity
 #
 group :test do
+  gem 'simplecov', :require => false
   gem "sequel"
-  gem "mysql"
-  gem "sqlite3"
+  gem "sqlite3", :platform => :ruby
+  gem "jdbc-sqlite3", :platform => :jruby
 end

data/README.markdown

@@ -7,6 +7,8 @@ names. Since the database itself specifies the frequency of each name,
 you can get specify whether you want a common name, rare name, etc.
 
 
+[![Build Status](https://travis-ci.org/muffinista/namey.png?branch=master)](https://travis-ci.org/muffinista/namey)
+
 ## Usage ##
 
 Using namey is pretty straightforward. 

data/api/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 source 'http://gemcutter.org'
 
 gem "sinatra"
@@ -7,4 +7,6 @@ gem "mysql"
 gem "sequel"
 gem "json"
 
+gem "shotgun"
+
 gem "namey"

data/api/{config.ru → config.ru.example}

@@ -3,6 +3,8 @@ require 'bundler'
 
 Bundler.require
 
+# update this to point to your database
+ENV['DATABASE_URL'] = "mysql://username@hostname/database"
+
 require './namey_app'
-#run NameyApp
 run Sinatra::Application

data/api/namey_app.rb

@@ -15,8 +15,19 @@ end
 
 # Establish the database connection; or, omit this and use the DATABASE_URL
 # environment variable as the connection string:
-set :database, 'mysql://username@hostname/database'
+#set :database, 'mysql://username@hostname/database'
 
+
+#
+# migration for logging names
+#
+migration "create the generated_names table" do
+  database.create_table :generated_names do
+    primary_key :id
+    String :name, :null => false
+    timestamp   :created_at, :null => false
+  end
+end
   
 get '/' do
   # use index.haml for readme
@@ -24,7 +35,7 @@ get '/' do
 end
   
 get '/name.?:format?' do
-  @generator = Namey::Generator.new(@database)
+  @generator = Namey::Generator.new(database)
 
   opts = {
     :frequency => :common
@@ -37,7 +48,6 @@ get '/name.?:format?' do
   end
 
   opts.delete(:type) if ! [:male, :female, :surname].include?(opts[:type])
-  #opts[:type] = "both" if ! [:male, :female, :surname].include?(opts[:type])
   
   count = (params.delete(:count) || 1).to_i
   count = 10 if count > 10
@@ -45,10 +55,19 @@ get '/name.?:format?' do
   names = 1.upto(count).collect do
     @generator.generate(opts)
   end.compact
+
+  names.each do |name|
+    database[:generated_names].insert(:name => name)
+  end
   
   if params[:format] == "json"
     content_type :json, 'charset' => 'utf-8'
-    JSON.generate names
+    tmp = JSON.generate names
+    if params[:callback]
+      "#{params[:callback]}(#{tmp});"
+    else
+      tmp
+    end
   else
     ["<ul>", names.collect { |n| "<li>#{n}</li>" }.join(" "), "</ul>"].join("")
   end

data/api/public/api.js

@@ -1,76 +1,88 @@
 /** namey */
 namey = {
-  // jx -- http://www.openjs.com/scripts/jx/ -- V3.00.A
-  jx:{getHTTPObject:function(){var A=false;if(typeof ActiveXObject!="undefined"){try{A=new ActiveXObject("Msxml2.XMLHTTP")}catch(C){try{A=new ActiveXObject("Microsoft.XMLHTTP")}catch(B){A=false}}}else{if(window.XMLHttpRequest){try{A=new XMLHttpRequest()}catch(C){A=false}}}return A},load:function(url,callback,format){var http=this.init();if(!http||!url){return }if(http.overrideMimeType){http.overrideMimeType("text/xml")}if(!format){var format="text"}format=format.toLowerCase();var now="uid="+new Date().getTime();url+=(url.indexOf("?")+1)?"&":"?";url+=now;http.open("GET",url,true);http.onreadystatechange=function(){if(http.readyState==4){if(http.status==200){var result="";if(http.responseText){result=http.responseText}if(format.charAt(0)=="j"){result=result.replace(/[\n\r]/g,"");result=eval("("+result+")")}if(callback){callback(result)}}else{if(error){error(http.status)}}}};http.send(null)},init:function(){return this.getHTTPObject()}},
 
-  /**
-   * API for namey random name generator.  There's two basic ways to use it.  First, just call namey.get with a callback:
-   *
-   * namey.get(function(n) { console.log(n); }); => ["John Clark"]
-   *
-   * The call returns an array because there's an option to request more than one random name. For example:
-   *
-   * namey.get({ count: 3, callback: function(n) { console.log(n); }}); ; => ["John Cook", "Ruth Fisher", "Donna Collins"]
-   *
-   * Here's the full list of parameters:
-   * 
-   * count -- how many names you would like (default: 1)
-   *
-   * type -- what sort of name you want 'female', 'male', 'surname', or leave blank if you want both genders
-   *
-   * with_surname -- true/false, if you want surnames with the first
-   * name. If false, you'll just get first names.  Default is true.
-   *
-   * frequency -- 'common', 'rare', 'all' -- default is 'common'. This
-   * picks a subset of names from the database -- common names are
-   * names that occur frequently, rare is names that occur rarely.
-   * 
-   * min_freq/max_freq  -- specific values to get back a really
-   * specific subset of the names db. values should be between 0 and
-   * 100. You probably don't need this, but here's an example:
-   * namey.get({ count: 3, min_freq: 30, max_freq: 50, callback: function(n) { console.log(n); }});
-   * => ["Crystal Zimmerman", "Joshua Rivas", "Tina Bryan"]
-   *
-   * callback -- a function to do something with the data.  The data
-   * passed in will be an array of names -- use them wisely.
-   * 
-   */
-  get : function(options) {
-	var callback;
-	var tmp_params = [];
+    /*
+     * Lightweight JSONP fetcher
+     * Copyright 2010 Erik Karlsson. All rights reserved.
+     * BSD licensed
+     */
+    // Lightweight JSONP fetcher - www.nonobtrusive.com
+    jsonP:(function(){var a=0,c,f,b,d=this;function e(j){var i=document.createElement("script"),h=false;i.src=j;i.async=true;i.onload=i.onreadystatechange=function(){if(!h&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){h=true;i.onload=i.onreadystatechange=null;if(i&&i.parentNode){i.parentNode.removeChild(i)}}};if(!c){c=document.getElementsByTagName("head")[0]}c.appendChild(i)}function g(h,j,k){f="?";j=j||{};for(b in j){if(j.hasOwnProperty(b)){f+=encodeURIComponent(b)+"="+encodeURIComponent(j[b])+"&"}}var i="json"+(++a);d[i]=function(l){k(l);try{delete d[i]}catch(m){}d[i]=null;};e(h+f+"callback="+i);return i}return{get:g}}()),
 
-	if ( typeof(options) == "function" ) {
-	  callback = options;
-	}
-	else if ( typeof(options) == "object" ) {
-	  callback = options.callback;
+    /**
+     * API for namey random name generator.  There's two basic ways to use it.  First, just call namey.get with a callback:
+     *
+     * namey.get(function(n) { console.log(n); }); => ["John Clark"]
+     *
+     * The call returns an array because there's an option to request more than one random name. For example:
+     *
+     * namey.get({ count: 3, callback: function(n) { console.log(n); }}); ; => ["John Cook", "Ruth Fisher", "Donna Collins"]
+     *
+     * Here's the full list of parameters:
+     * 
+     * count -- how many names you would like (default: 1)
+     *
+     * type -- what sort of name you want 'female', 'male', 'surname', or leave blank if you want both genders
+     *
+     * with_surname -- true/false, if you want surnames with the first
+     * name. If false, you'll just get first names.  Default is true.
+     *
+     * frequency -- 'common', 'rare', 'all' -- default is 'common'. This
+     * picks a subset of names from the database -- common names are
+     * names that occur frequently, rare is names that occur rarely.
+     * 
+     * min_freq/max_freq  -- specific values to get back a really
+     * specific subset of the names db. values should be between 0 and
+     * 100. You probably don't need this, but here's an example:
+     * namey.get({ count: 3, min_freq: 30, max_freq: 50, callback: function(n) { console.log(n); }});
+     * => ["Crystal Zimmerman", "Joshua Rivas", "Tina Bryan"]
+     *
+     * callback -- a function to do something with the data.  The data
+     * passed in will be an array of names -- use them wisely.
+     * 
+     */
+    get : function(options) {
+	      var callback;
+	      var tmp_params = [];
 
-	  if ( typeof(options.count) == "undefined" ) {
-		options.count = 1;
-	  }
-	  tmp_params.push("count=" + options.count);
+	      if ( typeof(options) == "function" ) {
+	          callback = options;
+	      }
+	      else if ( typeof(options) == "object" ) {
+	          callback = options.callback;
 
-	  if ( typeof(options.type) != "undefined" && options.type != "both" ) {
-		tmp_params.push("type=" + options.type);
-	  };
+            if ( typeof(options.host) === "undefined" ) {
+                options.host = "namey.muffinlabs.com";
+            }
 
-	  if ( options.type != "surname" && typeof(options.with_surname) != "undefined" ) {
-		tmp_params.push("with_surname=" + options.with_surname);
-	  }
-	  if ( options.min_freq ) {
-		tmp_params.push("min_freq=" + options.min_freq);
-		tmp_params.push("max_freq=" + options.max_freq);
-	  }
-	  else if ( typeof(options.frequency) != "undefined" ) {
-		tmp_params.push("frequency=" + options.frequency);
-	  }
-	}
+	          if ( typeof(options.count) == "undefined" ) {
+		            options.count = 1;
+	          }
+	          tmp_params.push("count=" + options.count);
 
-	this.jx.load('/name.json?' + tmp_params.join("&"), function(d) {
-	  var tmp = eval('(' + d + ')');
-	  if ( typeof(callback) == "function" ) {
-		callback(tmp);
-	  }
-	});
-  }
+	          if ( typeof(options.type) != "undefined" && options.type != "both" ) {
+		            tmp_params.push("type=" + options.type);
+	          };
+
+	          if ( options.type != "surname" && typeof(options.with_surname) != "undefined" ) {
+		            tmp_params.push("with_surname=" + options.with_surname);
+	          }
+	          if ( options.min_freq ) {
+		            tmp_params.push("min_freq=" + options.min_freq);
+		            tmp_params.push("max_freq=" + options.max_freq);
+	          }
+	          else if ( typeof(options.frequency) != "undefined" ) {
+		            tmp_params.push("frequency=" + options.frequency);
+	          }
+	      }
+
+	      this.jsonP.get('//' + options.host + '/name.json', tmp_params, function(d) {
+	          if ( typeof(callback) == "function" ) {
+		            callback(d);
+	          }
+	          else {
+		            console.log(d);
+	          }
+	      });
+    }
 }

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/names"
+base_url = "http://www.census.gov/genealogy/www/data/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.rb

@@ -1,6 +1,6 @@
 module Namey
   def self.db_path
-    @@db_path ||= "sqlite://#{File.join(self.libdir, "..", "data", "names.db")}"  
+    @@db_path ||= "#{'jdbc:' if RUBY_PLATFORM == 'java'}sqlite://" + File.join(self.libdir, "..", "data", "names.db")
   end
   def self.db_path=(x)
     @@db_path = x

data/lib/namey/version.rb

@@ -1,4 +1,4 @@
 module Namey
   NAME = "namey"
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/namey.gemspec

@@ -5,7 +5,6 @@ require "namey/version"
 Gem::Specification.new do |s|
   s.name        = "namey"
   s.version     = Namey::VERSION
-  s.platform    = Gem::Platform::RUBY
   s.authors     = ["Colin Mitchell"]
   s.email       = ["colin@muffinlabs.com"]
   s.homepage    = "https://github.com/muffinista/namey"
@@ -19,26 +18,27 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sequel>, [">= 0"])
-      s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])      
-    else
-      s.add_dependency(%q<sequel>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])      
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-    end
+  if RUBY_PLATFORM == "java"
+    s.platform = "java"
+    sqlite = "jdbc-sqlite3"
   else
-    s.add_dependency(%q<sequel>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])    
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
+    s.platform = Gem::Platform::RUBY
+    sqlite = "sqlite3"
   end
+
+  if RUBY_VERSION < "1.9"
+    spec.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_runtime_dependency(%q<sequel>, [">= 0"])
+  s.add_runtime_dependency(sqlite, [">= 0"])
+  s.add_development_dependency(%q<shoulda>, [">= 0"])
+  s.add_development_dependency(%q<yard>, [">= 0"])      
 end
 
 

data/spec/generator_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Namey::Generator" do
   before(:each) do
-    @uri = "sqlite:/"
+    @uri = "#{'jdbc:' if RUBY_PLATFORM == 'java'}sqlite:/"
     @gen = Namey::Generator.new(@uri)
   end
 

data/spec/spec_helper.rb

@@ -10,7 +10,6 @@ Bundler.require
 #require 'chatterbot'
 
 require 'tempfile'
-require 'sqlite3'
 
 
 # Requires supporting files with custom matchers and macros, etc,

metadata

@@ -1,60 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: namey
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Colin Mitchell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000Z
+date: 2013-11-18 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
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &9641500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9641500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &9641000 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9641000
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &9640520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9640520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &9640040 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9640040
+  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
 email:
@@ -66,11 +105,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.markdown
 - Rakefile
 - api/Gemfile
-- api/config.ru
+- api/config.ru.example
 - api/namey_app.rb
 - api/public/LICENSE
 - api/public/Makefile
@@ -142,27 +182,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/muffinista/namey
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: namey
-rubygems_version: 1.8.6
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple name generator based on US Census Data
 test_files: []
 has_rdoc: