addressabler 0.0.7 → 0.1.0

data/spec/addressabler/uri_deprecation_spec.rb

@@ -0,0 +1,39 @@
+require 'addressabler/uri_deprecation'
+
+describe Addressabler, "deprecation" do
+  describe "TLDS" do
+    it "returns public TLDS" do
+      Addressabler::TLDS.should == Addressabler.public_tlds
+    end
+
+    it "warns about the deprecated TLD constant" do
+      Addressabler.should_receive(:deprecation_warning)
+      Addressabler::TLDS
+    end
+  end
+end
+
+describe Addressable::URI, "deprecation" do
+  describe "custom_tlds" do
+    it "returns the Addressabler custom_tlds" do
+      Addressabler.custom_tlds = {foo: "bar"}
+      Addressable::URI.custom_tlds.should == {foo: "bar"}
+    end
+
+    it "sets the Addressabler custom_tlds" do
+      Addressable::URI.custom_tlds = {gert: "B. Frobe"}
+      Addressabler.custom_tlds.should == {gert: "B. Frobe"}
+    end
+
+    it "warns about the deprecated custom_tlds getter" do
+      Addressabler.should_receive(:deprecation_warning)
+      Addressable::URI.custom_tlds
+    end
+
+    it "warns about the deprecated custom_tlds setter" do
+      Addressabler.should_receive(:deprecation_warning)
+      Addressable::URI.custom_tlds = {bring_me: "a sandwich"}
+    end
+  end
+
+end

data/spec/addressabler/uri_spec.rb

@@ -0,0 +1,116 @@
+require 'addressabler/uri'
+
+describe Addressabler::URI do
+  it "does not prevent Addressable::URI from parsing" do
+    uri = Addressable::URI.parse("http://www.google.com/path?foo=bar#anchor")
+    uri.should be_instance_of(Addressable::URI)
+  end
+
+  it "resets when the host changes" do
+    uri = Addressable::URI.heuristic_parse("www.google.com")
+    uri.tld.should == 'com'
+    uri.domain.should == 'google'
+    uri.subdomain.should == 'www'
+    uri.host = 'www2.google.co.uk'
+    uri.tld.should == 'co.uk'
+    uri.domain.should == 'google'
+    uri.subdomain.should == 'www2'
+  end
+
+  it "does not explode on empty strings" do
+    uri = Addressable::URI.parse("")
+    uri.host.should be_nil
+    uri.domain.should be_nil
+    uri.tld.should be_nil
+    uri.subdomain.should be_nil
+  end
+
+  describe "#tld" do
+    it "returns a TLD" do
+      uri = Addressable::URI.parse("http://www.google.com/path?foo=bar#anchor")
+      uri.tld.should == 'com'
+    end
+
+    it "knows about complex TLDs" do
+      uri = Addressable::URI.parse("http://www.foo.bar.baz.co.uk/gjadgsg#sdgs?adg=f")
+      uri.tld.should == 'co.uk'
+    end
+
+    it "knows about newer TLDs" do
+      uri = Addressable::URI.parse("http://www.bart-blabla.cc")
+      uri.tld.should == 'cc'
+    end
+
+    it "doesn't know non-existant TLDs" do
+      uri = Addressable::URI.parse("http://www.bart-blabla.foobar")
+      uri.tld.should == ''
+    end
+
+    it "accepts custom TLDs" do
+      Addressabler.custom_tlds = { 'foobar' => {} }
+      uri = Addressable::URI.parse("http://www.bart-blabla.foobar")
+      uri.tld.should == 'foobar'
+    end
+
+    it "accepts nested custom TLDs" do
+      Addressabler.custom_tlds = { 'bar' => { 'foo' => {} } }
+      uri = Addressable::URI.parse("http://www.bart-blabla.foo.bar")
+      uri.tld.should == 'foo.bar'
+    end
+
+    it "is changeable" do
+      uri = Addressable::URI.heuristic_parse("www.google.com")
+      uri.tld = 'co.uk'
+      uri.to_s.should == 'http://www.google.co.uk'
+    end
+  end
+
+  describe "#domain" do
+    it "returns the domain" do
+      uri = Addressable::URI.heuristic_parse("i.am.a.subdomain.co.uk")
+      uri.domain.should == "subdomain"
+    end
+
+    it "is changeable" do
+      uri = Addressable::URI.heuristic_parse("www.google.com")
+      uri.domain = 'amazon'
+      uri.to_s.should == 'http://www.amazon.com'
+    end
+  end
+
+  describe "#subdomain" do
+    it "returns the subdomain" do
+      uri = Addressable::URI.heuristic_parse("i.am.a.subdomain.co.uk")
+      uri.subdomain.should == "i.am.a"
+    end
+
+    it "is changeable" do
+      uri = Addressable::URI.heuristic_parse("www.google.com")
+      uri.subdomain = 'www2'
+      uri.to_s.should == 'http://www2.google.com'
+    end
+
+    it "is blank when none exists" do
+      uri = Addressable::URI.parse("http://google.com")
+      uri.host.should == "google.com"
+      uri.domain.should == "google"
+      uri.tld.should == "com"
+      uri.subdomain.should == ""
+    end
+  end
+
+  describe "#query_hash" do
+    it "supports adding keys to the query" do
+      uri = Addressable::URI.parse("http://www.foo.bar.baz.co.uk/gjadgsg?adg=f")
+      uri.query_hash.should == {'adg' => 'f'}
+      uri.query_hash[:foo] = "bar"
+      uri.to_s.should == "http://www.foo.bar.baz.co.uk/gjadgsg?adg=f&foo=bar"
+    end
+
+    it "supports adding nested values to the query" do
+      uri = Addressable::URI.parse("http://www.amazon.ca")
+      uri.query_hash[:foo] = {:bar => "baz", :sommat => [:else, 1, true, false]}
+      uri.to_s.should == "http://www.amazon.ca?foo[bar]=baz&foo[sommat][]=else&foo[sommat][]=1&foo[sommat][]=true&foo[sommat][]=false"
+    end
+  end
+end

data/spec/addressabler_spec.rb

@@ -1,115 +1,18 @@
-require 'addressabler'
+require "addressabler"
 
 describe Addressabler do
-  it "should still let me parse a URI" do
-    uri = Addressable::URI.parse("http://www.google.com/path?foo=bar#anchor")
-    uri.should be_instance_of(Addressable::URI)
-  end
-
-  it "should get the scheme of a URI" do
-    uri = Addressable::URI.parse("http://www.google.com/path?foo=bar#anchor")
-    uri.scheme.should == "http"
-  end
-
-  describe "TLD parsing" do
-    it "returns a TLD" do
-      uri = Addressable::URI.parse("http://www.google.com/path?foo=bar#anchor")
-      uri.tld.should == 'com'
-    end
-
-    it "knows about complex TLDs" do
-      uri = Addressable::URI.parse("http://www.foo.bar.baz.co.uk/gjadgsg#sdgs?adg=f")
-      uri.tld.should == 'co.uk'
-    end
-
-    it "knows about newer TLDs" do
-      uri = Addressable::URI.parse("http://www.bart-blabla.cc")
-      uri.tld.should == 'cc'
+  describe ".parse_tlds" do
+    it "doesn't return private TLDs by default" do
+      host = 'fwefweewf.blogspot.com'
+      tld = Addressabler.parse_tld(host)
+      tld.should == 'com'
     end
 
-    it "doesn't know non-existing TLDs" do
-      uri = Addressable::URI.parse("http://www.bart-blabla.foobar")
-      uri.tld.should == ''
+    it "can switch private tlds on" do
+      Addressabler.use_private_tlds = true
+      host = 'fwefweewf.blogspot.com'
+      tld = Addressabler.parse_tld(host)
+      tld.should == 'blogspot.com'
     end
-
-    it "accepts custom TLDs" do
-      Addressable::URI.custom_tlds = { 'foobar' => {} }
-      uri = Addressable::URI.parse("http://www.bart-blabla.foobar")
-      uri.tld.should == 'foobar'
-    end
-
-    it "accepts nested custom TLDs" do
-      Addressable::URI.custom_tlds = { 'bar' => { 'foo' => {} } }
-      uri = Addressable::URI.parse("http://www.bart-blabla.foo.bar")
-      uri.tld.should == 'foo.bar'
-    end
-  end
-
-  it "should support adding keys to the query" do
-    uri = Addressable::URI.parse("http://www.foo.bar.baz.co.uk/gjadgsg?adg=f")
-    uri.query_hash.should == {'adg' => 'f'}
-    uri.query_hash[:foo] = "bar"
-    uri.to_s.should == "http://www.foo.bar.baz.co.uk/gjadgsg?adg=f&foo=bar"
-  end
-
-  it "should support adding nested values to the query" do
-    uri = Addressable::URI.parse("http://www.amazon.ca")
-    uri.query_hash[:foo] = {:bar => "baz", :sommat => [:else, 1, true, false]}
-    uri.to_s.should == "http://www.amazon.ca?foo[bar]=baz&foo[sommat][]=else&foo[sommat][]=1&foo[sommat][]=true&foo[sommat][]=false"
-  end
-
-  it "should support subdomains" do
-    uri = Addressable::URI.heuristic_parse("i.am.a.subdomain.co.uk")
-    uri.subdomain.should == "i.am.a"
-  end
-
-  it "should support domains" do
-    uri = Addressable::URI.heuristic_parse("i.am.a.subdomain.co.uk")
-    uri.domain.should == "subdomain"
-  end
-
-  it "should change stuff when the host changes" do
-    uri = Addressable::URI.heuristic_parse("www.google.com")
-    uri.tld.should == 'com'
-    uri.domain.should == 'google'
-    uri.subdomain.should == 'www'
-    uri.host = 'www2.google.co.uk'
-    uri.tld.should == 'co.uk'
-    uri.domain.should == 'google'
-    uri.subdomain.should == 'www2'
-  end
-
-  it "should let me change the subdomain" do
-    uri = Addressable::URI.heuristic_parse("www.google.com")
-    uri.subdomain = 'www2'
-    uri.to_s.should == 'http://www2.google.com'
-  end
-
-  it "should let me change the domain" do
-    uri = Addressable::URI.heuristic_parse("www.google.com")
-    uri.domain = 'amazon'
-    uri.to_s.should == 'http://www.amazon.com'
-  end
-
-  it "should let me change the tld" do
-    uri = Addressable::URI.heuristic_parse("www.google.com")
-    uri.tld = 'co.uk'
-    uri.to_s.should == 'http://www.google.co.uk'
-  end
-
-  it "should handle things with no subdomain" do
-    uri = Addressable::URI.parse("http://google.com")
-    uri.host.should == "google.com"
-    uri.domain.should == "google"
-    uri.tld.should == "com"
-    uri.subdomain.should == ""
-  end
-
-  it "should handle empty strings" do
-    uri = Addressable::URI.parse("")
-    uri.host.should be_nil
-    uri.domain.should be_nil
-    uri.tld.should be_nil
-    uri.subdomain.should be_nil
   end
 end

metadata

@@ -1,65 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: addressabler
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Flip Sasser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.2
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.2
-description: ! "\n    Addressabler extends the Addressable::URI class to provide information
+        version: '0'
+description: "\n    Addressabler extends the Addressable::URI class to provide information
   about, and manipulation of, specific parts of URI strings. It adds a `tld' method,
   a `domain' method,\n    and a `subdomain' method.\n\nIt also allows users to easily
   modify the URL's query values as a hash.\n  "
@@ -74,39 +67,47 @@ files:
 - LICENSE
 - lib/addressabler.rb
 - lib/addressabler/query.rb
+- lib/addressabler/uri.rb
+- lib/addressabler/uri_deprecation.rb
 - lib/tlds
 - README.md
+- spec/addressable/idna_spec.rb
+- spec/addressable/net_http_compat_spec.rb
+- spec/addressable/template_spec.rb
+- spec/addressable/uri_spec.rb
+- spec/addressabler/uri_deprecation_spec.rb
+- spec/addressabler/uri_spec.rb
 - spec/addressabler_spec.rb
 - spec/spec_helper.rb
-- spec/uri_spec.rb
 homepage: http://github.com/flipsasser/addressabler
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -879587546668061627
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An Addressable::URI extension adding support for TLDs and query part editing
 test_files:
+- spec/addressable/idna_spec.rb
+- spec/addressable/net_http_compat_spec.rb
+- spec/addressable/template_spec.rb
+- spec/addressable/uri_spec.rb
+- spec/addressabler/uri_deprecation_spec.rb
+- spec/addressabler/uri_spec.rb
 - spec/addressabler_spec.rb
 - spec/spec_helper.rb
-- spec/uri_spec.rb