rspec-autoswagger 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a745c33c8d2c88516c9a2c6654e13aaba7ac072e123e9b4658fab1fc53685c23
-  data.tar.gz: a3b9d2743776ae91a5b4899e86844bdd1b6605b5e113c9689f893f0ac8fadaca
+SHA1:
+  metadata.gz: 76c568faf41372d1f2c47bed9f0305ebdfecae2b
+  data.tar.gz: ab707fe34a2011e9671d0c2479091d5490bf84f8
 SHA512:
-  metadata.gz: acbe392f133ec1f130ceace1215a34459cd66d8c7593e833ddbc9ea9c900d825255655d315a8a42535353c261865e9ea5835b7b34cb901b66ef8878db9c40c8a
-  data.tar.gz: 4bf264f387794f4093f05183a21045fa737ea4ed32233f1f00d9c3dc98c103791a715de2d6bc8b135bf7ba719a2295afcd5b611243a5b184815bd167146aeb67
+  metadata.gz: 3c1290645d60f8b15c321228b1b3653a533d6d0904bf18eea60bd221c2b11a14eea3f94979cdaf6bc36dc530f079009199a1456e6f5c9e3a5d3c2b854eb64f97
+  data.tar.gz: 8130e944992f5ec08e3621a02e361f4642300dc8dc47d7b181c935095d93b038c516fce21056c9c16c68fa189a0faee3d492a9db25a80b3a2364ca0583220e38

data/lib/rspec/autoswagger.rb

@@ -5,6 +5,8 @@ require "rspec/autoswagger/doc_parts"
 module Rspec
   module Autoswagger
 
+    API_BASE_PATH = '/api/v1'
+
     def self.doc_parts
       @doc_parts ||= DocParts.new
     end

data/lib/rspec/autoswagger/doc_part.rb

@@ -1,27 +1,51 @@
 require 'rspec/autoswagger/parts/path'
 require 'rspec/autoswagger/parts/info'
 require 'rspec/autoswagger/parts/definition'
+require 'rspec/autoswagger/util'
 
 module Rspec
   module Autoswagger
     class DocPart
 
-      attr_reader :rspec_core_obj, :example
+      attr_reader :rspec_core_obj, :example, :request
 
       def initialize(rspec_core_obj, example)
         @rspec_core_obj = rspec_core_obj
+        @request = rspec_core_obj.request
         @example = example
       end
 
       def response_name
         status = rspec_core_obj.response.status.to_s
         if status == '200'
-          example.full_description[%r<(GET|POST|PATCH|PUT|DELETE) ([^ ]+)>, 2].gsub(/\/|:/, '').camelize
+          path = example.full_description[%r<(GET|POST|PATCH|PUT|DELETE) ([^ ]+)>, 2]
+          path = if path.blank?
+                   path = request.path.gsub(Rspec::Autoswagger::API_BASE_PATH, '')
+                   get_converted_path(path)
+                 end
+          path.gsub(/\/|:/, '').camelize
         else
-          example.full_description[%r<(GET|POST|PATCH|PUT|DELETE) ([^ ]+)>, 2].gsub(/\/|:/, '').camelize + '_' + status
+          path = example.full_description[%r<(GET|POST|PATCH|PUT|DELETE) ([^ ]+)>, 2]
+          path = if path.blank?
+                   path = request.path.gsub(Rspec::Autoswagger::API_BASE_PATH, '')
+                   get_converted_path(path)
+                 end
+          path.gsub(/\/|:/, '').camelize + '_' + status
         end
       end
 
+      def get_converted_path(path)
+        path.split("/").map do |path_element|
+          if Util.detect_uuid(path_element)
+            ":id"
+          elsif Util.detect_uuid(path_element)
+            ":id"
+          else
+            path_element
+          end
+        end.join("/")
+      end
+
       def create_path
         path = Parts::Path.new(rspec_core_obj, example, response_name)
         path.generate_hash

data/lib/rspec/autoswagger/parts/path.rb

@@ -1,3 +1,5 @@
+require 'rspec/autoswagger/util'
+
 module Rspec
   module Autoswagger
     module Parts
@@ -10,7 +12,6 @@ module Rspec
           begin
             @description = rspec_core_obj.description
           rescue RSpec::Core::ExampleGroup::WrongScopeError
-            puts "[AUTOSWAGGER WARNING] please write description"
             @description = ''
           end
           @example = example
@@ -19,7 +20,24 @@ module Rspec
 
         def path
           path = example.full_description[%r<(GET|POST|PATCH|PUT|DELETE) ([^ ]+)>, 2]
-          path.split("/").map { |name| name.include?(":") ? "{" + name.gsub(":", "") + "}" : name }.join("/")
+          if path.blank?
+            path = request.path.gsub(Rspec::Autoswagger::API_BASE_PATH, '')
+            get_converted_path(path)
+          else
+            path.split("/").map { |name| name.include?(":") ? "{" + name.gsub(":", "") + "}" : name }.join("/")
+          end
+        end
+
+        def get_converted_path(path)
+          path.split("/").map do |path_element|
+            if Util.detect_uuid(path_element)
+              "{id}"
+            elsif Util.detect_uuid(path_element)
+              "{id}"
+            else
+              path_element
+            end
+          end.join("/")
         end
 
         def tags

data/lib/rspec/autoswagger/util.rb

@@ -0,0 +1,9 @@
+class Util
+  def self.detect_uuid(sentense)
+    sentense.match(/^([a-zA-Z0-9]+-[a-zA-Z0-9]+-[a-zA-Z0-9]++-[a-zA-Z0-9]+-[a-zA-Z0-9]+)$/)
+  end
+
+  def self.detect_integer_id(sentense)
+    sentense.match(/^(\d+)$/)
+  end
+end

data/lib/rspec/autoswagger/version.rb

@@ -1,5 +1,5 @@
 module Rspec
   module Autoswagger
-    VERSION = "0.4.1"
+    VERSION = "0.5.1"
   end
 end

data/rspec-autoswagger.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "swagger_model", '0.4.6'
+  spec.add_dependency "swagger_model", '0.4.8'
   spec.add_dependency "rspec"
   spec.add_dependency "activesupport"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-autoswagger
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - joooee0000
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: swagger_model
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.8
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,7 @@ files:
 - lib/rspec/autoswagger/parts/info.rb
 - lib/rspec/autoswagger/parts/path.rb
 - lib/rspec/autoswagger/rspec.rb
+- lib/rspec/autoswagger/util.rb
 - lib/rspec/autoswagger/version.rb
 - rspec-autoswagger.gemspec
 homepage: https://github.com/joooee0000/rspec-autoswagger
@@ -126,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rspec extension to auto generate swagger/openapi specification