watir-rails 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f8abf0d7e9d327caf7fa3e7c5a21d13dac8f47c
-  data.tar.gz: b90e0a98b4296d0f740d6fd69c946ed9097f188b
+  metadata.gz: 421b12de052b4ab122bff2ec846731b9d3a67786
+  data.tar.gz: 59e48d801ea1d2b9bd2ce8be8ca59acf76ae0257
 SHA512:
-  metadata.gz: 903bacfd1d2c8409a8c43f3d2e4882aa996e2d046f3039b0264f9b9e05d2bb893d941f86820be2caacc93b69e27a89db5cbe6de039a8e760d84566b6d6f35bae
-  data.tar.gz: 46ac28987d1dfe385bf3d7a185a2da6c86eadf6a42c2578edf2489f08e3155196524642f5413592cfc1e55ea6a1f04877054082fdd3820072fcd4c78f4b261f1
+  metadata.gz: cd628805b43e11183862b3e4a0738e949a3ecbf97024506dee1427962c05d4a9611e9892bf8c28e34313083213a42b5d07f9e4d8b705f5acb076c5956f508735
+  data.tar.gz: b960519f894129e1aed748f5b83e2b85740e39b9e1ee9fbb693050fc295a6b6002f8be56b3b656d8eef05a7062c32f43677789ad0cb069fa065fbcc0c7e3ecac

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 1.2.0 - 2016/01/16
+
+* Add support for running Rails on Puma server. PR #15 by Andrey Koleshko.
+
 ### 1.1.0 - 2015/07/22
 
 * Remove strict `mime-types` dependency. See #13

data/Rakefile

@@ -3,7 +3,7 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-task :release => :spec
+task :build => :spec
 
 require "yard"
 YARD::Rake::YardocTask.new

data/lib/watir/rails.rb

@@ -141,11 +141,18 @@ module Watir
         begin
           require 'rack/handler/thin'
           Thin::Logging.silent = true
-          Rack::Handler::Thin.run(app, :Port => port)
+          return Rack::Handler::Thin.run(app, :Port => port)
         rescue LoadError
-          require 'rack/handler/webrick'
-          Rack::Handler::WEBrick.run(app, :Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
         end
+
+        begin
+          require 'rack/handler/puma'
+          return Rack::Handler::Puma.run(app, :Port => port, :Silent => true)
+        rescue LoadError
+        end
+
+        require 'rack/handler/webrick'
+        Rack::Handler::WEBrick.run(app, :Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
       end
 
       def legacy_rails?

data/lib/watir/version.rb

@@ -1,5 +1,5 @@
 module Watir
   class Rails
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/spec/watir/rails_spec.rb

@@ -126,7 +126,7 @@ describe Watir::Rails do
       response = double(Net::HTTPSuccess, is_a?: false)
       expect(Net::HTTP).to receive(:start).and_return response
       expect(described_class).not_to be_running
-    end    
+    end
 
     it "true if server response is success" do
       fake_thread = double("thread", join: nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jarmo Pertman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Use Watir (http://github.com/watir/watir) in Rails.