fictium 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5934206031e83692052ec6d5184d6c0ea7a040f5a7c859d274eb9101daa664f4
-  data.tar.gz: feaf049eee613925b0b3c14dcbaadb3a6a3c4f3e051b265853db873729e8ce37
+  metadata.gz: 6d68f0182b847a3713bd7891b4e63273ffa7a79759fea9f3081d7b840ed693a3
+  data.tar.gz: 91b28c80cc8291ccc7474fb4d643a5c12119742886e737eee6a0af8e4f7d7de4
 SHA512:
-  metadata.gz: 2ecc05097ef9652469e114db2fbb484a957afbb49b80feedbbb00dac03b0e47db441dac08a8694de1b0cc6cafa25ccfa00d90d6f375343bcec4d48f91e74a9bc
-  data.tar.gz: bf81849ffcafd6bc42c94b3ed06fedf1f2959c74a333ee2268e7cc02c8379f564512f4d0e2e8bf845f9aeb89d69ba6ce7a4c3d21373a3b26eaa360196f8fceb0
+  metadata.gz: 925a29a49dc0dc7ba6987e9970e500d90d327869709ad7c5134a416f71404b685219c954359acd4d5ca3e8bfb584d205dd74826cfbc7059919175c00895fa54e
+  data.tar.gz: f68a1b545102693083580f8cdc2542f8ddf846b0846d123bf7147ebd8dc504a0896938fee6956df6ed5b3d86ef8b92029b83477f87b6149b2646193a9cfabf30

data/CHANGELOG.md

@@ -17,6 +17,14 @@
 
 ## LOG
 
+### 0.3.3 (2019-11-12)
+
+Improve path recognition using controller actions.
+
+#### Changes
+
+- Use path parameters instead of formatting path.
+
 ### 0.3.2 (2019-11-12)
 
 Use path parameters instead of formatting path.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fictium (0.3.2)
+    fictium (0.3.3)
       activesupport (>= 5.1, < 6.2)
       json-schema (~> 2.8)
       verbs (~> 2.1.4)

data/lib/fictium/rspec/autocomplete/action.rb

@@ -3,19 +3,11 @@ module Fictium
     module Autocomplete
       module Action
         ACTION_NAME = /#([A-Z_]+)/i.freeze
-        DEFAULT_PATHS = {
-          index: '',
-          create: '',
-          new: '/new',
-          show: '/{id}',
-          update: '/{id}',
-          destroy: '/{id}'
-        }.freeze
+
         class << self
           def description_attributes(action, description)
             name = find_action_name(description)&.downcase
             find_summary(action, name)
-            find_path(action, name)
           end
 
           private
@@ -34,13 +26,6 @@ module Fictium
             @descriptors ||= Fictium.configuration.default_action_descriptors || {}
           end
 
-          def find_path(action, name)
-            return if name.blank?
-
-            key = name.to_sym
-            action.path = DEFAULT_PATHS[key] || "/{id}/#{name}"
-          end
-
           def find_action_name(description)
             match = description.match(ACTION_NAME)
             match.presence && match[1]

data/lib/fictium/rspec/autocomplete/params.rb

@@ -6,7 +6,10 @@ module Fictium
         IGNORED_PATH_PARAMETERS = %i[action controller].freeze
 
         class << self
+          include Rails.application.routes.url_helpers
+
           def extract_from_request(action, request)
+            extract_path(action, request)
             REQUEST_SECTIONS.each do |section|
               action.params[section] ||= ActiveSupport::HashWithIndifferentAccess.new
               send(:"parse_request_#{section}", action.params[section], action, request)
@@ -27,6 +30,25 @@ module Fictium
 
           private
 
+          def extract_path(action, request)
+            return unless action.path.nil?
+
+            mapped_controllers = transform_path(request)
+            full_path = CGI.unescape(url_for(**mapped_controllers.merge(only_path: true)))
+            action.path = full_path.sub(action.resource.base_path || '', '')
+          end
+
+          def transform_path(request)
+            {}.tap do |result|
+              request.path_parameters.except(*IGNORED_PATH_PARAMETERS).each do |key, _|
+                result[key] = "{#{key}}"
+              end
+              request.path_parameters.slice(*IGNORED_PATH_PARAMETERS).each do |key, value|
+                result[key] = value
+              end
+            end
+          end
+
           def parse_request_query(params, _action, request)
             request.query_parameters.each do |key, value|
               params[key] ||= {}

data/lib/fictium/version.rb

@@ -1,5 +1,5 @@
 module Fictium
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.3'.freeze
   RAILS_MIN_VERSION = '>= 5.1'.freeze
   RAILS_MAX_VERSION = '< 6.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fictium
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ramiro Rojo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport