Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency bump #38

Merged
merged 2 commits into from
Apr 1, 2014
Merged

Dependency bump #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22b5e25
dependency :gem: bump
benbalter Apr 1, 2014
906f4b1
use foo.invalid
benbalter Apr 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ PATH
remote: .
specs:
gman (2.0.0)
addressable
public_suffix
swot
addressable (~> 2.3.6)
public_suffix (~> 1.4.1)
swot (~> 0.3.0)

GEM
remote: https://rubygems.org/
Expand All @@ -15,14 +15,14 @@ GEM
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
addressable (2.3.5)
addressable (2.3.6)
atomic (1.1.14)
i18n (0.6.9)
json (1.8.1)
minitest (4.7.5)
multi_json (1.8.4)
net-dns (0.8.0)
public_suffix (1.3.3)
public_suffix (1.4.2)
rake (10.1.1)
rdoc (4.1.1)
json (~> 1.4)
Expand All @@ -32,7 +32,7 @@ GEM
shoulda-context (1.1.6)
shoulda-matchers (2.5.0)
activesupport (>= 3.0.0)
swot (0.2.13)
swot (0.3.0)
public_suffix
thread_safe (0.1.3)
atomic
Expand Down
6 changes: 3 additions & 3 deletions gman.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ Gem::Specification.new do |s|
".gitignore"
]
s.require_paths = ["lib"]
s.add_dependency( "public_suffix" )
s.add_dependency( "swot" )
s.add_dependency( "addressable" )
s.add_dependency( "public_suffix", '~> 1.4.1')
s.add_dependency( "swot", '~> 0.3.0' )
s.add_dependency( "addressable", '~> 2.3.6' )

s.add_development_dependency( "rake" )
s.add_development_dependency( "shoulda" )
Expand Down
2 changes: 1 addition & 1 deletion lib/gman.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def valid?(text)
return false unless PublicSuffix.valid?(domain)

# Ensure non-edu
return false if Swot::is_academic?(domain)
return false if domain_parts(domain).sld && Swot::is_academic?(domain)

# check using public suffix's standard logic
rule = list.find domain
Expand Down
2 changes: 1 addition & 1 deletion test/test_gman.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class TestGman < Test::Unit::TestCase

should "return public suffix domain" do
assert_equal PublicSuffix::Domain, Gman.domain_parts("whitehouse.gov").class
assert_equal NilClass, Gman.domain_parts("foo.bar").class
assert_equal NilClass, Gman.domain_parts("foo.invalid").class
end

should "parse domain parts" do
Expand Down