url_regexp 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62ed69e94460e3c50d9d20160d88c50e31fe0928
-  data.tar.gz: 2ca60a8b537b2b446e0979f2fb575db9aecb78bc
+  metadata.gz: 487e781ddee01fc474a062b437845457cc9d7726
+  data.tar.gz: 772dfd3b93f25bde5d00fbecd0ae12ff07b98d67
 SHA512:
-  metadata.gz: a904285e2bf5e22d4f7ad48056227814d811b986919a402a649b9a3ae878caa01eb1f819fafe6300121f68b7268c27aea62882c88a20594bc8810390cd27d00c
-  data.tar.gz: 69cc43725809e521e016d00a8c6e7178482835040bbf68ea48783349cb2f11561d7bd5b8885e32c43e74d717f5d63397b54d33a7911a05c69762bfec3e9b9bcf
+  metadata.gz: 8563e2a4b1c52c99fc7c17437fa3fc0a7c36bf366de1da0ee92bbe71c36f035400befe2f668ea8425e123cd0ca78e3796793f90aa5dcfb7b89866b6ab39c7c69
+  data.tar.gz: a4619b8a4b79af7c40756354dcb3a8174dad1aebf71a3c66bfe018a75a1a03f3b36df22055e45d5959c2001a9c641fa4941f243bf2fa7b36b7618328c0cf135e

data/.rubocop.yml

@@ -6,7 +6,7 @@ AllCops:
 Metrics/AbcSize:
   Max: 40
 Metrics/LineLength:
-  Max: 99
+  Max: 120
 Metrics/CyclomaticComplexity:
   Max: 20
 Metrics/PerceivedComplexity:
@@ -15,7 +15,20 @@ Metrics/MethodLength:
   Max: 30
 Metrics/BlockNesting:
   Max: 4
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
 Documentation:
   Enabled: false
 Style/SignalException:
   EnforcedStyle: only_raise
+RSpec/NamedSubject:
+  Enabled: false
+RSpec/ExampleLength:
+  Max: 20
+RSpec/MultipleExpectations:
+  Max: 10
+RSpec/NestedGroups:
+  Max: 5
+RSpec/SubjectStub:
+  Enabled: false

data/.travis.yml

@@ -1,8 +1,11 @@
 language: ruby
 rvm:
-  - 2.1
-  - 2.2
-  - 2.3.0
-before_install: gem install bundler -v 1.11.2
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
+before_install:
+  - gem update --system
+  - gem --version
 script:
   - bundle exec rake

data/Gemfile

@@ -1,11 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'simplecov'
-gem 'coveralls'
-# FIXME:
-#   Wait for the merge of https://github.com/bbatsov/rubocop/pull/2936
-gem 'rubocop', '~> 0.37.0', require: false
-gem 'rubocop-rspec', require: false
 gem 'pry'
 gem 'gem-release'
 

data/lib/url_regexp/path.rb

@@ -35,17 +35,17 @@ module UrlRegexp
       else
         label, rest = path.split('/', 2)
       end
-      if label
-        p = @paths.find { |pp| pp.label == label }
-        if p.nil?
-          p = Path.new(label, self, @options)
-          @paths.append(p)
-        end
-        if rest.nil?
-          p.path_end = true
-        else
-          p.append(rest)
-        end
+      return if label.nil?
+
+      p = @paths.find { |pp| pp.label == label }
+      if p.nil?
+        p = Path.new(label, self, @options)
+        @paths.append(p)
+      end
+      if rest.nil?
+        p.path_end = true
+      else
+        p.append(rest)
       end
     end
 

data/lib/url_regexp/query.rb

@@ -18,14 +18,16 @@ module UrlRegexp
     def to_regexp_s
       common_queries = @queries.reduce { |a, e| a & e } || []
       common_queries = common_queries.map { |q| Regexp.quote(q) }
-      regexp_s = if 1 < common_queries.size
-        "\\?(#{common_queries.permutation.map { |qs| "(.*&)?#{qs.join('.*&')}(&.*)?" }.join('|')})"
-      elsif 1 == common_queries.size
-        "\\?(.*&)?#{common_queries.first}(&.*)?"
+      if 1 <= common_queries.size
+        if 1 == common_queries.size
+          regexp_s = "\\?(.*&)?#{common_queries.first}(&.*)?"
+        else
+          regexp_s = "\\?(#{common_queries.permutation.map { |qs| "(.*&)?#{qs.join('.*&')}(&.*)?" }.join('|')})"
+        end
+        @include_nil ? "(#{regexp_s})?" : regexp_s
       else
         '(\\?.*)?'
       end
-      @include_nil ? "(#{regexp_s})?" : regexp_s
     end
   end
 end

data/lib/url_regexp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UrlRegexp
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

data/spec/spec_helper.rb

@@ -0,0 +1,27 @@
+require 'rubygems'
+require 'rspec'
+require 'simplecov'
+require 'coveralls'
+Coveralls.wear!
+
+resultset_path = SimpleCov::ResultMerger.resultset_path
+FileUtils.rm resultset_path if File.exist? resultset_path
+SimpleCov.use_merging true
+SimpleCov.at_exit do
+  SimpleCov.command_name "fork-#{$PID}"
+  SimpleCov.result.format!
+end
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start do
+  add_filter 'spec/'
+end
+
+require 'url_regexp'
+
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
+
+RSpec.configure do |config|
+end

data/spec/url_regexp/host_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe UrlRegexp::Host do
+  subject { described_class.new }
+
+  describe '#to_regexp_s' do
+    context 'single host' do
+      it 'returns regexp string' do
+        subject.append('www.example.com')
+        expect(subject.to_regexp_s).to eq 'www\\.example\\.com'
+      end
+    end
+    context 'multiple hosts' do
+      it 'returns regexp string' do
+        subject.append('www.example1.com')
+        subject.append('www.example2.com')
+        expect(subject.to_regexp_s).to eq '(www\\.example1\\.com|www\\.example2\\.com)'
+      end
+    end
+  end
+end

data/spec/url_regexp/node_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe UrlRegexp::Node do
+  subject { described_class.new }
+
+  describe '#append' do
+    it 'raises NotImplementedError' do
+      expect { subject.append('') }.to raise_error(NotImplementedError)
+    end
+  end
+  describe '#to_regexp_s' do
+    it 'raises NotImplementedError' do
+      expect { subject.to_regexp_s }.to raise_error(NotImplementedError)
+    end
+  end
+  describe '#to_regexp' do
+    it 'returns regexp of to_regexp_s' do
+      allow(subject).to receive(:to_regexp_s).and_return('foo[bar]')
+      expect(subject.to_regexp).to eq(/foo[bar]/)
+    end
+  end
+end

data/spec/url_regexp/path_set_spec.rb

@@ -0,0 +1,117 @@
+require 'spec_helper'
+
+describe UrlRegexp::PathSet do
+  subject { described_class.new }
+
+  describe '#to_regexp_s' do
+    context 'empty set' do
+      it 'returns nil' do
+        expect(subject.to_regexp_s).to eq nil
+      end
+    end
+    context 'single path' do
+      it 'returns regexp string' do
+        subject.append(UrlRegexp::Path.new('foo'))
+        expect(subject.to_regexp_s).to eq 'foo'
+      end
+    end
+    context 'multiple paths' do
+      it 'returns regexp string' do
+        subject.append(UrlRegexp::Path.new('foo'))
+        subject.append(UrlRegexp::Path.new('bar'))
+        expect(subject.to_regexp_s).to eq '(foo|bar)'
+      end
+      context 'same prefix paths' do
+        it 'returns regexp string' do
+          subject.append(UrlRegexp::Path.new('bar'))
+          subject.append(UrlRegexp::Path.new('bal'))
+          subject.append(UrlRegexp::Path.new('baz'))
+          expect(subject.to_regexp_s).to eq 'ba(r|l|z)'
+        end
+      end
+    end
+    context 'massive paths' do
+      context '6 paths' do
+        it 'returns regexp string' do
+          subject.append(UrlRegexp::Path.new('a'))
+          subject.append(UrlRegexp::Path.new('b'))
+          subject.append(UrlRegexp::Path.new('c'))
+          subject.append(UrlRegexp::Path.new('d'))
+          subject.append(UrlRegexp::Path.new('e'))
+          expect(subject.to_regexp_s).to eq '(a|b|c|d|e)'
+        end
+      end
+      context '6 paths' do
+        it 'returns regexp string' do
+          subject.append(UrlRegexp::Path.new('a'))
+          subject.append(UrlRegexp::Path.new('b'))
+          subject.append(UrlRegexp::Path.new('c'))
+          subject.append(UrlRegexp::Path.new('d'))
+          subject.append(UrlRegexp::Path.new('e'))
+          subject.append(UrlRegexp::Path.new('f'))
+          expect(subject.to_regexp_s).to eq '([^#?]*)'
+        end
+      end
+      context 'with wildcard_threshold option' do
+        subject { described_class.new(nil, wildcard_threshold: 3) }
+        context 'equal length' do
+          it 'returns regexp string' do
+            subject.append(UrlRegexp::Path.new('a'))
+            subject.append(UrlRegexp::Path.new('b'))
+            subject.append(UrlRegexp::Path.new('c'))
+            expect(subject.to_regexp_s).to eq '(a|b|c)'
+          end
+        end
+        context 'more than the value' do
+          it 'returns regexp string' do
+            subject.append(UrlRegexp::Path.new('a'))
+            subject.append(UrlRegexp::Path.new('b'))
+            subject.append(UrlRegexp::Path.new('c'))
+            subject.append(UrlRegexp::Path.new('d'))
+            expect(subject.to_regexp_s).to eq '([^#?]*)'
+          end
+        end
+      end
+    end
+    context 'merge paths' do
+      it 'returns regexp string' do
+        parent = UrlRegexp::Path.new
+        p1 = UrlRegexp::Path.new('foo', parent)
+        p1.append('wow')
+        p2 = UrlRegexp::Path.new('bar', parent)
+        p2.append('wow')
+
+        subject.append(p1)
+        subject.append(p2)
+        expect(subject.to_regexp_s).to eq '(foo|bar)/wow'
+      end
+      context 'with multiple paths' do
+        it 'returns regexp string' do
+          parent = UrlRegexp::Path.new
+          p1 = UrlRegexp::Path.new('foo', parent)
+          p1.append('wow/yay')
+          p2 = UrlRegexp::Path.new('bar', parent)
+          p2.append('wow/yay')
+
+          subject.append(p1)
+          subject.append(p2)
+          expect(subject.to_regexp_s).to eq '(foo|bar)/wow/yay'
+        end
+      end
+      context 'include path_end' do
+        it 'returns regexp string' do
+          parent = UrlRegexp::Path.new
+          p1 = UrlRegexp::Path.new('foo', parent)
+          p1.path_end = true
+          p1.append('wow')
+          p2 = UrlRegexp::Path.new('bar', parent)
+          p2.append('wow')
+
+          subject.append(p1)
+          subject.append(p2)
+          expect(subject.to_regexp_s).to eq '(foo(/wow)?|bar/wow)'
+        end
+      end
+    end
+  end
+end

data/spec/url_regexp/path_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe UrlRegexp::Path do
+  subject { described_class.new }
+
+  describe '#to_regexp_s' do
+    context 'only root' do
+      it 'returns regexp string' do
+        subject.append('/')
+        expect(subject.to_regexp_s).to eq '/'
+      end
+    end
+    context 'append same paths' do
+      it 'returns regexp string' do
+        subject.append('/foo')
+        expect(subject.to_regexp_s).to eq '/foo'
+        subject.append('/foo')
+        expect(subject.to_regexp_s).to eq '/foo'
+      end
+    end
+    context 'simple paths' do
+      it 'returns regexp string' do
+        subject.append('/foo/bar')
+        expect(subject.to_regexp_s).to eq '/foo/bar'
+        subject.append('/foo/wow')
+        expect(subject.to_regexp_s).to eq '/foo/(bar|wow)'
+      end
+    end
+    context 'include path end' do
+      it 'returns regexp string' do
+        subject.append('/foo')
+        subject.append('/foo/')
+        expect(subject.to_regexp_s).to eq '/foo(/)?'
+        subject.append('/foo/bar')
+        expect(subject.to_regexp_s).to eq '/foo(/(|bar))?'
+      end
+    end
+  end
+end

data/spec/url_regexp/query_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe UrlRegexp::Query do
+  subject { described_class.new }
+  describe '#to_regexp_s' do
+    context 'with various query' do
+      it 'generates regexp' do
+        subject.append('a=1')
+        subject.append('b=1')
+        regexp_s = subject.to_regexp_s
+        expect(regexp_s).to eq '(\\?.*)?'
+      end
+    end
+    context 'with common query' do
+      it 'generates regexp' do
+        subject.append('a=1')
+        subject.append('a=1&b=1')
+        regexp_s = subject.to_regexp_s
+        expect(regexp_s).to eq '\\?(.*&)?a=1(&.*)?'
+      end
+    end
+    context 'with multiple common queries' do
+      it 'generates regexp' do
+        subject.append('a=1&b=1')
+        subject.append('a=1&b=1')
+        regexp_s = subject.to_regexp_s
+        expect(regexp_s).to eq '\\?((.*&)?a=1.*&b=1(&.*)?|(.*&)?b=1.*&a=1(&.*)?)'
+      end
+    end
+    context 'with empty query' do
+      it 'generates regexp' do
+        subject.append('')
+        subject.append('a=1')
+        regexp_s = subject.to_regexp_s
+        expect(regexp_s).to eq '(\\?(.*&)?a=1(&.*)?)?'
+      end
+    end
+    context 'with only empty queries' do
+      it 'generates regexp' do
+        subject.append('')
+        subject.append('')
+        regexp_s = subject.to_regexp_s
+        expect(regexp_s).to eq '(\\?.*)?'
+      end
+    end
+  end
+end

data/spec/url_regexp/root_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe UrlRegexp::Root do
+  subject { described_class.new }
+  describe '#to_regexp_s' do
+    it 'generates regexp' do
+      subject.append('http://example.com/foo/bar?a=1&b=2')
+      subject.append('http://example.com/foo/wow?a=1&b=1')
+      regexp_s = subject.to_regexp_s
+      expect(regexp_s).to eq '^http://example\\.com/foo/(bar|wow)\\?(.*&)?a=1(&.*)?(#|$)'
+    end
+    context 'Replace redundant URL end' do
+      it 'generates regexp' do
+        subject.append('http://example.com/foo/bar')
+        subject.append('http://example.com/foo/wow')
+        regexp_s = subject.to_regexp_s
+        expect(regexp_s).to eq '^http://example\\.com/foo/(bar|wow)([?#]|$)'
+      end
+    end
+  end
+end

data/spec/url_regexp/scheme_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe UrlRegexp::Scheme do
+  subject { described_class.new }
+
+  describe '#to_regexp_s' do
+    context 'single scheme' do
+      it 'returns regexp string' do
+        subject.append('http')
+        expect(subject.to_regexp_s).to eq 'http://'
+      end
+    end
+    context 'multiple schemes' do
+      it 'returns regexp string' do
+        subject.append('http')
+        subject.append('https')
+        subject.append('ftp')
+        expect(subject.to_regexp_s).to eq '(http|https|ftp)://'
+      end
+    end
+    context 'http and https' do
+      it 'returns regexp string' do
+        subject.append('http')
+        subject.append('https')
+        expect(subject.to_regexp_s).to eq 'https?://'
+      end
+    end
+    context 'no scheme' do
+      it 'returns regexp string' do
+        expect(subject.to_regexp_s).to eq ''
+      end
+    end
+  end
+end

data/spec/url_regexp_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe UrlRegexp do
+  it 'has a version number' do
+    expect(UrlRegexp::VERSION).not_to be nil
+  end
+end

data/url_regexp.gemspec

@@ -6,18 +6,26 @@ require 'url_regexp/version'
 Gem::Specification.new do |spec|
   spec.name          = "url_regexp"
   spec.version       = UrlRegexp::VERSION
-  spec.authors       = ["Daisuke Taniwaki"]
+  spec.authors       = ["dtaniwaki"]
   spec.email         = ["daisuketaniwaki@gmail.com"]
-  spec.license     = "MIT"
+  spec.license       = "MIT"
 
   spec.summary       = %q{Generate regular expression for URL}
   spec.description   = %q{Generate regular expression for URL}
   spec.homepage      = "https://github.com/dtaniwaki/url_regexp"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  spec.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.required_ruby_version = [">= 2.1.0", "< 2.5"]
+
+  spec.add_development_dependency "rake", ">= 10.0", "< 13"
+  spec.add_development_dependency "rspec", ">= 3.0", "< 4"
+  spec.add_development_dependency "simplecov", "~> 0.12"
+  spec.add_development_dependency "timecop", "~> 0.8"
+  spec.add_development_dependency "rubocop", "~> 0.47"
+  spec.add_development_dependency "rubocop-rspec", "~> 1.4"
+  spec.add_development_dependency "coveralls", "~> 0.8"
 end

metadata

@@ -1,57 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: url_regexp
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
-- Daisuke Taniwaki
+- dtaniwaki
 autorequire: 
 bindir: bin
 cert_chain: []
 date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.47'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.47'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: Generate regular expression for URL
 email:
 - daisuketaniwaki@gmail.com
@@ -76,6 +144,15 @@ files:
 - lib/url_regexp/root.rb
 - lib/url_regexp/scheme.rb
 - lib/url_regexp/version.rb
+- spec/spec_helper.rb
+- spec/url_regexp/host_spec.rb
+- spec/url_regexp/node_spec.rb
+- spec/url_regexp/path_set_spec.rb
+- spec/url_regexp/path_spec.rb
+- spec/url_regexp/query_spec.rb
+- spec/url_regexp/root_spec.rb
+- spec/url_regexp/scheme_spec.rb
+- spec/url_regexp_spec.rb
 - url_regexp.gemspec
 homepage: https://github.com/dtaniwaki/url_regexp
 licenses:
@@ -89,7 +166,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -101,4 +181,13 @@ rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Generate regular expression for URL
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/url_regexp/host_spec.rb
+- spec/url_regexp/node_spec.rb
+- spec/url_regexp/path_set_spec.rb
+- spec/url_regexp/path_spec.rb
+- spec/url_regexp/query_spec.rb
+- spec/url_regexp/root_spec.rb
+- spec/url_regexp/scheme_spec.rb
+- spec/url_regexp_spec.rb