RubyApp 0.0.57 → 0.0.58

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    RubyApp (0.0.57)
+    RubyApp (0.0.58)
       BlueCloth
       chronic
       chronic_duration
@@ -31,7 +31,7 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.2.5)
+    childprocess (0.2.6)
       ffi (~> 1.0.6)
     chronic (0.6.6)
     chronic_duration (0.9.6)

data/features/step_definitions/default_steps.rb

@@ -16,14 +16,12 @@ end
 
 When /^I click "([^"]*)"$/ do |text|
   click_on(text)
-  #sleep 1
 end
 
 When /^I fill in the "([^"]*)" field with "([^"]*)"( and I change focus)?$/ do |field, value, change_focus|
   fill_in(field, :with => value)
   if change_focus
     find('body').click
-    #sleep 1
   end
 end
 

data/features/support/env.rb

@@ -1,12 +1,18 @@
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. lib]))
+
+require 'rubygems'
+require 'bundler/setup'
+
 require 'capybara'
 require 'capybara/cucumber'
 require 'capybara/dsl'
+require 'capybara/rspec/matchers'
 
-Capybara.register_driver :chrome do |app|
-  Capybara::Selenium::Driver.new(app, :browser => :firefox)
+Capybara.register_driver :pike do |app|
+  Capybara::Selenium::Driver.new(app, :browser => :firefox, :resynchronize => true)
 end
 
-Capybara.default_driver = :chrome
+Capybara.default_driver = :pike
 Capybara.app_host = 'http://localhost:8008'
 
 World(Capybara)

data/lib/ruby_app/log.rb

@@ -17,6 +17,13 @@ module RubyApp
       self.error('-' * 80)
     end
 
+    def duration(message)
+      start = Time.now
+      result = yield if block_given?
+      self.debug("#{message} duration=#{Time.now - start}s")
+      return result
+    end
+
     def self.get
       @@_log
     end

data/lib/ruby_app/rack/route.rb

@@ -24,7 +24,7 @@ module RubyApp
       end
 
       route(RubyApp::Mixins::RouteMixin::GET, /\/quit/) do |method, path|
-        RubyApp::Log.debug("#{self}.route method=#{method.inspect} path=#{path.inspect}")
+        #RubyApp::Log.debug("#{self}.route method=#{method.inspect} path=#{path.inspect}")
         begin
           [
             200,
@@ -38,7 +38,7 @@ module RubyApp
       end
 
       route(RubyApp::Mixins::RouteMixin::GET, /\/elements\/([^\.]+)\.([^\.\?]+)/) do |method, path, element_id, format|
-        RubyApp::Log.debug("#{self}.route method=#{method.inspect} path=#{path.inspect} element_id=#{element_id.inspect} format=#{format.to_sym.inspect}")
+        #RubyApp::Log.debug("#{self}.route method=#{method.inspect} path=#{path.inspect} element_id=#{element_id.inspect} format=#{format.to_sym.inspect}")
         begin
           [
             200,
@@ -56,12 +56,16 @@ module RubyApp
       end
 
       route(RubyApp::Mixins::RouteMixin::GET, /\.([^\.\?]+)/) do |method, path, format|
-        RubyApp::Log.debug("#{self}.route method=#{method.inspect} path=#{path.inspect} format=#{format.to_sym.inspect}")
+        #RubyApp::Log.debug("#{self}.route method=#{method.inspect} path=#{path.inspect} format=#{format.to_sym.inspect}")
         begin
           [
             200,
             { 'content-type' => RubyApp::Rack::Route.get_content_type(format) },
-            [ RubyApp::Session.pages.last.render(format.to_sym) ]
+            [
+              RubyApp::Log.duration("#{self}##{__method__} method=#{method.inspect} path=#{path.inspect} format=#{format.to_sym.inspect}") do
+                RubyApp::Session.pages.last.render(format.to_sym)
+              end
+            ]
           ]
         rescue Exception => exception
           RubyApp::Log.exception(exception)
@@ -70,7 +74,7 @@ module RubyApp
       end
 
       route(RubyApp::Mixins::RouteMixin::GET, /.*/) do |method, path|
-        RubyApp::Log.debug("#{self}.route method=#{method.inspect} path=#{path.inspect}")
+        #RubyApp::Log.debug("#{self}.route method=#{method.inspect} path=#{path.inspect}")
         do_route(RubyApp::Mixins::RouteMixin::GET, '/.html')
       end
 

data/lib/ruby_app/version.rb

@@ -1,4 +1,4 @@
 module RubyApp
-  VERSION = "0.0.57"
+  VERSION = "0.0.58"
   ROOT    = File.expand_path(File.dirname(__FILE__))
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyApp
 version: !ruby/object:Gem::Version 
-  hash: 109
+  hash: 107
   prerelease: 
   segments: 
   - 0
   - 0
-  - 57
-  version: 0.0.57
+  - 58
+  version: 0.0.58
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-08 00:00:00 Z
+date: 2012-01-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false