RubyGems - gorp - Versions diffs - 0.16.0 → 0.16.1 - Mend

gorp 0.16.0 → 0.16.1

Files changed (7) hide show

data/Manifest CHANGED

@@ -0,0 +1,9 @@
+Manifest
+README
+Rakefile
+gorp.gemspec
+lib/gorp.rb
+lib/gorp/edit.rb
+lib/gorp/env.rb
+lib/gorp/test.rb
+lib/version.rb

data/gorp.gemspec CHANGED

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.16.0"
+  s.version = "0.16.1"
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]

data/lib/gorp.rb CHANGED

@@ -5,14 +5,13 @@
 require 'fileutils'
 require 'open3'
-require 'net/http'
 require 'builder'
-require 'stringio'
 require 'time'
-require 'cgi'
 require 'gorp/env'
 require 'gorp/edit'
+require 'gorp/net'
+require 'gorp/rails'
 require 'rbconfig'
 $ruby = File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])
@@ -32,12 +31,6 @@ def section number, title, &steps
   $sections << [number, title, steps]
 end
-# verify that port is available for testing
-if (Net::HTTP.get_response('localhost','/',$PORT).code == '200' rescue false)
-  STDERR.puts "local server already running on port #{$PORT}"
-  exit
-end
 $x = Builder::XmlMarkup.new(:indent => 2)
 $toc = Builder::XmlMarkup.new(:indent => 2)
 $todos = Builder::XmlMarkup.new(:indent => 2)
@@ -289,263 +282,6 @@ rescue LoadError
   Comment = REXML::Comment
 end
-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|
-        $x.pre line.chomp, :class=>'stdout'
-      end
-    end
-    return
-  end
-  if response.body =~ /<body/
-    body = response.body
-  else
-    body = "<body>#{response.body}</body>"
-  end
-  begin
-    doc = xhtmlparse(body)
-  rescue
-    body.split("\n").each {|line| $x.pre line.chomp, :class=>'hilight'}
-    raise
-  end
-  title = doc.at('html/head/title').text rescue ''
-  body = doc.at('//body')
-  doc.search('//link[@rel="stylesheet"]').each do |sheet|
-    body.children.first.add_previous_sibling(sheet)
-  end
-  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 if textarea.text.to_s.empty?
-    end
-  end
-  %w{ a[@href] form[@action] }.each do |xpath|
-    name = xpath[/@(\w+)/,1]
-    body.search("//#{xpath}").each do |element|
-      next if element[name] =~ /^http:\/\//
-      element[name] = URI.join("http://localhost:#{$PORT}/", element[name]).to_s
-    end
-  end
-  %w{ img[@src] }.each do |xpath|
-    name = xpath[/@(\w+)/,1]
-    body.search("//#{xpath}").each do |element|
-      if element[name][0] == ?/
-        element[name] = 'data' + element[name]
-      end
-    end
-  end
-  body.search('//textarea').each do |element|
-    element.content=''
-  end
-  attrs = {:class => 'body', :title => title}
-  attrs[:class] = 'traceback' if response.code == '500'
-  attrs[:id] = body['id'] if body['id']
-  $x.div(attrs) do
-    body.children.each do |child|
-      $x << child.to_xml unless child.instance_of?(Comment)
-    end
-  end
-  $x.div '', :style => "clear: both"
-end
-def get path
-  post path, nil
-end
-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)
-  else
-    host, port = '127.0.0.1', $PORT
-  end
-  Net::HTTP.start(host, port) do |http|
-    get = Net::HTTP::Get.new(path)
-    get['Cookie'] = $COOKIE if $COOKIE
-    response = http.request(get)
-    snap response, form unless options[:snapget] == false
-    $COOKIE = response.response['set-cookie'] if response.response['set-cookie']
-    if form
-      body = xhtmlparse(response.body).at('//body')
-      body = xhtmlparse(response.body).root unless body
-      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
-      # 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'
-      $x.ul do
-        form.each do |name, value|
-          $x.li "#{name} => #{value}"
-        end
-        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)
-      post.form_data = form
-      post['Cookie'] = $COOKIE
-      response=http.request(post)
-      snap response
-    end
-    if response.code == '302'
-      $COOKIE=response.response['set-cookie'] if response.response['set-cookie']
-      path = response['Location']
-      $x.pre "get #{path}", :class=>'stdin'
-      get = Net::HTTP::Get.new(path)
-      get['Cookie'] = $COOKIE if $COOKIE
-      response = http.request(get)
-      snap response
-      $COOKIE=response.response['set-cookie'] if response.response['set-cookie']
-    end
-  end
-end
-# select a version of Rails
-if ARGV.first =~ /^_\d[.\d]*_$/
-  $rails = "rails #{ARGV.first}"
-elsif File.directory?(ARGV.first.to_s)
-  $rails = ARGV.first
-  $rails = File.join($rails,'rails') if
-    File.directory?(File.join($rails,'rails'))
-  $rails = File.expand_path($rails)
-else
-  $rails = 'rails'
-end
-def which_rails rails
-  railties = File.join(rails, 'railties', 'bin', 'rails')
-  rails = railties if File.exists?(railties)
-  if File.exists?(rails)
-    firstline = open(rails) {|file| file.readlines.first}
-    rails = 'ruby ' + rails unless firstline =~ /^#!/
-  end
-  rails
-end
-def rails name, app=nil
-  Dir.chdir($WORK)
-  FileUtils.rm_rf name
-  log :rails, name
-  # determine how to invoke rails
-  rails = which_rails $rails
-  $x.pre "#{rails} #{name}", :class=>'stdin'
-  popen3 "#{rails} #{name}"
-  # canonicalize the reference to Ruby
-  Dir["#{name}/script/**/*"].each do |script|
-    next if File.directory? script
-    code = open(script) {|file| file.read}
-    code.sub! /^#!.*/, '#!/usr/bin/env ruby'
-    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
-def restart_server
-  log :server, 'restart'
-  if $server
-    $x.h3 'Restart the server.'
-    Process.kill "INT", $server
-    Process.wait($server)
-  else
-    $x.h3 'Start the server.'
-  end
-  $server = fork
-  if $server
-    # wait for server to start
-    60.times do
-      sleep 0.5
-      begin
-        status = Net::HTTP.get_response('localhost','/',$PORT).code
-        break if %(200 404).include? status
-      rescue Errno::ECONNREFUSED
-      end
-    end
-  else
-    begin
-      if File.exist?('config.ru')
-        require 'rack'
-        server = Rack::Builder.new {eval open('config.ru').read}
-        Rack::Handler::WEBrick.run(server, :Port => $PORT)
-      else
-        # start server, redirecting stdout to a string
-        $stdout = StringIO.open('','w')
-        require './config/boot'
-        if Rails::VERSION::MAJOR == 2
-          require 'commands/server'
-        else
-          require 'rails/commands/server'
-        end
-      end
-    rescue
-      STDERR.puts $!
-      $!.backtrace.each {|method| STDERR.puts "\tfrom " + method}
-    ensure
-      Process.exit!
-    end
-  end
-end
 def secsplit section
   section.to_s.split('.').map {|n| n.to_i}
 end

data/lib/gorp/edit.rb CHANGED

@@ -7,61 +7,81 @@ class String
   end
 end
-module Gorp_string_editing_functions
-  def highlight
-    if self =~ /\n\z/
-      self[/(.*)/m,1] = "#START_HIGHLIGHT\n#{self}#END_HIGHLIGHT\n"
-    else
-      self[/(.*)/m,1] = "#START_HIGHLIGHT\n#{self}\n#END_HIGHLIGHT"
+module Gorp
+  module StringEditingFunctions
+    def highlight
+      if self =~ /^\s*<[%!\w].*>/
+        start = '<!-- START_HIGHLIGHT -->'
+        close = '<!-- END_HIGHLIGHT -->'
+      else
+        start = '#START_HIGHLIGHT'
+        close = '#END_HIGHLIGHT'
+      end
+      if self =~ /\n\z/
+        self[/(.*)/m,1] = "#{start}\n#{self}#{close}\n"
+      else
+        self[/(.*)/m,1] = "#{start}\n#{self}\n#{close}"
+      end
     end
-  end
-  def mark name
-    return unless name
-    self[/(.*)/m,1] = "#START:#{name}\n#{self}#END:#{name}\n"
-  end
+    def mark name
+      return unless name
+      if self =~ /^\s*<[%!\w].*>/
+        start = "<!-- START:#{name} -->"
+        close = "<!-- END:#{name} -->"
+      else
+        start = "#START:#{name}"
+        close = "#END:#{name}"
+      end
-  def edit(from, *options)
-    STDERR.puts options.inspect
-    STDERR.puts options.last.inspect
-    STDERR.puts options.last.respond_to? :[]
-    if from.instance_of? String
-      from = Regexp.new('.*' + Regexp.escape(from) + '.*')
+      if self =~ /\n\z/
+        self[/(.*)/m,1] = "#{start}\n#{self}#{close}\n"
+      else
+        self[/(.*)/m,1] = "#{start}\n#{self}\n#{close}"
+      end
     end
-    sub!(from) do |base|
-      base.extend Gorp_string_editing_functions
-      yield base if block_given?
-      base.highlight if options.include? :highlight
-      base.mark(options.last[:mark]) if options.last.respond_to? :key
-      base
+    def edit(from, *options)
+      if from.instance_of? String
+        from = Regexp.new('.*' + Regexp.escape(from) + '.*')
+      end
+      sub!(from) do |base|
+        base.extend Gorp::StringEditingFunctions
+        yield base if block_given?
+        base.highlight if options.include? :highlight
+        base.mark(options.last[:mark]) if options.last.respond_to? :key
+        base
+      end
     end
-  end
-  def dcl(name, *options)
-    self.sub!(/(\s*)(class|def|test)\s+"?#{name}"?.*?\n\1end\n/mo) do |lines|
-      lines.extend Gorp_string_editing_functions
-      yield lines
-      lines.mark(options.last[:mark]) if options.last.respond_to? :[]
-      lines
+    def dcl(name, *options)
+      self.sub!(/(\s*)(class|def|test)\s+"?#{name}"?.*?\n\1end\n/mo) do |lines|
+        lines.extend Gorp::StringEditingFunctions
+        yield lines
+        lines.mark(options.last[:mark]) if options.last.respond_to? :[]
+        lines
+      end
     end
-  end
-  def clear_highlights
-    self.gsub! /^\s*(#|<!--)\s*(START|END)_HIGHLIGHT(\s*-->)?\n/, ''
-    self.gsub! /^\s*(#|<!--)\s*(START|END)_HIGHLIGHT(\s*-->)?\n/, ''
-  end
+    def clear_highlights
+      self.gsub! /^\s*(#|<!--)\s*(START|END)_HIGHLIGHT(\s*-->)?\n/, ''
+      self.gsub! /^\s*(#|<!--)\s*(START|END)_HIGHLIGHT(\s*-->)?\n/, ''
+    end
-  def clear_all_marks
-    self.gsub! /^ *#\s?(START|END)(_HIGHLIGHT|:\w+)\n/, ''
-  end
+    def clear_all_marks
+      self.gsub! /^ *#\s?(START|END)(_HIGHLIGHT|:\w+)\n/, ''
+    end
-  def msub pattern, replacement
-    self[pattern, 1] = replacement
-  end
+    def msub pattern, replacement
+      self[pattern, 1] = replacement
+    end
-  def all=replacement
-    self[/(.*)/m,1]=replacement
+    def all=replacement
+      self[/(.*)/m,1]=replacement
+    end
   end
 end
@@ -73,7 +93,7 @@ def edit filename, tag=nil
   before = data.split("\n")
   begin
-    data.extend Gorp_string_editing_functions
+    data.extend Gorp::StringEditingFunctions
     yield data
     now = Time.now

data/lib/gorp/test.rb CHANGED

@@ -34,7 +34,18 @@ class Book::TestCase < ActiveSupport::TestCase
     return if @@omit.include? number.to_s
     test "#{number} #{title}" do
       instance_eval {select number}
-      instance_eval &tests
+      begin
+        instance_eval &tests
+      ensure
+        unless $!.instance_of? RuntimeError
+          @raw =~ /<pre\sclass="stdin">edit\s([\w\/.]+)<\/pre>\s+
+                   <pre\sclass="traceback">\s+
+                   \#&lt;IndexError:\sregexp\snot\smatched&gt;\s+
+                   (.*gorp\/lib\/gorp\/edit.rb.*\n\s+)*
+                   ([\w\/.]+:\d+)/x
+          fail "Edit #{$1} failed at #{$3}" if $1
+        end
+      end
     end
   end
@@ -91,13 +102,6 @@ class Book::TestCase < ActiveSupport::TestCase
     raise "Section #{number} not found" unless @@sections.has_key? number.to_s
     @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+
-             (.*gorp\/lib\/gorp\/edit.rb.*\n\s+)*
-             ([\w\/.]+:\d+)/x
-    fail "Edit #{$1} failed at #{$3}" if $1
   end
   attr_reader :raw

data/lib/version.rb CHANGED

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

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gorp
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Sam Ruby