opt_parse_validator 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b0a34c11c84d6fa32580ed925dac42346cee747
-  data.tar.gz: 7c50ea36943042d5cf7f8b77c15fd93b0969339c
+  metadata.gz: a2723f3613fc6738288980bec82ff2541520ff7d
+  data.tar.gz: 0917da11c83e5ed23ee707b8c0858c367e5caac9
 SHA512:
-  metadata.gz: 051c726116d357bd876f87d9a113ba3c00f53a2b146e92e69d2447bef77de471fe2150f2c834356d52a1ec0b5b14f0b8e94e3177e3e6c84190ceac2068be1579
-  data.tar.gz: 910103742d3c7cfab15980043a02a169a9708f4ed3f11086ee280eec9d8cdd57621d82a8cf04f7739083f7384fd50c98e45ac2e5a129175c5a5461f52d2c8ff6
+  metadata.gz: 0629015ce8aec7f45c5a30e96d4c9ebe2188fffd14c5813f800fa7786cdb694c7480958e6c97bd6826d869348f8364e25b92addcebd82ddb1ace3d3930116c2e
+  data.tar.gz: a36713b133c62e53dcdcc7cdf34188850be49c6fd9dc1f6122597e05fab572d92d85b3e6df0369667ea33afef6a7983f7fc9bc49858e1fd615a496d138ef3500

data/README.md

@@ -34,7 +34,10 @@ OptParseValidator
   - :writable
 - Proxy
   - :protocols
+  - :default_protocol
 - String
 - URI
   - :protocols
+  - :default_protocol
 - URL
+  - :default_protocol

data/lib/opt_parse_validator/opts/uri.rb

@@ -5,14 +5,22 @@ module OptParseValidator
       @allowed_protocols ||= [*attrs[:protocols]]
     end
 
+    # The default protocol (or scheme) to use if none was given
+    def default_protocol
+      @default_protocol ||= attrs[:default_protocol]
+    end
+
     # @param [ String ] value
     #
     # @return [ String ]
     def validate(value)
-      uri       = Addressable::URI.parse(value)
-      protocols = allowed_protocols
+      uri = Addressable::URI.parse(value)
+
+      if !uri.scheme && default_protocol
+        uri = Addressable::URI.parse("#{default_protocol}://#{value}")
+      end
 
-      unless protocols.empty? || protocols.include?(uri.scheme)
+      unless allowed_protocols.empty? || allowed_protocols.include?(uri.scheme)
         # For future refs: will have to check if the uri.scheme exists,
         # otherwise it means that the value was empty
         fail Addressable::URI::InvalidURIError

data/lib/opt_parse_validator/version.rb

@@ -1,4 +1,4 @@
 # Gem Version
 module OptParseValidator
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/lib/opt_parse_validator/opts/uri_spec.rb

@@ -8,6 +8,7 @@ describe OptParseValidator::OptURI do
   describe '#new, #allowed_protocols' do
     context 'when no attrs supplied' do
       its(:allowed_protocols) { should be_empty }
+      its(:default_protocol) { should be nil }
     end
 
     context 'when only one protocol supplied' do
@@ -29,7 +30,7 @@ describe OptParseValidator::OptURI do
   end
 
   describe '#validate' do
-    context 'when the allowed_protocols is empty' do
+    context 'when allowed_protocols is empty' do
       it 'accepts all protocols' do
         %w(http ftp file).each do |p|
           expected = "#{p}://testing"
@@ -53,6 +54,22 @@ describe OptParseValidator::OptURI do
         expect(opt.validate(expected)).to eq expected
       end
     end
+
+    context 'when default_protocol' do
+      let(:attrs) { { default_protocol: 'ftp' } }
+
+      context 'when the argument already contains a protocol' do
+        it 'does not add the default protocol' do
+          expect(opt.validate('http://ex.lo')).to eq 'http://ex.lo'
+        end
+      end
+
+      context 'when no protocol given in the argument' do
+        it 'adds it' do
+          expect(opt.validate('ex.lo')).to eq 'ftp://ex.lo'
+        end
+      end
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_parse_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - WPScanTeam - Erwan le Rousseau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable