jets 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce0b14790bc57baa9dfcdf1caf6c4d6f4224326a3664b2ec47d20bd05abd123f
-  data.tar.gz: 5964441e10debe6a51e185c02ba32d88a81196713be63d4d136a106510830466
+  metadata.gz: 20fa97bccfb5b99e19a2edcf301bf31e53cd433a13862114fcb9648880e11fcc
+  data.tar.gz: 124710223a460aed3a74a7498e2d2a15e5227c820d20a59db639ce83bdf2fb73
 SHA512:
-  metadata.gz: 13948762fdf93c03173f85267fdd5f9b268b6aacc8de062633a07b6da89e8046ff350e6e5d3d4fba16f9524265ce32d928221cc7252c59f8cd16f93daa9bc589
-  data.tar.gz: '078b9ab98342bdd28126a69e2a363b3cbe01c673987a1e19290aaed451587fbaed2ae48cb3400891d45339bb38ac2e51bf044567a3ef3e997b7765a696c873a6'
+  metadata.gz: d6ce23cf7b443de33af876d2ac178eaaa2faca79eb5b70188cedd726861478cb030f4dbcab3d03a894f271878a7d4b1923e9bef1555db97faebc4b34aa5cfb36
+  data.tar.gz: b415939caba3f43bd03a5c10e47263ca2cd5adb0ebd01c7e76e495b3d09d25228863f51c83b9ece4eee865a0aa6ce5b64f1de3c6ac29234f55c0cde2d3ee0581

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [1.1.5]
+- Support multiple path parameters. Also allow path parameters to hold any value other than '/'.
+- Merge pull request #82 from adam-harwood/master
+
 ## [1.1.4]
 - Fully qualify bundle install path, to fix issue when building on CodeBuild. Fixes #80.
 - Merge pull request #81 from adam-harwood/master

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.1.4)
+    jets (1.1.5)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)
@@ -39,40 +39,40 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.1)
-      actionview (= 5.2.1)
-      activesupport (= 5.2.1)
+    actionpack (5.2.1.1)
+      actionview (= 5.2.1.1)
+      activesupport (= 5.2.1.1)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.1)
-      activesupport (= 5.2.1)
+    actionview (5.2.1.1)
+      activesupport (= 5.2.1.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
+    activemodel (5.2.1.1)
+      activesupport (= 5.2.1.1)
+    activerecord (5.2.1.1)
+      activemodel (= 5.2.1.1)
+      activesupport (= 5.2.1.1)
       arel (>= 9.0)
-    activesupport (5.2.1)
+    activesupport (5.2.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.117.0)
+    aws-partitions (1.118.0)
     aws-sdk-cloudformation (1.13.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-cloudwatchlogs (1.11.0)
+    aws-sdk-cloudwatchlogs (1.12.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-core (3.40.0)
+    aws-sdk-core (3.41.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
@@ -131,9 +131,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.1)
-      actionpack (= 5.2.1)
-      activesupport (= 5.2.1)
+    railties (5.2.1.1)
+      actionpack (= 5.2.1.1)
+      activesupport (= 5.2.1.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)

data/lib/jets/route.rb

@@ -4,7 +4,7 @@
 #   to: "posts#index",
 # )
 class Jets::Route
-  CAPTURE_REGEX = "([a-zA\\-Z0-9_.]*)" # as string
+  CAPTURE_REGEX = "([^/]*)" # as string
 
   def initialize(options)
     @options = options
@@ -105,19 +105,23 @@ class Jets::Route
   def extract_parameters_capture(actual_path)
     # changes path to a string used for a regexp
     # posts/:id/edit => posts\/(.*)\/edit
+    labels = []
     regexp_string = path.split('/').map do |s|
-                      s.include?(':') ? CAPTURE_REGEX : s
+                      if s.start_with?(':')
+                        labels << s.delete_prefix(':')
+                        CAPTURE_REGEX
+                      else
+                        s
+                      end
                     end.join('\/')
     # make sure beginning and end of the string matches
     regexp_string = "^#{regexp_string}$"
     regexp = Regexp.new(regexp_string)
-    value = regexp.match(actual_path)[1]
 
-    # only supports one path parameter key right now
-    key = path.split('/').find {|s| s.include?(':') } # :id
-    key = key.sub(':','')
-
-    { key => value }
+    values = regexp.match(actual_path).captures
+    labels.map do |next_label|
+      [next_label, values.delete_at(0)]
+    end.to_h
   end
 
   def authorization_type

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack