url 0.3.1 → 0.3.2

data/lib/url.rb

@@ -22,14 +22,14 @@ files.each { |f| require File.join(File.dirname(__FILE__),'url',f) }
 #   url.subdomain # => ['mail']
 #   url.path   # => '/mail/'
 #   url.hash   # => 'mbox'
-#   
+#
 #   url.subdomain = ['my','mail']
 #   url.params[:foo] = 'bar'
 #   url.to_s   # => 'https://my.mail.google.com/mail/?foo=bar&shva=1#mbox'
 class URL
   extend Forwardable
   attr_reader :string
-  
+
   # The params for the request
   # @returns [URL::ParamsHash]
   attr_reader :params
@@ -41,21 +41,21 @@ class URL
     raise ArgumentError, 'Params must be a URL::ParamsHash' unless p.is_a?(ParamsHash)
     @params = p
   end
-  
+
   # Attributes of the URL which are editable
   # @returns [String]
   attr_accessor :domain, :scheme, :format, :port, :hash
-  
+
   # The path for the request
   # @returns [URL::Path]
   attr_reader :path
-  
+
   # Set the path for the request
   def path=str
     if str.nil? || str.empty?
       str = '/'
     end
-    
+
     @path = str
   end
 
@@ -67,22 +67,22 @@ class URL
     @path << val.sub(/^\//,'')
     @path
   end
-  
+
   # Returns array of subdomains
   # @returns [URL::Subdomain]
   attr_reader :subdomain
   alias_method :subdomains, :subdomain
-  
+
   # @param [Array,String] subdomain An array or string for subdomain
   def subdomain=(s)
     if s.is_a?(String)
       s = s.split('.')
     end
-    
+
     @subdomain = s
   end
   alias_method :subdomains=, :subdomain=
-  
+
   # Creates a new URL object
   # @param [String] URL the starting url to work with
   def initialize str
@@ -93,16 +93,17 @@ class URL
     self.path = sp[5]
     @format = @path.gsub(/(.+\.)/,'')
     @hash = sp[8]
-    
+
     if sp[2]
       host_parts = sp[2].split('.')
-      if host_parts[-2] == 'co'
+      # Detect internationl urls and treat as tld (eg .co.uk)
+      if host_parts[-2] == 'co' and host_parts.length > 2
         @domain = host_parts[-3,3].join('.')
         @subdomain = host_parts.first(host_parts.length-3)
       else
         begin
           @domain = host_parts[-2,2].join('.')
-          @subdomain = host_parts.first(host_parts.length-2) 
+          @subdomain = host_parts.first(host_parts.length-2)
         rescue # if there arent at least 2 parts eg: localhost
           @domain = host_parts.join('.')
         end
@@ -111,7 +112,7 @@ class URL
       @domain = nil
       @subdomain = nil
     end
-    
+
     @params = ParamsHash.new
     if sp[7]
       sp[7].gsub('?','').split('&').each do |myp|
@@ -121,9 +122,9 @@ class URL
       end
     end
   end
-  
+
   def_delegators :@params, :[], :[]=
-  
+
   # The full hostname (not including port) for the URL
   def host
     [@subdomain,@domain].flatten.compact.join('.')
@@ -133,7 +134,7 @@ class URL
   def host_with_port
     host<<':'<<port.to_s
   end
-  
+
   # Outputs the full current url
   # @param [Hash] ops Prevent certain parts of the object from being shown by setting `:scheme`,`:port`,`:path`,`:params`, or `:hash` to `false`
   # @return [String]
@@ -145,33 +146,33 @@ class URL
     if path && ops[:path] != false
       ret << path
     end
-    
+
     ret << params.to_s if params && ops[:params] != false
-    
+
     ret << "##{hash.to_s}" if hash && ops[:hash] != false
-    
+
     ret
   end
-  
+
   # Returns the parsed URI object for the string
   # @return [URI]
   def to_uri
     URI.parse(to_s)
   end
-  
+
   class << self
     # Define the request handler to use. If Typhoeus is setup it will use {TyHandler} otherwise will default back to Net::HTTP with {NetHandler}
     # @return [RequstHandler]
     def req_handler
       return @req_handler if @req_handler
-      
+
       if defined?(Typhoeus)
         URL.req_handler = URL::TyHandler
       else
         URL.req_handler = URL::NetHandler
       end
     end
-    
+
     # Define the request handler to use. If Typhoeus is setup it will use {TyHandler} otherwise will default back to Net::HTTP with {NetHandler}
     # @param [RequstHandler]
     # @return [RequstHandler]
@@ -179,10 +180,10 @@ class URL
       raise ArgumentError, 'Must be a subclass of URL::RequestHandler' unless r.nil? || r < RequestHandler
       @req_handler = r
     end
-    
+
     def json_handler
       return @json_handler if @json_handler
-      
+
       if defined?(Yajl)
         URL.json_handler = URL::YajlHandler
       elsif defined?(JSON)
@@ -191,25 +192,25 @@ class URL
         URL.json_handler = URL::ASJSONHandler
       end
     end
-    
+
     def json_handler=r
       raise ArgumentError, 'Must be a subclass of URL::JSONHandler' unless r.nil? || r < JSONHandler
       @json_handler = r
     end
   end
-  
+
   # Performs a get request for the current URL
   # @return [URL::Response] A subclass of string which also repsonds to a few added mthods storing more information
   def get(*args)
     req_handler.get(*args)
   end
-  
+
   # Performs a post request for the current URL
   # @return [URL::Response] A subclass of string which also repsonds to a few added mthods storing more information
   def post(*args)
     req_handler.post(*args)
   end
-  
+
   # Performs a delete request for the current URL
   # @return [URL::Response] A subclass of string which also repsonds to a few added mthods storing more information
   def delete(*args)
@@ -221,25 +222,25 @@ class URL
   def put(*args)
     req_handler.delete(*args)
   end
-  
+
   def inspect
     "#<#{self.class} #{to_s}>"
   end
-  
+
   def dup
     URL.new(to_s)
   end
-  
-  # The request handler for this 
+
+  # The request handler for this
   # @return [Handler]
   def req_handler
     (@req_handler||self.class.req_handler).new(self)
   end
-  
+
   def =~ reg
     to_s =~ reg
   end
-  
+
   # Sets the handler to use for this request
   # @param [RequstHandler]
   # @return [RequstHandler]
@@ -247,6 +248,6 @@ class URL
     raise ArgumentError, 'Must be a subclass of URL::Handler' unless r < RequestHandler
     @req_handler = r
   end
-  
+
 end
 

data/lib/url/version.rb

@@ -1,3 +1,3 @@
 class URL
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,76 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: url
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.3.2
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Tal Atlas
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-07-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70179099658740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
-  name: rspec
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rake
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *70179099658740
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70179099658320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70179099658320
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70179099657740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 7
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.1
-  name: yard
-  version_requirements: *id003
-description: A simple url object to allow for OO based manipulation and usage of a url
+  type: :development
+  prerelease: false
+  version_requirements: *70179099657740
+description: A simple url object to allow for OO based manipulation and usage of a
+  url
 email: me@tal.by
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - lib/url/accepts_endpoint.rb
 - lib/url/classer.rb
 - lib/url/endpoint.rb
@@ -98,36 +80,26 @@ files:
 - Rakefile
 homepage: http://github.com/talby/url
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: A URL object
 test_files: []
-