grape-path-helpers 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ee9652b65323f2cebb2687b2f39efd3080d4338
-  data.tar.gz: 797414941764d98caa976ecfa838850a34d802b6
+  metadata.gz: e815c5ab96ef4eb2cc8485164b66d52fad17ef84
+  data.tar.gz: ad85602cc19898c77ffe765c4af0806b10485cd9
 SHA512:
-  metadata.gz: 0adb5f0e43cab6b495fab62396ee2f76e420776f083a7b777fafb1e8e07d59c0cb9e0af71a59c562ead55ed0271721ec002fee1ae9027619903d206a7afbb19a
-  data.tar.gz: 80b8b4e0430f706f7cc79b5bf47630fe84f70fa1e69baa644ae9b169413b2a7b7b45cbfc57b92b54b2aa9609ec78fe35f8381550a7948874b0a05f795d6e92bc
+  metadata.gz: 8357a7a8d21d72d1cfd5daa5962e44f0444e1f5d0682c257484d8c22508d4350cb839598fe65cf25f32a9429c32d0c4f603c513ff69fb7532c16165a384d58f2
+  data.tar.gz: 4319294fe446969741d1badabca8c757184f9556aec29533b91f78f3ae13feefb84e2bbf600601281f318f5284a1f376008e9a0515ed44a9a27fc999b9c0ef13

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.6
+
+* [Fix segments parsing for optional segments](https://gitlab.com/gitlab-org/grape-path-helpers/merge_requests/10)
+
 ## 1.0.5
 
 * [Relax dependencies](https://gitlab.com/gitlab-org/grape-path-helpers/merge_requests/9)

data/lib/grape-path-helpers/decorated_route.rb

@@ -105,7 +105,7 @@ module GrapePathHelpers
     end
 
     def path_segments
-      pattern = %r{\(/?\.:?\w+\)|/|\??\*}
+      pattern = %r{\(/?\.:?\w+\)|/(?!\))|(?<=\))|\??\*}
       route_path.split(pattern).reject(&:blank?)
     end
 
@@ -120,6 +120,10 @@ module GrapePathHelpers
       segment.start_with?(':')
     end
 
+    def optional_segment?(segment)
+      segment.start_with?('(')
+    end
+
     def required_helper_segments
       segments_in_options = dynamic_path_segments.select do |segment|
         route.options[segment.to_sym]

data/lib/grape-path-helpers/version.rb

@@ -1,4 +1,4 @@
 # Gem version
 module GrapePathHelpers
-  VERSION = '1.0.5'.freeze
+  VERSION = '1.0.6'.freeze
 end

data/spec/grape_path_helpers/decorated_route_spec.rb

@@ -30,6 +30,10 @@ describe GrapePathHelpers::DecoratedRoute do
     routes.detect { |route| route.route_path =~ /ping/ }
   end
 
+  let(:optional_route) do
+    routes.detect { |route| route.route_path =~ /optional/ }
+  end
+
   describe '#sanitize_method_name' do
     it 'removes characters that are illegal in Ruby method names' do
       illegal_names = ['beta-1', 'name_with_+', 'name_with_(']
@@ -104,6 +108,15 @@ describe GrapePathHelpers::DecoratedRoute do
     end
   end
 
+  describe '#path_segments' do
+    context 'when path has optional segments' do
+      it 'leaves them intact' do
+        result = optional_route.path_segments
+        expect(result).to eq(%w[api :version cats :id (-/) optional])
+      end
+    end
+  end
+
   describe '#path_segments_with_values' do
     context 'when path has dynamic segments' do
       it 'replaces segments with corresponding values found in @options' do
@@ -237,5 +250,10 @@ describe GrapePathHelpers::DecoratedRoute do
       end
     end
   end
+
+  describe '#optional_segment?' do
+    it { expect(index_route.optional_segment?('mandatory')).to eq(false) }
+    it { expect(index_route.optional_segment?('(optional/)')).to eq(true) }
+  end
 end
 # rubocop:enable Metrics/BlockLength

data/spec/support/api.rb

@@ -25,6 +25,10 @@ module Spec
           end
         end
 
+        get ':id/(-/)optional' do
+          'optional content'
+        end
+
         get ':id/owners' do
           %w[owner1 owner2]
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-path-helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Drew Blessing
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Route path helpers for Grape