ress 0.0.8 → 0.0.9

data/lib/ress/canonical_version.rb

@@ -13,7 +13,6 @@ module Ress
     # Create a tag of this format:
     #  `<link rel="canonical" href="http://www.example.com/page-1" >`
     def link_tag(protocol, fullpath, req_subdomain, view)
-
       view.tag :link, :rel => 'canonical', :href => url(protocol, fullpath, req_subdomain)
     end
 

data/lib/ress/subdomain.rb

@@ -62,21 +62,18 @@ module Ress
       end
 
       def url(protocol, fullpath, subdomain)
-
         fullpath = fullpath[(subdomain.length + 1)..-1] unless subdomain.empty?
         begin
-          if matches?(subdomain)
-            if subdomain.empty?
-              return "#{protocol}#{fullpath}"
-            else
-              return "#{protocol}#{subdomain}.#{fullpath}"
-            end
-
-          end
-          subdomain = subdomain.split('.')[1..-1].join('.')
-        end while(!subdomain.empty?)
+          return build_url(protocol, subdomain, fullpath) if matches?(subdomain)
+        end while( subdomain.slice!(/^[^\.]+\.?/) )
       end
 
+      private
+
+        def build_url(protocol, subdomain, fullpath)
+          subdomain.empty? ? "#{protocol}#{fullpath}" : "#{protocol}#{subdomain}.#{fullpath}"
+        end
+
     end
 
   end

data/lib/ress/version.rb

@@ -1,3 +1,3 @@
 module Ress
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/ress/subdomain_spec.rb

@@ -108,10 +108,10 @@ describe Ress::Subdomain do
       end
 
       it 'can handle empty subdomains' do
-        subdomain = Ress::Subdomain::RegexpSubdomain.new(/^(?!(m|tablet)\.).*$/)
+        subdomain = Ress::Subdomain::RegexpSubdomain.new(/^(?!(m|tablet)).*$/)
         subdomain.matches?('').should be_true
-        subdomain.url('http://', 'somewhere.com/some/stuff', '').should ==
-        'http://somewhere.com/some/stuff'
+        subdomain.url('http://', 'somewhere.com/some/stuff', '').should eq 'http://somewhere.com/some/stuff'
+        subdomain.url('http://', 'm.somewhere.com/some/stuff', 'm').should eq 'http://somewhere.com/some/stuff'
       end
 
     end

metadata

@@ -2,7 +2,7 @@
 name: ress
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Matthew Robertson