swagger_api 0.1.47 → 0.1.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 812e8f25428409c5e5d1333c7c0291c9e78f7fa7
-  data.tar.gz: 4ff23a9a7418a41a2ef02add83d7f2155caa0c82
+  metadata.gz: ebb4dd2a0633d5191515c8699a0c6b03c8441e91
+  data.tar.gz: f9cb561189108adfd5c7fb599ef4af095de44a6a
 SHA512:
-  metadata.gz: 64a94addb280474318675bf9a94ec33cc1f521df2861eb36452d35cd93e89824dd7911750d813eb8e5c69fa0d102f6c4c303dcc207a941e1243fee657f9e08b6
-  data.tar.gz: 94ff5977456c75aed5acd6e007d2bac65c77a1fe2912b126b925abd294a5821f378b7b1c61b11b42a574eacc5ff45a3920f0d8fe3b30857430a5fc6973f4607e
+  metadata.gz: e716f77b6772363c94b31d97a8c74ee748cccd18fae8bdb9266ef390ab9255bba31cc09910609cd9a77524e122a4f0e4efb81a88145d683ab437b855b529b23e
+  data.tar.gz: 6026a289c5edc66bd67e9d4ab8ececa879aeac81883b08df47055c57f8297b096b8e1fbb863d8f0be2af917670ad1b731b6005a2ace5c384fcf41e2bc618d872

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swagger_api (0.1.43)
+    swagger_api (0.1.47)
       active_attr
       rails (>= 5.0)
       rspec-rails
@@ -32,7 +32,7 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_attr (0.10.3)
+    active_attr (0.11.0)
       activemodel (>= 3.0.2, < 6.0)
       activesupport (>= 3.0.2, < 6.0)
     activejob (5.2.0)
@@ -61,7 +61,7 @@ GEM
     erubi (1.7.1)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    i18n (1.0.0)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     loofah (2.2.2)
       crass (~> 1.0.2)
@@ -75,10 +75,10 @@ GEM
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    nio4r (2.3.0)
-    nokogiri (1.8.2)
+    nio4r (2.3.1)
+    nokogiri (1.8.3)
       mini_portile2 (~> 2.3.0)
-    rack (2.0.4)
+    rack (2.0.5)
     rack-test (1.0.0)
       rack (>= 1.0, < 3)
     rails (5.2.0)

data/lib/swagger_api/component_schema.rb

@@ -16,7 +16,7 @@ module SwaggerApi
 
     def required
       controller.try(:columns).try(:required) ||
-      columns.map(&:name) & clean_required_attributes
+        columns.map(&:name).map { |name| name.gsub(/^encrypted_/, '') } & clean_required_attributes
     end
 
     def clean_required_attributes
@@ -35,14 +35,22 @@ module SwaggerApi
       end.compact.flatten.uniq.map(&:to_s)
     end
 
+    def absence_attributes
+      @absence_attributes ||= model.validators.map do |validator|
+        validator.attributes if validator.is_a?(ActiveRecord::Validations::AbsenceValidator)
+      end.compact.flatten.uniq.map(&:to_s)
+    end
+
     def properties
-      properties = {}
-      columns.each do |column|
-        properties[column.name] = ColumnSchema.new(column: column).create
-      end
-      properties
+      columns.map do |column|
+        next if column.name.end_with? '_iv'
+        next if absence_attributes.include? column.name
+        attribute_name = column.name.gsub(/^encrypted_/, '')
+        [attribute_name, ColumnSchema.new(column: column).create]
+      end.compact.to_h
     end
 
+
     def model
       controller.model.constantize
     end

data/lib/swagger_api/components.rb

@@ -1,6 +1,8 @@
 module SwaggerApi
   class Components
     include ActiveAttr::Model
+    include Concerns::StiSchema
+
     attr_accessor :controllers
 
     def create
@@ -8,7 +10,7 @@ module SwaggerApi
       @components = {}
       controllers.each do |controller|
         if controller.custom_model_file.nil?
-          @components[controller.model] = ComponentSchema.new(controller: controller).create
+          @components.merge!(create_model_components_from_controller(controller))
         else
           @components.merge!(custom_json(controller.custom_model_file))
         end
@@ -20,5 +22,17 @@ module SwaggerApi
       file = File.read(custom_model_file)
       JSON.parse(file)
     end
+
+    def create_model_components_from_controller(controller)
+      if is_sti?(controller.model)
+        controller.model.constantize.descendants.map do |klass|
+          [klass.name, ComponentSchema.new(controller: OpenStruct.new(model: klass.name)).create]
+        end.to_h
+      else
+        {
+          controller.model => ComponentSchema.new(controller: controller).create
+        }
+      end
+    end
   end
 end

data/lib/swagger_api/concerns/columns.rb

@@ -21,4 +21,4 @@ module SwaggerApi
       end
     end
   end
-end
+end

data/lib/swagger_api/concerns/sti_schema.rb

@@ -0,0 +1,30 @@
+module SwaggerApi
+  module Concerns
+    module StiSchema
+      extend ActiveSupport::Concern
+
+      included do
+        def is_sti?(model)
+          model_klass = model&.safe_constantize || model
+          return false if model_klass.is_a? String
+          Rails.application.eager_load!
+          model_klass.descendants.count != 0
+        end
+
+        def schema(model)
+          if is_sti?(model)
+            {
+              oneOf: model.descendants.map do |klass|
+                { '$ref' => "#/components/schemas/#{klass.name}" }
+              end
+            }
+          else
+            {
+              '$ref' => "#/components/schemas/#{model.try(:name) || model}"
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/swagger_api/operations/base.rb

@@ -3,6 +3,7 @@ module SwaggerApi
     class Base
       include ActiveAttr::Model
       include SwaggerApi::Concerns::Columns
+      include SwaggerApi::Concerns::StiSchema
 
       attr_accessor :controller, :action
 
@@ -32,6 +33,12 @@ module SwaggerApi
         ]
       end
 
+      def request_body
+        {
+          '$ref' => "#/components/requestBodies/#{model_name}"
+        }
+      end
+
       def responses
         return @responses unless @responses.nil?
         @responses = success_response
@@ -47,9 +54,7 @@ module SwaggerApi
             description: "#{readable_action} #{model_name.downcase}'s information",
             content: {
               'application/json; charset=utf-8' => {
-                schema: {
-                  '$ref' => "#/components/schemas/#{model_name}"
-                }
+                schema: schema(model)
               }
             }
           }

data/lib/swagger_api/operations/create.rb

@@ -8,12 +8,6 @@ module SwaggerApi
         create
       end
 
-      def request_body
-        {
-          "$ref" => "#/components/requestBodies/#{model_name}"
-        }
-      end
-
       def success_response
         {
           '303' => {

data/lib/swagger_api/operations/update.rb

@@ -7,12 +7,6 @@ module SwaggerApi
         create
       end
 
-      def request_body
-        {
-          "$ref" => "#/components/requestBodies/#{model_name}"
-        }
-      end
-
       def success_response
         {
           '303' => {

data/lib/swagger_api/request_bodies.rb

@@ -1,6 +1,8 @@
 module SwaggerApi
   class RequestBodies
     include ActiveAttr::Model
+    include SwaggerApi::Concerns::StiSchema
+
     attr_accessor :controllers
 
     def create
@@ -15,12 +17,10 @@ module SwaggerApi
       {
         content: {
           'application/json' => {
-            schema: {
-              '$ref' => "#/components/schemas/#{controller.model}"
-            }
+            schema: schema(controller.model.safe_constantize || controller.model)
           }
         },
-        description: "audience attribute",
+        description: "#{controller.model} attribute",
         required: true
       }
     end

data/lib/swagger_api/version.rb

@@ -1,3 +1,3 @@
 module SwaggerApi
-  VERSION = "0.1.47"
+  VERSION = "0.1.48"
 end

data/lib/swagger_api.rb

@@ -110,6 +110,7 @@ require 'swagger_api/railtie'
 
 require 'swagger_api/actions'
 require 'swagger_api/concerns/columns'
+require 'swagger_api/concerns/sti_schema'
 require 'swagger_api/column_schema'
 require 'swagger_api/component_schema'
 require 'swagger_api/components'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagger_api
 version: !ruby/object:Gem::Version
-  version: 0.1.47
+  version: 0.1.48
 platform: ruby
 authors:
 - Full Measure Education
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,6 +121,7 @@ files:
 - lib/swagger_api/component_schema.rb
 - lib/swagger_api/components.rb
 - lib/swagger_api/concerns/columns.rb
+- lib/swagger_api/concerns/sti_schema.rb
 - lib/swagger_api/operations/base.rb
 - lib/swagger_api/operations/create.rb
 - lib/swagger_api/operations/delete.rb