resthome 0.6.2 → 0.6.3

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/resthome.rb

@@ -31,12 +31,14 @@ class RESTHome
   # [:expected_status]
   #   Expected status code of the response, will raise InvalidResponse. Can be an array of codes.
   # [:return]
-  #   The method to call or the class to create before method returns.
+  #   The method to call, the class to create or a Proc to call before method returns.
   # [:resource]
   #   The name of the element to return from the response.
   # [:no_body]
   #   Removes the body argument from a post/put route
-  def self.route(name, path, options={})
+  # [:query]
+  #   Default set of query arguments
+  def self.route(name, path, options={}, &block)
     args = path.scan /:[a-z_]+/
     function_args = args.collect{ |arg| arg[1..-1] }
 
@@ -90,6 +92,10 @@ class RESTHome
       end
     end
 
+    if options[:query]
+      method_src << "options[:query] = #{options[:query].inspect}.merge(options[:query] || {})\n"
+    end
+
     method_src << "request :#{method}, path, options\n"
 
     if expected_status
@@ -101,8 +107,12 @@ class RESTHome
     end
 
     return_method = 'nil'
-    if options[:return].nil?
-      return_method = 'nil'
+    if options[:return].nil? || options[:return].is_a?(Proc)
+      block ||= options[:return]
+      if block
+        register_route_block name, block
+        return_method = "self.class.route_blocks['#{name}']"
+      end
     elsif options[:return].is_a?(Class)
       return_method = options[:return].to_s
     else
@@ -249,8 +259,8 @@ class RESTHome
   # Parse an array of Set-cookie headers
   def save_cookies(data)
     @cookies ||= {}
-    data.collect { |cookie| cookie.split("\; ")[0].split('=') }.each do |c|
-      @cookies[c[0]] = c[1]
+    data.delete_if{ |c| c.blank? }.collect { |cookie| parts = cookie.split("\; "); parts[0] ? parts[0].split('=') : nil }.each do |c|
+      @cookies[c[0].strip] = c[1].strip if c && c[0] && c[1]
     end
   end
 
@@ -260,6 +270,20 @@ class RESTHome
     save_cookies!
   end
 
+  def self.route_blocks #:nodoc:
+    {}
+  end
+
+  def self.register_route_block(route, proc) #:nodoc:
+    blocks = self.route_blocks
+    blocks[route.to_s] = proc
+
+    sing = class << self; self; end
+    sing.send :define_method, :route_blocks do 
+      blocks
+    end 
+  end
+
   protected
 
   def _handle_response(response, opts={}, &block) #:nodoc:
@@ -277,6 +301,8 @@ class RESTHome
     if opts[:return]
       if opts[:return].is_a?(Class)
         obj = opts[:return].new obj
+      elsif opts[:return].is_a?(Proc)
+        obj = opts[:return].call obj
       else
         obj = send opts[:return], obj
       end

data/resthome.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resthome}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Doug Youch"]
-  s.date = %q{2010-11-29}
+  s.date = %q{2010-11-30}
   s.description = %q{Simple wrapper class generator for consuming RESTful web services}
   s.email = %q{doug@cykod.com}
   s.extra_rdoc_files = [

data/spec/lib/resthome_spec.rb

@@ -314,4 +314,94 @@ describe RESTHome do
     @service.request_url.should == 'http://test.dev/products.json'
     @service.request_options.should == {}    
   end
+
+  it "should be able to use blocks on the response" do
+    @service_class.route :products, '/products.json', :resource => 'product', :return => Proc.new { |res| res['name'] }
+    @service_class.method_defined?(:products).should be_true
+
+    @service = @service_class.new
+    @service.base_uri = 'http://test.dev'
+
+    fakeweb_response(:get, 'http://test.dev/products.json', 200,
+                     [{'product' => {'id' => 1, 'name' => 'Item1'}}, {'product' => {'id' => 2, 'name' => 'Item2'}}])
+    @names = @service.products
+
+    @names.should == ['Item1', 'Item2']
+    @service.request_method.should == :get
+    @service.request_url.should == 'http://test.dev/products.json'
+    @service.request_options.should == {}    
+  end
+
+  it "should be able to use blocks on the response" do
+    @service_class.route :products, '/products.json', :resource => 'product', :return => lambda { |res| res['name'] }
+    @service_class.method_defined?(:products).should be_true
+
+    @service = @service_class.new
+    @service.base_uri = 'http://test.dev'
+
+    fakeweb_response(:get, 'http://test.dev/products.json', 200,
+                     [{'product' => {'id' => 1, 'name' => 'Item1'}}, {'product' => {'id' => 2, 'name' => 'Item2'}}])
+    @names = @service.products
+
+    @names.should == ['Item1', 'Item2']
+    @service.request_method.should == :get
+    @service.request_url.should == 'http://test.dev/products.json'
+    @service.request_options.should == {}    
+  end
+
+  it "should be able to use blocks on the response" do
+    @service_class.route :products, '/products.json', :resource => 'product' do |res|
+      res['name']
+    end
+    @service_class.method_defined?(:products).should be_true
+
+    @service = @service_class.new
+    @service.base_uri = 'http://test.dev'
+
+    fakeweb_response(:get, 'http://test.dev/products.json', 200,
+                     [{'product' => {'id' => 1, 'name' => 'Item1'}}, {'product' => {'id' => 2, 'name' => 'Item2'}}])
+    @names = @service.products
+
+    @names.should == ['Item1', 'Item2']
+    @service.request_method.should == :get
+    @service.request_url.should == 'http://test.dev/products.json'
+    @service.request_options.should == {}    
+  end
+
+  it "should be able to parse cookies" do
+    @service = RESTHome.new
+    @service.save_cookies [nil, '', "test=1111; path=/; expires=Sat, 30-Nov-2002 00:00:00 GMT", "dev=1", "missing="]
+    @service.cookies['test'].should == '1111'
+    @service.cookies['dev'].should == '1'
+    @service.cookies['missing'].should be_nil
+  end
+
+  it "should be able to setup default query parameters" do
+    @service_class.route :find_songs, '/songs.json', :query => {'search' => 'all'}
+    @service_class.method_defined?(:find_songs).should be_true
+
+    @service = @service_class.new
+    @service.base_uri = 'http://test.dev'
+
+    fakeweb_response(:get, 'http://test.dev/songs.json?search=all', 200, [])
+    @names = @service.find_songs
+
+    @service.request_method.should == :get
+    @service.request_url.should == 'http://test.dev/songs.json'
+    @service.request_options.should == {:query => {'search' => 'all'}}
+
+    fakeweb_response(:get, 'http://test.dev/songs.json?search=test', 200, [])
+    @names = @service.find_songs_by_search 'test'
+
+    @service.request_method.should == :get
+    @service.request_url.should == 'http://test.dev/songs.json'
+    @service.request_options.should == {:query => {'search' => 'test'}}
+
+    fakeweb_response(:get, 'http://test.dev/songs.json?search=test2', 200, [])
+    @names = @service.find_songs :query => {'search' => 'test2'}
+
+    @service.request_method.should == :get
+    @service.request_url.should == 'http://test.dev/songs.json'
+    @service.request_options.should == {:query => {'search' => 'test2'}}
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resthome
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Doug Youch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 -05:00
+date: 2010-11-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency