dredd-rack 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4278e4bc0587b5ed694817be28ab765e3460f7c1
-  data.tar.gz: ed36921e13d44511dd2e07a7f42fffae50cb5e1c
+  metadata.gz: 18df818e221d674ff9790acfbccc8cb2324fcab3
+  data.tar.gz: 6631de46a43a5dc77506c7b42de90d7ad383142e
 SHA512:
-  metadata.gz: d05bc71fd49b22d448da2051089c9dd285365264c6b208590d5d19468c05777dd2a2ad6396e57601546b5c5a3918d5f84c11689d7241e1b8f27f1da33bbf6318
-  data.tar.gz: 0b2c37756677d31608eaa57a18dd0b3c6ad45dc612ee76fcf9402111cc2e88d3acd0169257e58c52d8be71cea338ece227996c3422cc0775c65f242e5be30665
+  metadata.gz: cc4009ccc1e08a1ae033edb244ec1a8db6e50dff78686ea96d249859a9a70ae3fd7225dfb460cbc757add66c77f0a6f7f15dd6eeb8a1a4f666edde24e3a70422
+  data.tar.gz: 6c940aef0d478e172e73455516944bff12b6de3a5001b674a12ac2238c782bff9df04d02bf9f1415036aca34f2de4816c7de4327f8466f2ed95c4b0328b0de0d

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.8.2] - 2016-06-08
+
+### Fixed
+
+- Fix inaccurate counting of command arguments for local API
+- Minor fix missing documentation for Dredd v1.0.8 options
+
 ## [0.8.1] - 2016-05-07
 
 ### Added
@@ -65,6 +72,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 The original implementation of the Rake task was shared in this [gist][gist].
 
 [gist]: https://gist.github.com/gonzalo-bulnes/eec3f73cc7d6605add21
+[0.8.2]: https://github.com/gonzalo-bulnes/dredd-rack/compare/v0.8.1...v0.8.2
 [0.8.1]: https://github.com/gonzalo-bulnes/dredd-rack/compare/v0.7.1...v0.8.1
 [0.8.0]: https://github.com/gonzalo-bulnes/dredd-rack/compare/v0.7.1...v0.8.0
 [0.7.1]: https://github.com/gonzalo-bulnes/dredd-rack/compare/v0.7.0...v0.7.1

data/README.md

@@ -28,7 +28,7 @@ Add the gem to your `Gemfile`:
 ```ruby
 # Gemfile
 
-gem 'dredd-rack', '0.8.1' # see semver.org
+gem 'dredd-rack', '0.8.2' # see semver.org
 ```
 
 Define which application Dredd::Rack must serve automatically:

data/doc/runner.md

@@ -82,6 +82,15 @@ dredd = Dredd::Rack::Runner.new do |options|
 
   options.method('POST').method('PUT')
 
+  options.hooks_worker_timeout 5000
+  options.hooks_worker_connect_timeout 1500
+  options.hooks_worker_connect_retry 500
+  options.hooks_worker_after_connect_wait 100
+  options.hooks_worker_term_timeout 5000
+  options.hooks_worker_term_retry 500
+  options.hooks_worker_handler_host 'localhost'
+  options.hooks_worker_handler_port 61321
+
   options.dry_run!            # no_dry_run!
   options.sandbox!            # no_sandbox!
   options.names!              # no_names!

data/lib/dredd/rack/runner.rb

@@ -117,7 +117,11 @@ module Dredd
         end
 
         def command_valid?
-          command.has_at_least_two_arguments?
+          if api_remote?
+            command.has_at_least_two_arguments?
+          else
+            command.has_at_least_one_argument?
+          end
         end
 
         def start_server!
@@ -151,6 +155,34 @@ end
 
 class String
 
+  # Verify that a command has at least one argument (excluding options)
+  #
+  # Examples:
+  #
+  #    "dredd doc/*.apib".valid? # => true
+  #    "dredd doc/*.apib doc/*apib.md".valid? # => true
+  #    "dredd doc/*.apib --level verbose".valid? # => true
+  #    "dredd".valid? # => false
+  #    "dredd --dry-run".valid? # => false
+  #    "dredd --dry-run --level verbose".valid? # => false
+  #
+  # Known limitations:
+  #
+  # Does not support short flags. (e.g. using `-l` instead of `--level`).
+  # Requires options to be specified after the last argument.
+  #
+  # Note:
+  #
+  # The known limitations imply that there may be false negatives: this method
+  # can return false for commands that do have two arguments or more. But there
+  # should not be false positives: if the method returns true, then the command
+  # does have at least two arguments.
+  #
+  # Returns true if the command String has at least one arguments, false otherwise.
+  def has_at_least_one_argument?
+    split('--').first.split(' ').length >= 2
+  end
+
   # Verify that a command has at least two arguments (excluding options)
   #
   # Examples:

data/lib/dredd/rack/version.rb

@@ -1,5 +1,5 @@
 module Dredd
   module Rack
-    VERSION = '0.8.1'
+    VERSION = '0.8.2'
   end
 end

data/spec/lib/dredd/rack/runner_spec.rb

@@ -74,13 +74,33 @@ describe Dredd::Rack::Runner do
 
   describe '#command_valid?', private: true do
 
-    context 'when the generated command has less than two arguments' do
+
+    context 'when the command has less than one argument' do
 
       it 'returns false' do
+        allow(subject).to receive_message_chain(:command, :has_at_least_one_argument?).and_return(false)
         allow(subject).to receive_message_chain(:command, :has_at_least_two_arguments?).and_return(false)
+
         expect(subject.send(:command_valid?)).not_to be_truthy
       end
     end
+
+    context 'when the API to test is remote' do
+
+      before(:each) do
+        allow(subject).to receive(:api_remote?).and_return(true)
+      end
+
+      context 'when the command has less than two arguments' do
+
+        it 'returns false' do
+          allow(subject).to receive_message_chain(:command, :has_at_least_one_argument?).and_return(true)
+          allow(subject).to receive_message_chain(:command, :has_at_least_two_arguments?).and_return(false)
+
+          expect(subject.send(:command_valid?)).not_to be_truthy
+        end
+      end
+    end
   end
 
   describe '#configure', public: true do
@@ -252,6 +272,10 @@ end
 
 describe String, public: true do
 
+  it 'responds to :has_at_least_one_argument?' do
+    expect(subject).to respond_to :has_at_least_one_argument?
+  end
+
   it 'responds to :has_at_least_two_arguments?' do
     expect(subject).to respond_to :has_at_least_two_arguments?
   end
@@ -260,6 +284,37 @@ describe String, public: true do
     expect(subject).to respond_to :quote!
   end
 
+  describe '#has_at_least_one_argument?' do
+
+    context 'when the String can be interpreted as a command with at least one argument' do
+      context 'returns true (reliable)' do
+
+        ['dredd doc/*.apib',
+         'dredd doc/*.apib doc/*apib.md',
+         'dredd doc/*.apib --level verbose'].each do |subject|
+
+          it "e.g. '#{subject}'" do
+            expect(subject.has_at_least_one_argument?).to be_truthy
+          end
+        end
+      end
+    end
+
+    context 'when the String can be interpreted as a command with no arguments' do
+      context 'returns false (unreliable)' do
+
+        ['dredd',
+         'dredd --dry-run',
+         'dredd --dry-run --level verbose'].each do |subject|
+
+          it "e.g. '#{subject}'" do
+            expect(subject.has_at_least_one_argument?).to be_falsey
+          end
+        end
+      end
+    end
+  end
+
   describe '#has_at_least_two_arguments?' do
 
     context 'when the String can be interpreted as a command with at least two arguments' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dredd-rack
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Gonzalo Bulnes Guilpain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-07 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: Convenient API blueprint testing with Apiary Dredd for Rack applications.