steam 0.0.4 → 0.0.5

data/Gemfile

@@ -0,0 +1,2 @@
+gem 'rjb',     '>= 1.2.0'
+gem 'locator', '>= 0.0.6'

data/lib/core_ext/ruby/string/camelize.rb

@@ -1,5 +1,5 @@
 class String
   def camelize
-    split(/[^a-z0-9]/i).map { |w| w.capitalize }.join
+    to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
   end
 end unless String.method_defined?(:camelize)

data/lib/core_ext/ruby/string/underscore.rb

@@ -1,5 +1,12 @@
 class String
   def underscore
-    self[0, 1].downcase + self[1..-1].gsub(/[A-Z]/) { |c| "_#{c.downcase}" }
+    # self[0, 1].downcase + self[1..-1].gsub(/[A-Z]/) { |c| "_#{c.downcase}" }
+    word = to_s
+    word.gsub!(/::/, '/')
+    word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+    word.tr!("-", "_")
+    word.downcase!
+    word
   end
 end unless String.method_defined?(:underscore)

data/lib/steam/browser/html_unit.rb

@@ -19,7 +19,7 @@ module Steam
 
       include Actions
 
-      attr_accessor :client, :page, :request, :response
+      attr_accessor :client, :page, :response
 
       def initialize(*args)
         @client = Client.new(*args)
@@ -33,15 +33,19 @@ module Steam
         @client.closeAllWindows
       end
 
+      def request
+        @request ||= Request.new
+      end
+
       def get(url)
-        call Request.env_for(url)
+        perform(:get, url)
       end
       alias :visit :get
 
-      def call(env)
+      def perform(method, uri)
         respond_to do
-          @request = Rack::Request.new(env)
-          client.get(@request.url)
+          request.update(:method => method, :uri => uri)
+          client.get(request)
         end.to_a
       end
 

data/lib/steam/browser/html_unit/client.rb

@@ -9,6 +9,7 @@ module Steam
 
         Java.import 'com.gargoylesoftware.htmlunit.Version'
         Java.import 'com.gargoylesoftware.htmlunit.WebClient'
+        Java.import 'com.gargoylesoftware.htmlunit.WebRequestSettings'
         Java.import 'com.gargoylesoftware.htmlunit.BrowserVersion'
         Java.import 'com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController'
         Java.import 'com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException'
@@ -49,8 +50,19 @@ module Steam
           end
         end
 
-        def get(*args)
-          @java.getPage(*args) # TODO use WebRequestSettings
+        def get(request)
+          perform(self.request_settings(request))
+        end
+        
+        def perform(request_settings)
+          @java._invoke('getPage', 'Lcom.gargoylesoftware.htmlunit.WebRequestSettings;', request_settings)
+        end
+        
+        def request_settings(request)
+          url      = Java::Net::Url.new(request.url)
+          settings = WebRequestSettings.new(url)
+          request.headers.each { |name, value| settings.setAdditionalHeader(name.to_s, value.to_s) } if request.headers
+          settings
         end
 
         def wait_for_javascript(timeout)

data/lib/steam/browser/html_unit/connection.rb

@@ -25,11 +25,11 @@ module Steam
 
         include Java::Com::Gargoylesoftware::Htmlunit
 
-        Java.import('com.gargoylesoftware.htmlunit.MockWebConnection')
+        Java.import 'com.gargoylesoftware.htmlunit.MockWebConnection'
         classifier = Version.getProductVersion == '2.6' ?
           'org.apache.commons.httpclient.NameValuePair' :    # HtmlUnit 2.6
           'com.gargoylesoftware.htmlunit.util.NameValuePair' # HtmlUnit 2.7
-        NameValuePair = Java.import(classifier, :NameValuePair)
+        NameValuePair = Java.import(classifier, 'NameValuePair')
 
         attr_reader :connection, :java
 
@@ -38,25 +38,25 @@ module Steam
           @java = MockWebConnection.new
         end
 
-        def getResponse(request)
+        def getResponse(request_settings)
           # FIXME preserve original scheme, host + port
-          method = request.getHttpMethod.toString.dup
-          url    = request.getUrl.toString.dup
+          method = request_settings.getHttpMethod.toString.dup
+          url    = request_settings.getUrl.toString.dup
 
-          body   = request.getRequestBody
+          body   = request_settings.getRequestBody
           body   = body.toString.dup if body
 
-          params = request.getRequestParameters
+          params = request_settings.getRequestParameters
           params = Hash[*params.toArray.map { |e| [e.name, e.value] }.flatten]
 
           input  = body ? body : Rack::Utils.build_nested_query(params)
-          env    = Request.env_for(url, :method => method, :input => input)
+          env    = Request.new(:method => method, :url => url, :input => input).env
 
           status, headers, response = connection.call(env)
           response.body.close if response.body.respond_to?(:close)
 
-          set_response(request.getUrl, response)
-          java.getResponse(request)
+          set_response(request_settings.getUrl, response)
+          java.getResponse(request_settings)
         rescue Exception => e
           puts "#{e.class.name}: #{e.message}"
           e.backtrace.each { |line| puts line }

data/lib/steam/browser/html_unit/web_response.rb

@@ -6,7 +6,6 @@ module Steam
   module Browser
     class HtmlUnit
       class WebResponse
-        Java.import 'java.net.Url'
         Java.import 'java.io.ByteArrayInputStream'
         Java.import 'com.gargoylesoftware.htmlunit.WebRequestSettings'
 

data/lib/steam/connection/net_http.rb

@@ -1,4 +1,4 @@
-# This connection proxies requests using open-uri. 
+# This connection proxies requests using open-uri.
 #
 
 require 'net/http'
@@ -17,20 +17,20 @@ module Steam
         response = follow_redirect(response) if response.status.to_s[0, 1] == '3'
         response.to_a
       end
-      
+
       def get(request)
         url      = URI.parse(request.url)
         response = Net::HTTP.start(url.host, url.port) { |http| http.get(url.path) }
         Rack::Response.new(response.body, response.code, response.to_hash)
       end
-      
+
       def post(request)
         url      = URI.parse(request.url)
         params   = Rack::Utils.parse_query(Rack::Utils.build_nested_query(request.params))
         response = Net::HTTP.post_form(url, params)
         Rack::Response.new(response.body, response.code, response.to_hash)
       end
-      
+
       def follow_redirect(response)
         location = response.headers['location'].join
         env      = Steam::Request.env_for(location)

data/lib/steam/java.rb

@@ -33,19 +33,19 @@ module Steam
       end
 
       def import(signature, name = nil)
-        init unless @initialized
-        name = path_to_const_name(signature)
+        name ||= path_to_const_name(signature)
+        name.gsub!('Java::', '')
         const_set_nested(name, Rjb::import(signature))
       end
 
       def path_to_const_name(path)
-        path.split('.').map { |token| token.underscore.camelize }.join('::').gsub('Java::', '')
+        path.split('.').map { |token| token.underscore.camelize }.join('::')
       end
 
       def init
         @initialized = true
 
-        import('java.net.URL')
+        import('java.net.URL', 'Java::Net::Url')
         import('java.lang.System')
         import('java.util.Arrays')
         import('java.util.ArrayList')
@@ -56,6 +56,7 @@ module Steam
       def load_from(path)
         paths = Dir["#{Steam.config[:html_unit][:java_path]}/*.jar"]
         load(paths.join(':')) unless paths.empty?
+        init
       end
 
       def load(paths)
@@ -63,11 +64,11 @@ module Steam
       end
 
       def logger(classifier)
-        Java::Util::Logging::Logger.getLogger(classifier)
+        Util::Logging::Logger.getLogger(classifier)
       end
 
       def log_level(name)
-        Java::Util::Logging::Level.send(name.to_s.upcase)
+        Util::Logging::Level.send(name.to_s.upcase)
       end
     end
   end

data/lib/steam/request.rb

@@ -1,49 +1,102 @@
-# Extends a Rack::Request with convenience methods
+# Extends a Rack::Request with a few convenience methods
 
 require 'uri'
 
 module Steam
   class Request < Rack::Request
-    attr_accessor :method, :headers
-
-    DEFAULT_ENV = {
-      "rack.version"      => [0, 1],
-      "rack.input"        => StringIO.new,
-      "rack.errors"       => StringIO.new,
-      "rack.multithread"  => true,
-      "rack.multiprocess" => true,
-      "rack.run_once"     => false,
-    }
+    attr_reader :method
 
     class << self
-      def env_for(uri = '', opts = {})
-        env   = DEFAULT_ENV.dup
-        uri   = URI.parse(uri)
-        input = opts[:input] || ''
-
-        env.merge!(
-          'REQUEST_METHOD'   => opts[:method] || 'GET',
-          'SERVER_NAME'      => Steam.config[:server_name],
-          'SERVER_PORT'      => Steam.config[:server_port],
-          'QUERY_STRING'     => uri.query.to_s,
-          'PATH_INFO'        => (!uri.path || uri.path.empty?) ? '/' : uri.path,
-          'rack.url_scheme'  => Steam.config[:url_scheme],
-          'SCRIPT_NAME'      => opts[:script_name] || '',
-          'rack.errors'      => StringIO.new,
-          'rack.input'       => input.is_a?(String) ? StringIO.new(input) : input,
-          'CONTENT_LENGTH'   => env['rack.input'].length.to_s,
-          'rack.test.scheme' => uri.scheme || 'http',
-          'rack.test.host'   => uri.host   || 'www.example.com',
-          'rack.test.port'   => uri.port,
+      def default_env
+        @default_env ||= {
+          'REQUEST_METHOD'    => 'GET',
+          'SERVER_NAME'       => Steam.config[:server_name],
+          'SERVER_PORT'       => Steam.config[:server_port],
+          'rack.url_scheme'   => Steam.config[:url_scheme],
+          'rack.version'      => [0, 1],
+          'rack.input'        => StringIO.new,
+          'rack.errors'       => StringIO.new,
+          'rack.multithread'  => true,
+          'rack.multiprocess' => true,
+          'rack.run_once'     => false,
+          'rack.test.scheme'  => Steam.config[:url_scheme],
+          'rack.test.host'    => 'www.example.com',
           'rack.test.cache_classes' => true
-        )
-        env
+        }
+        @default_env.dup
       end
     end
 
-    def initialize(method, uri, opts = {})
-      env = self.class.env_for(uri, opts.merge(:method => method))
-      super(env)
+    def initialize(env = {})
+      super(self.class.default_env)
+      update(env)
+    end
+
+    def update(options = {})
+      options.each { |name, value| send("#{name}=", value) }
+    end
+    
+    def env
+      super.merge(headers)
+    end
+
+    def method=(method)
+      @env['REQUEST_METHOD'] = method
+    end
+
+    def uri=(uri)
+      uri = URI.parse(uri)
+      self.path   = uri.path
+      self.query  = uri.query  if uri.query
+      self.scheme = uri.scheme if uri.scheme
+      self.port   = uri.port   if uri.port
+    end
+    alias url= uri=
+    
+    def scheme=(scheme)
+      @env.merge!(
+        'rack.url_scheme'  => scheme,
+        'rack.test.scheme' => scheme
+      )
+    end
+    
+    def host=(host)
+      @env.merge!(
+        'rack.test.host' => host
+      )
+    end
+    
+    def port=(port)
+      @env.merge!(
+        'rack.test.port' => port
+      )
+    end
+    
+    def query=(query)
+      @env.merge!(
+        'QUERY_STRING' => query.to_s
+      )
+    end
+    
+    def path=(path)
+      @env.merge!(
+        'PATH_INFO' => path && !path.empty? ? path : '/'
+      )
+    end
+
+    def headers=(headers)
+      self.headers.merge!(headers)
+    end
+    
+    def headers
+      @headers ||= {}
+    end
+
+    def input=(input)
+      @env.merge!(
+        'rack.input'     => input.is_a?(String) ? StringIO.new(input) : input,
+        'CONTENT_LENGTH' => input.length.to_s
+      )
     end
   end
 end

data/lib/steam/session/rails.rb

@@ -25,7 +25,7 @@ module Steam
 
         # FIXME remove ActionController::Request dependency
         def generic_url_rewriter 
-          env = Request.env_for(Steam.config[:request_url])
+          env = Request.new(:method => :get, :url => Steam.config[:request_url]).env
           UrlRewriter.new(ActionController::Request.new(env), {})
         end
     end

data/lib/steam/version.rb

@@ -1,3 +1,3 @@
 module Steam
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -5,17 +5,16 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Sven Fuchs
-- Clemens Kofler
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 +02:00
+date: 2010-04-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,14 +51,9 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.textile
-- TODO
+extra_rdoc_files: []
+
 files: 
-- MIT-LICENSE
-- README.textile
-- Rakefile
-- TODO
 - lib/core_ext/ruby/array/flatten_once.rb
 - lib/core_ext/ruby/hash/except.rb
 - lib/core_ext/ruby/hash/slice.rb
@@ -67,35 +61,39 @@ files:
 - lib/core_ext/ruby/process/daemon.rb
 - lib/core_ext/ruby/string/camelize.rb
 - lib/core_ext/ruby/string/underscore.rb
-- lib/steam.rb
-- lib/steam/browser.rb
-- lib/steam/browser/html_unit.rb
 - lib/steam/browser/html_unit/actions.rb
 - lib/steam/browser/html_unit/client.rb
 - lib/steam/browser/html_unit/connection.rb
 - lib/steam/browser/html_unit/drb.rb
 - lib/steam/browser/html_unit/page.rb
 - lib/steam/browser/html_unit/web_response.rb
-- lib/steam/connection.rb
+- lib/steam/browser/html_unit.rb
+- lib/steam/browser.rb
 - lib/steam/connection/mock.rb
 - lib/steam/connection/net_http.rb
 - lib/steam/connection/open_uri.rb
 - lib/steam/connection/rails.rb
 - lib/steam/connection/static.rb
+- lib/steam/connection.rb
 - lib/steam/java.rb
 - lib/steam/process.rb
 - lib/steam/request.rb
 - lib/steam/response.rb
-- lib/steam/session.rb
 - lib/steam/session/rails.rb
+- lib/steam/session.rb
 - lib/steam/version.rb
+- lib/steam.rb
+- Gemfile
+- MIT-LICENSE
+- README.textile
+- TODO
 has_rdoc: true
 homepage: http://github.com/svenfuchs/steam
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -110,41 +108,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: "[none]"
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: "Headless integration testing w/ HtmlUnit: enables testing JavaScript-driven web sites"
-test_files: 
-- test/all.rb
-- test/browser/html_unit/actions_test.rb
-- test/browser/html_unit/javascript_test.rb
-- test/browser/html_unit/rails_actions_test.rb
-- test/browser/html_unit_test.rb
-- test/connection/cascade_test.rb
-- test/connection/mock_test.rb
-- test/connection/rails_test.rb
-- test/connection/static_test.rb
-- test/example/webrat_compat_steps_test.rb
-- test/fixtures/html_fakes.rb
-- test/java_test.rb
-- test/playground/connection.rb
-- test/playground/dragdrop_behavior.rb
-- test/playground/drb.rb
-- test/playground/java_signature.rb
-- test/playground/nokogiri.rb
-- test/playground/put_headers.rb
-- test/playground/rack.rb
-- test/playground/rjb_bind.rb
-- test/playground/stack_level_problem.rb
-- test/playground/thread_problem.rb
-- test/playground/web_response_data.rb
-- test/playground/webrat.rb
-- test/playground/xhr_accept_headers.rb
-- test/process_test.rb
-- test/session_test.rb
-- test/test_helper.rb
+test_files: []
+