rest-api-generator 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3c84db27490fa76b76096f10ba351092bfb42479890a2a279d725f579c4edb7
-  data.tar.gz: 25e537cd496a09eb3b5755fadf4d04bbcaad38c941bf54af60e230ed7a1ccd13
+  metadata.gz: 4873b5f52ba8ca76abbc7449e0c0398ee1d38fbfb47ebec80dabb293b3ca0cea
+  data.tar.gz: bd96d06619b7a14eb9e6b953d60bc6a2f84bb7d48b0cca5181c0a588bb066cba
 SHA512:
-  metadata.gz: a0f07b832a6373ed5197f114a0bdc54c6a6c2088d712e3641b8d55d717a5d5b019bba3427907b73495ac6a97de2bfbdd68ee48de267651808cf3d6adbe9f2547
-  data.tar.gz: 565c3cc7797794a6c59008990e58727173c5fa472ef8a8a188cb2a2ba60789cf03994ba8feaff7d8d5dfcf3443333412ece5dbb926f5a44156fa71ad240531b0
+  metadata.gz: 7cd7f1d823c9b0abba38301024eefb393eb460b10a0ff92e41b7f377b401f09f37771afd039701539fd697a4612e0b0a46ef99b6eccf81d118a23e5fff63bfbb
+  data.tar.gz: dbb337a4c098fdc2b04e71456b5664be8ca670fdd277436cf05111897a7f72ac0559bd47bacf840c6248406aae0e931506e00ad6f3715d9f22da4a9a30984b90

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-api-generator (0.1.3)
+    rest-api-generator (0.1.4)
       rails (>= 5.0)
 
 GEM

data/lib/generators/rest_api_generator/helpers.rb

@@ -71,22 +71,24 @@ module RestApiGenerator
     def nested_routes
       return "" if options["father"].blank?
 
-      "#{options["father"].downcase.pluralize}/\#{#{options["father"].singularize.downcase}.id}/#{plural_name}"
+      "#{options["father"].downcase.pluralize}/\#{#{options["father"].singularize.downcase}.id}"
     end
 
     def initial_route
-      return "/#{plural_name}" if options["father"].blank? && options["scope"].blank?
-
-      scope_route_path + "/" + nested_routes
+      route = ""
+      route += scope_route_path if options["scope"].present?
+      route += options["father"].present? && route.present? ? "/#{nested_routes}" : nested_routes
+      route += "/#{plural_name}"
+      route[0] == "/" ? route : "/#{route}"
     end
 
     def spec_routes
       {
         index: initial_route,
-        show: initial_route + "\#{#{singular_name}.id}",
+        show: initial_route + "/\#{#{singular_name}.id}",
         create: initial_route,
-        update: initial_route + "\#{#{singular_name}.id}",
-        delete: initial_route + "\#{#{singular_name}.id}",
+        update: initial_route + "/\#{#{singular_name}.id}",
+        delete: initial_route + "/\#{#{singular_name}.id}",
       }
     end
   end

data/lib/generators/rest_api_generator/spec/rspec_generator.rb

@@ -26,9 +26,9 @@ module RestApiGenerator
 
       def spec_controller_template
         if options["father"].present?
-          "rspec/resource_controller_spec.rb"
-        else
           "rspec/nested_resource_controller_spec.rb"
+        else
+          "rspec/resource_controller_spec.rb"
         end
       end
     end

data/lib/generators/rest_api_generator/spec/rswag_generator.rb

@@ -25,7 +25,7 @@ module RestApiGenerator
       def nested_routes
         return "" if options["father"].blank?
 
-        "#{options["father"].downcase.pluralize}/{#{options["father"].singularize.downcase}_id}/#{plural_name}"
+        "#{options["father"].downcase.pluralize}/{#{options["father"].singularize.downcase}_id}"
       end
 
       def spec_routes

data/lib/generators/rest_api_generator/spec/templates/rspec/resource_controller_spec.rb.tt

@@ -38,7 +38,7 @@ RSpec.describe "<%= class_name %>", type: :request do
 
   describe "DELETE /<%= plural_name %>/:id" do
     it "deletes an <%= plural_name %>" do
-      item = create(:<%= singular_name %>)
+      <%= singular_name %> = create(:<%= singular_name %>)
       expect do
         delete "<%= spec_routes[:delete] %>"
       end.to change(<%= class_name %>, :count).by(-1)

data/lib/rest_api_generator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RestApiGenerator
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-api-generator
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - PedroAugustoRamalhoDuarte