falcon-capybara 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f13782d8b3ab7182209b65b6545fc3ad8a1c4acd
-  data.tar.gz: 247c771c625fc5590b878c39bbe3f4b0484f5faa
+SHA256:
+  metadata.gz: f4162ab989c210b1cec6c9da885de4d750028b4e4136d07141f1722497c14f39
+  data.tar.gz: 85b2701c5a7b97b570d68cc90a7822da77e5efa490d4da86583c231dd0f96cc0
 SHA512:
-  metadata.gz: 650fbbb92b42056029fe130b509ee1a1cd698e1ebd16418c2978b95b67067f54e0123985877e38d3b4f27cf8d8eac4f74882c51e2d74fc2f94396f8c5768ca6b
-  data.tar.gz: 445cde6699a18be68f5f876dded9365c08c06a8b1092bda229ed376ba7e96291dabc591cad3ff943cb500956c551442b76b2b28a6cd76dde9d107aff0dea49ee
+  metadata.gz: 50dc210923c0df355de145e0905765784c20c597dd8889261c99df7222b7981dcf781be66cb4583074b3b476d04bd5425cdbf797154e899c289889a38e3f3c9f
+  data.tar.gz: 017cf0912a7634f9fda1e8a372d32cc0c737489a19bb10d6b429250e006b460c418e9dbbd62db7672c0a986fce9f576c97996511ee5264e106f208a8f4d40f8c

data/.travis.yml

@@ -2,6 +2,10 @@ language: ruby
 sudo: false
 dist: trusty
 cache: bundler
+addons:
+  apt:
+    packages:
+      - google-chrome-stable
 rvm:
   - 2.0
   - 2.1

data/Gemfile

@@ -4,3 +4,7 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in falcon-capybara.gemspec
 gemspec
+
+group :development do
+	gem "pry"
+end

data/README.md

@@ -32,7 +32,7 @@ Or install it yourself as:
 In your `spec_helper.rb` add the following:
 
 ```ruby
-require 'falcon-capybara'
+require "falcon/capybara"
 
 require "capybara/rspec"
 Capybara.configure do |config|
@@ -42,6 +42,8 @@ Capybara.configure do |config|
 end
 ```
 
+### Selenium
+
 Optionally, you might want to set up selenium:
 
 ```ruby
@@ -49,6 +51,12 @@ require "selenium/webdriver"
 Capybara.javascript_driver = :selenium_chrome_headless
 ```
 
+To use chromedriver add the following to your gemfile:
+
+```ruby
+gem "chromedriver-helper"
+```
+
 ## Contributing
 
 1. Fork it

data/falcon-capybara.gemspec

@@ -18,10 +18,12 @@ Gem::Specification.new do |spec|
 	
 	spec.require_paths = ["lib"]
 	
-	spec.add_dependency "falcon"
+	spec.add_dependency "falcon", "~> 0.9"
 	spec.add_dependency "capybara"
 	spec.add_dependency "selenium-webdriver"
 	
+	spec.add_development_dependency "chromedriver-helper"
+	
 	spec.add_development_dependency "bundler", "~> 1.15"
 	spec.add_development_dependency "rake", "~> 10.0"
 	spec.add_development_dependency "rspec", "~> 3.0"

data/lib/falcon/capybara.rb

@@ -21,14 +21,6 @@
 require 'capybara'
 
 require_relative "capybara/version"
+require_relative "capybara/wrapper"
 
-Capybara.register_server :falcon do |app, port, host|
-	require 'async/reactor'
-	require 'falcon/server'
-	
-	Async::Reactor.run do
-		server = Falcon::Server.new(app, [Async::IO::Endpoint.tcp(host, port)])
-		
-		server.run
-	end
-end
+Capybara.servers[:falcon] = Falcon::Capybara::Wrapper.new

data/lib/falcon/capybara/version.rb

@@ -20,6 +20,6 @@
 
 module Falcon
 	module Capybara
-		VERSION = "1.0.0"
+		VERSION = "1.1.0"
 	end
 end

data/lib/falcon/capybara/wrapper.rb

@@ -0,0 +1,75 @@
+# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'thread'
+
+require 'async/condition'
+require 'async/io/notification'
+
+module Falcon
+	module Capybara
+		class Wrapper
+			def initialize
+				@job = nil
+				
+				@job_available = Async::IO::Notification.new
+				@job_complete = Async::IO::Notification.new
+			end
+			
+			def close
+				@job_available.close
+				@job_complete.close
+			end
+			
+			def remote(&block)
+				@job = block
+				@job_available.signal
+				
+				Async::Reactor.run do
+					Async.logger.debug (self) {"Waiting for job completion..."}
+					@job_complete.wait until @job.nil?
+				end.wait
+			end
+			
+			def call(app, port, host)
+				require 'async/reactor'
+				require 'falcon/server'
+				
+				Async::Reactor.run do |task|
+					server = Falcon::Server.new(app, Async::IO::Endpoint.tcp(host, port))
+					
+					task.async do
+						Async.logger.debug (self) {"Running server..."}
+						server.run
+					end
+					
+					while true
+						Async.logger.debug (self) {"Waiting for job..."}
+						@job_available.wait while @job.nil?
+						
+						Async.logger.debug (self) {"Running job #{@job}"}
+						@job.call
+						@job = nil
+					end
+				end
+			end
+		end
+	end
+end

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: falcon-capybara
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: falcon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,13 +53,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -110,6 +124,7 @@ files:
 - falcon-capybara.gemspec
 - lib/falcon/capybara.rb
 - lib/falcon/capybara/version.rb
+- lib/falcon/capybara/wrapper.rb
 homepage: https://github.com/socketry/falcon-capybara
 licenses: []
 metadata: {}
@@ -129,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ''