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

gorp 0.16.1 → 0.16.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

data/Manifest CHANGED

@@ -1,9 +0,0 @@
-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.1"
+  s.version = "0.16.3"
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
     assertions based on selections (typically CSS) against the generated HTML.
 }
   s.email = %q{rubys@intertwingly.net}
-  s.extra_rdoc_files = ["README", "lib/gorp.rb", "lib/gorp/edit.rb", "lib/gorp/env.rb", "lib/gorp/test.rb", "lib/version.rb"]
-  s.files = ["Manifest", "README", "Rakefile", "gorp.gemspec", "lib/gorp.rb", "lib/gorp/edit.rb", "lib/gorp/env.rb", "lib/gorp/test.rb", "lib/version.rb"]
+  s.extra_rdoc_files = ["README", "lib/gorp.rb", "lib/gorp/edit.rb", "lib/gorp/env.rb", "lib/gorp/net.rb", "lib/gorp/rails.rb", "lib/gorp/test.rb", "lib/version.rb"]
+  s.files = ["Manifest", "README", "Rakefile", "gorp.gemspec", "lib/gorp.rb", "lib/gorp/edit.rb", "lib/gorp/env.rb", "lib/gorp/net.rb", "lib/gorp/rails.rb", "lib/gorp/test.rb", "lib/version.rb"]
   s.homepage = %q{http://github.com/rubys/gorp}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Gorp", "--main", "README"]
   s.require_paths = ["lib"]

data/lib/gorp/net.rb ADDED

@@ -0,0 +1,163 @@
+require 'net/http'
+require 'cgi'
+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
+  # ensure that textareas don't use the self-closing syntax
+  body.search('//textarea').each do |element|
+    element.content=''
+  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.content = form[textarea['name']].to_s if textarea.text.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
+  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={}
+  log :get, path unless form
+  $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
+      log :post, path
+      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

data/lib/gorp/rails.rb ADDED

@@ -0,0 +1,126 @@
+require 'fileutils'
+require 'open3'
+require 'builder'
+require 'stringio'
+require 'time'
+# 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
+# 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
+# determine which version of rails is running
+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
+# run rails as a command
+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
+# start/restart a rails server in a separate process
+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
+    #
+    # For unknown reason, the below produces:
+    #   undefined method `chomp' for nil:NilClass (NoMethodError)
+    #   from rails/actionpack/lib/action_dispatch/middleware/static.rb:13
+    #     path   = env['PATH_INFO'].chomp('/')
+    #
+    # STDOUT.reopen '/dev/null', 'a'
+    # exec "#{$ruby} script/server --port #{$PORT}"
+    # alternatives to the above, with backtrace
+    begin
+      if File.exist?('config.ru')
+        require 'rack'
+        server = Rack::Builder.new {eval(open('config.ru') {|file| file.read})}
+        Rack::Handler::WEBrick.run(server, :Port => $PORT)
+      else
+        ARGV.clear.unshift('--port', $PORT.to_s)
+        # 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'
+          Rails::Server.start
+        end
+      end
+    rescue
+      STDERR.puts $!
+      $!.backtrace.each {|method| STDERR.puts "\tfrom " + method}
+    ensure
+      Process.exit!
+    end
+  end
+end

data/lib/version.rb CHANGED

@@ -2,7 +2,7 @@ module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 16
-    TINY  = 1
+    TINY  = 3
     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.1
+  version: 0.16.3
 platform: ruby
 authors:
 - Sam Ruby
@@ -123,6 +123,8 @@ extra_rdoc_files:
 - lib/gorp.rb
 - lib/gorp/edit.rb
 - lib/gorp/env.rb
+- lib/gorp/net.rb
+- lib/gorp/rails.rb
 - lib/gorp/test.rb
 - lib/version.rb
 files:
@@ -133,6 +135,8 @@ files:
 - lib/gorp.rb
 - lib/gorp/edit.rb
 - lib/gorp/env.rb
+- lib/gorp/net.rb
+- lib/gorp/rails.rb
 - lib/gorp/test.rb
 - lib/version.rb
 has_rdoc: true