namey 0.0.7 → 0.0.8

data/api/Gemfile

@@ -2,9 +2,9 @@ source :rubygems
 source 'http://gemcutter.org'
 
 gem "sinatra"
+gem "sinatra-sequel"
 gem "mysql"
 gem "sequel"
-gem "redcarpet"
 gem "json"
 
-gem "namey", :path => "/home/colin/Projects/namey"
+gem "namey"

data/api/namey_app.rb

@@ -1,4 +1,5 @@
 require 'sinatra'
+require 'sinatra/sequel'
 require 'namey'
 require 'json'
 
@@ -11,9 +12,11 @@ class Hash
   end
 end
 
-before do
-  @generator = Namey::Generator.new
-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'
+
   
 get '/' do
   # use index.haml for readme
@@ -21,6 +24,8 @@ get '/' do
 end
   
 get '/name.?:format?' do
+  @generator = Namey::Generator.new(@database)
+
   opts = {
     :frequency => :common
   }.merge(params.symbolize_keys!)

data/lib/namey/generator.rb

@@ -11,8 +11,12 @@ module Namey
     # initialize the name generator
     # * +dbname+ - Sequel style db URI ex: 'sqlite://foo.db'
     def initialize(dbname = nil)
-      dbname = Namey.db_path if dbname.nil?
-      @db = Sequel.connect(dbname)
+      if dbname.is_a? Sequel::Database
+        @db = dbname
+      else
+        dbname = Namey.db_path if dbname.nil?
+        @db = Sequel.connect(dbname)
+      end
     end
 
     #

data/lib/namey/version.rb

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

data/spec/generator_spec.rb

@@ -6,6 +6,13 @@ describe "Namey::Generator" do
     @gen = Namey::Generator.new(@uri)
   end
 
+  describe "incoming sequel object" do
+    it "should work" do
+      @tmp = Sequel.connect(@uri)
+      @gen2 = Namey::Generator.new(@tmp)
+    end
+  end
+  
   describe "name" do
     it "should pass params to generate" do
       @gen.should_receive(:generate).with(:frequency => :common, :with_surname => true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namey
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000Z
+date: 2011-11-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &13029780 !ruby/object:Gem::Requirement
+  requirement: &9641500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13029780
+  version_requirements: *9641500
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &13029280 !ruby/object:Gem::Requirement
+  requirement: &9641000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13029280
+  version_requirements: *9641000
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &13028800 !ruby/object:Gem::Requirement
+  requirement: &9640520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13028800
+  version_requirements: *9640520
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &13028320 !ruby/object:Gem::Requirement
+  requirement: &9640040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13028320
+  version_requirements: *9640040
 description: Simple name generator, which can generate male/female names based on
   US Census Data
 email: