colander 0.2.1 → 0.2.2

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.ruby-version

data/Gemfile

@@ -1,4 +1,6 @@
 source "http://rubygems.org"
 
+gem 'rake'
+
 # Specify your gem's dependencies in colander.gemspec
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-Colander [![Build Status](https://secure.travis-ci.org/mynewsdesk/colander.png?branch=master)](http://travis-ci.org/mynewsdesk/colander)
+Colander [![Build Status](https://secure.travis-ci.org/mynewsdesk/colander.png?branch=master)](http://travis-ci.org/mynewsdesk/colander) [![Gem Version](https://badge.fury.io/rb/colander.png)](http://badge.fury.io/rb/colander)
 ==============
 Colander is a gem to collect emails from various file formats.
 

data/lib/colander/parser/base.rb

@@ -20,7 +20,7 @@ module Colander
       protected
 
       def collect_emails
-        parse_file.scan(/\b[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}\b/).flatten.uniq
+        parse_file.scan(/\b[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}\b/).flatten.uniq
       end
 
       def parse_file

data/lib/colander/version.rb

@@ -1,3 +1,3 @@
 module Colander
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/base_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe Colander::Parser::Base do
   describe "#emails" do
-    it "should responses to it" do
+    it "responds to email" do
       Colander::Parser::Base.any_instance.stub(:parse)
-      Colander::Parser::Base.new("foo/bar").should respond_to :emails
+      expect(Colander::Parser::Base.new("foo/bar")).to respond_to :emails
     end
   end
 
@@ -13,8 +13,8 @@ describe Colander::Parser::Base do
     Dir.entries(sample_dir).each do |file_name|
       sample = File.join(sample_dir, file_name)
       next unless File.file?(sample)
-      it "should be able to parse the sample #{file_name}" do
-        Colander.parse(sample).emails.should be_an(Array)
+      it "is able to parse the sample #{file_name}" do
+        expect(Colander.parse(sample).emails).to be_an(Array)
       end
     end
   end

data/spec/colander_spec.rb

@@ -2,44 +2,48 @@ require 'spec_helper'
 
 describe Colander do
   describe ".parse" do
-    it "should raise error if no file path is passed" do
-      lambda{
+    it "raises error if no file path is passed" do
+      expect {
         Colander.parse
-      }.should raise_exception(ArgumentError)
+      }.to raise_error
     end
 
-    it "should raise error if file is unsupported" do
-      lambda {
+    it "raises error if the file couldn't be found" do
+      expect {
+        Colander.parse("/path/to/hell.csv")
+      }.to raise_error
+    end
+
+    it "raises error if file is unsupported" do
+      expect {
         Colander.parse("foo.bar")
-      }.should raise_error(Colander::InvalidFile)
+      }.to raise_error
     end
 
-    it "should not raise error if a file path is passed" do
-      lambda{
-        Colander.parse("/file/path")
-      }.should_not raise_exception(ArgumentError)
+    it "does not raise error if a file path is passed" do
+      expect {
+        Colander.parse("spec/fixtures/plain.csv")
+      }.to_not raise_error
     end
 
     it "accepts an option file name and returns correct parser" do
-      Colander::Parser::Xls.any_instance.stub(:parse)
-      Colander.parse("/file/path", "apa.xls").should be_a Colander::Parser::Xls
+      expect(Colander.parse("spec/fixtures/new-format.xlsx")).to be_a Colander::Parser::Xls
     end
 
-    it "should recognize a xls file and return correct parser" do
-      path = "/foo/apa.xls"
-      Colander::Parser::Xls.any_instance.stub(:parse)
-      Colander.parse(path).should be_a Colander::Parser::Xls
+    it "recognizes a xls file and return correct parser" do
+      path = "spec/fixtures/new-format.xlsx"
+      expect(Colander.parse(path)).to be_a Colander::Parser::Xls
     end
 
-    it "should recognize a xlsx file and return correct parser" do
+    it "recognizes a xlsx file and return correct parser" do
       path = "/foo/apa.xlsx"
       Colander::Parser::Xlsx.any_instance.stub(:parse)
-      Colander.parse(path).should be_a Colander::Parser::Xlsx
+      expect(Colander.parse(path)).to be_a Colander::Parser::Xlsx
     end
 
-    it "should invoke parse method on the parser" do
-      Colander::Parser::Xlsx.any_instance.should_receive(:parse)
-      Colander.parse("/foo/bar.xlsx")
+    it "invokes parse method on the parser" do
+      expect_any_instance_of(Colander::Parser::Xlsx).to receive(:parse)
+      Colander.parse("/foo/apa.xlsx")
     end
   end
 end

data/spec/fixtures/plain.csv

@@ -1,3 +1,4 @@
 name, email, phone
 Jonas, jonas.forsberg@mynewsdesk.com, +460011234567
-Peter, "peter.forsberg@xhockeypro.com", +46 11 2 34567
+Peter, "peter.forsberg@xhockeypro.com", +46 11 2 34567
+Alfred, "alfred.pennyworth@gotham.travel", +99 99 9 99999

data/spec/plain_spec.rb

@@ -5,13 +5,19 @@ describe Colander::Parser::Plain do
     it "retreives emails from an csv file" do
       parser = Colander::Parser::Plain.new("spec/fixtures/plain.csv")
       parser.parse
-      parser.emails.sort.should eql(["jonas.forsberg@mynewsdesk.com", "peter.forsberg@xhockeypro.com"].sort)
+      expect(parser.emails.sort).to eq ["jonas.forsberg@mynewsdesk.com", "alfred.pennyworth@gotham.travel", "peter.forsberg@xhockeypro.com"].sort
+    end
+
+    it 'supports top-level-domains of all sizes' do
+      parser = Colander::Parser::Plain.new("spec/fixtures/plain.csv")
+      parser.parse
+      expect(parser.emails.sort).to eq ["jonas.forsberg@mynewsdesk.com", "alfred.pennyworth@gotham.travel", "peter.forsberg@xhockeypro.com"].sort
     end
 
     it "retreives emails from an txt file" do
       parser = Colander::Parser::Plain.new("spec/fixtures/text.txt")
       parser.parse
-      parser.emails.sort.should eql(["jonas.forsberg@mynewsdesk.com", "kristian.hellquist@mynewsdesk.com", "richard@mynewsdesk.com"].sort)
+      expect(parser.emails.sort).to eq ["jonas.forsberg@mynewsdesk.com", "kristian.hellquist@mynewsdesk.com", "richard@mynewsdesk.com"].sort
     end
 
   end

data/spec/xls_spec.rb

@@ -4,40 +4,40 @@ describe Colander::Parser::Xls do
   describe "#parse" do
     it "stores found emails" do
       parser = Colander::Parser::Xls.new("file/path")
-      parser.should_receive(:parse_file).and_return("bruce@wayne.com")
+      expect(parser).to receive(:parse_file).and_return("bruce@wayne.com")
       parser.parse
-      parser.emails.sort.should eql(["bruce@wayne.com"])
+      expect(parser.emails.sort).to eq ["bruce@wayne.com"]
     end
 
     it "raises exception if file is invalid" do
       parser = Colander::Parser::Xls.new("./#{__FILE__}")
-      lambda {
+      expect {
         parser.parse
-      }.should raise_error(Colander::InvalidFile)
+      }.to raise_error
     end
 
     it "wraps errors and returns InvalidFile" do
       parser = Colander::Parser::Xls.new("file/path")
-      parser.should_receive(:parse_file).and_raise(RuntimeError.new("FUUU"))
+      expect(parser).to receive(:parse_file).and_raise(RuntimeError.new("FUUU"))
       expect {
         parser.parse
-      }.to raise_error(Colander::InvalidFile)
+      }.to raise_error
     end
 
     it "retreives emails from an 95-excel spreadsheet" do
       parser = Colander::Parser::Xls.new("spec/fixtures/excel95.xls")
       parser.parse
-      parser.emails.sort.should eql(["markus.nordin@mynewsdesk.com", "markus@hej.se", "sven@bertil.se", "Adam.A@hotmail.com", "apa@elabs.se", "liam@neeson.net", "david@mynewsdesk.com"].sort)
+      expect(parser.emails.sort).to eq ["markus.nordin@mynewsdesk.com", "markus@hej.se", "sven@bertil.se", "Adam.A@hotmail.com", "apa@elabs.se", "liam@neeson.net", "david@mynewsdesk.com"].sort
     end
     it "retreives emails from an xls spreadsheet" do
       parser = Colander::Parser::Xls.new("spec/fixtures/old-format.xls")
       parser.parse
-      parser.emails.sort.should eql(["markus.nordin@mynewsdesk.com", "markus@hej.se", "sven@bertil.se", "Adam.A@hotmail.com", "apa@elabs.se", "liam@neeson.net", "david@mynewsdesk.com"].sort)
+      expect(parser.emails.sort).to eq ["markus.nordin@mynewsdesk.com", "markus@hej.se", "sven@bertil.se", "Adam.A@hotmail.com", "apa@elabs.se", "liam@neeson.net", "david@mynewsdesk.com"].sort
     end
     it "retreives emails from an 95-excel spreadsheet without file suffix" do
       parser = Colander::Parser::Xls.new("spec/fixtures/excel95-without-file-suffix")
       parser.parse
-      parser.emails.sort.should eql(["markus.nordin@mynewsdesk.com", "markus@hej.se", "sven@bertil.se", "Adam.A@hotmail.com", "apa@elabs.se", "liam@neeson.net", "david@mynewsdesk.com"].sort)
+      expect(parser.emails.sort).to eq ["markus.nordin@mynewsdesk.com", "markus@hej.se", "sven@bertil.se", "Adam.A@hotmail.com", "apa@elabs.se", "liam@neeson.net", "david@mynewsdesk.com"].sort
     end
   end
 end

data/spec/xlsx_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 describe Colander::Parser::Xlsx do
   it "is subclass of Colander::Parser::Xls" do
-     Colander::Parser::Xlsx.new("foo/bar").should be_a Colander::Parser::Xls
+     expect(Colander::Parser::Xlsx.new("foo/bar")).to be_a Colander::Parser::Xls
   end
 
   describe "#parse" do
     it "retreives emails from an xlsx spreadsheet" do
       parser = Colander::Parser::Xlsx.new("spec/fixtures/new-format.xlsx")
       parser.parse
-      parser.emails.sort.should eql(["markus.nordin@mynewsdesk.com", "markus@hej.se", "sven@bertil.se", "Adam.A@hotmail.com", "apa@elabs.se", "liam@neeson.net", "david@mynewsdesk.com"].sort)
+      expect(parser.emails.sort).to eq ["markus.nordin@mynewsdesk.com", "markus@hej.se", "sven@bertil.se", "Adam.A@hotmail.com", "apa@elabs.se", "liam@neeson.net", "david@mynewsdesk.com"].sort
     end
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: colander
 version: !ruby/object:Gem::Version
-  version: 0.2.1
   prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - Kristian Hellquist
@@ -10,41 +10,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: zip
-  requirement: &70363883863640 !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.2
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *70363883863640
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: rspec
-  requirement: &70363883863220 !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70363883863220
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: pry
-  requirement: &70363883862760 !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70363883862760
+    none: false
 description: Exctract an array of emails from various file formats (xls, xlsx, csv,
   txt)
 email:
@@ -54,7 +69,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rbenv-version
+- .ruby-version.example
 - .rvmrc
 - .travis.yml
 - Gemfile
@@ -89,20 +104,26 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 3478533411363888682
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 3478533411363888682
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Exctract an array of emails from various file formats