gorp 0.13.0 → 0.14.0

data/gorp.gemspec

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

@@ -52,6 +52,9 @@ class String
   def unindent(n)
     gsub Regexp.new("^#{' '*n}"), ''
   end
+  def indent(n)
+    gsub /^/, ' '*n
+  end
 end
 
 def read name
@@ -352,7 +355,7 @@ rescue LoadError
   Comment = REXML::Comment
 end
 
-def snap response, form={}
+def snap response, form=nil
   if response.content_type == 'text/plain' or response.content_type =~ /xml/
     $x.div :class => 'body' do
       response.body.split("\n").each do |line| 
@@ -381,12 +384,12 @@ def snap response, form={}
     body.children.first.add_previous_sibling(sheet)
   end
 
-  if ! form.empty?
+  if form
     body.search('//input[@name]').each do |input|
       input['value'] ||= form[input['name']].to_s
     end
     body.search('//textarea[@name]').each do |textarea|
-      textarea.text ||= form[textarea['name']].to_s
+      textarea.text = form[textarea['name']].to_s if textarea.text.to_s.empty?
     end
   end
 
@@ -423,7 +426,7 @@ def snap response, form={}
 end
 
 def get path
-  post path, {}
+  post path, nil
 end
 
 def post path, form, options={}
@@ -442,7 +445,7 @@ def post path, form, options={}
     snap response, form unless options[:snapget] == false
     $COOKIE = response.response['set-cookie'] if response.response['set-cookie']
 
-    if ! form.empty?
+    if form
       body = xhtmlparse(response.body).at('//body')
       body = xhtmlparse(response.body).root unless body
       xforms = body.search('//form')
@@ -551,12 +554,14 @@ def rails name, app=nil
     open(script,'w') {|file| file.write code}
   end
 
+  cmd "mkdir #{name}" unless File.exist?(name)
   Dir.chdir(name)
   FileUtils.rm_rf 'public/.htaccess'
 
   cmd 'rake rails:freeze:edge' if ARGV.include? 'edge'
 
   if $rails != 'rails' and File.directory?($rails)
+    cmd "mkdir vendor" unless File.exist?('vendor')
     cmd "ln -s #{$rails} vendor/rails"
   end
 end

data/lib/gorp/test.rb

@@ -14,21 +14,19 @@ end
 class Book::TestCase < ActiveSupport::TestCase
   # just enough infrastructure to get 'assert_select' to work
   $:.unshift "#{$WORK}/depot/vendor/rails/actionpack/lib"
+  require 'action_controller'
   begin
-    # installed Rails (2.3.3 ish)
-    require 'action_controller'
+    # Rails (2.3.3 ish)
     require 'action_controller/assertions/selector_assertions'
     include ActionController::Assertions::SelectorAssertions
-    require 'action_controller/vendor/html-scanner/html/tokenizer'
-    require 'action_controller/vendor/html-scanner/html/document'
   rescue LoadError
-    # testing Rails (3.0 ish)
-    require 'action_controller'
+    # Rails (3.0 ish)
     require 'action_dispatch/testing/assertions'
-    require 'action_dispatch/testing/assertions/selector'
+  require 'action_dispatch/testing/assertions/selector'
     include ActionDispatch::Assertions::SelectorAssertions
   end
-  $:.shift
+  require 'action_controller/vendor/html-scanner/html/tokenizer'
+  require 'action_controller/vendor/html-scanner/html/document'
 
   # micro DSL allowing the definition of optional tests
   def self.section number, title, &tests
@@ -84,12 +82,18 @@ class Book::TestCase < ActiveSupport::TestCase
   # select an individual section from the HTML
   def select number
     raise "Section #{number} not found" unless @@sections.has_key? number.to_s
-    @selected = HTML::Document.new(@@sections[number.to_s]).root.children
-    assert @@sections[number.to_s] !~
-      /<pre class="traceback">\s+#&lt;IndexError: regexp not matched&gt;/,
-      "edit failed"
+    @raw = @@sections[number.to_s]
+    @selected = HTML::Document.new(@raw).root.children
+
+    @raw =~ /<pre\sclass="stdin">edit\s([\w\/.]+)<\/pre>\s+
+             <pre\sclass="traceback">\s+
+             \#&lt;IndexError:\sregexp\snot\smatched&gt;\s+
+             ([\w\/.]+:\d+)/x
+    fail "edit #{$1} failed at #{$2}" if $1
   end
 
+  attr_reader :raw
+
   def collect_stdout
     css_select('.stdout').map do |tag|
       tag.children.join.gsub('&lt;','<').gsub('&gt;','>')

data/lib/version.rb

@@ -1,7 +1,7 @@
 module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 13
+    MINOR = 14
     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.13.0
+  version: 0.14.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-12 00:00:00 -05:00
+date: 2009-12-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency