standardapi 6.0.0.29 → 6.0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3670132e90418137f095c8e7741310e2911bfde21e78579e27ea6c54ae88d0f1
-  data.tar.gz: 205778759e7188eda509e289495a383d6a5ff037116fd5043a519f95c5b7222d
+  metadata.gz: bf7ed75a06eda9f024ebd87caccab44573802435d0494944137d92da6403fca2
+  data.tar.gz: f44ad9cdd0d8bb87bc971f0b11b8f50b5f5f1289911d7bf4764f6f867b59b407
 SHA512:
-  metadata.gz: 2d4a009d0ea47b18ebc5088d81bdf4518e9a22749b1ea0a17e8f7b5504be42dbeea60945ad75eeb5a4cdfda866f39edc12391262ff64b2a5cc3748011cb0c4bc
-  data.tar.gz: 49a638815647e3fbe6d63dc4eda87eda4703425b2c36e4565763cc0aad1abf0934d54d8f18858d00ac733f1e4662873f5ff586e1cdf27aafdaebfbc825703b71
+  metadata.gz: 2f0f4ba53a851f87467a584b0a37708a1d2c6a52fc3360c31fbd50462af17918b7c43b435001410984291db24a451940e97487fc549f993d35ecc63d832d3b20
+  data.tar.gz: 26d70be42fd115039c04a4a0ba614225c05a549af0847d3473659c9d593002cd11addcfd330000163eb9d1597843c274593ba99ddd6f9a57ee39b83e8a05fcbb

data/lib/standard_api/controller.rb

@@ -7,6 +7,7 @@ module StandardAPI
       klass.helper_method :includes, :orders, :model, :models, :resource_limit,
         :default_limit
       klass.before_action :set_standardapi_headers
+      klass.rescue_from StandardAPI::ParameterMissing, with: :bad_request
       klass.rescue_from StandardAPI::UnpermittedParameters, with: :bad_request
       klass.append_view_path(File.join(File.dirname(__FILE__), 'views'))
       klass.extend(ClassMethods)
@@ -284,9 +285,9 @@ module StandardAPI
         limit = params.permit(:limit)[:limit]&.to_i || default_limit
 
         if !limit
-          raise ActionController::ParameterMissing.new(:limit)
+          raise StandardAPI::ParameterMissing.new(:limit)
         elsif limit > resource_limit
-          raise ActionController::UnpermittedParameters.new([:limit, limit])
+          raise StandardAPI::UnpermittedParameters.new([:limit, limit])
         end
 
         limit

data/lib/standard_api/errors.rb

@@ -2,6 +2,15 @@ module StandardAPI
   class StandardAPIError < StandardError
   end
 
+  class ParameterMissing < StandardAPIError
+    attr_reader :param
+
+    def initialize(param)
+      @param = param
+      super("param is missing or the value is empty: #{param}")
+    end
+  end
+
   class UnpermittedParameters < StandardAPIError
     attr_reader :params
 

data/lib/standard_api/test_case/create_tests.rb

@@ -85,9 +85,12 @@ module StandardAPI
       end
 
       test '#create.html' do
-        return unless supports_format(:html)
+        return unless supports_format(:html, :create)
+
+        attrs = attributes_for(singular_name, :nested).select do |k,v|
+          !model.readonly_attributes.include?(k.to_s)
+        end
 
-        attrs = attributes_for(singular_name, :nested).select{ |k,v| !model.readonly_attributes.include?(k.to_s) }
         mask.each { |k, v| attrs[k] = v }
         create_webmocks(attrs)
 
@@ -98,7 +101,7 @@ module StandardAPI
       end
 
       test '#create.html with invalid attributes renders edit action' do
-        return unless supports_format(:html)
+        return unless supports_format(:html, :create)
 
         trait = FactoryBot.factories[singular_name].definition.defined_traits.any? { |x| x.name.to_s == 'invalid' }
 

data/lib/standard_api/test_case/index_tests.rb

@@ -37,10 +37,10 @@ module StandardAPI
 
       test '#index.json params[:limit] does not exceed maximum limit' do
         return if !resource_limit || resource_limit == Float::INFINITY
-        
-        assert_raises ActionController::UnpermittedParameters do
-          get resource_path(:index, format: :json), params: { limit: resource_limit + 1 }
-        end
+
+        get resource_path(:index, format: :json), params: { limit: resource_limit + 1 }
+        assert_response :bad_request
+        assert_equal 'found unpermitted parameters: :limit, 1001', response.body
       end
 
       test '#index.json params[:where]' do

data/lib/standard_api/test_case.rb

@@ -18,7 +18,7 @@ module StandardAPI::TestCase
       assert_equal(expected, *args)
     end
   end
-      
+
   def self.included(klass)
     [:filters, :orders, :includes].each do |attribute|
       klass.send(:class_attribute, attribute)
@@ -53,14 +53,14 @@ module StandardAPI::TestCase
     end
   end
 
-  def supports_format(format)
+  def supports_format(format, action=nil)
     count = controller_class.view_paths.count do |path|
-      !Dir.glob("#{path.instance_variable_get(:@path)}/{#{model.name.underscore},application}/**/*.#{format}*").empty?
+      !Dir.glob("#{path.instance_variable_get(:@path)}/{#{model.name.underscore},application}/**/#{action || '*'}.#{format}*").empty?
     end
-    
+
     count > 0
   end
-  
+
   def default_orders
     controller_class.new.send(:default_orders)
   end
@@ -76,7 +76,7 @@ module StandardAPI::TestCase
   def model
     self.class.model
   end
-  
+
   def mask
     {}
   end
@@ -98,11 +98,11 @@ module StandardAPI::TestCase
   def singular_name
     model.model_name.singular
   end
-  
+
   def plural_name
     model.model_name.plural
   end
-    
+
   def create_webmocks(attributes)
     attributes.each do |attribute, value|
       self.class.model.validators_on(attribute)
@@ -122,7 +122,7 @@ module StandardAPI::TestCase
       value
     end
   end
-    
+
   def normalize_to_json(record, attribute, value)
     value = normalize_attribute(record, attribute, value)
     return nil if value.nil?
@@ -149,7 +149,7 @@ module StandardAPI::TestCase
 
     def controller_class
       controller_class_name = self.name.gsub(/Test$/, '')
-      controller_class_name.constantize 
+      controller_class_name.constantize
     rescue NameError => e
       raise e if e.message != "uninitialized constant #{controller_class_name}"
     end
@@ -166,7 +166,7 @@ module StandardAPI::TestCase
       return @model if defined?(@model) && @model
 
       klass_name = controller_class.name.gsub(/Controller$/, '').singularize
-        
+
       begin
         @model = klass_name.constantize
       rescue NameError

data/lib/standard_api/version.rb

@@ -1,3 +1,3 @@
 module StandardAPI
-  VERSION = '6.0.0.29'
+  VERSION = '6.0.0.30'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standardapi
 version: !ruby/object:Gem::Version
-  version: 6.0.0.29
+  version: 6.0.0.30
 platform: ruby
 authors:
 - James Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails