superstring 0.0.1 → 0.0.2

data/lib/superstring.rb

@@ -94,23 +94,20 @@ class ::String
     safer
   end
 
-  DOMAIN_SEGMENT_PATTERN = "[a-z0-9][a-z0-9-]+"
-  URI_PATTERN =
-    %r{
-      ^
-      \s*                                   # optional leading whitespace
-      (?:[a-z]+:)?                          # optional protocol, eg http:
-      //                                    # required //
-      (?:www\.)?                            # 'www.' is ignored
-      (
-        #{DOMAIN_SEGMENT_PATTERN}           # first domain segment
-        (?:\.#{DOMAIN_SEGMENT_PATTERN})+    # one or more additional domain segments
-      )
-      (?:/|$)                               # followed by a '/' or end of line
-    }ix
-
   def domain
-    match(URI_PATTERN).to_a[1]
+    host_without_www
+  end
+
+  def host_without_www
+    host.gsub(/^www./, '') if host
+  end
+
+  def host
+    uri.host if uri
+  end
+
+  def uri
+    URI.parse self rescue nil
   end
 
   def strip_lines!

data/lib/superstring/version.rb

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

data/spec/superstring_spec.rb

@@ -46,29 +46,32 @@ describe ::String do
     it { "\n\nfoo\nbar\n\n".compact_whitespace.should == "foo bar" }
   end
 
-  describe "#domain" do
-    it { "http://mediawiki.org".domain.should == "mediawiki.org"}
-    it { "http://mediawiki.org/".domain.should == "mediawiki.org"}
-    it { "http://mediawiki.org/foo.html".domain.should == "mediawiki.org"}
-    it { "https://mediawiki.org/".domain.should == "mediawiki.org"}
-    it { "gopher://mediawiki.org/".domain.should == "mediawiki.org"}
-    it { "anyprotocol://mediawiki.org/".domain.should == "mediawiki.org"}
-    it { "//mediawiki.org/".domain.should == "mediawiki.org"}
+  describe "#host" do
+    it { "http://mediawiki.org".host.should == "mediawiki.org"}
+    it { "http://mediawiki.org/".host.should == "mediawiki.org"}
+    it { "http://mediawiki.org/foo.html".host.should == "mediawiki.org"}
+    it { "https://mediawiki.org/".host.should == "mediawiki.org"}
+    it { "gopher://mediawiki.org/".host.should == "mediawiki.org"}
+    it { "anyprotocol://mediawiki.org/".host.should == "mediawiki.org"}
+    it { "//mediawiki.org/".host.should == "mediawiki.org"}
     context "subdomains" do
-      it { "http://www.mediawiki.org/".domain.should == "mediawiki.org"}
-      it { "http://dance.dance.mediawiki.org/".domain.should == "dance.dance.mediawiki.org"}
-      it { "http://dance-dance-.mediawiki.org/".domain.should == "dance-dance-.mediawiki.org"}
-      it { "http://www.dance.dance.mediawiki.org/".domain.should == "dance.dance.mediawiki.org"}
+      it { "http://www.mediawiki.org/".host.should == "www.mediawiki.org"}
+      it { "http://dance.dance.mediawiki.org/".host.should == "dance.dance.mediawiki.org"}
+      it { "http://dance-dance-.mediawiki.org/".host.should == "dance-dance-.mediawiki.org"}
+      it { "http://www.dance.dance.mediawiki.org/".host.should == "www.dance.dance.mediawiki.org"}
     end
     context "invalid URIs" do
-      it { "".domain.should == nil }
-      it { "/mediawiki.org".domain.should == nil }
-      it { "http://mediawiki.org~~~".domain.should == nil }
-      it { "http://-illegal-subdomain.mediawiki.org".domain.should == nil }
-      it { "http://-illegal-subdomain.mediawiki.org".domain.should == nil }
+      it { "".host.should == nil }
+      it { "/mediawiki.org".host.should == nil }
+      it { "http://mediawiki.org~~~".host.should == nil }
     end
   end
 
+  describe "#host_without_www, #domain" do
+    it { "http://www.mediawiki.org/".host_without_www.should == "mediawiki.org"}
+    it { "http://www.mediawiki.org/".domain.should == "mediawiki.org"}
+  end
+
   describe "#slug" do
     context "slugs safe for file names, and (arguably) URLs" do
       it { "".slug(:page).should == "" }
@@ -137,4 +140,11 @@ describe ::String do
     it { "".in?(nil).should == false }
   end
 
-end
+  # Note: we don't define this method; it's from the shellescape standard ruby library
+  describe "#shellescape" do
+    it {"Nahko-Bear-(Medicine-for-the-People)-ღ-Aloha-Ke-Akua-ღ".shellescape.should ==
+      "Nahko-Bear-\\(Medicine-for-the-People\\)-\\ღ-Aloha-Ke-Akua-\\ღ" }
+  end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superstring
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport