url_regexp 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e00ee5f39e4cd8652f37ca2cd51d3e9089217608
-  data.tar.gz: 94adfb1668385c347a8875415df91d1eac1bf426
+  metadata.gz: f350bc548233f7897ce4c1e4c5c2905835454549
+  data.tar.gz: c3dc80a9fe0e099cc1ca8cb6b00fb8575616fe3b
 SHA512:
-  metadata.gz: 79b26aa82519dfe3d6ee5215d83c8a766e080797fb2f2f6885c8736e141a39bd03db3f92371ea806d75f60dfecb3292d76ade31550f1ccd2fb3a008251bf3b5b
-  data.tar.gz: 4d5c32620af06e77bd29d9121bfcc43da3093e8697af2a9f753eaf2731740b63ad3fe3eb35bff0ca0679910cdbcdaae8cad68bc5927b685f7245cf7154c4a22b
+  metadata.gz: 2d0c2c0083914456cbf852a57ae904d2432063ef89fb1e1b335c79790180cfb181dcd50e5237f769d58ea8afde9a5834c0c2fe66e8005c1ea8077ced9f7d72bd
+  data.tar.gz: 95b44f1711e304625684f70cf7a4fad0c5c383b2b2ac4b3465c6c7b5d30a49d76f7d97c9a0083e1360e63c728acf3497aa3dcb86583815d5b13f2990081d2c7a

data/.rubocop.yml

@@ -0,0 +1,19 @@
+require: rubocop-rspec
+AllCops:
+  Include:
+    - 'lib/**/*'
+    - 'spec/**/*'
+Metrics/AbcSize:
+  Max: 32
+Metrics/LineLength:
+  Max: 99
+Metrics/CyclomaticComplexity:
+  Max: 20
+Metrics/PerceivedComplexity:
+  Max: 20
+Metrics/MethodLength:
+  Max: 30
+Documentation:
+  Enabled: false
+Style/SignalException:
+  EnforcedStyle: only_raise

data/.travis.yml

@@ -4,3 +4,5 @@ rvm:
   - 2.2
   - 2.3.0
 before_install: gem install bundler -v 1.11.2
+script:
+  - bundle exec rake

data/Gemfile

@@ -2,5 +2,8 @@ source 'https://rubygems.org'
 
 gem 'simplecov'
 gem 'coveralls'
+gem 'rubocop', require: false
+gem 'rubocop-rspec', require: false
+gem 'pry'
 
 gemspec

data/README.md

@@ -24,14 +24,28 @@ e.g.
 root = UrlRegexp::Root.new
 root.append('http://www.example.com/foo/bar')
 root.to_regexp
-# => /^http:\/\/www\.example\.com\/foo\/bar(\?.*)?(#|$)/
+# => /^http:\/\/www\.example\.com\/foo\/bar([?#]|$)/
 root.append('http://www.example.com/foo/bar/wow')
 root.to_regexp
-# => /^http:\/\/www\.example\.com\/foo\/bar(\/wow)?(\?.*)?(#|$)/
+# => /^http:\/\/www\.example\.com\/foo\/bar(\/wow)?([?#]|$)/
+root.append('http://www.example.com/boo/bar')
+root.to_regexp
+# => /^http:\/\/www\.example\.com\/(foo\/bar(\/wow)?|boo\/bar)([?#]|$)/
+root.append('http://www.example.com/boo/bar/wow')
+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.
 
+## Test
+
+```bash
+bundle exec rake
+```
+
+It will execute `rspec` and `rubocop`.
+
 ## Contributing
 
 1. Fork it
@@ -48,12 +62,12 @@ Copyright (c) 2016 Daisuke Taniwaki. See [LICENSE](LICENSE) for details.
 
 [gem-image]:   https://badge.fury.io/rb/url_regexp.svg
 [gem-link]:    http://badge.fury.io/rb/url_regexp
-[build-image]: https://secure.travis-ci.org/dtaniwaki/url_regexp.png?branch=master
+[build-image]: https://secure.travis-ci.org/dtaniwaki/url_regexp.svg?branch=master
 [build-link]:  http://travis-ci.org/dtaniwaki/url_regexp?branch=master
 [deps-image]:  https://gemnasium.com/dtaniwaki/url_regexp.svg?branch=master
 [deps-link]:   https://gemnasium.com/dtaniwaki/url_regexp?branch=master
-[cov-image]:   https://coveralls.io/repos/dtaniwaki/url_regexp/badge.png?branch=master
-[cov-link]:    https://coveralls.io/r/dtaniwaki/url_regexp?branch=master
-[gpa-image]:   https://codeclimate.com/github/dtaniwaki/url_regexp.png?branch=master
+[cov-image]:   https://coveralls.io/repos/github/dtaniwaki/url_regexp/badge.svg?branch=master
+[cov-link]:    https://coveralls.io/github/dtaniwaki/url_regexp?branch=master
+[gpa-image]:   https://codeclimate.com/github/dtaniwaki/url_regexp.svg?branch=master
 [gpa-link]:    https://codeclimate.com/github/dtaniwaki/url_regexp?branch=master
 

data/Rakefile

@@ -1,6 +1,11 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+RuboCop::RakeTask.new do |task|
+  task.requires << 'rubocop-rspec'
+end
+
+task :default => [:spec, :rubocop]

data/lib/url_regexp/host.rb

@@ -11,11 +11,10 @@ module UrlRegexp
     def to_regexp_s
       hosts = @hosts.map { |h| Regexp.quote(h.to_s) }
       if 1 < hosts.size
-        hosts = "(#{hosts.join('|')})"
+        "(#{hosts.join('|')})"
       else
-        hosts = hosts[0]
+        hosts[0]
       end
-      hosts
     end
   end
 end

data/lib/url_regexp/node.rb

@@ -1,10 +1,6 @@
 module UrlRegexp
   class Node
-    def eql?(other)
-      hash == other.hash
-    end
-
-    def append(node)
+    def append(_)
       raise NotImplementedError
     end
 

data/lib/url_regexp/path.rb

@@ -13,33 +13,37 @@ module UrlRegexp
       @path_end = false
     end
 
-    def path_end?
-      @path_end
+    def ==(other)
+      self.class == other.class &&
+        @label == other.label &&
+        @paths == other.paths &&
+        @path_end == other.path_end
     end
 
+    alias eql? ==
+
     def hash
-      [@label, @paths.hash].hash
+      [@label, @paths, @path_end].hash
     end
 
     def append(path)
       if path == ''
         @paths.append(Path.new('', self))
+      elsif @parent.nil?
+        _, label, rest = path.split('/', 3)
       else
-        if @parent.nil?
-          _, label, rest = path.split('/', 3)
-        else
-          label, rest = path.split('/', 2)
+        label, rest = path.split('/', 2)
+      end
+      if label
+        p = @paths.find { |pp| pp.label == label }
+        if p.nil?
+          p = Path.new(label, self)
+          @paths.append(p)
         end
-        if label
-          unless p = @paths.find { |_p| _p.label == label }
-            p = Path.new(label, self)
-            @paths.append(p)
-          end
-          if rest.nil?
-            p.path_end = true
-          else
-            p.append(rest)
-          end
+        if rest.nil?
+          p.path_end = true
+        else
+          p.append(rest)
         end
       end
     end

data/lib/url_regexp/path_set.rb

@@ -1,11 +1,19 @@
 require_relative './node'
 
 module UrlRegexp
+  class Set < ::Set
+    def include?(o)
+      # Comparing keys directly is faster than rehash everytime for few items
+      # @hash.rehash
+      # super(o)
+      @hash.keys.include?(o)
+    end
+  end
+
   class PathSet < Node
-    include Enumerable
     extend Forwardable
 
-    def_delegators :@set, :size, :hash, *Enumerable.public_instance_methods(false)
+    def_delegators :@set, :size, *Enumerable.public_instance_methods(false)
 
     def initialize(set = Set.new)
       @set = set
@@ -15,28 +23,41 @@ module UrlRegexp
       set << path
     end
 
+    def ==(other)
+      self.class == other.class &&
+        @set.to_a == other.set.to_a
+    end
+
+    alias eql? ==
+
+    def hash
+      @set.hash
+    end
+
     def &(other)
-      self.class.new(set & other.set)
+      self.class.new(@set & other.set)
     end
 
     def |(other)
-      self.class.new(set & other.set)
+      self.class.new(@set & other.set)
+    end
+
+    def include?(path)
+      @set.include?(path)
     end
 
     def to_regexp_s
       if 5 < size
-        "([^#?]*)"
+        '([^#?]*)'
       elsif 1 < size
-        children_paths = map(&:paths).reduce { |s1, s2| s1 & s2 }
-        if children_paths.size == 1 && all? { |p| !p.path_end? }
-          "(#{map(&:label).join("|")})/#{children_paths.to_regexp_s}"
+        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("|")})"
+          "(#{map(&:to_regexp_s).join('|')})"
         end
       elsif 1 == size
         to_a.first.to_regexp_s
-      else
-        nil
       end
     end
 

data/lib/url_regexp/query.rb

@@ -5,19 +5,19 @@ module UrlRegexp
     end
 
     def append(query)
-      if !query.nil?
-        @queries << query.to_s.split('&').reject(&:empty?)
-      end
+      return if query.nil?
+      @queries << query.to_s.split('&').reject(&:empty?)
     end
 
     def to_regexp_s
-      common_queries = @queries.reduce { |q1, q2| q1 & q2 } || []
+      common_queries = @queries.reduce { |a, e| a & e } || []
+      common_queries = common_queries.map { |q| Regexp.quote(q) }
       if 1 < common_queries.size
-        "\\?(#{common_queries.map { |q| Regexp.quote(q) }.permutation.to_a.map { |qs| "(.*&)?#{qs.join('.*&')}(&.*)?" }.join('|')})"
+        "\\?(#{common_queries.permutation.map { |qs| "(.*&)?#{qs.join('.*&')}(&.*)?" }.join('|')})"
       elsif 1 == common_queries.size
-        "\\?(.*&)?#{Regexp.quote(common_queries.first)}(&.*)?"
+        "\\?(.*&)?#{common_queries.first}(&.*)?"
       else
-        "(\\?.*)?"
+        '(\\?.*)?'
       end
     end
   end

data/lib/url_regexp/root.rb

@@ -20,7 +20,13 @@ module UrlRegexp
     end
 
     def to_regexp_s
-      "^#{@scheme.to_regexp_s}#{@host.to_regexp_s}#{@path.to_regexp_s}#{@query.to_regexp_s}(#|$)"
+      s = '^' +
+          @scheme.to_regexp_s +
+          @host.to_regexp_s +
+          @path.to_regexp_s +
+          @query.to_regexp_s +
+          '(#|$)'
+      s.sub('(\\?.*)?(#|$)', '([?#]|$)')
     end
   end
 end

data/lib/url_regexp/scheme.rb

@@ -12,16 +12,15 @@ module UrlRegexp
 
     def to_regexp_s
       schemes = @schemes.map { |s| Regexp.quote(s) }
-      s = if schemes == %w(http https)
-        "https?://"
+      if schemes == %w(http https)
+        'https?://'
       elsif 1 < @schemes.size
         "(#{schemes.join('|')})://"
       elsif 1 == @schemes.size
-        "#{schemes.to_a.first.to_s}://"
+        "#{schemes.to_a.first}://"
       else
-        ""
+        ''
       end
-      s
     end
   end
 end

data/lib/url_regexp/version.rb

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

data/lib/url_regexp.rb

@@ -1,4 +1,4 @@
-require "url_regexp/version"
+require 'url_regexp/version'
 require 'url_regexp/root'
 
 module UrlRegexp

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: url_regexp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Daisuke Taniwaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE