capybara-webkit 0.10.0 → 0.10.1

data/ChangeLog

@@ -1,3 +1,19 @@
+2012-03-02  Matthew Mongeau  <halogenandtoast@gmail.com>
+  * capybara_webkit_builder.rb:
+	set LANG to en_US.UTF-8 to prevent string encoding issues during install
+
+2012-03-02  Marc Schwieterman
+  * Rakefile: pro, find_command, and CommandFactory are more structured
+
+2012-02-27  Joe Ferris  <jferris@thoughtbot.com>
+  * README.md: Fixed broken wiki link
+
+2012-02-24  Joe Ferris  <jferris@thoughtbot.com>
+  * README.md: Update instructions for platform specific installation issues
+
+2012-02-17  Matthew Mongeau  <halogenandtoast@gmail.com>
+  * driver_spec.rb, capybara.js: Send proper keycode during keypress event
+
 2012-02-17  Matthew Mongeau  <halogenandtoast@gmail.com>
   * ChangeLog, version.rb:
 	Bump to 0.10.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (0.9.0)
+    capybara-webkit (0.10.1)
       capybara (>= 1.0.0, < 1.2)
       json
 

data/NEWS.md

@@ -1,3 +1,9 @@
+New for 0.10.1:
+* LANG environment variable is set to en_US.UTF-8 in order to avoid string encoding issues from qmake.
+* pro, find_command, and CommandFactory are more structured.
+* Changed wiki link and directing platform specific issues to the google group.
+* Pass proper keycode value for keypress events.
+
 New for 0.10.0:
 
 * current_url now more closely matches the behavior of Selenium

data/README.md

@@ -3,13 +3,13 @@ capybara-webkit
 
 A [capybara](https://github.com/jnicklas/capybara) driver that uses [WebKit](http://webkit.org) via [QtWebKit](http://doc.qt.nokia.com/4.7/qtwebkit.html).
 
-Qt Dependency
+Qt Dependency and Installation Issues
 -------------
 
 capybara-webkit depends on a WebKit implementation from Qt, a cross-platform
 development toolkit. You'll need to download the Qt libraries to build and
 install the gem. You can find instructions for downloading and installing QT on
-the [capybara-webkit wiki](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-QT)
+the [capybara-webkit wiki](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit)
 
 Reporting Issues
 ----------------
@@ -20,7 +20,11 @@ log of what happened during each test. Before filing a crash bug, please see
 [Reporting Crashes](https://github.com/thoughtbot/capybara-webkit/wiki/Reporting-Crashes).
 You're much more likely to get a fix if you follow those instructions.
 
-If you are having compiling issues please post to the [mailing list](http://groups.google.com/group/capybara-webkit).
+If you are having compiling issues please check out the
+[capybara-webkit wiki](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit).
+If you don't have any luck there, please post to the
+[mailing list](http://groups.google.com/group/capybara-webkit). Please don't
+open a Github issue for a system-specific compiler issue.
 
 CI
 --

data/Rakefile

@@ -49,12 +49,17 @@ task :generate_command do
 
   Dir.glob("src/*.pro").each do |project_file_name|
     project = IO.read(project_file_name)
-    project.gsub!(/^(HEADERS = .*)/, "\\1 #{name}.h")
-    project.gsub!(/^(SOURCES = .*)/, "\\1 #{name}.cpp")
+    project.gsub!(/^(HEADERS = .*)/, "\\1\n  #{name}.h \\")
+    project.gsub!(/^(SOURCES = .*)/, "\\1\n  #{name}.cpp \\")
     File.open(project_file_name, "w") { |file| file.write(project) }
   end
 
   File.open("src/find_command.h", "a") do |file|
-    file.write("CHECK_COMMAND(#{name})")
+    file.write("CHECK_COMMAND(#{name})\n")
   end
+
+  command_factory_file_name = "src/CommandFactory.cpp"
+  command_factory = IO.read(command_factory_file_name)
+  command_factory.sub!(/^$/, "#include \"#{name}.h\"\n")
+  File.open(command_factory_file_name, "w") { |file| file.write(command_factory) }
 end

data/lib/capybara/driver/webkit/version.rb

@@ -1,7 +1,7 @@
 module Capybara
   module Driver
     class Webkit
-      VERSION = '0.10.0'.freeze
+      VERSION = '0.10.1'.freeze
     end
   end
 end

data/lib/capybara_webkit_builder.rb

@@ -28,11 +28,11 @@ module CapybaraWebkitBuilder
   end
 
   def makefile
-    system("#{qmake_bin} -spec #{spec}")
+    system("LANG='en_US.UTF-8' #{qmake_bin} -spec #{spec}")
   end
 
   def qmake
-    system("#{make_bin} qmake")
+    system("LANG='en_US.UTF-8' #{make_bin} qmake")
   end
 
   def build

data/spec/driver_spec.rb

@@ -1408,4 +1408,34 @@ describe Capybara::Driver::Webkit do
       subject.body.should include "Congrats"
     end
   end
+
+  context "keypress app" do
+    before(:all) do
+      @app = lambda do |env|
+        body = <<-HTML
+            <html>
+              <head><title>Form</title></head>
+              <body>
+                <div id="charcode_value"></div>
+                <input type="text" id="charcode" name="charcode" onkeypress="setcharcode" />
+                <script type="text/javascript">
+                  var element = document.getElementById("charcode")
+                  element.addEventListener("keypress", setcharcode);
+                  function setcharcode(event) {
+                    var element = document.getElementById("charcode_value");
+                    element.innerHTML = event.charCode;
+                  }
+                </script>
+              </body>
+            </html>
+        HTML
+        [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s }, [body]]
+      end
+    end
+
+    it "returns the charCode for the keypressed" do
+      subject.find("//input")[0].set("a")
+      subject.find("//div")[0].text.should == "97"
+    end
+  end
 end

data/src/capybara.js

@@ -174,7 +174,7 @@ Capybara = {
       for (strindex = 0; strindex < length; strindex++) {
         node.value += value[strindex];
         this.trigger(index, "keydown");
-        this.keypress(index, false, false, false, false, 0, value[strindex]);
+        this.keypress(index, false, false, false, false, 0, value.charCodeAt(strindex));
         this.trigger(index, "keyup");
       }
       this.trigger(index, "change");

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000Z
+date: 2012-03-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2157249340 !ruby/object:Gem::Requirement
+  requirement: &2153762820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -28,10 +28,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2157249340
+  version_requirements: *2153762820
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2157247960 !ruby/object:Gem::Requirement
+  requirement: &2156481880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -39,10 +39,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157247960
+  version_requirements: *2156481880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157240260 !ruby/object:Gem::Requirement
+  requirement: &2156481340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -50,10 +50,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2157240260
+  version_requirements: *2156481340
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2157239520 !ruby/object:Gem::Requirement
+  requirement: &2156480920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -61,10 +61,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157239520
+  version_requirements: *2156480920
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &2157238560 !ruby/object:Gem::Requirement
+  requirement: &2156480460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -72,10 +72,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157238560
+  version_requirements: *2156480460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157237520 !ruby/object:Gem::Requirement
+  requirement: &2156480040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -83,10 +83,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157237520
+  version_requirements: *2156480040
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &2157236860 !ruby/object:Gem::Requirement
+  requirement: &2156479540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,7 +94,7 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2157236860
+  version_requirements: *2156479540
 description: 
 email: support@thoughtbot.com
 executables: []
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Headless Webkit driver for Capybara