gorp 0.11.1 → 0.12.0

data/gorp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.11.1"
+  s.version = "0.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = %q{2009-12-07}
+  s.date = %q{2009-12-09}
   s.description = %q{    Enables the creation of scenarios that involve creating a rails project,
     starting and stoppping of servers, generating projects, editing files,
     issuing http requests, running of commands, etc.  Output is captured as

data/lib/gorp.rb

@@ -420,8 +420,8 @@ def get path
   post path, {}
 end
 
-def post path, form
-  $x.pre "get #{path}", :class=>'stdin'
+def post path, form, options={}
+  $x.pre "get #{path}", :class=>'stdin' unless options[:snapget] == false
 
   if path.include? ':'
     host, port, path = URI.parse(path).select(:host, :port, :path)
@@ -433,7 +433,7 @@ def post path, form
     get = Net::HTTP::Get.new(path)
     get['Cookie'] = $COOKIE if $COOKIE
     response = http.request(get)
-    snap response, form
+    snap response, form unless options[:snapget] == false
     $COOKIE = response.response['set-cookie'] if response.response['set-cookie']
 
     if ! form.empty?
@@ -442,7 +442,7 @@ def post path, form
       xform = body.at('//form[.//input[@name="commit"]]')
 
       if !xform
-        # if page isn't one big form, find matching button on page instead
+        # if page isn't one big form, find matching button by action
         require 'cgi'
         query = form.map{|key,val| /[&?]#{key}=#{CGI.escape(val.to_s)}(&|$)/}
         xform = body.search('//form').find do |element|
@@ -450,6 +450,16 @@ def post path, form
         end
       end
 
+      if !xform
+        # if all else fails, find matching button by input values
+        xform = body.search('//form').find do |element|
+          form.all? do |name, value| 
+            element.search("//input[@name=#{name.inspect} and
+                                    @value=#{value.inspect}]")
+          end
+        end
+      end
+
       return unless xform
       path = xform.attribute('action').to_s unless
         xform.attribute('action').to_s.empty?
@@ -480,6 +490,7 @@ def post path, form
       get['Cookie'] = $COOKIE if $COOKIE
       response = http.request(get)
       snap response
+      $COOKIE=response.response['set-cookie'] if response.response['set-cookie']
     end
   end
 end

data/lib/version.rb

@@ -1,8 +1,8 @@
 module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 11
-    TINY  = 1
+    MINOR = 12
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gorp
 version: !ruby/object:Gem::Version 
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 -05:00
+date: 2009-12-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency