url_regexp 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f350bc548233f7897ce4c1e4c5c2905835454549
-  data.tar.gz: c3dc80a9fe0e099cc1ca8cb6b00fb8575616fe3b
+  metadata.gz: 62ed69e94460e3c50d9d20160d88c50e31fe0928
+  data.tar.gz: 2ca60a8b537b2b446e0979f2fb575db9aecb78bc
 SHA512:
-  metadata.gz: 2d0c2c0083914456cbf852a57ae904d2432063ef89fb1e1b335c79790180cfb181dcd50e5237f769d58ea8afde9a5834c0c2fe66e8005c1ea8077ced9f7d72bd
-  data.tar.gz: 95b44f1711e304625684f70cf7a4fad0c5c383b2b2ac4b3465c6c7b5d30a49d76f7d97c9a0083e1360e63c728acf3497aa3dcb86583815d5b13f2990081d2c7a
+  metadata.gz: a904285e2bf5e22d4f7ad48056227814d811b986919a402a649b9a3ae878caa01eb1f819fafe6300121f68b7268c27aea62882c88a20594bc8810390cd27d00c
+  data.tar.gz: 69cc43725809e521e016d00a8c6e7178482835040bbf68ea48783349cb2f11561d7bd5b8885e32c43e74d717f5d63397b54d33a7911a05c69762bfec3e9b9bcf

data/.gemrelease

@@ -0,0 +1,2 @@
+bump:
+  tag: true

data/.rubocop.yml

@@ -4,7 +4,7 @@ AllCops:
     - 'lib/**/*'
     - 'spec/**/*'
 Metrics/AbcSize:
-  Max: 32
+  Max: 40
 Metrics/LineLength:
   Max: 99
 Metrics/CyclomaticComplexity:
@@ -13,6 +13,8 @@ Metrics/PerceivedComplexity:
   Max: 20
 Metrics/MethodLength:
   Max: 30
+Metrics/BlockNesting:
+  Max: 4
 Documentation:
   Enabled: false
 Style/SignalException:

data/Gemfile

@@ -2,8 +2,11 @@ source 'https://rubygems.org'
 
 gem 'simplecov'
 gem 'coveralls'
-gem 'rubocop', require: false
+# 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'
 
 gemspec

data/README.md

@@ -36,7 +36,24 @@ root.to_regexp
 # => /^http:\/\/www\.example\.com\/(foo|boo)\/bar(\/wow)?([?#]|$)/
 ```
 
-You can set the options globally and locally. Locally set option overwrites the one globally set. Just add any settings necessary for your mailers from the list below.
+## Options
+
+### wildcard_threshold (default: 5)
+
+You can change the threshold to group paths as wildcard.
+
+```ruby
+root = UrlRegexp::Root.new(wildcard_threshold: 2)
+root.append('http://www.example.com/foo')
+root.to_regexp
+# => /^http:\/\/www\.example\.com\/foo([?#]|$)/
+root.append('http://www.example.com/bar')
+root.to_regexp
+# => /^http:\/\/www\.example\.com\/(foo|bar)([?#]|$)/
+root.append('http://www.example.com/wow')
+root.to_regexp
+# => /^http:\/\/www\.example\.com\/([^#?]*)([?#]|$)/
+```
 
 ## Test
 

data/lib/url_regexp/host.rb

@@ -1,7 +1,8 @@
 module UrlRegexp
   class Host < Node
-    def initialize
+    def initialize(options = {})
       @hosts = Set.new
+      @options = options
     end
 
     def append(host)

data/lib/url_regexp/path.rb

@@ -6,10 +6,11 @@ module UrlRegexp
     attr_reader :label, :paths
     attr_accessor :path_end
 
-    def initialize(label = nil, parent = nil)
+    def initialize(label = nil, parent = nil, options = {})
       @label = label
       @parent = parent
-      @paths = PathSet.new
+      @options = options
+      @paths = PathSet.new(nil, @options)
       @path_end = false
     end
 
@@ -28,7 +29,7 @@ module UrlRegexp
 
     def append(path)
       if path == ''
-        @paths.append(Path.new('', self))
+        @paths.append(Path.new('', self, @options))
       elsif @parent.nil?
         _, label, rest = path.split('/', 3)
       else
@@ -37,7 +38,7 @@ module UrlRegexp
       if label
         p = @paths.find { |pp| pp.label == label }
         if p.nil?
-          p = Path.new(label, self)
+          p = Path.new(label, self, @options)
           @paths.append(p)
         end
         if rest.nil?

data/lib/url_regexp/path_set.rb

@@ -15,8 +15,10 @@ module UrlRegexp
 
     def_delegators :@set, :size, *Enumerable.public_instance_methods(false)
 
-    def initialize(set = Set.new)
-      @set = set
+    def initialize(set = nil, options = {})
+      @set = set || Set.new
+      @options = options
+      @wildcard_threshold = options[:wildcard_threshold] || 5
     end
 
     def append(path)
@@ -35,11 +37,11 @@ module UrlRegexp
     end
 
     def &(other)
-      self.class.new(@set & other.set)
+      self.class.new(@set & other.set, @options)
     end
 
     def |(other)
-      self.class.new(@set & other.set)
+      self.class.new(@set & other.set, @options)
     end
 
     def include?(path)
@@ -47,14 +49,25 @@ module UrlRegexp
     end
 
     def to_regexp_s
-      if 5 < size
+      if @wildcard_threshold < size
         '([^#?]*)'
       elsif 1 < size
         children_paths = map(&:paths).reduce { |a, e| a & e }
         if children_paths.size == 1 && all? { |p| !p.path_end }
           "(#{map(&:label).join('|')})/#{children_paths.to_regexp_s}"
         else
-          "(#{map(&:to_regexp_s).join('|')})"
+          regexps = map(&:to_regexp_s)
+          match = ''
+          if regexps.size > 1
+            base = regexps[0]
+            base.split(//).each do |c|
+              tmp = match + c
+              break unless regexps[1..-1].all? { |r| r.start_with? tmp }
+              match = tmp
+            end
+            regexps = regexps.map { |r| r[match.size..-1] }
+          end
+          "#{match}(#{regexps.join('|')})"
         end
       elsif 1 == size
         to_a.first.to_regexp_s

data/lib/url_regexp/query.rb

@@ -1,24 +1,31 @@
 module UrlRegexp
   class Query
-    def initialize
+    def initialize(options = {})
+      @include_nil = false
       @queries = []
+      @options = options
     end
 
     def append(query)
-      return if query.nil?
-      @queries << query.to_s.split('&').reject(&:empty?)
+      query = query.to_s
+      if query.empty?
+        @include_nil = true
+        return
+      end
+      @queries << query.split('&')
     end
 
     def to_regexp_s
       common_queries = @queries.reduce { |a, e| a & e } || []
       common_queries = common_queries.map { |q| Regexp.quote(q) }
-      if 1 < common_queries.size
+      regexp_s = if 1 < common_queries.size
         "\\?(#{common_queries.permutation.map { |qs| "(.*&)?#{qs.join('.*&')}(&.*)?" }.join('|')})"
       elsif 1 == common_queries.size
         "\\?(.*&)?#{common_queries.first}(&.*)?"
       else
         '(\\?.*)?'
       end
+      @include_nil ? "(#{regexp_s})?" : regexp_s
     end
   end
 end

data/lib/url_regexp/root.rb

@@ -4,11 +4,12 @@ end
 
 module UrlRegexp
   class Root < Node
-    def initialize
-      @scheme = Scheme.new
-      @host = Host.new
-      @path = Path.new
-      @query = Query.new
+    def initialize(options = {})
+      @scheme = Scheme.new(options)
+      @host = Host.new(options)
+      @path = Path.new(nil, nil, options)
+      @query = Query.new(options)
+      @options = options
     end
 
     def append(url)

data/lib/url_regexp/scheme.rb

@@ -2,8 +2,9 @@ require_relative './node'
 
 module UrlRegexp
   class Scheme < Node
-    def initialize
+    def initialize(options = {})
       @schemes = Set.new
+      @options = options
     end
 
     def append(scheme)

data/lib/url_regexp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: url_regexp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Daisuke Taniwaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gemrelease"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -96,9 +97,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Generate regular expression for URL
 test_files: []
-has_rdoc: