myna_bird 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/myna_bird.rb

@@ -1,5 +1,8 @@
 class MynaBird
   
+  class MalformedEmailException < Exception
+  end
+  
   COMMON_LOCALS = %w(
     support info sales marketing admin webmaster help
   )
@@ -10,7 +13,7 @@ class MynaBird
     paracalls linkedin mynet interia.pl yandex.ru sina 126 lycos bol in me 
     voila.fr mail comcast netcom roadrunner verizon 1and1 att adelphia
     bigpond bluebottle blueyonder btopenworld charter cox earthlink sbc telus
-    mailinator charter rogers sympatico tiscali
+    mailinator charter rogers sympatico tiscali tmail
   ) + [
     /\.edu$/
   ]
@@ -20,8 +23,12 @@ class MynaBird
   end
   
   def initialize(email)
+    # email must be in a somewhat sane format
+    # i.e. have an @ sign and at least one letter or number on each side of it
+    raise MalformedEmailException unless email =~ /^[^@]*[a-z0-9][^@]*@[^@]*[a-z0-9][^@]*$/i
+    
     @email = email.downcase
-    @local, @domain = @email.split('@') 
+    @local, @domain = @email.split('@')
   end
   
   

data/myna_bird.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{myna_bird}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brendan Schwartz"]
-  s.date = %q{2010-10-21}
+  s.date = %q{2010-11-07}
   s.description = %q{Given an email address, MynaBird generates a name suitable for use in a host name}
   s.email = %q{bschwartz@wistia.com}
   s.extra_rdoc_files = [

data/spec/myna_bird_spec.rb

@@ -1,16 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-module ShouldConvert
-  def it_should_convert(from, to_hash)
-    to = to_hash[:to]    
-    it "should convert '#{from}' to '#{to}'" do
-      MynaBird.convert(from) == to
-    end
-  end
-end
-
 describe MynaBird do
-  extend ShouldConvert
 
   it_should_convert 'brendan@wistia.com',              :to => 'wistia'
   it_should_convert 'brendan.schwartz@gmail.com',      :to => 'brendan-schwartz'
@@ -25,5 +15,13 @@ describe MynaBird do
   it_should_convert 'brendan+nospam@aol.com',          :to => 'brendan'
   it_should_convert 'BRENDAN@aol.com',                 :to => 'brendan'
   it_should_convert 'brendan@WISTIA.COM',              :to => 'wistia'
+  it_should_convert 'BRENDAN@WISTIA',                  :to => 'wistia'
+  
+  # bad input
+  it_should_not_convert 'no.at.sign'
+  it_should_not_convert '@domain.only'
+  it_should_not_convert 'local.only@'
+  it_should_not_convert '@@@@'
+  it_should_not_convert '++@++'
   
 end

data/spec/spec_helper.rb

@@ -4,6 +4,23 @@ require 'myna_bird'
 require 'spec'
 require 'spec/autorun'
 
-Spec::Runner.configure do |config|
+module ShouldAndShouldNotConvert
+  def it_should_convert(from, to_hash)
+    to = to_hash[:to]    
+    it "should convert '#{from}' to '#{to}'" do
+      MynaBird.convert(from) == to
+    end
+  end
   
+  def it_should_not_convert(from)
+    it "should raise MalformedEmailException when attempting to convert '#{from}'" do
+      lambda {
+        MynaBird.convert(from)
+      }.should raise_error(MynaBird::MalformedEmailException)
+    end
+  end
+end
+
+Spec::Runner.configure do |config|
+  config.extend(ShouldAndShouldNotConvert)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: myna_bird
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Brendan Schwartz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 -04:00
+date: 2010-11-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency