ohio_state_person 0.0.1 → 0.0.2

data/lib/{OhioStatePerson → ohio_state_person}/version.rb

@@ -1,3 +1,3 @@
 module OhioStatePerson
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/ohio_state_person.rb

@@ -0,0 +1,60 @@
+require "ohio_state_person/version"
+
+module OhioStatePerson
+
+	module ModelAdditions
+		def is_a_buckeye
+			extend ClassMethods
+			include InstanceMethods
+
+			validates_uniqueness_of :name_n
+			validates_format_of :name_n, :with => /\A[a-z]([a-z-]*[a-z])?\.[1-9]\d*\z/, :message => 'must be in format: name.#'
+
+			validates_uniqueness_of :emplid
+			validates_format_of :emplid, :with => /\A\d{8,9}\z/, :message => 'must be 8 or 9 digits'
+
+			before_validation :set_id, :on => :create
+			validate :id_is_emplid
+		end
+	end
+
+	module ClassMethods
+		def search(q)
+			q.strip! if q
+			case q
+			when /\A\d+\z/
+				where(:emplid => q)
+			when /\A\D+\.\d+\z/
+				where(:name_n => q)
+			when /(\S+),\s*(\S+)/
+				where('last_name LIKE ? AND first_name LIKE ?', $1, "#{$2}%")
+			when /(\S+)\s+(\S+)/
+				where('first_name LIKE ? AND last_name LIKE ?', $1, "#{$2}%")
+			when /\S/
+				where('last_name LIKE ?', "#{q}%")
+			else
+				where('1=2')
+			end
+		end
+	end
+
+	module InstanceMethods
+		def email
+			name_n.present? ? "#{name_n}@osu.edu" : ''
+		end
+
+		protected
+		def set_id
+			self.id = self.emplid.to_i
+		end
+
+		def id_is_emplid
+			unless self.id == self.emplid.to_i
+				errors.add(:id, 'must be the same as the emplid')
+			end
+		end
+	end
+
+end
+
+::ActiveRecord::Base.send :extend, OhioStatePerson::ModelAdditions

data/{OhioStatePerson.gemspec → ohio_state_person.gemspec}

@@ -1,17 +1,17 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "OhioStatePerson/version"
+require "ohio_state_person/version"
 
 Gem::Specification.new do |s|
   s.name        = "ohio_state_person"
   s.version     = OhioStatePerson::VERSION
   s.authors     = ["mikegee"]
   s.email       = ["gee.24@osu.edu"]
-  s.homepage    = "https://github.com/ASCTech/OhioStatePerson"
+  s.homepage    = "https://github.com/ASCTech/ohio_state_person"
   s.summary     = %q{ActiveRecord mixin for people at Ohio State University}
   s.description = %q{requires fields: name_n, emplid; sets id to emplid.to_i; provides a search method; etc.}
 
-  s.rubyforge_project = "OhioStatePerson"
+  s.rubyforge_project = "ohio_state_person"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ohio_state_person
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - mikegee
@@ -44,11 +44,11 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- OhioStatePerson.gemspec
 - Rakefile
-- lib/OhioStatePerson.rb
-- lib/OhioStatePerson/version.rb
-homepage: https://github.com/ASCTech/OhioStatePerson
+- lib/ohio_state_person.rb
+- lib/ohio_state_person/version.rb
+- ohio_state_person.gemspec
+homepage: https://github.com/ASCTech/ohio_state_person
 licenses: []
 
 post_install_message: 
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: OhioStatePerson
+rubyforge_project: ohio_state_person
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3

data/lib/OhioStatePerson.rb

@@ -1,54 +0,0 @@
-require "OhioStatePerson/version"
-
-module OhioStatePerson
-
-	def self.included(base)
-		base.instance_eval do
-			validates_uniqueness_of :name_n
-			validates_format_of :name_n, :with => /\A[a-z]([a-z-]*[a-z])?\.[1-9]\d*\z/, :message => 'must be in format: name.#'
-
-			validates_uniqueness_of :emplid
-			validates_format_of :emplid, :with => /\A\d{8,9}\z/, :message => 'must be 8 or 9 digits'
-
-			before_validation :set_id, :on => :create
-			validate :id_is_emplid
-
-
-			def self.search(q)
-				q.strip! if q
-				case q
-				when /\A\d+\z/
-					where(:emplid => q)
-				when /\A\D+\.\d+\z/
-					where(:name_n => q)
-				when /(\S+),\s*(\S+)/
-					where('last_name LIKE ? AND first_name LIKE ?', $1, "#{$2}%")
-				when /(\S+)\s+(\S+)/
-					where('first_name LIKE ? AND last_name LIKE ?', $1, "#{$2}%")
-				when /\S/
-					where('last_name LIKE ?', "#{q}%")
-				else
-					where('1=2')
-				end
-			end
-
-		end
-	end
-
-	def email
-		name_n.present? ? "#{name_n}@osu.edu" : ''
-	end
-
-	protected
-
-	def set_id
-		self.id = self.emplid.to_i
-	end
-
-	def id_is_emplid
-		unless self.id == self.emplid.to_i
-			errors.add(:id, 'must be the same as the emplid')
-		end
-	end
-
-end