gorp 0.12.0 → 0.13.0

data/gorp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.12.0"
+  s.version = "0.13.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-09}
+  s.date = %q{2009-12-12}
   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

@@ -10,6 +10,7 @@ require 'builder'
 require 'stringio'
 require 'gorp/env'
 require 'time'
+require 'cgi'
 
 require 'rbconfig'
 $ruby = File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])
@@ -200,7 +201,6 @@ def irb file
 end
 
 def edit filename, tag=nil
-  log :edit, filename
   $x.pre "edit #{filename}", :class=>'stdin'
 
   stale = File.mtime(filename) rescue Time.now-2
@@ -209,6 +209,10 @@ def edit filename, tag=nil
 
   begin
     yield data
+
+    now = Time.now
+    usec = now.usec/1000000.0
+    sleep 1-usec if now-usec <= stale
     open(filename,'w') {|file| file.write data}
     File.utime(stale+2, stale+2, filename) if File.mtime(filename) <= stale
 
@@ -221,6 +225,8 @@ def edit filename, tag=nil
     tag = nil
 
   ensure
+    log :edit, filename
+
     include = tag.nil?
     hilight = false
     data.split("\n").each do |line|
@@ -413,7 +419,7 @@ def snap response, form={}
       $x << child.to_xml unless child.instance_of?(Comment)
     end
   end
-  $x.div :style => "clear: both"
+  $x.div '', :style => "clear: both"
 end
 
 def get path
@@ -439,28 +445,36 @@ def post path, form, options={}
     if ! form.empty?
       body = xhtmlparse(response.body).at('//body')
       body = xhtmlparse(response.body).root unless body
-      xform = body.at('//form[.//input[@name="commit"]]')
-
-      if !xform
-        # 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|
-          query.all? {|kv| element.attribute('action').to_s =~ kv}
-        end
+      xforms = body.search('//form')
+
+      # find matching button by action
+      xform = xforms.find do |element|
+        next unless element.attribute('action').to_s.include?('?')
+        query = CGI.parse(URI.parse(element.attribute('action').to_s).query)
+        query.all? {|key,values| values.include?(form[key].to_s)}
       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}]")
+      # find matching button by input names
+      xform ||= xforms.find do |element|
+        form.all? do |name, value| 
+          element.search('.//input | .//textarea | ..//select').any? do |input|
+            input.attribute('name').to_s==name.to_s
           end
         end
       end
 
+      # match based on action itself
+      xform ||= xforms.find do |element|
+        form.all? do |name, value| 
+          element.attribute('action').to_s.include?(path)
+        end
+      end
+
+      # look for a commit button
+      xform ||= xforms.find {|element| element.at('.//input[@name="commit"]')}
+
       return unless xform
+
       path = xform.attribute('action').to_s unless
         xform.attribute('action').to_s.empty?
       $x.pre "post #{path}", :class=>'stdin'
@@ -469,10 +483,11 @@ def post path, form, options={}
         form.each do |name, value|
           $x.li "#{name} => #{value}"
         end
-      end
 
-      body.search('//input[@type="hidden"]').each do |element|
-        form[element['name']] ||= element['value']
+        xform.search('.//input[@type="hidden"]').each do |element|
+          # $x.li "#{element['name']} => #{element['value']}"
+          form[element['name']] ||= element['value']
+        end
       end
 
       post = Net::HTTP::Post.new(path)
@@ -605,6 +620,7 @@ def secinclude ranges, section
 end
 
 at_exit do
+  $x.declare! :DOCTYPE, :html
   $x.html :xmlns => 'http://www.w3.org/1999/xhtml' do
     $x.header do
       $x.title $title
@@ -743,15 +759,9 @@ at_exit do
   $x.target!.sub! /<ul class="todos"\/>/,
     "<ul class=\"todos\">\n#{$todos.target!.gsub(/^/,' '*6)}    </ul>"
   $x.target!.gsub! '<strong/>', '<strong></strong>'
+  $x.target!.gsub! /(<textarea[^>]+)\/>/, '\1></textarea>'
   log :WRITE, "#{$output}.html"
-  open("#{$WORK}/#{$output}.html",'w') do |file| 
-    file.write <<-EOF.unindent(6)
-      <!DOCTYPE html
-      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-    EOF
-    file.write $x.target!
-  end
+  open("#{$WORK}/#{$output}.html",'w') { |file| file.write $x.target! }
   
   # run tests
   if $checker

data/lib/version.rb

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

metadata

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