url 0.1.2 → 0.2.0

data/README.rdoc

@@ -33,7 +33,7 @@ You can quickly and easily make requests from those urls without having to worry
 A {URL::Response} object is returned from {URL#post}, {URL#get}, or {URL#delete}. This is basically a string with a few additional methods including:
 
 The time the request took in seconds
-The http code of the response and whether the request was successful or not (code == 200).
+The http code of the response and whether the request was successful or not (code == 2xx).
 
   response.time     # => 1.6
   response.code     # => 200
@@ -52,10 +52,35 @@ You can make GET, POST, or DELETE requests without doing any special formatting.
   url.params.delete(:message)
   url.delete
 
+=== JSON
+
+If you've initialized the Yajl, JSON, or Active Service gems you can call .json on any response object.
+
+  url = URL.new('https://graph.facebook.com/37901410')
+  url.get.json # => => {"name"=>"Tal Atlas", "gender"=>"male", "id"=>"37901410", "last_name"=>"Atlas", "locale"=>"en_US", "link"=>"http://www.facebook.com/talatlas", "first_name"=>"Tal"}
+
+=== Make Custom Objects
+
+Make objects designed around specific urls
+
+  class FacebookURL < URL('http://www.facebook.com/__test_me__/foo/__test_again__')
+    allow_changed :subdomain
+    allow_params :foo, :bar
+  end
+
+This will create a FacebookURL object where you can only change the subdomain, the params foo and bar, and the parts of the paths tagged
+test_me and test_again. This object has the getters and setters: subdomain, foo, bar, test_me, and test_again. You can then call .to_s,
+.get, .post, or .delete.
+
+The object has an instance variable defined as @url which is a url object you can manipulate.
+
 == TODO
+* Fast Dup method
 * More Documentation
 * More specs
 * Make faster
+* JSON support
+* More robust subdomain/path methods
 
 == Note on Patches/Pull Requests
  

data/Rakefile

@@ -10,23 +10,17 @@ begin
     gem.email = "me@tal.by"
     gem.homepage = "http://github.com/talby/url"
     gem.authors = ["Tal Atlas"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "rspec", "~> 2.0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
 task :spec => :check_dependencies

data/VERSION.yml

@@ -1,5 +1,4 @@
----
+--- 
+:minor: 2
+:patch: 0
 :major: 0
-:minor: 1
-:patch: 2
-:build: 

data/lib/url/classer.rb

@@ -0,0 +1,107 @@
+module URL::Classer
+  VAR_MATCHER = /__([A-Za-z]?[A-Za-z_]*[A-Za-z])__/
+  
+  module ClassMethods
+    def allowed_params
+      @allowed_params ||= []
+    end
+  private
+    def allow_changed *args
+      args.flatten!
+      def_delegators :@url, :subdomains if args.include?(:subdomain)
+      def_delegators :@url, :subdomain  if args.include?(:subdomains)
+      def_delegators :@url, :[], :[]=   if args.include?(:params)
+      def_delegators :@url, *args
+    end
+    
+    def allow_params *args
+      args.flatten.each do |arg|
+        arg = arg.to_sym
+        self.allowed_params << arg
+        define_method arg do
+          @url.params[arg]
+        end
+        
+        define_method "#{arg}=" do |val|
+          @url.params[arg] = val
+        end
+      end
+    end
+    
+    def overrideable_path_val v
+      v = v.to_s.downcase
+      define_method v do
+        @var_map[v]
+      end
+      
+      define_method "#{v}=" do |val|
+        @var_map[v] = val
+        
+        p = self.class.const_get(:URL).path.dup
+        
+        @var_map.each do |key,value|
+          p.gsub!("__#{key}__", value.to_s)
+        end
+        
+        @url.path = p
+        
+        val
+      end
+    end
+    
+  end
+  
+  module InstanceMethods
+    def initialize(opts={})
+      @url = self.class.const_get(:URL).dup
+      
+      @var_map = {}
+      
+      opts.each do |op,v|
+        send("#{op}=",v)
+      end
+    end
+    
+    def to_s
+      @url.to_s
+    end
+    
+    def dup
+      n_url = @url.dup
+      n = super
+      n.instance_variable_set(:@url, n_url)
+      n
+    end
+    
+  end
+  
+  def self.included(receiver)
+    receiver.extend         Forwardable
+    receiver.send :def_delegators, :@url, :get, :post, :delete, :inspect
+    
+    receiver.extend         ClassMethods
+    receiver.send :include, InstanceMethods
+  end
+end
+
+def URL url
+  if url.is_a?(URL)
+    url = url.dup
+  else
+    url = ::URL.new(url)
+  end
+  
+  klass = Class.new do
+    include URL::Classer
+    
+    vars = url.path.scan(URL::Classer::VAR_MATCHER).flatten
+    
+    vars.each do |var|
+      overrideable_path_val(var)
+    end
+  end
+  
+  klass.const_set(:URL, url.freeze)
+  
+  klass
+end

data/lib/url/handlers/as_json_handler.rb

@@ -0,0 +1,9 @@
+class URL
+  class ASJSONHandler < JSONHandler
+    
+    def parse
+      ActiveSupport::JSON.decode(@str)
+    end
+    
+  end
+end

data/lib/url/handlers/base_json_handler.rb

@@ -0,0 +1,9 @@
+class URL
+  class BaseJSONHandler < JSONHandler
+    
+    def parse
+      JSON.parse(@str)
+    end
+    
+  end
+end

data/lib/url/handlers/net_handler.rb

@@ -0,0 +1,59 @@
+class URL
+  # Net::HTTP Handler
+  class NetHandler < RequestHandler
+    def get(args={})
+      http = http_obj
+      request = Net::HTTP::Get.new(make_path + url.params.to_s)
+      t = Time.now
+      resp = http.request(request)
+      make_str(resp,Time.now-t)
+    end
+    
+    def post(args={})
+      http = http_obj
+      request = Net::HTTP::Post.new(make_path)
+      request.set_form_data(url.params)
+      t = Time.now
+      resp = http.request(request)
+      make_str(resp,Time.now-t)
+    end
+    
+    def delete(args={})
+      http = http_obj
+      request = Net::HTTP::Delete.new(make_path + url.params.to_s)
+      t = Time.now
+      resp = http.request(request)
+      make_str(resp,Time.now-t)
+    end
+    
+  private
+  
+    def make_path
+      url.path
+    end
+    
+    def make_str(resp,time)
+      hsh = {
+        :code => resp.code.to_i,
+        :time => time,
+        :body => resp.body,
+        :response => resp,
+        :url => url.to_s
+      }
+      
+      Response.new(hsh)
+    end
+    
+    def http_obj
+      uri = url.to_uri
+      http = Net::HTTP.new(uri.host,uri.port)
+      
+      if url.scheme == 'https'
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+      
+      http
+    end
+  end
+end

data/lib/url/handlers/ty_handler.rb

@@ -0,0 +1,37 @@
+class URL
+  # Typhoeus handler
+  class TyHandler < RequestHandler
+    
+    def get(args={})
+      resp = Typhoeus::Request.get(url.to_s)
+      
+      make_str(resp)
+    end
+    
+    def post(args={})
+      resp = Typhoeus::Request.post(url.to_s(:params => false), :params => url.params)
+      
+      make_str(resp)
+    end
+    
+    def delete(args={})
+      resp = Typhoeus::Request.delete(url.to_s)
+      make_str(resp)
+    end
+    
+  private
+    
+    def make_str(resp)
+      hsh = {
+        :code => resp.code,
+        :time => resp.time,
+        :body => resp.body,
+        :response => resp,
+        :url => url.to_s
+      }
+      
+      Response.new(hsh)
+    end
+    
+  end
+end

data/lib/url/handlers/yajl_handler.rb

@@ -0,0 +1,13 @@
+class URL
+  class YajlHandler < JSONHandler
+    
+    def parse
+      parser.parse(@str.to_s)
+    end
+    
+  private
+    def parser
+      @parser ||= Yajl::Parser.new
+    end
+  end
+end

data/lib/url/handlers.rb

@@ -13,100 +13,37 @@ class URL
   #     :url => url.to_s
   #   }
   #   Response.new(hsh)
-  class Handler
+  class RequestHandler
     attr_reader :url
     def initialize(url)
       @url = url
     end
-  end
-  
-  # Typhoeus handler
-  class TyHandler < Handler
     
     def get(args={})
-      resp = Typhoeus::Request.get(url.to_s)
-      
-      make_str(resp)
+      raise Exception, "You need to implement #{self.class}#get"
     end
     
     def post(args={})
-      resp = Typhoeus::Request.post(url.to_s(:params => false), :params => url.params)
-      
-      make_str(resp)
+      raise Exception, "You need to implement #{self.class}#post"
     end
     
-    def delete
-      resp = Typhoeus::Request.delete(url.to_s)
-      make_str(resp)
-    end
-    
-  private
-    
-    def make_str(resp)
-      hsh = {
-        :code => resp.code,
-        :time => resp.time,
-        :body => resp.body,
-        :response => resp,
-        :url => url.to_s
-      }
-      
-      Response.new(hsh)
+    def delete(args={})
+      raise Exception, "You need to implement #{self.class}#delete"
     end
-    
   end
   
-  # Net::HTTP Handler
-  class NetHandler < Handler
-    def get(args={})
-      http = http_obj
-      request = Net::HTTP::Get.new(url.path + url.params.to_s)
-      t = Time.now
-      resp = http.request(request)
-      make_str(resp,Time.now-t)
+  class JSONHandler
+    attr_reader :str
+    def initialize(str)
+      @str = str
     end
     
-    def post(args={})
-      http = http_obj
-      request = Net::HTTP::Post.new(url.path)
-      request.set_form_data(url.params)
-      t = Time.now
-      resp = http.request(request)
-      make_str(resp,Time.now-t)
+    def parse
+      raise Exception, "You need to implement #{self.class}#parse"
     end
     
-    def delete(args={})
-      http = http_obj
-      request = Net::HTTP::Delete.new(url.path + url.params.to_s)
-      t = Time.now
-      resp = http.request(request)
-      make_str(resp,Time.now-t)
-    end
-    
-  private
-    
-    def make_str(resp,time)
-      hsh = {
-        :code => resp.code.to_i,
-        :time => time,
-        :body => resp.body,
-        :response => resp,
-        :url => url.to_s
-      }
-      
-      Response.new(hsh)
-    end
-    
-    def http_obj
-      uri = url.to_uri
-      http = Net::HTTP.new(uri.host,uri.port)
-      
-      if url.scheme == 'https'
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-      
-      http
-    end
   end
-end
+  
+end
+
+Dir[File.join(File.dirname(__FILE__),'handlers','*.rb')].each {|f| require f}

data/lib/url/helper_classes.rb

@@ -1,68 +1,50 @@
-require "delegate"
-
 class URL
   
-  # The Response class is a deleegate to string which also contains metadata about the request.
-  # These methods are also available
-  # * body
-  # * code - http code
-  # * response - the original response object from whatever handler you chose
-  # * time - time taken to make call
-  # * success? - whether the http code is 200
-  # * url - the URL the object was gotten from
-  class Response < DelegateClass(String)
-    # The time taken for the request
-    # @returns [Integer]
-    attr_reader :time
-    
-    # The http code return
-    # @returns [Integer] eg. 200, 404, 500, 503
-    attr_reader :code
-    
-    # The response object generated by the handler
-    # @returns [Net::HTTPResponse,Typhoeus::Response]
-    attr_reader :response
-    
-    # The url which generated this response
-    # @returns [String]
-    attr_reader :url
-    
-    # @param [String] body The body of the response object, main string
-    # @param [Hash] args Additional arguments: :time,:code,:response,:url
-    def initialize(str,args={})
-      if str.is_a?(Hash)
-        args = str
-        str = args[:body]
-      end
-      
-      raise unless str
-      super(str)
-      args.each do |key, value|
-        instance_variable_set "@#{key}", value
-      end
+  # A hash where all keys are symbols
+  class Mash < Hash
+    # Set the value of a param
+    def []=(k,v)
+      k = k.to_s.to_sym unless k.is_a?(Symbol)
+      super(k,v)
     end
     
-    # Compares {Response#code} to 200
-    # @returns [true,false]
-    def success?
-      return @successful if @successful
-      
-      code == 200
+    # Read the value of a param
+    def [](k)
+      k = k.to_s.to_sym unless k.is_a?(Symbol)
+      super(k)
     end
   end
   
-  class ParamsHash < Hash
+  class ParamsHash < Mash
     
     # Merges the array into a parameter string of the form <tt>?key=value&foo=bar</tt>
     def to_s
       return '' if empty?
       '?' + to_a.inject(Array.new) do |ret,param|
-        val = param[1].to_s
-        
-        val = CGI.escape(val)# if val =~ /(\/|\?|\s)/
+        key = param[0].to_s
+        val = param[1]
         
         if param && val
-          ret << %{#{param[0].to_s}=#{val}}
+          if val.is_a?(Hash)
+            # TODO: Make this recusrive
+            val.each do |param_key,param_val|
+              param_key = CGI.escape("#{key}[#{param_key}]")
+              param_val = CGI.escape(param_val.to_s)
+              ret << %Q{#{param_key}=#{param_val}}
+            end
+          elsif val.is_a?(Array)
+            # TODO: Make this recusrive
+            val.each_with_index do |param_val,i|
+              param_key = CGI.escape("#{key}[]")
+              param_val = CGI.escape(param_val.to_s)
+              ret << %Q{#{param_key}=#{param_val}}
+            end
+          else
+            val = val.to_s
+
+            val = CGI.escape(val)# if val =~ /(\/|\?|\s)/
+            ret << %{#{param[0].to_s}=#{val}}
+          end
         elsif param
           ret << param[0].to_s
         end

data/lib/url/response.rb

@@ -0,0 +1,60 @@
+require "delegate"
+
+class URL
+  
+  # The Response class is a deleegate to string which also contains metadata about the request.
+  # These methods are also available
+  # * body
+  # * code - http code
+  # * response - the original response object from whatever handler you chose
+  # * time - time taken to make call
+  # * success? - whether the http code is 2xx
+  # * url - the URL the object was gotten from
+  class Response < DelegateClass(String)
+    # The time taken for the request
+    # @returns [Integer]
+    attr_reader :time
+    
+    # The http code return
+    # @returns [Integer] eg. 200, 404, 500, 503
+    attr_reader :code
+    
+    # The response object generated by the handler
+    # @returns [Net::HTTPResponse,Typhoeus::Response]
+    attr_reader :response
+    
+    # The url which generated this response
+    # @returns [String]
+    attr_reader :url
+    
+    # @param [String] body The body of the response object, main string
+    # @param [Hash] args Additional arguments: :time,:code,:response,:url
+    def initialize(str,args={})
+      if str.is_a?(Hash)
+        args = str
+        str = args[:body]
+      end
+      
+      raise unless str
+      super(str)
+      args.each do |key, value|
+        instance_variable_set "@#{key}", value
+      end
+    end
+    
+    # Compares {Response#code} to 2xx
+    # @returns [true,false]
+    def success?
+      return @successful if @successful
+      
+      (200..299).include?(code)
+    end
+    
+    def json
+      raise StandardError, 'No JSON library initialized' unless URL.json_handler
+      URL.json_handler.new(self).parse
+    end
+    
+  end
+  
+end

data/lib/url.rb

@@ -2,8 +2,11 @@ require "net/http"
 require "net/https"
 require 'uri'
 require 'cgi'
+require 'forwardable'
 
-files = Dir.glob(File.join(File.dirname(__FILE__),'url','**','*.rb'))
+
+files = Dir.glob(File.join(File.dirname(__FILE__),'url','*.rb'))
+files.delete_if {|f| f =~ /url\/(classer)\.rb/}
 files.each { |f| require f }
 
 # Main class for managing urls
@@ -20,12 +23,45 @@ files.each { |f| require f }
 #   url.params[:foo] = 'bar'
 #   url.to_s   # => 'https://my.mail.google.com/mail/?foo=bar&shva=1#mbox'
 class URL
-  attr_reader :string, :params
+  extend Forwardable
+  attr_reader :string
+  
+  # The params for the request
+  # @returns [URL::ParamsHash]
+  attr_reader :params
   
   # Attributes of the URL which are editable
-  attr_accessor :subdomain, :domain, :path, :scheme, :format, :port, :hash
+  # @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
+  
+  # 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
@@ -33,7 +69,7 @@ class URL
     sp = URI.split(@string)
     @scheme = sp[0]
     @port = sp[3]
-    @path = sp[5]
+    self.path = sp[5]
     @format = @path.gsub(/(.+\.)/,'')
     @hash = sp[8]
     
@@ -54,18 +90,20 @@ class URL
       @domain = nil
       @subdomain = nil
     end
+    
+    @params = ParamsHash.new
     if sp[7]
-      @params = sp[7].gsub('?','').split('&').inject(ParamsHash.new) do |result,param|
-        key,value = param.split('=')
+      sp[7].gsub('?','').split('&').each do |myp|
+        key,value = myp.split('=')
         value = CGI.unescape(value) if value
-        result[key.to_sym] = value if key
-        result
+        @params[key.to_sym] = value if key
       end
-    else
-      @params = ParamsHash.new
     end
   end
   
+  def_delegators :@params, :[], :[]=
+  
+  # The full hostname (not including port) for the URL
   def host
     [@subdomain,@domain].flatten.compact.join('.')
   end
@@ -97,8 +135,41 @@ class URL
   
   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 [Handler]
-    attr_accessor :req_handler
+    # @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]
+    def req_handler=r
+      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)
+        URL.json_handler = URL::BaseJSONHandler
+      elsif defined?(ActiveSupport::JSON)
+        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
@@ -120,18 +191,30 @@ class URL
   end
   
   def inspect
-    "#<URL #{to_s}>"
+    "#<#{self.class} #{to_s}>"
   end
   
-  if defined?(Typhoeus)
-    URL.req_handler = TyHandler
-  else
-    URL.req_handler = NetHandler
+  def dup
+    URL.new(to_s)
   end
   
-private
+  # The request handler for this 
+  # @return [Handler]
   def req_handler
-    self.class.req_handler.new(self)
+    (@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]
+  def req_handler=r
+    raise ArgumentError, 'Must be a subclass of URL::Handler' unless r < RequestHandler
+    @req_handler = r
+  end
+  
 end
 

data/spec/classer_spec.rb

@@ -0,0 +1,66 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'url/classer'
+
+describe "URL()" do
+  
+  before(:all) do
+    class FacebookURL < URL('http://www.facebook.com/__test_me__/foo/__test_again__')
+      allow_changed :subdomain
+      allow_params :foo, :bar
+    end
+  end
+  
+  it "should create a class" do
+    url = 'http://www.facebook.com'
+    lambda {class FacebookURL2 < URL(url); end}.should_not raise_error
+    
+    FacebookURL2.new.to_s.should == 'http://www.facebook.com/'
+    FacebookURL2.new.should be_a(URL::Classer)
+  end
+  
+  context '.new' do
+    subject {FacebookURL.new}
+    
+    it "shoud work like whatever" do
+      subject.subdomain << 'us'
+      subject.to_s.should =~ /^http:\/\/www\.us\.facebook.com/
+    
+      u = FacebookURL.new
+      u.to_s.should =~ /^http:\/\/www\.facebook.com/
+    end
+  
+    it "should dup" do
+      subject.subdomain << 'us'
+      d = subject.dup
+      d.subdomain.should == ['www','us']
+      
+      d.subdomain << '1'
+      d.subdomain.should == ['www','us','1']
+      subject.subdomain.should == ['www','us']
+    end
+    
+    it "should allow params" do
+      subject.foo = 1
+      subject.foo.should == 1
+      subject.to_s.should =~ /foo=1/
+    end
+    
+    it "should set vars" do
+      subject.test_me = 'foobar'
+      subject.test_me.should == 'foobar'
+      
+      subject.test_again = 'abc'
+      subject.to_s.should == "http://www.facebook.com/foobar/foo/abc"
+      
+      subject.test_again = 'aaa'
+      subject.to_s.should == "http://www.facebook.com/foobar/foo/aaa"
+    end
+    
+    it "should set vars in create" do
+      u = FacebookURL.new(:test_me => 'foobar', :test_again => 'abc')
+      
+      u.to_s.should == "http://www.facebook.com/foobar/foo/abc"
+    end
+  end
+  
+end

data/spec/handler_spec.rb

@@ -0,0 +1,69 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+shared_examples_for "all requests" do
+  it "should work" do
+    @resp.should be_success
+  end
+  
+  it "should have a response of the correct class" do
+    @resp.response.should be_a(@resp_class)
+  end
+  
+  it "shoudl have all attribures" do
+    @resp.time.should be_a(Float)
+    @resp.code.should be_a(Integer)
+    @resp.url.should be_a(String)
+  end
+end
+
+shared_examples_for "all builds" do
+  
+  
+  before do
+    @url = URL.new('http://www.omgpop.com')
+  end
+  
+  describe "#get" do
+    before do
+      @resp = @url.get
+    end
+    it_should_behave_like "all requests"
+  end
+  
+  describe "#post" do
+    before do
+      @resp = @url.post
+    end
+    it_should_behave_like "all requests"
+  end
+  
+  describe "#delete" do
+    before do
+      @resp = @url.delete
+    end
+    it_should_behave_like "all requests"
+  end
+end
+
+describe "Typhoeus", URL do
+  before(:all) do
+    require 'typhoeus'
+    URL.req_handler = URL::TyHandler
+    @resp_class = Typhoeus::Response
+  end
+  
+  it_should_behave_like "all builds"
+  
+end
+
+
+describe "Net::HTTP", URL do
+  before(:all) do
+    require 'net/http'
+    URL.req_handler = URL::NetHandler
+    @resp_class = Net::HTTPResponse
+  end
+  
+  it_should_behave_like "all builds"
+  
+end

data/spec/json_spec.rb

@@ -0,0 +1,13 @@
+require 'json'
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe URL do
+  context "A json response" do
+    subject { URL.new('https://graph.facebook.com/37901410') }
+    
+    it "should parse json" do
+      subject.get.json.should be_a(Hash)
+    end
+  end
+  
+end

data/spec/spec_helper.rb

@@ -1,9 +1,5 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'url'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 
-Spec::Runner.configure do |config|
-  
-end

data/spec/url_spec.rb

@@ -28,7 +28,11 @@ describe URL do
   
   describe '#to_s' do
     it "should roundtrip" do
-      @url.to_s.should == 'https://mail.google.com:8080/foo/bar/baz?q=one&foo=bar'
+      s = @url.to_s
+      s.should include 'https://mail.google.com:8080/foo/bar/baz?'
+      s.should include 'q=one'
+      s.should include 'foo=bar'
+      s.should include '&'
     end
     
     it "should change and add params" do
@@ -46,72 +50,80 @@ describe URL do
     end
   end
   
-end
-
-shared_examples_for "all requests" do
-  it "should work" do
-    @resp.should be_success
-  end
-  
-  it "should have a response of the correct class" do
-    @resp.response.should be_a(@resp_class)
-  end
   
-  it "shoudl have all attribures" do
-    @resp.time.should be_a(Float)
-    @resp.code.should be_a(Integer)
-    @resp.url.should be_a(String)
+  it "should should modify params easily" do
+    @url[:foo] = '123'
+    @url['foo'].should == '123'
+    @url.to_s.should include('foo=123')
+    
+    @url['foo'] = '345'
+    @url[:foo].should == '345'
+    @url.to_s.should include('foo=345')
   end
-end
-
-shared_examples_for "all builds" do
   
-  
-  before do
-    @url = URL.new('http://www.omgpop.com/')
+  it "should should accept arbitrary req handlers" do
+    class TestReq < URL::TyHandler; end
+    @url.req_handler = TestReq
+    @url.req_handler.should be_a(URL::RequestHandler)
+    @url.req_handler.should be_instance_of(TestReq)
   end
   
-  describe "#get" do
-    before do
-      @resp = @url.get
-    end
-    it_should_behave_like "all requests"
+  it "should should make sure there's always a path" do
+    @url.path = nil
+    @url.path.should == '/'
+    
+    @url.path = ''
+    @url.path.should == '/'
   end
   
-  describe "#post" do
-    before do
-      @resp = @url.post
-    end
-    it_should_behave_like "all requests"
+  it "should match =~" do
+    (@url =~ /mail\.google\.com/).should == (@url.to_s =~ /mail\.google\.com/)
   end
   
-  describe "#delete" do
-    before do
-      @resp = @url.delete
-    end
-    it_should_behave_like "all requests"
-  end
 end
 
-describe "Typhoeus", URL do
-  before(:all) do
-    require 'typhoeus'
-    URL.req_handler = URL::TyHandler
-    @resp_class = Typhoeus::Response
+describe URL::ParamsHash, '#to_s' do
+  it "should make a param string" do
+    hsh = URL::ParamsHash.new
+    
+    hsh[:foo] = 'bar'
+    hsh[1] = 2
+    
+    str = hsh.to_s
+    
+    # str.should match(/^?/)
+    str.should include('foo=bar')
+    str.should include('1=2')
   end
   
-  it_should_behave_like "all builds"
-  
-end
-
-
-describe "Net::HTTP", URL do
-  before(:all) do
-    require 'net/http'
-    URL.req_handler = URL::NetHandler
-    @resp_class = Net::HTTPResponse
-  end\
-  
-  it_should_behave_like "all builds"
+  it "should make a param string with an array or hash" do
+    hsh = URL::ParamsHash.new
+    
+    hsh[:test] = [*1..3]
+    hsh[:hash] = {:one => 1, :two => 2}
+    
+    str = hsh.to_s
+    
+    str.should include CGI.escape('hash[one]')+'=1'
+    str.should include CGI.escape('hash[two]')+'=2'
+    str.should include CGI.escape('test[]')+'=1'
+    str.should include CGI.escape('test[]')+'=2'
+    str.should include CGI.escape('test[]')+'=3'
+  end
   
+  it "should recursively make objects" do
+    pending('implementation')
+    hsh = URL::ParamsHash.new
+    
+    hsh[:test] = [{:foo => 'bar', :bar => 'baz'},{:foo => 'baz'}]
+    hsh[:hash] = {:one => {'o' => 1}, :two => 2}
+    
+    str = hsh.to_s
+    
+    str.should include CGI.escape('test[][foo]')+'=bar'
+    str.should include CGI.escape('test[][bar]')+'=baz'
+    str.should include CGI.escape('test[][foo]')+'=baz'
+    str.should include CGI.escape('hash[one][o]')+'=1'
+    str.should include CGI.escape('hash[two]')+'=2'
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: url
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tal Atlas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 -05:00
+date: 2011-01-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 0
+        version: "2.0"
   type: :development
   version_requirements: *id001
 description: A simple url object to allow for OO based manipulation and usage of a url
@@ -45,14 +44,23 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION.yml
 - lib/url.rb
+- lib/url/classer.rb
 - lib/url/handlers.rb
+- lib/url/handlers/as_json_handler.rb
+- lib/url/handlers/base_json_handler.rb
+- lib/url/handlers/net_handler.rb
+- lib/url/handlers/ty_handler.rb
+- lib/url/handlers/yajl_handler.rb
 - lib/url/helper_classes.rb
+- lib/url/response.rb
+- spec/classer_spec.rb
+- spec/handler_spec.rb
+- spec/json_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/url_spec.rb
@@ -61,8 +69,8 @@ homepage: http://github.com/talby/url
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -91,5 +99,8 @@ signing_key:
 specification_version: 3
 summary: A URL object
 test_files: 
+- spec/classer_spec.rb
+- spec/handler_spec.rb
+- spec/json_spec.rb
 - spec/spec_helper.rb
 - spec/url_spec.rb

data/.gitignore

@@ -1,24 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-.yardoc/*
-.yard/*
-doc/*